[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 159cd7910bda2d7cdb0d8f48c203f012c9dbad1a
by git＠ipfire.org 22 Mar '11
by git＠ipfire.org 22 Mar '11
22 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 159cd7910bda2d7cdb0d8f48c203f012c9dbad1a (commit)
via fc5338fa5e617820ca3a6c2a8987621c4b0b9f63 (commit)
via 7c5fe3a8daa3dc51bb6d8f4fa82d043db8dc6ef5 (commit)
via 2ee8c6e70eed961bc9e1c48a3194c889cbc1a771 (commit)
via cb0279033d7e548985c316d4ad2c9ed6f3976f14 (commit)
via e37bf054584855483f5475ddc8d1c60038af5eb5 (commit)
via 0371d2c84cb3c3e54baa4de8b74f356394f6f217 (commit)
from 94fc0510d83ed869280495e63ac9690abf2d0133 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 159cd7910bda2d7cdb0d8f48c203f012c9dbad1a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 22:52:17 2011 +0100
pam: Add pam_ldap as dependency.
We use this for authentication.
commit fc5338fa5e617820ca3a6c2a8987621c4b0b9f63
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 18:18:20 2011 +0100
util-linux: Make sure all included pam files are present.
commit 7c5fe3a8daa3dc51bb6d8f4fa82d043db8dc6ef5
Merge: 2ee8c6e 94fc051
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 15:35:28 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 2ee8c6e70eed961bc9e1c48a3194c889cbc1a771
Merge: cb02790 a3fe657
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 13:13:06 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit cb0279033d7e548985c316d4ad2c9ed6f3976f14
Merge: e37bf05 fb2f3a9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 21 02:49:13 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit e37bf054584855483f5475ddc8d1c60038af5eb5
Merge: 0371d2c b42a752
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 21 02:35:54 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 0371d2c84cb3c3e54baa4de8b74f356394f6f217
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 20 16:48:17 2011 +0100
mc: Build fix. Ignore weird dependency perl(pieces).
-----------------------------------------------------------------------
Summary of changes:
pkgs/mc/mc.nm | 5 ++++-
pkgs/pam/pam.nm | 3 ++-
pkgs/util-linux/util-linux.nm | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/pkgs/mc/mc.nm b/pkgs/mc/mc.nm
index bec6d2e..6625e4a 100644
--- a/pkgs/mc/mc.nm
+++ b/pkgs/mc/mc.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = mc
PKG_VER = 4.7.4
-PKG_REL = 0
+PKG_REL = 1
PKG_MAINTAINER =
PKG_GROUPS = Applications/System
@@ -36,6 +36,9 @@ PKG_SUMMARY = User-friendly text console file manager and visual shell.
PKG_BUILD_DEPS+= e2fsprogs-devel glib2-devel pkg-config samba-devel slang-devel
+# This awkward dependency is found and cannot be resolved.
+PKG_REQUIRES_FILTER = perl\(pieces\)
+
define PKG_DESCRIPTION
Midnight Commander is a visual shell much like a file manager, only \
with many more features. It is a text mode application, but it also \
diff --git a/pkgs/pam/pam.nm b/pkgs/pam/pam.nm
index 1287a23..45f88c7 100644
--- a/pkgs/pam/pam.nm
+++ b/pkgs/pam/pam.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = Linux-PAM
PKG_VER = 1.1.0
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER =
PKG_GROUPS = System/Base
@@ -35,6 +35,7 @@ PKG_LICENSE = BSD and GPLv2+ and BSD with advertising
PKG_SUMMARY = An extensible library which provides authentication for applications.
PKG_BUILD_DEPS+= audit-devel bison cracklib-devel flex libselinux-devel
+PKG_DEPS-pam += pam_ldap
define PKG_DESCRIPTION
PAM (Pluggable Authentication Modules) is a system security tool that \
diff --git a/pkgs/util-linux/util-linux.nm b/pkgs/util-linux/util-linux.nm
index 670624f..458a3ff 100644
--- a/pkgs/util-linux/util-linux.nm
+++ b/pkgs/util-linux/util-linux.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = util-linux
PKG_VER = 2.19
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER =
PKG_GROUPS = System/Base
@@ -37,6 +37,7 @@ PKG_SUMMARY = A collection of basic system utilities.
PKG_BUILD_DEPS+= audit-devel gettext libcap-devel libselinux-devel \
libsepol-devel ncurses-devel pam-devel zlib-devel
+PKG_DEPS += /etc/pam.d/system-auth
define PKG_DESCRIPTION
The util-linux package contains a large variety of low-level system \
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 94fc0510d83ed869280495e63ac9690abf2d0133
by git＠ipfire.org 22 Mar '11
by git＠ipfire.org 22 Mar '11
22 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 94fc0510d83ed869280495e63ac9690abf2d0133 (commit)
via 3fda3057d54cd8fec31e25a3af839adc66744d2e (commit)
via f8b4a3ba2ec115dd316b9e54d582de196632d4c9 (commit)
via 27dc0ff7fe876ba84ae8f4b8570f89aae200f417 (commit)
via 5fa9f2d9430aca108f8de3b1a29dd60502b526f6 (commit)
via c3b815b0dbb6d2452e5ad2566ced6767a9774981 (commit)
via bdbbdbffcfe33a8c9f8baa77b4e2d8c2158d8526 (commit)
via d2ab169e2f8bbee2d5771a03ecf7bf72a144af9f (commit)
via e337df8a6068f8710ea233abbe0c98595c12f1e4 (commit)
from a3fe65752cfc3aa9f51e63a818b5207746ecbae2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 94fc0510d83ed869280495e63ac9690abf2d0133
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 15:32:58 2011 +0100
upower: util-linux-ng -> util-linux.
commit 3fda3057d54cd8fec31e25a3af839adc66744d2e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 15:32:58 2011 +0100
udisks: util-linux-ng -> util-linux.
commit f8b4a3ba2ec115dd316b9e54d582de196632d4c9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 15:32:54 2011 +0100
nfs-utils: util-linux-ng -> util-linux.
commit 27dc0ff7fe876ba84ae8f4b8570f89aae200f417
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 15:32:50 2011 +0100
initscripts: util-linux-ng -> util-linux.
commit 5fa9f2d9430aca108f8de3b1a29dd60502b526f6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 15:32:48 2011 +0100
dracut: util-linux-ng -> util-linux.
commit c3b815b0dbb6d2452e5ad2566ced6767a9774981
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 15:32:47 2011 +0100
basesystem: util-linux-ng -> util-linux.
commit bdbbdbffcfe33a8c9f8baa77b4e2d8c2158d8526
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 15:17:58 2011 +0100
util-linux: Renamed util-linux-ng and updated it to 2.19.
commit d2ab169e2f8bbee2d5771a03ecf7bf72a144af9f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 14:46:51 2011 +0100
util-linux-ng: Add /etc/mtab.
References #149.
commit e337df8a6068f8710ea233abbe0c98595c12f1e4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 14:46:21 2011 +0100
build-essentials: Add whitelisting for symlinks.
-----------------------------------------------------------------------
Summary of changes:
pkgs/basesystem/basesystem.nm | 2 +-
pkgs/build-essentials/build-essentials.nm | 2 +-
pkgs/build-essentials/buildsystem/Constants | 1 +
.../quality-agent/quality-agent.d/002-bad-symlinks | 6 ++++
pkgs/dracut/dracut.nm | 2 +-
pkgs/initscripts/initscripts.nm | 2 +-
pkgs/nfs-utils/nfs-utils.nm | 2 +-
pkgs/udisks/udisks.nm | 2 +-
pkgs/upower/upower.nm | 2 +-
pkgs/{util-linux-ng => util-linux}/nologin.8 | 0
pkgs/{util-linux-ng => util-linux}/nologin.c | 0
pkgs/{util-linux-ng => util-linux}/pam.d/login | 0
.../util-linux-ng.nm => util-linux/util-linux.nm} | 25 +++++++++++++------
13 files changed, 31 insertions(+), 15 deletions(-)
rename pkgs/{util-linux-ng => util-linux}/nologin.8 (100%)
rename pkgs/{util-linux-ng => util-linux}/nologin.c (100%)
rename pkgs/{util-linux-ng => util-linux}/pam.d/login (100%)
rename pkgs/{util-linux-ng/util-linux-ng.nm => util-linux/util-linux.nm} (91%)
Difference in files:
diff --git a/pkgs/basesystem/basesystem.nm b/pkgs/basesystem/basesystem.nm
index 9377ee5..552aa57 100644
--- a/pkgs/basesystem/basesystem.nm
+++ b/pkgs/basesystem/basesystem.nm
@@ -42,7 +42,7 @@ PKG_BUILD_DEPS = # There are no build dependencies
PKG_DEPS += /bin/sh /sbin/init \
coreutils file findutils gawk grep iana-etc initscripts kbd less \
module-init-tools network pakfire passwd procps psmisc sed setup \
- shadow system-release tar udev util-linux-ng vim
+ shadow system-release tar udev util-linux vim
define PKG_DESCRIPTION
This package contains files that are needed to run basic \
diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 6df0215..6509f73 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials
PKG_VER = $(DISTRO_VERSION)
-PKG_REL = 12
+PKG_REL = 13
PKG_EPOCH = 1
PKG_ARCH = noarch
diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants
index dda1195..0bc56c1 100644
--- a/pkgs/build-essentials/buildsystem/Constants
+++ b/pkgs/build-essentials/buildsystem/Constants
@@ -157,3 +157,4 @@ export QUALITY_AGENT_WHITELIST_EXECSTACK
export QUALITY_AGENT_WHITELIST_NX
export QUALITY_AGENT_WHITELIST_RPATH
export QUALITY_AGENT_WHITELIST_SONAME
+export QUALITY_AGENT_WHITELIST_SYMLINK
diff --git a/pkgs/build-essentials/quality-agent/quality-agent.d/002-bad-symlinks b/pkgs/build-essentials/quality-agent/quality-agent.d/002-bad-symlinks
index 595a7c5..27e8558 100755
--- a/pkgs/build-essentials/quality-agent/quality-agent.d/002-bad-symlinks
+++ b/pkgs/build-essentials/quality-agent/quality-agent.d/002-bad-symlinks
@@ -9,12 +9,18 @@ log_debug "Search for absolute symlinks"
function check() {
local failed=0
+ local item
for link in $(find ${BUILDROOT} -type l); do
if fgrep -q "/lib/udev/devices" <<<${link}; then
continue
fi
+ if listmatch "${link:${#BUILDROOT}}" ${QUALITY_AGENT_WHITELIST_SYMLINK}; then
+ log INFO "Symlink ${link} is on the whitelist."
+ continue
+ fi
+
destination=$(readlink ${link})
if [ "${destination:0:1}" = "/" ]; then
log ERROR " Absolute symlink: ${link}"
diff --git a/pkgs/dracut/dracut.nm b/pkgs/dracut/dracut.nm
index 88695b6..ed5dc08 100644
--- a/pkgs/dracut/dracut.nm
+++ b/pkgs/dracut/dracut.nm
@@ -37,7 +37,7 @@ PKG_SUMMARY = Initramfs generator using udev.
PKG_DEPS += bash bzip2 cpio coreutils dmraid e2fsprogs eject gzip \
iproute2 iputils kbd less libselinux lvm2 mdadm multipath-tools \
- sysvinit udev util-linux-ng which
+ sysvinit udev util-linux which
define PKG_DESCRIPTION
dracut is a new, event-driven initramfs infrastructure based around udev.
diff --git a/pkgs/initscripts/initscripts.nm b/pkgs/initscripts/initscripts.nm
index 08fbbb2..6dea941 100644
--- a/pkgs/initscripts/initscripts.nm
+++ b/pkgs/initscripts/initscripts.nm
@@ -35,7 +35,7 @@ PKG_LICENSE = GPLv3+
PKG_SUMMARY = The set of scripts that initalize the system.
PKG_DEPS += bash coreutils e2fsprogs grep iproute2 module-init-tools \
- procps sed system-release udev util-linux-ng
+ procps sed system-release udev util-linux
define PKG_DESCRIPTION
The initscripts package contains the basic system scripts used to boot \
diff --git a/pkgs/nfs-utils/nfs-utils.nm b/pkgs/nfs-utils/nfs-utils.nm
index d67254b..a9dca11 100644
--- a/pkgs/nfs-utils/nfs-utils.nm
+++ b/pkgs/nfs-utils/nfs-utils.nm
@@ -34,7 +34,7 @@ PKG_URL = http://nfs.sourceforge.net/
PKG_LICENSE = MIT and GPLv2 and GPLv2+
PKG_SUMMARY = NFS utilities and supporting clients and daemons for the NFS server.
-PKG_DEPS += libevent libnfsidmap libgssglue libcap util-linux-ng
+PKG_DEPS += libevent libnfsidmap libgssglue libcap util-linux
define PKG_DESCRIPTION
The nfs-utils package provides a daemon for the kernel NFS server \
diff --git a/pkgs/udisks/udisks.nm b/pkgs/udisks/udisks.nm
index 3e9f3e9..5e9c3fd 100644
--- a/pkgs/udisks/udisks.nm
+++ b/pkgs/udisks/udisks.nm
@@ -37,7 +37,7 @@ PKG_SUMMARY = Storage Management Service.
PKG_BUILD_DEPS+= dbus-devel dbus-glib-devel e2fsprogs-devel glib2-devel \
intltool libatasmart-devel libdevmapper-devel libudev-devel \
parted-devel polkit-devel pkg-config sg3-utils-devel
-PKG_DEPS += dosfstools e2fsprogs mdadm parted udev util-linux-ng xfsprogs
+PKG_DEPS += dosfstools e2fsprogs mdadm parted udev util-linux xfsprogs
define PKG_DESCRIPTION
udisks provides a daemon, D-Bus API and command line tools \
diff --git a/pkgs/upower/upower.nm b/pkgs/upower/upower.nm
index f3d5abe..b4fc020 100644
--- a/pkgs/upower/upower.nm
+++ b/pkgs/upower/upower.nm
@@ -36,7 +36,7 @@ PKG_SUMMARY = Power Management Service.
PKG_BUILD_DEPS+= bison dbus-devel dbus-glib-devel glib2-devel gettext intltool \
perl-XML-Parser pkg-config polkit-devel
-PKG_DEPS += udev util-linux-ng
+PKG_DEPS += udev util-linux
define PKG_DESCRIPTION
udisks provides a daemon, D-Bus API and command line tools \
diff --git a/pkgs/util-linux-ng/nologin.8 b/pkgs/util-linux-ng/nologin.8
deleted file mode 100644
index 5cb1601..0000000
--- a/pkgs/util-linux-ng/nologin.8
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" $OpenBSD: nologin.8,v 1.8 1999/06/04 02:45:19 aaron Exp $
-.\" $NetBSD: nologin.8,v 1.3 1995/03/18 14:59:09 cgd Exp $
-.\"
-.\" Copyright (c) 1993
-.\" The Regents of the University of California. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" @(#)nologin.8 8.1 (Berkeley) 6/19/93
-.\"
-.Dd February 15, 1997
-.Dt NOLOGIN 8
-.Os
-.Sh NAME
-.Nm nologin
-.Nd politely refuse a login
-.Sh SYNOPSIS
-.Nm nologin
-.Sh DESCRIPTION
-.Nm
-displays a message that an account is not available and
-exits non-zero.
-It is intended as a replacement shell field for accounts that
-have been disabled.
-.Pp
-If the file
-.Pa /etc/nologin.txt
-exists,
-.Nm
-displays its contents to the user instead of the default message.
-.Sh SEE ALSO
-.Xr login 1
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.4 .
diff --git a/pkgs/util-linux-ng/nologin.c b/pkgs/util-linux-ng/nologin.c
deleted file mode 100644
index 8a51ba9..0000000
--- a/pkgs/util-linux-ng/nologin.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $OpenBSD: nologin.c,v 1.2 1997/04/04 16:51:37 millert Exp $ */
-
-/*
- * Copyright (c) 1997, Jason Downs. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-/* Distinctly different from _PATH_NOLOGIN. */
-#define _PATH_NOLOGIN_TXT "/etc/nologin.txt"
-
-#define DEFAULT_MESG "This account is currently not available.\n"
-
-/*ARGSUSED*/
-int main(argc, argv)
- int argc;
- char *argv[];
-{
- int nfd, nrd;
- char nbuf[128];
-
- nfd = open(_PATH_NOLOGIN_TXT, O_RDONLY);
- if (nfd < 0) {
- write(STDOUT_FILENO, DEFAULT_MESG, strlen(DEFAULT_MESG));
- exit (1);
- }
-
- while ((nrd = read(nfd, nbuf, sizeof(nbuf))) > 0)
- write(STDOUT_FILENO, nbuf, nrd);
- close (nfd);
-
- exit (1);
-}
diff --git a/pkgs/util-linux-ng/pam.d/login b/pkgs/util-linux-ng/pam.d/login
deleted file mode 100644
index ba632dd..0000000
--- a/pkgs/util-linux-ng/pam.d/login
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth include system-auth
-
-account required pam_nologin.so
-account include system-auth
-
-password include system-auth
-
-session include system-auth
diff --git a/pkgs/util-linux-ng/util-linux-ng.nm b/pkgs/util-linux-ng/util-linux-ng.nm
deleted file mode 100644
index 129d32e..0000000
--- a/pkgs/util-linux-ng/util-linux-ng.nm
+++ /dev/null
@@ -1,165 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include $(PKGROOT)/Include
-
-PKG_NAME = util-linux-ng
-PKG_VER = 2.18
-PKG_REL = 2
-
-PKG_MAINTAINER =
-PKG_GROUPS = System/Base
-PKG_GROUPS-$(PKG_NAME) = Base $(PKG_GROUPS)
-PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
-PKG_LICENSE = GPLv2 and GPLv2+ and BSD with advertising and Public Domain
-PKG_SUMMARY = A collection of basic system utilities.
-
-PKG_BUILD_DEPS+= audit-devel gettext libcap-devel libselinux-devel \
- libsepol-devel ncurses-devel pam-devel zlib-devel
-
-define PKG_DESCRIPTION
- The util-linux-ng package contains a large variety of low-level system \
- utilities that are necessary for a Linux system to function. Among \
- others, Util-linux contains the fdisk configuration tool and the login \
- program.
-endef
-
-PKG_TARBALL = $(THISAPP).tar.gz
-
-PKG_PACKAGES += libblkid libblkid-devel libuuid libuuid-devel \
- libmount libmount-devel
-
-# Package information for libblkid
-PKG_SUMMARY-libblkid = Block device ID library.
-PKG_DESCRIPTION-libblkid = This is the block device identification library, \
- part of util-linux-ng.
-
-define PKG_FILES-libblkid
- /lib/libblkid.*
-endef
-
-# Package information for libblkid-devel
-PKG_SUMMARY-libblkid-devel = Development library and header of libblkid.
-PKG_DESCRIPTION-libblkid-devel = $(PKG_SUMMARY-libblkid-devel)
-
-define PKG_FILES-libblkid-devel
- /usr/include/blkid/ \
- /usr/lib/libblkid.* \
- /usr/lib/pkgconfig/blkid.pc \
- /usr/share/man/man3/*blkid*
-endef
-
-# Package information for libuuid
-PKG_SUMMARY-libuuid = Universally unique ID library.
-PKG_DESCRIPTION-libuuid = This is the universally unique ID library, \
- part of util-linux-ng.
-
-define PKG_FILES-libuuid
- /lib/libuuid.*
-endef
-
-# Package information for libuuid-devel
-PKG_SUMMARY-libuuid-devel = Development library and header of libuuid.
-PKG_DESCRIPTION-libuuid-devel = $(PKG_SUMMARY-libuuid-devel)
-
-define PKG_FILES-libuuid-devel
- /usr/include/uuid/ \
- /usr/lib/libuuid.* \
- /usr/lib/pkgconfig/uuid.pc \
- /usr/share/man/man3/*uuid*
-endef
-
-# Package information for libmount
-PKG_SUMMARY-libmount = Device mounting library.
-PKG_DESCRIPTION-libmount = This is the device mounting library, \
- part of util-linux-ng.
-
-define PKG_FILES-libmount
- /lib/libmount.*
-endef
-
-# Package information for libmount-devel
-PKG_SUMMARY-libmount-devel = Development library and header of libmount.
-PKG_DESCRIPTION-libmount-devel = $(PKG_SUMMARY-libmount-devel)
-
-define PKG_FILES-libmount-devel
- /usr/include/mount/ \
- /usr/lib/libmount.* \
- /usr/lib/pkgconfig/mount.pc \
- /usr/share/man/man3/*mount*
-endef
-
-
-CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-
-CONFIGURE_OPTIONS += \
- --bindir=/bin \
- --sbindir=/sbin \
- --disable-wall \
- --enable-arch \
- --enable-kill \
- --enable-login-utils \
- --enable-partx \
- --enable-write \
- --with-selinux \
- --with-audit \
- --disable-makeinstall-chown \
- --disable-static
-
-
-define STAGE_PREPARE_CMDS
- cd $(DIR_APP) && sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
- -i $$(grep -rl '/etc/adjtime' .)
-endef
-
-define STAGE_BUILD_CMDS
- # Build nologin
- cd $(DIR_APP) && gcc $(CFLAGS) -o nologin $(DIR_SOURCE)/nologin.c
-endef
-
-define STAGE_INSTALL_CMDS
- -mkdir -pv $(BUILDROOT)/sbin \
- $(BUILDROOT)/var/lib/hwclock \
- $(BUILDROOT)/usr/share/man/man8 \
- $(BUILDROOT)/var/log
-
- install -m 755 $(DIR_APP)/nologin $(BUILDROOT)/sbin
- install -m 644 $(DIR_SOURCE)/nologin.8 $(BUILDROOT)/usr/share/man/man8/
-
- touch $(BUILDROOT)/var/log/lastlog
-
- # Remove deprecated commands
- rm -fv $(BUILDROOT)/{sbin,usr/share/man/man*}/{fsck,mkfs}.{bfs,minix}* \
- $(BUILDROOT)/usr/bin/chkdupexe $(BUILDROOT)/usr/bin/vi{gr,pw} \
- $(BUILDROOT)/sbin/{sln,shutdown} $(BUILDROOT)/bin/{line,newgrp,pg}
- rm -fv $(BUILDROOT)/usr/share/getopt/*.tcsh
-endef
-
-define STAGE_INSTALL_POST
- # Set capabilities
- chmod -v -s $(BUILDROOT)/bin/mount
- setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep $(BUILDROOT)/bin/mount
- chmod -v -s $(BUILDROOT)/bin/umount
- setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep $(BUILDROOT)/bin/umount
-endef
diff --git a/pkgs/util-linux/nologin.8 b/pkgs/util-linux/nologin.8
new file mode 100644
index 0000000..5cb1601
--- /dev/null
+++ b/pkgs/util-linux/nologin.8
@@ -0,0 +1,63 @@
+.\" $OpenBSD: nologin.8,v 1.8 1999/06/04 02:45:19 aaron Exp $
+.\" $NetBSD: nologin.8,v 1.3 1995/03/18 14:59:09 cgd Exp $
+.\"
+.\" Copyright (c) 1993
+.\" The Regents of the University of California. All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by the University of
+.\" California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\" may be used to endorse or promote products derived from this software
+.\" without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" @(#)nologin.8 8.1 (Berkeley) 6/19/93
+.\"
+.Dd February 15, 1997
+.Dt NOLOGIN 8
+.Os
+.Sh NAME
+.Nm nologin
+.Nd politely refuse a login
+.Sh SYNOPSIS
+.Nm nologin
+.Sh DESCRIPTION
+.Nm
+displays a message that an account is not available and
+exits non-zero.
+It is intended as a replacement shell field for accounts that
+have been disabled.
+.Pp
+If the file
+.Pa /etc/nologin.txt
+exists,
+.Nm
+displays its contents to the user instead of the default message.
+.Sh SEE ALSO
+.Xr login 1
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.4 .
diff --git a/pkgs/util-linux/nologin.c b/pkgs/util-linux/nologin.c
new file mode 100644
index 0000000..8a51ba9
--- /dev/null
+++ b/pkgs/util-linux/nologin.c
@@ -0,0 +1,58 @@
+/* $OpenBSD: nologin.c,v 1.2 1997/04/04 16:51:37 millert Exp $ */
+
+/*
+ * Copyright (c) 1997, Jason Downs. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+/* Distinctly different from _PATH_NOLOGIN. */
+#define _PATH_NOLOGIN_TXT "/etc/nologin.txt"
+
+#define DEFAULT_MESG "This account is currently not available.\n"
+
+/*ARGSUSED*/
+int main(argc, argv)
+ int argc;
+ char *argv[];
+{
+ int nfd, nrd;
+ char nbuf[128];
+
+ nfd = open(_PATH_NOLOGIN_TXT, O_RDONLY);
+ if (nfd < 0) {
+ write(STDOUT_FILENO, DEFAULT_MESG, strlen(DEFAULT_MESG));
+ exit (1);
+ }
+
+ while ((nrd = read(nfd, nbuf, sizeof(nbuf))) > 0)
+ write(STDOUT_FILENO, nbuf, nrd);
+ close (nfd);
+
+ exit (1);
+}
diff --git a/pkgs/util-linux/pam.d/login b/pkgs/util-linux/pam.d/login
new file mode 100644
index 0000000..ba632dd
--- /dev/null
+++ b/pkgs/util-linux/pam.d/login
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth include system-auth
+
+account required pam_nologin.so
+account include system-auth
+
+password include system-auth
+
+session include system-auth
diff --git a/pkgs/util-linux/util-linux.nm b/pkgs/util-linux/util-linux.nm
new file mode 100644
index 0000000..670624f
--- /dev/null
+++ b/pkgs/util-linux/util-linux.nm
@@ -0,0 +1,174 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = util-linux
+PKG_VER = 2.19
+PKG_REL = 1
+
+PKG_MAINTAINER =
+PKG_GROUPS = System/Base
+PKG_GROUPS-$(PKG_NAME) = Base $(PKG_GROUPS)
+PKG_URL = http://kernel.org/~kzak/util-linux/
+PKG_LICENSE = GPLv2 and GPLv2+ and BSD with advertising and Public Domain
+PKG_SUMMARY = A collection of basic system utilities.
+
+PKG_BUILD_DEPS+= audit-devel gettext libcap-devel libselinux-devel \
+ libsepol-devel ncurses-devel pam-devel zlib-devel
+
+define PKG_DESCRIPTION
+ The util-linux package contains a large variety of low-level system \
+ utilities that are necessary for a Linux system to function. Among \
+ others, Util-linux contains the fdisk configuration tool and the login \
+ program.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.gz
+
+PKG_PACKAGES += libblkid libblkid-devel libuuid libuuid-devel \
+ libmount libmount-devel
+
+# This symlink is allowed to be absolute.
+QUALITY_AGENT_WHITELIST_SYMLINK = /etc/mtab
+PKG_REQUIRES_FILTER = /proc/.*/mounts
+
+# Package information for libblkid
+PKG_SUMMARY-libblkid = Block device ID library.
+PKG_DESCRIPTION-libblkid = This is the block device identification library, \
+ part of util-linux.
+
+define PKG_FILES-libblkid
+ /lib/libblkid.*
+endef
+
+# Package information for libblkid-devel
+PKG_SUMMARY-libblkid-devel = Development library and header of libblkid.
+PKG_DESCRIPTION-libblkid-devel = $(PKG_SUMMARY-libblkid-devel)
+
+define PKG_FILES-libblkid-devel
+ /usr/include/blkid/ \
+ /usr/lib/libblkid.* \
+ /usr/lib/pkgconfig/blkid.pc \
+ /usr/share/man/man3/*blkid*
+endef
+
+# Package information for libuuid
+PKG_SUMMARY-libuuid = Universally unique ID library.
+PKG_DESCRIPTION-libuuid = This is the universally unique ID library, \
+ part of util-linux.
+
+define PKG_FILES-libuuid
+ /lib/libuuid.*
+endef
+
+# Package information for libuuid-devel
+PKG_SUMMARY-libuuid-devel = Development library and header of libuuid.
+PKG_DESCRIPTION-libuuid-devel = $(PKG_SUMMARY-libuuid-devel)
+
+define PKG_FILES-libuuid-devel
+ /usr/include/uuid/ \
+ /usr/lib/libuuid.* \
+ /usr/lib/pkgconfig/uuid.pc \
+ /usr/share/man/man3/*uuid*
+endef
+
+# Package information for libmount
+PKG_SUMMARY-libmount = Device mounting library.
+PKG_DESCRIPTION-libmount = This is the device mounting library, \
+ part of util-linux.
+
+define PKG_FILES-libmount
+ /lib/libmount.*
+endef
+
+# Package information for libmount-devel
+PKG_SUMMARY-libmount-devel = Development library and header of libmount.
+PKG_DESCRIPTION-libmount-devel = $(PKG_SUMMARY-libmount-devel)
+
+define PKG_FILES-libmount-devel
+ /usr/include/mount/ \
+ /usr/lib/libmount.* \
+ /usr/lib/pkgconfig/mount.pc \
+ /usr/share/man/man3/*mount*
+endef
+
+
+CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+
+CONFIGURE_OPTIONS += \
+ --bindir=/bin \
+ --sbindir=/sbin \
+ --disable-wall \
+ --enable-arch \
+ --enable-kill \
+ --enable-login-utils \
+ --enable-partx \
+ --enable-write \
+ --enable-libmount-mount \
+ --with-selinux \
+ --with-audit \
+ --disable-makeinstall-chown \
+ --disable-static
+
+
+define STAGE_PREPARE_CMDS
+ cd $(DIR_APP) && sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
+ -i $$(grep -rl '/etc/adjtime' .)
+endef
+
+define STAGE_BUILD_CMDS
+ # Build nologin
+ cd $(DIR_APP) && gcc $(CFLAGS) -o nologin $(DIR_SOURCE)/nologin.c
+endef
+
+define STAGE_INSTALL_CMDS
+ -mkdir -pv $(BUILDROOT)/sbin \
+ $(BUILDROOT)/var/lib/hwclock \
+ $(BUILDROOT)/usr/share/man/man8 \
+ $(BUILDROOT)/var/log
+
+ install -m 755 $(DIR_APP)/nologin $(BUILDROOT)/sbin
+ install -m 644 $(DIR_SOURCE)/nologin.8 $(BUILDROOT)/usr/share/man/man8/
+
+ touch $(BUILDROOT)/var/log/lastlog
+
+ # Remove deprecated commands
+ rm -fv $(BUILDROOT)/{sbin,usr/share/man/man*}/{fsck,mkfs}.{bfs,minix}* \
+ $(BUILDROOT)/usr/bin/chkdupexe $(BUILDROOT)/usr/bin/vi{gr,pw} \
+ $(BUILDROOT)/sbin/{sln,shutdown} $(BUILDROOT)/bin/{line,newgrp,pg}
+ rm -fv $(BUILDROOT)/usr/share/getopt/*.tcsh
+
+ # Create /etc/mtab symlink
+ -mkdir -pv $(BUILDROOT)/etc
+ ln -svf /proc/mounts $(BUILDROOT)/etc/mtab
+endef
+
+define STAGE_INSTALL_POST
+ # Set capabilities
+ chmod -v -s $(BUILDROOT)/bin/mount
+ setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep $(BUILDROOT)/bin/mount
+ chmod -v -s $(BUILDROOT)/bin/umount
+ setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep $(BUILDROOT)/bin/umount
+endef
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a3fe65752cfc3aa9f51e63a818b5207746ecbae2
by git＠ipfire.org 22 Mar '11
by git＠ipfire.org 22 Mar '11
22 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via a3fe65752cfc3aa9f51e63a818b5207746ecbae2 (commit)
from fb2f3a92448d0f1e939544380a46db2cbe7d6d52 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a3fe65752cfc3aa9f51e63a818b5207746ecbae2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 21 20:54:29 2011 +0100
kernel: Enable cgroup support.
-----------------------------------------------------------------------
Summary of changes:
pkgs/kernel/config | 35 +++++++++++++++++++++++++++--------
pkgs/kernel/kernel.nm | 2 +-
2 files changed, 28 insertions(+), 9 deletions(-)
Difference in files:
diff --git a/pkgs/kernel/config b/pkgs/kernel/config
index d4b5a68..45d860d 100644
--- a/pkgs/kernel/config
+++ b/pkgs/kernel/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37 Kernel Configuration
-# Mon Jan 17 11:24:54 2011
+# Linux/i386 2.6.37.2 Kernel Configuration
+# Tue Mar 22 11:50:10 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -116,13 +116,30 @@ CONFIG_IKCONFIG=y
# CONFIG_IKCONFIG_PROC is not set
CONFIG_LOG_BUF_SHIFT=18
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_CGROUPS is not set
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=m
+# CONFIG_DEBUG_BLK_CGROUP is not set
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
@@ -212,11 +229,11 @@ CONFIG_BLK_DEV_BSG=y
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_CFQ_GROUP_IOSCHED is not set
+CONFIG_DEFAULT_DEADLINE=y
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
# CONFIG_INLINE_SPIN_TRYLOCK is not set
@@ -248,7 +265,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y
CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
CONFIG_MUTEX_SPIN_ON_OWNER=y
-# CONFIG_FREEZER is not set
+CONFIG_FREEZER=y
#
# Processor type and features
@@ -902,6 +919,7 @@ CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
@@ -4002,6 +4020,7 @@ CONFIG_PAX_PAGEEXEC=y
CONFIG_PAX_SEGMEXEC=y
CONFIG_PAX_EMUTRAMP=y
CONFIG_PAX_MPROTECT=y
+# CONFIG_PAX_MPROTECT_COMPAT is not set
CONFIG_PAX_ELFRELOCS=y
CONFIG_PAX_KERNEXEC=y
CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
diff --git a/pkgs/kernel/kernel.nm b/pkgs/kernel/kernel.nm
index 91a24db..3144ecb 100644
--- a/pkgs/kernel/kernel.nm
+++ b/pkgs/kernel/kernel.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = linux
PKG_VER = 2.6.37.2
-PKG_REL = 2
+PKG_REL = 3
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
PKG_GROUPS = System/Kernels
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3bcaa8bbdf45ae2ff2ac9084ef2ccdd38a55d912
by git＠ipfire.org 21 Mar '11
by git＠ipfire.org 21 Mar '11
21 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 3bcaa8bbdf45ae2ff2ac9084ef2ccdd38a55d912 (commit)
from 5ec2c61ab08b41cf01f7f144c92d8c2d4581aae0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3bcaa8bbdf45ae2ff2ac9084ef2ccdd38a55d912
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 21 12:24:37 2011 +0100
nano: rootfile update.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/nano | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano
index 8a2f616..815c3fa 100644
--- a/config/rootfiles/packages/nano
+++ b/config/rootfiles/packages/nano
@@ -9,17 +9,34 @@ usr/bin/rnano
#usr/share/man/man5/nanorc.5
#usr/share/nano
usr/share/nano/asm.nanorc
+usr/share/nano/awk.nanorc
usr/share/nano/c.nanorc
+usr/share/nano/cmake.nanorc
+usr/share/nano/css.nanorc
+usr/share/nano/debian.nanorc
+usr/share/nano/fortran.nanorc
+usr/share/nano/gentoo.nanorc
usr/share/nano/groff.nanorc
usr/share/nano/html.nanorc
usr/share/nano/java.nanorc
+usr/share/nano/makefile.nanorc
+#usr/share/nano/man-html
+#usr/share/nano/man-html/nano.1.html
+#usr/share/nano/man-html/nanorc.5.html
+#usr/share/nano/man-html/rnano.1.html
usr/share/nano/man.nanorc
+usr/share/nano/mgp.nanorc
usr/share/nano/mutt.nanorc
usr/share/nano/nanorc.nanorc
+usr/share/nano/objc.nanorc
+usr/share/nano/ocaml.nanorc
usr/share/nano/patch.nanorc
usr/share/nano/perl.nanorc
+usr/share/nano/php.nanorc
usr/share/nano/pov.nanorc
usr/share/nano/python.nanorc
usr/share/nano/ruby.nanorc
usr/share/nano/sh.nanorc
+usr/share/nano/tcl.nanorc
usr/share/nano/tex.nanorc
+usr/share/nano/xml.nanorc
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5ec2c61ab08b41cf01f7f144c92d8c2d4581aae0
by git＠ipfire.org 21 Mar '11
by git＠ipfire.org 21 Mar '11
21 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 5ec2c61ab08b41cf01f7f144c92d8c2d4581aae0 (commit)
via 25942c277cb9c7485cb9aa6e2b20662031a127b5 (commit)
from 7fb4ff755e5bf009e9e6925c5b010e5d71c89566 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5ec2c61ab08b41cf01f7f144c92d8c2d4581aae0
Merge: 25942c2 7fb4ff7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 21 09:34:29 2011 +0100
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
commit 25942c277cb9c7485cb9aa6e2b20662031a127b5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 21 09:29:53 2011 +0100
gnump3d: fix perl version in plugin path.
run gnump3d-index after installation.
-----------------------------------------------------------------------
Summary of changes:
config/gnump3d/gnump3d.conf | 2 +-
lfs/gnump3d | 2 +-
src/paks/gnump3d/install.sh | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/gnump3d/gnump3d.conf b/config/gnump3d/gnump3d.conf
index 079874e..e6a6e44 100644
--- a/config/gnump3d/gnump3d.conf
+++ b/config/gnump3d/gnump3d.conf
@@ -731,7 +731,7 @@ sort_order = $TRACK
# the installation script - if this doesn't happen report this as
# a bug.
#
-plugin_directory = /usr/lib/perl5/5.8.8/gnump3d/plugins
+plugin_directory = /usr/lib/perl5/5.12.3/gnump3d/plugins
#
diff --git a/lfs/gnump3d b/lfs/gnump3d
index e59753b..ca14c27 100644
--- a/lfs/gnump3d
+++ b/lfs/gnump3d
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = gnump3d
-PAK_VER = 4
+PAK_VER = 5
DEPS = ""
diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh
index 745dfb7..13c7e8a 100644
--- a/src/paks/gnump3d/install.sh
+++ b/src/paks/gnump3d/install.sh
@@ -24,6 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
[ -d /var/mp3 ] || ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
+gnump3d-index &
start_service ${NAME}
ln -svf ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d
ln -svf ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fb2f3a92448d0f1e939544380a46db2cbe7d6d52
by git＠ipfire.org 21 Mar '11
by git＠ipfire.org 21 Mar '11
21 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via fb2f3a92448d0f1e939544380a46db2cbe7d6d52 (commit)
from b42a752b31d98101726e357524cafe5a017d24dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fb2f3a92448d0f1e939544380a46db2cbe7d6d52
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 21 02:48:00 2011 +0100
build-essentials: Remove $(BUILDROOT) when running clean.
-----------------------------------------------------------------------
Summary of changes:
pkgs/build-essentials/build-essentials.nm | 2 +-
pkgs/build-essentials/buildsystem/Targets | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 7845ec2..6df0215 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials
PKG_VER = $(DISTRO_VERSION)
-PKG_REL = 11
+PKG_REL = 12
PKG_EPOCH = 1
PKG_ARCH = noarch
diff --git a/pkgs/build-essentials/buildsystem/Targets b/pkgs/build-essentials/buildsystem/Targets
index b065507..4e42f06 100644
--- a/pkgs/build-essentials/buildsystem/Targets
+++ b/pkgs/build-essentials/buildsystem/Targets
@@ -57,5 +57,6 @@ build: $(OBJECTS)
.PHONY: clean
clean:
- # Remove all files from $(DIR_APP)
- -rm -rf $(DIR_APP)
+ # Remove all files from $(DIR_APP) and $(BUILDROOT)
+ -rm -rf $(DIR_APP) $(BUILDROOT)
+ -mkdir -pv $(BUILDROOT)
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b42a752b31d98101726e357524cafe5a017d24dc
by git＠ipfire.org 21 Mar '11
by git＠ipfire.org 21 Mar '11
21 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via b42a752b31d98101726e357524cafe5a017d24dc (commit)
via bb7d617c58d43796a017b435c4205b99ae025b4e (commit)
via 5b8e837a240435dd924bd869b5a3ae1c8847b18e (commit)
from 8adaa8e1a04dab1749011e0cb92bd3a192beca4a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b42a752b31d98101726e357524cafe5a017d24dc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 21 02:30:43 2011 +0100
Mark a number of packages to be installed to the basesystem.
commit bb7d617c58d43796a017b435c4205b99ae025b4e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 21 01:40:18 2011 +0100
PKG_GROUP -> PKG_GROUPS on all packages.
commit 5b8e837a240435dd924bd869b5a3ae1c8847b18e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 21 01:38:45 2011 +0100
build-essentials: Rename PKG_GROUP to PKG_GROUPS.
-----------------------------------------------------------------------
Summary of changes:
pkgs/X11vnc/X11vnc.nm | 2 +-
pkgs/acl/acl.nm | 2 +-
pkgs/acpid/acpid.nm | 2 +-
pkgs/aiccu/aiccu.nm | 2 +-
pkgs/attr/attr.nm | 2 +-
pkgs/audit/audit.nm | 2 +-
pkgs/autoconf/autoconf.nm | 2 +-
pkgs/autogen/autogen.nm | 2 +-
pkgs/automake/automake.nm | 2 +-
pkgs/avahi/avahi.nm | 2 +-
pkgs/basesystem/basesystem.nm | 2 +-
pkgs/bash/bash.nm | 2 +-
pkgs/bc/bc.nm | 2 +-
pkgs/beep/beep.nm | 2 +-
pkgs/bind/bind.nm | 2 +-
pkgs/binutils/binutils.nm | 2 +-
pkgs/bison/bison.nm | 2 +-
pkgs/boost/boost.nm | 2 +-
pkgs/bootchart2/bootchart2.nm | 2 +-
pkgs/br2684ctl/br2684ctl.nm | 2 +-
pkgs/bridge-utils/bridge-utils.nm | 2 +-
pkgs/btrfs-progs/btrfs-progs.nm | 2 +-
pkgs/build-essentials/build-essentials.nm | 4 ++--
pkgs/build-essentials/buildsystem/Constants | 2 +-
pkgs/build-essentials/buildsystem/Targets | 2 +-
pkgs/bwm-ng/bwm-ng.nm | 2 +-
pkgs/bzip2/bzip2.nm | 2 +-
pkgs/cairo/cairo.nm | 2 +-
pkgs/ccache/ccache.nm | 2 +-
pkgs/cloog/cloog.nm | 2 +-
pkgs/cmake/cmake.nm | 2 +-
pkgs/coreutils/coreutils.nm | 2 +-
pkgs/cpio/cpio.nm | 2 +-
pkgs/cracklib/cracklib.nm | 2 +-
pkgs/cryptsetup-luks/cryptsetup-luks.nm | 2 +-
pkgs/cups/cups.nm | 2 +-
pkgs/curl/curl.nm | 2 +-
pkgs/cyrus-sasl/cyrus-sasl.nm | 2 +-
pkgs/dansguardian/dansguardian.nm | 2 +-
pkgs/db4/db4.nm | 2 +-
pkgs/dbus-glib/dbus-glib.nm | 2 +-
pkgs/dbus/dbus.nm | 2 +-
pkgs/dejagnu/dejagnu.nm | 2 +-
pkgs/dhcp/dhcp.nm | 2 +-
pkgs/diffutils/diffutils.nm | 2 +-
pkgs/directfb/directfb.nm | 2 +-
pkgs/dmidecode/dmidecode.nm | 2 +-
pkgs/dmraid/dmraid.nm | 2 +-
pkgs/dos2unix/dos2unix.nm | 2 +-
pkgs/dosfstools/dosfstools.nm | 2 +-
pkgs/dracut/dracut.nm | 2 +-
pkgs/dvdrtools/dvdrtools.nm | 2 +-
pkgs/e2fsprogs/e2fsprogs.nm | 3 ++-
pkgs/ebtables/ebtables.nm | 2 +-
pkgs/eggdbus/eggdbus.nm | 2 +-
pkgs/eject/eject.nm | 2 +-
pkgs/elfutils/elfutils.nm | 2 +-
pkgs/elinks/elinks.nm | 2 +-
pkgs/etherwake/etherwake.nm | 2 +-
pkgs/ethtool/ethtool.nm | 2 +-
pkgs/eventlog/eventlog.nm | 2 +-
pkgs/expat/expat.nm | 2 +-
pkgs/expect/expect.nm | 2 +-
pkgs/ez-ipupdate/ez-ipupdate.nm | 2 +-
pkgs/fail2ban/fail2ban.nm | 2 +-
pkgs/file/file.nm | 2 +-
pkgs/findutils/findutils.nm | 2 +-
pkgs/firewall/firewall.nm | 2 +-
pkgs/flex/flex.nm | 2 +-
pkgs/fontconfig/fontconfig.nm | 2 +-
pkgs/freeradius/freeradius.nm | 2 +-
pkgs/freetype/freetype.nm | 2 +-
pkgs/fuse-sshfs/fuse-sshfs.nm | 2 +-
pkgs/fuse/fuse.nm | 2 +-
pkgs/gawk/gawk.nm | 2 +-
pkgs/gcc/gcc.nm | 2 +-
pkgs/gdb/gdb.nm | 2 +-
pkgs/gdbm/gdbm.nm | 2 +-
pkgs/gettext/gettext.nm | 2 +-
pkgs/ghostscript/ghostscript.nm | 2 +-
pkgs/git/git.nm | 2 +-
pkgs/glib2/glib2.nm | 2 +-
pkgs/glibc/glibc.nm | 2 +-
pkgs/gmp/gmp.nm | 2 +-
pkgs/gnupg2/gnupg2.nm | 2 +-
pkgs/gnutls/gnutls.nm | 2 +-
.../gobject-introspection/gobject-introspection.nm | 2 +-
pkgs/gperf/gperf.nm | 2 +-
pkgs/grep/grep.nm | 2 +-
pkgs/groff/groff.nm | 2 +-
pkgs/grub/grub.nm | 2 +-
pkgs/gssdp/gssdp.nm | 2 +-
pkgs/guile/guile.nm | 2 +-
pkgs/gupnp-av/gupnp-av.nm | 2 +-
pkgs/gupnp-igd/gupnp-igd.nm | 2 +-
pkgs/gupnp/gupnp.nm | 2 +-
pkgs/gzip/gzip.nm | 2 +-
pkgs/hdparm/hdparm.nm | 2 +-
pkgs/hostapd/hostapd.nm | 2 +-
pkgs/hplip/hplip.nm | 2 +-
pkgs/htop/htop.nm | 2 +-
pkgs/hwdata/hwdata.nm | 2 +-
pkgs/iana-etc/iana-etc.nm | 2 +-
pkgs/icecream/icecream.nm | 2 +-
pkgs/initscripts/initscripts.nm | 2 +-
pkgs/intltool/intltool.nm | 2 +-
pkgs/iproute2/iproute2.nm | 2 +-
pkgs/iptables/iptables.nm | 3 ++-
pkgs/iputils/iputils.nm | 2 +-
.../iscsi-initiator-utils/iscsi-initiator-utils.nm | 2 +-
pkgs/iw/iw.nm | 2 +-
pkgs/joe/joe.nm | 2 +-
pkgs/jwhois/jwhois.nm | 2 +-
pkgs/kbd/kbd.nm | 2 +-
pkgs/kernel/kernel.nm | 2 +-
pkgs/l7-protocols/l7-protocols.nm | 2 +-
pkgs/ldapvi/ldapvi.nm | 2 +-
pkgs/less/less.nm | 2 +-
pkgs/libICE/libICE.nm | 2 +-
pkgs/libSM/libSM.nm | 2 +-
pkgs/libVNCServer/libVNCServer.nm | 2 +-
pkgs/libX11/libX11.nm | 2 +-
pkgs/libXau/libXau.nm | 2 +-
pkgs/libXaw/libXaw.nm | 2 +-
pkgs/libXdamage/libXdamage.nm | 2 +-
pkgs/libXdmcp/libXdmcp.nm | 2 +-
pkgs/libXext/libXext.nm | 2 +-
pkgs/libXfixes/libXfixes.nm | 2 +-
pkgs/libXfont/libXfont.nm | 2 +-
pkgs/libXft/libXft.nm | 2 +-
pkgs/libXi/libXi.nm | 2 +-
pkgs/libXmu/libXmu.nm | 2 +-
pkgs/libXpm/libXpm.nm | 2 +-
pkgs/libXrandr/libXrandr.nm | 2 +-
pkgs/libXrender/libXrender.nm | 2 +-
pkgs/libXres/libXres.nm | 2 +-
pkgs/libXt/libXt.nm | 2 +-
pkgs/libXtst/libXtst.nm | 2 +-
pkgs/libXv/libXv.nm | 2 +-
pkgs/libXvMC/libXvMC.nm | 2 +-
pkgs/libXxf86vm/libXxf86vm.nm | 2 +-
pkgs/libaal/libaal.nm | 2 +-
pkgs/libaio/libaio.nm | 2 +-
pkgs/libart/libart.nm | 2 +-
pkgs/libassuan/libassuan.nm | 2 +-
pkgs/libatasmart/libatasmart.nm | 2 +-
pkgs/libcap-ng/libcap-ng.nm | 2 +-
pkgs/libcap/libcap.nm | 2 +-
pkgs/libdaemon/libdaemon.nm | 2 +-
pkgs/libdnet/libdnet.nm | 2 +-
pkgs/libdrm/libdrm.nm | 2 +-
pkgs/libevent/libevent.nm | 2 +-
pkgs/libffi/libffi.nm | 2 +-
pkgs/libfontenc/libfontenc.nm | 2 +-
pkgs/libgcrypt/libgcrypt.nm | 2 +-
pkgs/libgpg-error/libgpg-error.nm | 2 +-
pkgs/libgssglue/libgssglue.nm | 2 +-
pkgs/libidn/libidn.nm | 2 +-
pkgs/libjpeg/libjpeg.nm | 2 +-
pkgs/libksba/libksba.nm | 2 +-
pkgs/libmng/libmng.nm | 2 +-
pkgs/libnet/libnet.nm | 2 +-
.../libnetfilter_conntrack.nm | 2 +-
pkgs/libnetfilter_log/libnetfilter_log.nm | 2 +-
pkgs/libnetfilter_queue/libnetfilter_queue.nm | 2 +-
pkgs/libnfnetlink/libnfnetlink.nm | 2 +-
pkgs/libnfsidmap/libnfsidmap.nm | 2 +-
pkgs/libnih/libnih.nm | 2 +-
pkgs/libnl/libnl.nm | 2 +-
pkgs/libpcap/libpcap.nm | 2 +-
pkgs/libpciaccess/libpciaccess.nm | 2 +-
pkgs/libpng/libpng.nm | 2 +-
pkgs/librpcsecgss/librpcsecgss.nm | 2 +-
pkgs/libselinux/libselinux.nm | 2 +-
pkgs/libsemanage/libsemanage.nm | 2 +-
pkgs/libsepol/libsepol.nm | 2 +-
pkgs/libsoup/libsoup.nm | 2 +-
pkgs/libssh2/libssh2.nm | 2 +-
pkgs/libtiff/libtiff.nm | 2 +-
pkgs/libtool/libtool.nm | 2 +-
pkgs/libusb-compat/libusb-compat.nm | 2 +-
pkgs/libusb/libusb.nm | 2 +-
pkgs/libuser/libuser.nm | 2 +-
pkgs/libvirt/libvirt.nm | 2 +-
pkgs/libxcb/libxcb.nm | 2 +-
pkgs/libxkbfile/libxkbfile.nm | 2 +-
pkgs/libxml2/libxml2.nm | 2 +-
pkgs/libxslt/libxslt.nm | 2 +-
pkgs/libyaml/libyaml.nm | 2 +-
pkgs/lighttpd/lighttpd.nm | 2 +-
pkgs/linux-atm/linux-atm.nm | 2 +-
pkgs/linux-firmware/linux-firmware.nm | 2 +-
pkgs/lldpd/lldpd.nm | 2 +-
pkgs/lm-sensors/lm-sensors.nm | 2 +-
pkgs/logrotate/logrotate.nm | 2 +-
pkgs/lsof/lsof.nm | 2 +-
pkgs/lua/lua.nm | 2 +-
pkgs/lvm2/lvm2.nm | 2 +-
pkgs/lzo/lzo.nm | 2 +-
pkgs/m4/m4.nm | 2 +-
pkgs/mailcap/mailcap.nm | 2 +-
pkgs/make/make.nm | 2 +-
pkgs/man-db/man-db.nm | 2 +-
pkgs/man-pages/man-pages.nm | 2 +-
pkgs/mc/mc.nm | 2 +-
pkgs/mdadm/mdadm.nm | 2 +-
pkgs/memtest86+/memtest86+.nm | 2 +-
pkgs/mesa/mesa.nm | 2 +-
pkgs/module-init-tools/module-init-tools.nm | 2 +-
pkgs/mpc/mpc.nm | 2 +-
pkgs/mpfr/mpfr.nm | 2 +-
pkgs/multipath-tools/multipath-tools.nm | 2 +-
pkgs/nano/nano.nm | 2 +-
pkgs/nasm/nasm.nm | 2 +-
pkgs/ncurses/ncurses.nm | 2 +-
pkgs/net-snmp/net-snmp.nm | 2 +-
pkgs/net-tools/net-tools.nm | 2 +-
pkgs/netplug/netplug.nm | 2 +-
pkgs/network/network.nm | 2 +-
pkgs/newt/newt.nm | 2 +-
pkgs/nfs-utils/nfs-utils.nm | 2 +-
pkgs/nmap/nmap.nm | 2 +-
pkgs/noip/noip.nm | 2 +-
pkgs/nspr/nspr.nm | 2 +-
pkgs/nss-softokn/nss-softokn.nm | 2 +-
pkgs/nss-util/nss-util.nm | 2 +-
pkgs/nss/nss.nm | 2 +-
pkgs/nss_ldap/nss_ldap.nm | 2 +-
pkgs/ntp/ntp.nm | 2 +-
pkgs/openl2tp/openl2tp.nm | 2 +-
pkgs/openldap/openldap.nm | 2 +-
pkgs/openssh/openssh.nm | 2 +-
pkgs/openssl/openssl.nm | 2 +-
pkgs/openvpn/openvpn.nm | 2 +-
pkgs/os-prober/os-prober.nm | 2 +-
pkgs/pakfire/pakfire.nm | 2 +-
pkgs/pam/pam.nm | 2 +-
pkgs/pam_ldap/pam_ldap.nm | 2 +-
pkgs/pango/pango.nm | 2 +-
pkgs/parted/parted.nm | 2 +-
pkgs/passwd/passwd.nm | 2 +-
pkgs/patch/patch.nm | 2 +-
pkgs/pax-utils/pax-utils.nm | 2 +-
pkgs/paxctl/paxctl.nm | 2 +-
pkgs/paxtest/paxtest.nm | 2 +-
pkgs/pcapy/pcapy.nm | 2 +-
pkgs/pciutils/pciutils.nm | 3 ++-
pkgs/pcre/pcre.nm | 2 +-
pkgs/pdns-recursor/pdns-recursor.nm | 2 +-
pkgs/pdns/pdns.nm | 2 +-
pkgs/perl-HTML-Parser/perl-HTML-Parser.nm | 2 +-
pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm | 2 +-
pkgs/perl-Test-Simple/perl-Test-Simple.nm | 2 +-
pkgs/perl-URI/perl-URI.nm | 2 +-
pkgs/perl-XML-Parser/perl-XML-Parser.nm | 2 +-
pkgs/perl-libwww-perl/perl-libwww-perl.nm | 2 +-
pkgs/perl/perl.nm | 2 +-
pkgs/pinentry/pinentry.nm | 2 +-
pkgs/pixman/pixman.nm | 2 +-
pkgs/pkg-config/pkg-config.nm | 2 +-
pkgs/polkit/polkit.nm | 2 +-
pkgs/popt/popt.nm | 2 +-
pkgs/powertop/powertop.nm | 2 +-
pkgs/ppl/ppl.nm | 2 +-
pkgs/ppp/ppp.nm | 2 +-
pkgs/pptp/pptp.nm | 2 +-
pkgs/procps/procps.nm | 2 +-
pkgs/psmisc/psmisc.nm | 2 +-
pkgs/pth/pth.nm | 2 +-
pkgs/pyQt/pyQt.nm | 2 +-
pkgs/pychecker/pychecker.nm | 2 +-
pkgs/pyfire/pyfire.nm | 2 +-
pkgs/pygobject2/pygobject2.nm | 2 +-
pkgs/pyliblzma/pyliblzma.nm | 2 +-
pkgs/python-IPy/python-IPy.nm | 2 +-
pkgs/python-cairo/python-cairo.nm | 2 +-
pkgs/python-cryptsetup/python-cryptsetup.nm | 2 +-
pkgs/python-dbus/python-dbus.nm | 2 +-
pkgs/python-decorator/python-decorator.nm | 2 +-
.../python-distutils-extra.nm | 2 +-
pkgs/python-gudev/python-gudev.nm | 2 +-
.../python-netfilter_conntrack.nm | 2 +-
pkgs/python-parted/python-parted.nm | 2 +-
pkgs/python-piksemel/python-piksemel.nm | 2 +-
pkgs/python-progressbar/python-progressbar.nm | 2 +-
pkgs/python-pyaspects/python-pyaspects.nm | 2 +-
pkgs/python-pyblock/python-pyblock.nm | 2 +-
pkgs/python-pycurl/python-pycurl.nm | 2 +-
pkgs/python-qtermwidget/python-qtermwidget.nm | 2 +-
pkgs/python-setuptools/python-setuptools.nm | 2 +-
pkgs/python-tornado/python-tornado.nm | 2 +-
pkgs/python-urlgrabber/python-urlgrabber.nm | 2 +-
pkgs/python/python.nm | 2 +-
pkgs/pyxattr/pyxattr.nm | 2 +-
pkgs/qemu/qemu.nm | 2 +-
pkgs/qt/qt.nm | 2 +-
pkgs/qtermwidget/qtermwidget.nm | 2 +-
pkgs/quagga/quagga.nm | 2 +-
pkgs/radvd/radvd.nm | 2 +-
pkgs/readline/readline.nm | 2 +-
pkgs/reiser4progs/reiser4progs.nm | 2 +-
pkgs/reiserfsprogs/reiserfsprogs.nm | 2 +-
pkgs/rrdtool/rrdtool.nm | 2 +-
pkgs/rstp/rstp.nm | 2 +-
pkgs/rsync/rsync.nm | 2 +-
pkgs/samba/samba.nm | 2 +-
pkgs/sane/sane.nm | 2 +-
pkgs/screen/screen.nm | 2 +-
pkgs/sdl/sdl.nm | 2 +-
pkgs/sed/sed.nm | 2 +-
pkgs/setup/setup.nm | 2 +-
pkgs/sg3-utils/sg3-utils.nm | 2 +-
pkgs/shadow/shadow.nm | 2 +-
pkgs/sip/sip.nm | 2 +-
pkgs/slang/slang.nm | 2 +-
pkgs/smartmontools/smartmontools.nm | 2 +-
pkgs/sqlite/sqlite.nm | 2 +-
pkgs/squashfs-tools/squashfs-tools.nm | 2 +-
pkgs/squid/squid.nm | 2 +-
pkgs/strace/strace.nm | 2 +-
pkgs/strongswan/strongswan.nm | 2 +-
pkgs/sudo/sudo.nm | 2 +-
pkgs/suricata/suricata.nm | 2 +-
pkgs/swig/swig.nm | 2 +-
pkgs/sysfsutils/sysfsutils.nm | 2 +-
pkgs/syslinux/syslinux.nm | 2 +-
pkgs/syslog-ng/syslog-ng.nm | 2 +-
pkgs/system-release/system-release.nm | 2 +-
pkgs/sysvinit/sysvinit.nm | 2 +-
pkgs/tar/tar.nm | 2 +-
pkgs/tcl/tcl.nm | 2 +-
pkgs/tcpdump/tcpdump.nm | 2 +-
pkgs/texinfo/texinfo.nm | 2 +-
pkgs/traceroute/traceroute.nm | 2 +-
pkgs/tunctl/tunctl.nm | 2 +-
pkgs/udev/udev.nm | 2 +-
pkgs/udisks/udisks.nm | 2 +-
pkgs/ulogd2/ulogd2.nm | 2 +-
pkgs/unzip/unzip.nm | 2 +-
pkgs/upower/upower.nm | 2 +-
pkgs/upstart/upstart.nm | 2 +-
pkgs/usbutils/usbutils.nm | 2 +-
pkgs/ustr/ustr.nm | 2 +-
pkgs/util-linux-ng/util-linux-ng.nm | 3 ++-
pkgs/vim/vim.nm | 2 +-
pkgs/vlan/vlan.nm | 2 +-
pkgs/vsftpd/vsftpd.nm | 2 +-
pkgs/wget/wget.nm | 2 +-
pkgs/which/which.nm | 2 +-
pkgs/wireless-tools/wireless-tools.nm | 2 +-
pkgs/wpa_supplicant/wpa_supplicant.nm | 2 +-
pkgs/xcb-proto/xcb-proto.nm | 2 +-
pkgs/xcb-util/xcb-util.nm | 2 +-
pkgs/xen/xen.nm | 2 +-
pkgs/xfsprogs/xfsprogs.nm | 2 +-
pkgs/xkeyboard-config/xkeyboard-config.nm | 2 +-
pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm | 2 +-
pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm | 2 +-
pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm | 2 +-
.../xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm | 2 +-
pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 2 +-
pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm | 2 +-
.../xorg-x11-drv-synaptics.nm | 2 +-
pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm | 2 +-
pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm | 2 +-
pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm | 2 +-
pkgs/xorg-x11-fonts/xorg-x11-fonts.nm | 2 +-
pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 2 +-
pkgs/xorg-x11-server/xorg-x11-server.nm | 2 +-
pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm | 2 +-
pkgs/xorg-x11-xinit/xorg-x11-xinit.nm | 2 +-
pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm | 2 +-
.../xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm | 2 +-
pkgs/xrandr/xrandr.nm | 2 +-
pkgs/xterm/xterm.nm | 2 +-
pkgs/xz/xz.nm | 2 +-
pkgs/zerofree/zerofree.nm | 2 +-
pkgs/zlib/zlib.nm | 2 +-
378 files changed, 383 insertions(+), 379 deletions(-)
Difference in files:
diff --git a/pkgs/X11vnc/X11vnc.nm b/pkgs/X11vnc/X11vnc.nm
index 6e74e2d..f62da62 100644
--- a/pkgs/X11vnc/X11vnc.nm
+++ b/pkgs/X11vnc/X11vnc.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9.12
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.karlrunge.com/x11vnc/
PKG_LICENSE = GPLv2
PKG_SUMMARY = VNC server for the current X11 session.
diff --git a/pkgs/acl/acl.nm b/pkgs/acl/acl.nm
index 697e007..1d4fa0a 100644
--- a/pkgs/acl/acl.nm
+++ b/pkgs/acl/acl.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.2.47
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://oss.sgi.com/projects/xfs/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Access control list utilities.
diff --git a/pkgs/acpid/acpid.nm b/pkgs/acpid/acpid.nm
index 9400b9a..86caa02 100644
--- a/pkgs/acpid/acpid.nm
+++ b/pkgs/acpid/acpid.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.4
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = Base System/Daemons
PKG_URL = http://tedfelix.com/linux/acpid-netlink.html
PKG_LICENSE = GPLv2+
PKG_SUMMARY = ACPI Event Daemon.
diff --git a/pkgs/aiccu/aiccu.nm b/pkgs/aiccu/aiccu.nm
index 9a2768e..d950dd3 100644
--- a/pkgs/aiccu/aiccu.nm
+++ b/pkgs/aiccu/aiccu.nm
@@ -29,7 +29,7 @@ PKG_VER = 20070115
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = http://www.sixxs.net/tools/aiccu/
PKG_LICENSE = BSD
PKG_SUMMARY = Automatic IPv6 Connectivity Client Utility for SixXS tunnels.
diff --git a/pkgs/attr/attr.nm b/pkgs/attr/attr.nm
index 3cc2474..15c3e29 100644
--- a/pkgs/attr/attr.nm
+++ b/pkgs/attr/attr.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.4.43
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://oss.sgi.com/projects/xfs/
PKG_LICENSE = GPLv2+ LGPLv2+
PKG_SUMMARY = Tools for extended attribute support.
diff --git a/pkgs/audit/audit.nm b/pkgs/audit/audit.nm
index c86b005..07cbbb5 100644
--- a/pkgs/audit/audit.nm
+++ b/pkgs/audit/audit.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = http://people.redhat.com/sgrubb/audit/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = User space tools for 2.6 kernel auditing.
diff --git a/pkgs/autoconf/autoconf.nm b/pkgs/autoconf/autoconf.nm
index 010e87d..7dda014 100644
--- a/pkgs/autoconf/autoconf.nm
+++ b/pkgs/autoconf/autoconf.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/autoconf/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A GNU tool for automatically configuring source code.
diff --git a/pkgs/autogen/autogen.nm b/pkgs/autogen/autogen.nm
index 670aace..8ddff40 100644
--- a/pkgs/autogen/autogen.nm
+++ b/pkgs/autogen/autogen.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.9.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/autogen/
PKG_LICENSE = GPLv3
PKG_SUMMARY = Automated text file generator.
diff --git a/pkgs/automake/automake.nm b/pkgs/automake/automake.nm
index 40f83bb..803fb8d 100644
--- a/pkgs/automake/automake.nm
+++ b/pkgs/automake/automake.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/automake/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A GNU tool for automatically configuring source code.
diff --git a/pkgs/avahi/avahi.nm b/pkgs/avahi/avahi.nm
index 68c2293..e062d88 100644
--- a/pkgs/avahi/avahi.nm
+++ b/pkgs/avahi/avahi.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.6.25
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Zeroconf
+PKG_GROUPS = Networking/Zeroconf
PKG_URL = http://avahi.org/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Local network service discovery
diff --git a/pkgs/basesystem/basesystem.nm b/pkgs/basesystem/basesystem.nm
index ccac75f..9377ee5 100644
--- a/pkgs/basesystem/basesystem.nm
+++ b/pkgs/basesystem/basesystem.nm
@@ -30,7 +30,7 @@ PKG_REL = 2
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL =
PKG_LICENSE = GPLv3+
PKG_SUMMARY = Basic system files.
diff --git a/pkgs/bash/bash.nm b/pkgs/bash/bash.nm
index 5a4fff2..3e27abe 100644
--- a/pkgs/bash/bash.nm
+++ b/pkgs/bash/bash.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.2
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = System/Tools
+PKG_GROUPS = Base System/Tools
PKG_URL = http://www.gnu.org/software/bash/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Bash is short for born again shell.
diff --git a/pkgs/bc/bc.nm b/pkgs/bc/bc.nm
index 49ed1d1..9700e76 100644
--- a/pkgs/bc/bc.nm
+++ b/pkgs/bc/bc.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.06
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Tools
+PKG_GROUPS = System/Tools
PKG_URL = http://www.gnu.org/software/bc/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = bc is an arbitrary precision numeric processing language.
diff --git a/pkgs/beep/beep.nm b/pkgs/beep/beep.nm
index dda6808..969dfe9 100644
--- a/pkgs/beep/beep.nm
+++ b/pkgs/beep/beep.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.2.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Applications/System
PKG_URL = http://www.johnath.com/beep/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Beep the PC speaker any number of ways.
diff --git a/pkgs/bind/bind.nm b/pkgs/bind/bind.nm
index 0040f28..7ca8cd6 100644
--- a/pkgs/bind/bind.nm
+++ b/pkgs/bind/bind.nm
@@ -29,7 +29,7 @@ PKG_VER = 9.7.2-P3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://www.isc.org/products/BIND/
PKG_LICENSE = Proprietary
PKG_SUMMARY = BIND provides tools for the DNS.
diff --git a/pkgs/binutils/binutils.nm b/pkgs/binutils/binutils.nm
index 77b4930..bebdb4d 100644
--- a/pkgs/binutils/binutils.nm
+++ b/pkgs/binutils/binutils.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.20.1
PKG_REL = 0
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/binutils/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = The GNU Binutils are a collection of binary tools.
diff --git a/pkgs/bison/bison.nm b/pkgs/bison/bison.nm
index 6e4c843..a93e1b5 100644
--- a/pkgs/bison/bison.nm
+++ b/pkgs/bison/bison.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.4.3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/bison/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = GNU Bison is a parser generator.
diff --git a/pkgs/boost/boost.nm b/pkgs/boost/boost.nm
index 773192f..16cbc08 100644
--- a/pkgs/boost/boost.nm
+++ b/pkgs/boost/boost.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.41.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.boost.org/
PKG_LICENSE = Boost
PKG_SUMMARY = The Boost C++ Libraries.
diff --git a/pkgs/bootchart2/bootchart2.nm b/pkgs/bootchart2/bootchart2.nm
index f5c1709..69a0316 100644
--- a/pkgs/bootchart2/bootchart2.nm
+++ b/pkgs/bootchart2/bootchart2.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.12.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Statistics
+PKG_GROUPS = System/Statistics
PKG_URL = http://github.com/mmeeks/bootchart
PKG_LICENSE = GPLv2
PKG_SUMMARY = Graphs the boot process.
diff --git a/pkgs/br2684ctl/br2684ctl.nm b/pkgs/br2684ctl/br2684ctl.nm
index c684b2f..3888d4d 100644
--- a/pkgs/br2684ctl/br2684ctl.nm
+++ b/pkgs/br2684ctl/br2684ctl.nm
@@ -29,7 +29,7 @@ PKG_VER = ipfire-1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://cvs.linux-atm.sourceforge.net/viewcvs.py/linux-atm/linux-atm/src/br2…
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utilities for configuring an ATM/ethernet bridge.
diff --git a/pkgs/bridge-utils/bridge-utils.nm b/pkgs/bridge-utils/bridge-utils.nm
index 3f34764..a0c54ce 100644
--- a/pkgs/bridge-utils/bridge-utils.nm
+++ b/pkgs/bridge-utils/bridge-utils.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://bridge.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utilities for configuring the linux ethernet bridge.
diff --git a/pkgs/btrfs-progs/btrfs-progs.nm b/pkgs/btrfs-progs/btrfs-progs.nm
index ac733c8..1f08786 100644
--- a/pkgs/btrfs-progs/btrfs-progs.nm
+++ b/pkgs/btrfs-progs/btrfs-progs.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.19
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://btrfs.wiki.kernel.org/index.php/Main_Page
PKG_LICENSE = GPLv2
PKG_SUMMARY = Userspace programs for btrfs.
diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 8bec9f3..7845ec2 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,12 +26,12 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials
PKG_VER = $(DISTRO_VERSION)
-PKG_REL = 10
+PKG_REL = 11
PKG_EPOCH = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.ipfire.org
PKG_LICENSE = GPL
PKG_SUMMARY = Elementary scripts for the build system.
diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants
index 500e2f1..dda1195 100644
--- a/pkgs/build-essentials/buildsystem/Constants
+++ b/pkgs/build-essentials/buildsystem/Constants
@@ -67,7 +67,7 @@ PKG_VARIABLES = \
PKG_DESCRIPTION \
PKG_EPOCH \
PKG_FILES \
- PKG_GROUP \
+ PKG_GROUPS \
PKG_MAINTAINER \
PKG_LICENSE \
PKG_PROVIDES \
diff --git a/pkgs/build-essentials/buildsystem/Targets b/pkgs/build-essentials/buildsystem/Targets
index 24cbec7..b065507 100644
--- a/pkgs/build-essentials/buildsystem/Targets
+++ b/pkgs/build-essentials/buildsystem/Targets
@@ -20,7 +20,7 @@ buildinfo:
@echo "PKG_BUILD_DEPENDENCIES=\"$(PKG_BUILD_DEPS)\""
@echo "PKG_DEPENDENCIES=\"$(PKG_DEPS)\""
@echo "PKG_DESCRIPTION=\"$(strip $(PKG_DESCRIPTION))\""
- @echo "PKG_GROUP=\"$(PKG_GROUP)\""
+ @echo "PKG_GROUPS=\"$(PKG_GROUPS)\""
@echo "PKG_LICENSE=\"$(PKG_LICENSE)\""
@echo "PKG_MAINTAINER=\"$(PKG_MAINTAINER)\""
@echo "PKG_SUMMARY=\"$(strip $(PKG_SUMMARY))\""
diff --git a/pkgs/bwm-ng/bwm-ng.nm b/pkgs/bwm-ng/bwm-ng.nm
index 80b4008..88eda17 100644
--- a/pkgs/bwm-ng/bwm-ng.nm
+++ b/pkgs/bwm-ng/bwm-ng.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.6
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Statistics
+PKG_GROUPS = Networking/Statistics
PKG_URL = http://www.gropp.org/?id=projects&sub=bwm-ng
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A bandwidth monitor for the shell.
diff --git a/pkgs/bzip2/bzip2.nm b/pkgs/bzip2/bzip2.nm
index 1bb063e..d3ff752 100644
--- a/pkgs/bzip2/bzip2.nm
+++ b/pkgs/bzip2/bzip2.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.6
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Compression
+PKG_GROUPS = Applications/Compression
PKG_URL = http://www.bzip.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Bzip2 is a data compressor.
diff --git a/pkgs/cairo/cairo.nm b/pkgs/cairo/cairo.nm
index bb46a6a..d1eb4a4 100644
--- a/pkgs/cairo/cairo.nm
+++ b/pkgs/cairo/cairo.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.10.2
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = System/Graphics
+PKG_GROUPS = System/Graphics
PKG_URL = http://cairographics.org
PKG_LICENSE = LGPLv2 MPLv1.1
PKG_SUMMARY = A 2D graphics library.
diff --git a/pkgs/ccache/ccache.nm b/pkgs/ccache/ccache.nm
index 3ebfbc3..0a22718 100644
--- a/pkgs/ccache/ccache.nm
+++ b/pkgs/ccache/ccache.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.1.4
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = Development/Compilers
+PKG_GROUPS = Development/Compilers
PKG_URL = http://ccache.samba.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = C/C++ compiler cache.
diff --git a/pkgs/cloog/cloog.nm b/pkgs/cloog/cloog.nm
index 06f3bc2..d15bb83 100644
--- a/pkgs/cloog/cloog.nm
+++ b/pkgs/cloog/cloog.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.15.9
PKG_REL = 0
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.cloog.org
PKG_LICENSE = GPLv2+
PKG_SUMMARY = The Chunky Loop Generator.
diff --git a/pkgs/cmake/cmake.nm b/pkgs/cmake/cmake.nm
index d56ccf5..4370155 100644
--- a/pkgs/cmake/cmake.nm
+++ b/pkgs/cmake/cmake.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.8.2
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.cmake.org
PKG_LICENSE = BSD
PKG_SUMMARY = Cross-platform make system.
diff --git a/pkgs/coreutils/coreutils.nm b/pkgs/coreutils/coreutils.nm
index a9ca919..bc4e339 100644
--- a/pkgs/coreutils/coreutils.nm
+++ b/pkgs/coreutils/coreutils.nm
@@ -29,7 +29,7 @@ PKG_VER = 8.9
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL = http://www.gnu.org/software/coreutils/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A set of basic GNU tools commonly used in shell scripts.
diff --git a/pkgs/cpio/cpio.nm b/pkgs/cpio/cpio.nm
index 2174b3d..b0aa1f5 100644
--- a/pkgs/cpio/cpio.nm
+++ b/pkgs/cpio/cpio.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.10
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Packaging
+PKG_GROUPS = System/Packaging
PKG_URL = http://www.gnu.org/software/cpio/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A GNU archiving program.
diff --git a/pkgs/cracklib/cracklib.nm b/pkgs/cracklib/cracklib.nm
index c365e89..e850133 100644
--- a/pkgs/cracklib/cracklib.nm
+++ b/pkgs/cracklib/cracklib.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.8.12
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Security/Password
+PKG_GROUPS = Security/Password
PKG_URL = http://sourceforge.net/projects/cracklib/
PKG_LICENSE = GPLv2
PKG_SUMMARY = A password-checking library.
diff --git a/pkgs/cryptsetup-luks/cryptsetup-luks.nm b/pkgs/cryptsetup-luks/cryptsetup-luks.nm
index aa06032..da3dafe 100644
--- a/pkgs/cryptsetup-luks/cryptsetup-luks.nm
+++ b/pkgs/cryptsetup-luks/cryptsetup-luks.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://cryptsetup.googlecode.com/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A utility for setting up encrypted filesystems.
diff --git a/pkgs/cups/cups.nm b/pkgs/cups/cups.nm
index d347228..fd30c1a 100644
--- a/pkgs/cups/cups.nm
+++ b/pkgs/cups/cups.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.5
PKG_REL = 3
PKG_MAINTAINER =
-PKG_GROUP = Applications/Printing
+PKG_GROUPS = Applications/Printing
PKG_URL = http://cups.org/software.php
PKG_LICENSE = GPLv2+
PKG_SUMMARY = The common UNIX printing system.
diff --git a/pkgs/curl/curl.nm b/pkgs/curl/curl.nm
index aceda4f..74e8eb4 100644
--- a/pkgs/curl/curl.nm
+++ b/pkgs/curl/curl.nm
@@ -29,7 +29,7 @@ PKG_VER = 7.21.2
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Application/Internet
+PKG_GROUPS = Application/Internet
PKG_URL = http://www.curl.haxx.se/
PKG_LICENSE = MIT
PKG_SUMMARY = A utility for getting files from remote servers (FTP, HTTP, and others).
diff --git a/pkgs/cyrus-sasl/cyrus-sasl.nm b/pkgs/cyrus-sasl/cyrus-sasl.nm
index 7d8af2c..3cfaa0c 100644
--- a/pkgs/cyrus-sasl/cyrus-sasl.nm
+++ b/pkgs/cyrus-sasl/cyrus-sasl.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1.23
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://asg.web.cmu.edu/sasl/sasl-library.html
PKG_LICENSE = BSD
PKG_SUMMARY = The Cyrus SASL library.
diff --git a/pkgs/dansguardian/dansguardian.nm b/pkgs/dansguardian/dansguardian.nm
index 137f7b8..3861cc1 100644
--- a/pkgs/dansguardian/dansguardian.nm
+++ b/pkgs/dansguardian/dansguardian.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.10.1.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Proxy
+PKG_GROUPS = Networking/Proxy
PKG_URL = http://www.dansguardian.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A content filtering web proxy.
diff --git a/pkgs/db4/db4.nm b/pkgs/db4/db4.nm
index 87a6c11..1035d90 100644
--- a/pkgs/db4/db4.nm
+++ b/pkgs/db4/db4.nm
@@ -34,7 +34,7 @@ PKG_EPOCH = 1
# Never update this to major version 5.
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.oracle.com/technology/products/berkeley-db/
PKG_LICENSE = Proprietary
PKG_SUMMARY = Berkeley DB is a library that provides an embedded database.
diff --git a/pkgs/dbus-glib/dbus-glib.nm b/pkgs/dbus-glib/dbus-glib.nm
index 47af08c..766515a 100644
--- a/pkgs/dbus-glib/dbus-glib.nm
+++ b/pkgs/dbus-glib/dbus-glib.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.82
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.freedesktop.org/software/dbus/
PKG_LICENSE = GPLv2+ AFL
PKG_SUMMARY = Glib bindings for D-Bus.
diff --git a/pkgs/dbus/dbus.nm b/pkgs/dbus/dbus.nm
index 0f85d40..5aaab35 100644
--- a/pkgs/dbus/dbus.nm
+++ b/pkgs/dbus/dbus.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.3.2
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = http://www.freedesktop.org/software/dbus/
PKG_LICENSE = GPLv2+ AFL
PKG_SUMMARY = D-BUS message bus.
diff --git a/pkgs/dejagnu/dejagnu.nm b/pkgs/dejagnu/dejagnu.nm
index 17292be..3bae435 100644
--- a/pkgs/dejagnu/dejagnu.nm
+++ b/pkgs/dejagnu/dejagnu.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/dejagnu/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A front end for testing other programs
diff --git a/pkgs/dhcp/dhcp.nm b/pkgs/dhcp/dhcp.nm
index e575b33..9893ae7 100644
--- a/pkgs/dhcp/dhcp.nm
+++ b/pkgs/dhcp/dhcp.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.1.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Networking/Daemons
+PKG_GROUPS = Networking/Daemons
PKG_URL = http://isc.org/products/DHCP/
PKG_LICENSE = ISC
PKG_SUMMARY = Dynamic host configuration protocol software.
diff --git a/pkgs/diffutils/diffutils.nm b/pkgs/diffutils/diffutils.nm
index 61870d1..bf80e1a 100644
--- a/pkgs/diffutils/diffutils.nm
+++ b/pkgs/diffutils/diffutils.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Base Development/Tools
PKG_URL = http://www.gnu.org/software/diffutils/diffutils.html
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A GNU collection of diff utilities.
diff --git a/pkgs/directfb/directfb.nm b/pkgs/directfb/directfb.nm
index 163401f..4db258b 100644
--- a/pkgs/directfb/directfb.nm
+++ b/pkgs/directfb/directfb.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Graphics
+PKG_GROUPS = System/Graphics
PKG_URL = http://www.directfb.org/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Graphics abstraction library for the Linux Framebuffer Device.
diff --git a/pkgs/dmidecode/dmidecode.nm b/pkgs/dmidecode/dmidecode.nm
index f2fa79c..3293a51 100644
--- a/pkgs/dmidecode/dmidecode.nm
+++ b/pkgs/dmidecode/dmidecode.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.10
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Applications/System
PKG_URL = http://www.nongnu.org/dmidecode/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Tool to analyse BIOS DMI data.
diff --git a/pkgs/dmraid/dmraid.nm b/pkgs/dmraid/dmraid.nm
index 892955d..979038a 100644
--- a/pkgs/dmraid/dmraid.nm
+++ b/pkgs/dmraid/dmraid.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.0.rc15
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://people.redhat.com/heinzm/sw/dmraid
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Device-mapper RAID tool and library.
diff --git a/pkgs/dos2unix/dos2unix.nm b/pkgs/dos2unix/dos2unix.nm
index 1eaf170..b47a636 100644
--- a/pkgs/dos2unix/dos2unix.nm
+++ b/pkgs/dos2unix/dos2unix.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.1.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Text
+PKG_GROUPS = Applications/Text
PKG_URL = http://www.xs4all.nl/~waterlan/dos2unix.html
PKG_LICENSE = BSD
PKG_SUMMARY = Text file format converters.
diff --git a/pkgs/dosfstools/dosfstools.nm b/pkgs/dosfstools/dosfstools.nm
index 91d505b..0ed09ce 100644
--- a/pkgs/dosfstools/dosfstools.nm
+++ b/pkgs/dosfstools/dosfstools.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0.10
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://www.daniel-baumann.ch/software/dosfstools/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = Utilities for making and checking MS-DOS FAT filesystems on Linux.
diff --git a/pkgs/dracut/dracut.nm b/pkgs/dracut/dracut.nm
index 4c6e227..88695b6 100644
--- a/pkgs/dracut/dracut.nm
+++ b/pkgs/dracut/dracut.nm
@@ -30,7 +30,7 @@ PKG_REL = 4
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = System/Boot
+PKG_GROUPS = System/Boot
PKG_URL = http://sourceforge.net/apps/trac/dracut/wiki
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Initramfs generator using udev.
diff --git a/pkgs/dvdrtools/dvdrtools.nm b/pkgs/dvdrtools/dvdrtools.nm
index c9f2c17..38cde09 100644
--- a/pkgs/dvdrtools/dvdrtools.nm
+++ b/pkgs/dvdrtools/dvdrtools.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.2.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://savannah.nongnu.org/projects/dvdrtools/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A set of command line programs that allows to record media.
diff --git a/pkgs/e2fsprogs/e2fsprogs.nm b/pkgs/e2fsprogs/e2fsprogs.nm
index b33988a..d4d30b0 100644
--- a/pkgs/e2fsprogs/e2fsprogs.nm
+++ b/pkgs/e2fsprogs/e2fsprogs.nm
@@ -29,7 +29,8 @@ PKG_VER = 1.41.11
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
+PKG-GROUPS-$(PKG_NAME) = Base $(PKG_GROUPS)
PKG_URL = http://e2fsprogs.sourceforge.net/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Utilities for managing the extended (ext2/ext3/ext4) filesystems.
diff --git a/pkgs/ebtables/ebtables.nm b/pkgs/ebtables/ebtables.nm
index 6d0254f..cf7d2f3 100644
--- a/pkgs/ebtables/ebtables.nm
+++ b/pkgs/ebtables/ebtables.nm
@@ -29,7 +29,7 @@ PKG_VER = v2.0.9-2
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://ebtables.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Ethernet Bridge frame table administration tool.
diff --git a/pkgs/eggdbus/eggdbus.nm b/pkgs/eggdbus/eggdbus.nm
index 126a1d9..5d8f8a8 100644
--- a/pkgs/eggdbus/eggdbus.nm
+++ b/pkgs/eggdbus/eggdbus.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.6
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://cgit.freedesktop.org/~david/eggdbus
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Experimental D-Bus bindings for GObject.
diff --git a/pkgs/eject/eject.nm b/pkgs/eject/eject.nm
index 5370f2f..ca9a1ab 100644
--- a/pkgs/eject/eject.nm
+++ b/pkgs/eject/eject.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://www.pobox.com/~tranter
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A program that ejects removable media using software control.
diff --git a/pkgs/elfutils/elfutils.nm b/pkgs/elfutils/elfutils.nm
index 0d7f748..ecbfa06 100644
--- a/pkgs/elfutils/elfutils.nm
+++ b/pkgs/elfutils/elfutils.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.145
PKG_REL = 1
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = https://fedorahosted.org/elfutils/
PKG_LICENSE = GPLv2 with exceptions
PKG_SUMMARY = A collection of utilities and DSOs to handle compiled objects.
diff --git a/pkgs/elinks/elinks.nm b/pkgs/elinks/elinks.nm
index de97e8c..9fa5e2e 100644
--- a/pkgs/elinks/elinks.nm
+++ b/pkgs/elinks/elinks.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.11.7
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/Internet
+PKG_GROUPS = Applications/Internet
PKG_URL = http://elinks.or.cz/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Full-Featured Text WWW Browser.
diff --git a/pkgs/etherwake/etherwake.nm b/pkgs/etherwake/etherwake.nm
index 35e5bbf..425b99b 100644
--- a/pkgs/etherwake/etherwake.nm
+++ b/pkgs/etherwake/etherwake.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.09
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL =
PKG_LICENSE =
PKG_SUMMARY = Can wake up sleeping PCs by WOL.
diff --git a/pkgs/ethtool/ethtool.nm b/pkgs/ethtool/ethtool.nm
index 74a03a4..4bb0acc 100644
--- a/pkgs/ethtool/ethtool.nm
+++ b/pkgs/ethtool/ethtool.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.6.34
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Base Applications/System
PKG_URL = http://sourceforge.net/projects/gkernel/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Ethernet settings tool for PCI ethernet cards.
diff --git a/pkgs/eventlog/eventlog.nm b/pkgs/eventlog/eventlog.nm
index 8a4901d..bbd7639 100644
--- a/pkgs/eventlog/eventlog.nm
+++ b/pkgs/eventlog/eventlog.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.2.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.balabit.com/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Eventlog is an API for syslog-ng.
diff --git a/pkgs/expat/expat.nm b/pkgs/expat/expat.nm
index 1414959..46992b9 100644
--- a/pkgs/expat/expat.nm
+++ b/pkgs/expat/expat.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.libexpat.org/
PKG_LICENSE = MIT
PKG_SUMMARY = An XML parser library.
diff --git a/pkgs/expect/expect.nm b/pkgs/expect/expect.nm
index fe5bdb5..f00c5cc 100644
--- a/pkgs/expect/expect.nm
+++ b/pkgs/expect/expect.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.43
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://expect.nist.gov/
PKG_LICENSE = Public Domain
PKG_SUMMARY = A program-script interaction and testing utility.
diff --git a/pkgs/ez-ipupdate/ez-ipupdate.nm b/pkgs/ez-ipupdate/ez-ipupdate.nm
index b7846df..305385e 100644
--- a/pkgs/ez-ipupdate/ez-ipupdate.nm
+++ b/pkgs/ez-ipupdate/ez-ipupdate.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0.11b8
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://www.gusnet.cx/proj/ez-ipupdate/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Client for Dynamic DNS Services.
diff --git a/pkgs/fail2ban/fail2ban.nm b/pkgs/fail2ban/fail2ban.nm
index 4463eb8..9933728 100644
--- a/pkgs/fail2ban/fail2ban.nm
+++ b/pkgs/fail2ban/fail2ban.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.8.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Security/Tools
+PKG_GROUPS = Security/Tools
PKG_URL = http://fail2ban.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Ban IPs that make too many password failures.
diff --git a/pkgs/file/file.nm b/pkgs/file/file.nm
index d434e8e..a69483d 100644
--- a/pkgs/file/file.nm
+++ b/pkgs/file/file.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.05
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Tools
+PKG_GROUPS = Base System/Tools
PKG_URL = http://www.darwinsys.com/file/
PKG_LICENSE = BSD
PKG_SUMMARY = A utility for determining file types.
diff --git a/pkgs/findutils/findutils.nm b/pkgs/findutils/findutils.nm
index bfbd060..728f952 100644
--- a/pkgs/findutils/findutils.nm
+++ b/pkgs/findutils/findutils.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.5.9
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Tools
+PKG_GROUPS = Base System/Tools
PKG_URL = http://www.gnu.org/software/findutils/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The GNU versions of find utilities (find and xargs).
diff --git a/pkgs/firewall/firewall.nm b/pkgs/firewall/firewall.nm
index 2b78f54..a3d8796 100644
--- a/pkgs/firewall/firewall.nm
+++ b/pkgs/firewall/firewall.nm
@@ -29,7 +29,7 @@ PKG_VER =
PKG_REL = 1
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Networking/Firewall
+PKG_GROUPS = Networking/Firewall
PKG_URL = http://www.ipfire.org/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The IPFire Firewall Engine.
diff --git a/pkgs/flex/flex.nm b/pkgs/flex/flex.nm
index 726fe38..7f45cf9 100644
--- a/pkgs/flex/flex.nm
+++ b/pkgs/flex/flex.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.5.35
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://flex.sourceforge.net/
PKG_LICENSE = BSD
PKG_SUMMARY = A tool for creating scanners (text pattern recognizers).
diff --git a/pkgs/fontconfig/fontconfig.nm b/pkgs/fontconfig/fontconfig.nm
index 8c8d3d2..c2dc70c 100644
--- a/pkgs/fontconfig/fontconfig.nm
+++ b/pkgs/fontconfig/fontconfig.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.7.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Graphics
+PKG_GROUPS = System/Graphics
PKG_URL = http://fontconfig.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Font configuration and customization library.
diff --git a/pkgs/freeradius/freeradius.nm b/pkgs/freeradius/freeradius.nm
index 41233c5..df89c43 100644
--- a/pkgs/freeradius/freeradius.nm
+++ b/pkgs/freeradius/freeradius.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1.9
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = http://www.freeradius.org
PKG_LICENSE = GPLv2+ and LGPLv2+
PKG_SUMMARY = High-performance and highly configurable free RADIUS server.
diff --git a/pkgs/freetype/freetype.nm b/pkgs/freetype/freetype.nm
index e9249d2..7421509 100644
--- a/pkgs/freetype/freetype.nm
+++ b/pkgs/freetype/freetype.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.3.9
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Graphics
+PKG_GROUPS = System/Graphics
PKG_URL = http://www.freetype.org/
PKG_LICENSE = FTL GPLv2+
PKG_SUMMARY = A free and portable font rendering engine.
diff --git a/pkgs/fuse-sshfs/fuse-sshfs.nm b/pkgs/fuse-sshfs/fuse-sshfs.nm
index 67a9ae0..b4e4dcc 100644
--- a/pkgs/fuse-sshfs/fuse-sshfs.nm
+++ b/pkgs/fuse-sshfs/fuse-sshfs.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.2
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://fuse.sourceforge.net/sshfs.html
PKG_LICENSE = GPLv2
PKG_SUMMARY = FUSE-Filesystem to access remote filesystems via SSH.
diff --git a/pkgs/fuse/fuse.nm b/pkgs/fuse/fuse.nm
index 490bee8..ef9f3d6 100644
--- a/pkgs/fuse/fuse.nm
+++ b/pkgs/fuse/fuse.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.8.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://fuse.sf.net/
PKG_LICENSE = GPL+
PKG_SUMMARY = File System in Userspace (FUSE) utilities.
diff --git a/pkgs/gawk/gawk.nm b/pkgs/gawk/gawk.nm
index 3b656dd..9f96da5 100644
--- a/pkgs/gawk/gawk.nm
+++ b/pkgs/gawk/gawk.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.1.8
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Tools
+PKG_GROUPS = Base System/Tools
PKG_URL = http://www.gnu.org/software/gawk/gawk.html
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The GNU version of the awk text processing utility.
diff --git a/pkgs/gcc/gcc.nm b/pkgs/gcc/gcc.nm
index 5386c54..328b687 100644
--- a/pkgs/gcc/gcc.nm
+++ b/pkgs/gcc/gcc.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.5.2
PKG_REL = 7
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Compilers
+PKG_GROUPS = Development/Compilers
PKG_URL = http://gcc.gnu.org/
PKG_LICENSE = GPLv3+ and GPLv2+ with exceptions
PKG_SUMMARY = Various compilers (C, C++, Objective-C, Java, ...).
diff --git a/pkgs/gdb/gdb.nm b/pkgs/gdb/gdb.nm
index ea9ac1b..1f13680 100644
--- a/pkgs/gdb/gdb.nm
+++ b/pkgs/gdb/gdb.nm
@@ -29,7 +29,7 @@ PKG_VER = 7.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Debuggers
+PKG_GROUPS = Development/Debuggers
PKG_URL = http://gnu.org/software/gdb/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A GNU source-level debugger for C, C++, Java and other languages.
diff --git a/pkgs/gdbm/gdbm.nm b/pkgs/gdbm/gdbm.nm
index cf0d9f3..b643bd4 100644
--- a/pkgs/gdbm/gdbm.nm
+++ b/pkgs/gdbm/gdbm.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.8.3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/gdbm/
PKG_LICENSE = GPL
PKG_SUMMARY = The GDBM package contains the GNU Database Manager.
diff --git a/pkgs/gettext/gettext.nm b/pkgs/gettext/gettext.nm
index ebe34c6..e71351e 100644
--- a/pkgs/gettext/gettext.nm
+++ b/pkgs/gettext/gettext.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.18.1.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://www.gnu.org/software/gettext/
PKG_LICENSE = GPLv3 LGPL2+
PKG_SUMMARY = GNU libraries and utilities for producing multi-lingual messages.
diff --git a/pkgs/ghostscript/ghostscript.nm b/pkgs/ghostscript/ghostscript.nm
index 90ad764..eb5d54d 100644
--- a/pkgs/ghostscript/ghostscript.nm
+++ b/pkgs/ghostscript/ghostscript.nm
@@ -29,7 +29,7 @@ PKG_VER = 8.70
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Printing
+PKG_GROUPS = Applications/Printing
PKG_URL = http://ghostscript.com
PKG_LICENSE = GPL
PKG_SUMMARY = An interpreter for the PostScript language and for PDF.
diff --git a/pkgs/git/git.nm b/pkgs/git/git.nm
index ded2da2..bcf3435 100644
--- a/pkgs/git/git.nm
+++ b/pkgs/git/git.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.7.3.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://git-scm.com/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Fast Version Control System.
diff --git a/pkgs/glib2/glib2.nm b/pkgs/glib2/glib2.nm
index d5b9f52..3e34ba3 100644
--- a/pkgs/glib2/glib2.nm
+++ b/pkgs/glib2/glib2.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.28.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gtk.org
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = A library of handy utility functions.
diff --git a/pkgs/glibc/glibc.nm b/pkgs/glibc/glibc.nm
index 5205079..edcd71a 100644
--- a/pkgs/glibc/glibc.nm
+++ b/pkgs/glibc/glibc.nm
@@ -31,7 +31,7 @@ PKG_REL = 1
# TODO tzdata
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://sources.redhat.com/glibc/
PKG_LICENSE = GPLv2+ LGPLv2+
PKG_SUMMARY = The GNU libc libraries.
diff --git a/pkgs/gmp/gmp.nm b/pkgs/gmp/gmp.nm
index 9084e7a..d096b99 100644
--- a/pkgs/gmp/gmp.nm
+++ b/pkgs/gmp/gmp.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.0.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://gmplib.org/
PKG_LICENSE = LGPLv3+
PKG_SUMMARY = A GNU arbitrary precision library.
diff --git a/pkgs/gnupg2/gnupg2.nm b/pkgs/gnupg2/gnupg2.nm
index 94a7762..8ef75bb 100644
--- a/pkgs/gnupg2/gnupg2.nm
+++ b/pkgs/gnupg2/gnupg2.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.17
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Security/Tools
+PKG_GROUPS = Security/Tools
PKG_URL = http://www.gnupg.org/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = Utility for secure communication and data storage.
diff --git a/pkgs/gnutls/gnutls.nm b/pkgs/gnutls/gnutls.nm
index 1c0a098..cffa437 100644
--- a/pkgs/gnutls/gnutls.nm
+++ b/pkgs/gnutls/gnutls.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.8.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnu.org/software/gnutls/
PKG_LICENSE = LGPLv2.1+
PKG_SUMMARY = A general-purpose cryptography library.
diff --git a/pkgs/gobject-introspection/gobject-introspection.nm b/pkgs/gobject-introspection/gobject-introspection.nm
index a595246..9524373 100644
--- a/pkgs/gobject-introspection/gobject-introspection.nm
+++ b/pkgs/gobject-introspection/gobject-introspection.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9.12
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://live.gnome.org/GObjectIntrospection
PKG_LICENSE = GPLv2+, LGPLv2+, MIT
PKG_SUMMARY = Introspection system for GObject-based libraries.
diff --git a/pkgs/gperf/gperf.nm b/pkgs/gperf/gperf.nm
index 289dc4c..def24ae 100644
--- a/pkgs/gperf/gperf.nm
+++ b/pkgs/gperf/gperf.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/gperf/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A perfect hash function generator.
diff --git a/pkgs/grep/grep.nm b/pkgs/grep/grep.nm
index 9fbd803..c48a84c 100644
--- a/pkgs/grep/grep.nm
+++ b/pkgs/grep/grep.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Text
+PKG_GROUPS = Base Applications/Text
PKG_URL = http://www.gnu.org/software/grep/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A pattern matching utilities.
diff --git a/pkgs/groff/groff.nm b/pkgs/groff/groff.nm
index 0e81e5a..d7bbde5 100644
--- a/pkgs/groff/groff.nm
+++ b/pkgs/groff/groff.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.18.1.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Text
+PKG_GROUPS = Applications/Text
PKG_URL = http://groff.ffii.org/
PKG_LICENSE = GPLv2 and GFDL
PKG_SUMMARY = A document formatting system.
diff --git a/pkgs/grub/grub.nm b/pkgs/grub/grub.nm
index f390c25..1aa3f14 100644
--- a/pkgs/grub/grub.nm
+++ b/pkgs/grub/grub.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.98
PKG_REL = 6
PKG_MAINTAINER =
-PKG_GROUP = System/Boot
+PKG_GROUPS = Base System/Boot
PKG_URL = http://www.gnu.org/software/grub/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Grand Unified Boot Loader.
diff --git a/pkgs/gssdp/gssdp.nm b/pkgs/gssdp/gssdp.nm
index 1c8ada5..0bddc82 100644
--- a/pkgs/gssdp/gssdp.nm
+++ b/pkgs/gssdp/gssdp.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.7.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gupnp.org
PKG_LICENSE = LGPL
PKG_SUMMARY = Resource discovery and announcement over SSDP.
diff --git a/pkgs/guile/guile.nm b/pkgs/guile/guile.nm
index 7e898d2..26f5359 100644
--- a/pkgs/guile/guile.nm
+++ b/pkgs/guile/guile.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.8.7
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/guile/
PKG_LICENSE = GPLv2+ and LGPLv2+ and GFDL and OFSFDL
PKG_SUMMARY = A GNU implementation of Scheme for application extensibility.
diff --git a/pkgs/gupnp-av/gupnp-av.nm b/pkgs/gupnp-av/gupnp-av.nm
index 1d2ab1b..f3eeec7 100644
--- a/pkgs/gupnp-av/gupnp-av.nm
+++ b/pkgs/gupnp-av/gupnp-av.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.5.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gupnp.org
PKG_LICENSE = LGPL
PKG_SUMMARY = gupnp audio/video helpers.
diff --git a/pkgs/gupnp-igd/gupnp-igd.nm b/pkgs/gupnp-igd/gupnp-igd.nm
index ae7e17d..df9f4a2 100644
--- a/pkgs/gupnp-igd/gupnp-igd.nm
+++ b/pkgs/gupnp-igd/gupnp-igd.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.1.3
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gupnp.org
PKG_LICENSE = LGPL
PKG_SUMMARY = gupnp - Internet Gateway device implementation (Microsoft).
diff --git a/pkgs/gupnp/gupnp.nm b/pkgs/gupnp/gupnp.nm
index ae12a23..24ed6fd 100644
--- a/pkgs/gupnp/gupnp.nm
+++ b/pkgs/gupnp/gupnp.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.13.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gupnp.org
PKG_LICENSE = LGPL
PKG_SUMMARY = An UPNP framework.
diff --git a/pkgs/gzip/gzip.nm b/pkgs/gzip/gzip.nm
index 00a66b6..307b19b 100644
--- a/pkgs/gzip/gzip.nm
+++ b/pkgs/gzip/gzip.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Compression
+PKG_GROUPS = Base Applications/Compression
PKG_URL = http://www.gzip.org/
PKG_LICENSE = GPLv2
PKG_SUMMARY = The GNU data compression program.
diff --git a/pkgs/hdparm/hdparm.nm b/pkgs/hdparm/hdparm.nm
index 29b9868..50e26be 100644
--- a/pkgs/hdparm/hdparm.nm
+++ b/pkgs/hdparm/hdparm.nm
@@ -29,7 +29,7 @@ PKG_VER = 9.37
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Hardware
+PKG_GROUPS = Base Applications/Hardware
PKG_URL = http://sourceforge.net/projects/hdparm/
PKG_LICENSE = BSD
PKG_SUMMARY = A utility for displaying and/or setting hard disk parameters.
diff --git a/pkgs/hostapd/hostapd.nm b/pkgs/hostapd/hostapd.nm
index 46e07bd..1188bfa 100644
--- a/pkgs/hostapd/hostapd.nm
+++ b/pkgs/hostapd/hostapd.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.6.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://hostap.epitest.fi/hostapd/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = User space daemon to create Wifi Access points.
diff --git a/pkgs/hplip/hplip.nm b/pkgs/hplip/hplip.nm
index 6b787d9..c765b6f 100644
--- a/pkgs/hplip/hplip.nm
+++ b/pkgs/hplip/hplip.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.10.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Printing
+PKG_GROUPS = Applications/Printing
PKG_URL = http://hplipopensource.com/hplip-web/index.html
PKG_LICENSE = GPLv2*
PKG_SUMMARY = HP Printer/Scanner Library (full version).
diff --git a/pkgs/htop/htop.nm b/pkgs/htop/htop.nm
index 5c58d5e..ef54909 100644
--- a/pkgs/htop/htop.nm
+++ b/pkgs/htop/htop.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Base Applications/System
PKG_URL = http://htop.sourceforge.net/
PKG_LICENSE = GPL+
PKG_SUMMARY = Interactive process viewer.
diff --git a/pkgs/hwdata/hwdata.nm b/pkgs/hwdata/hwdata.nm
index 514851c..0bfc7d7 100644
--- a/pkgs/hwdata/hwdata.nm
+++ b/pkgs/hwdata/hwdata.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL = http://git.fedorahosted.org/git/hwdata.git
PKG_LICENSE = GPLv2+ and LGPLv2+
PKG_SUMMARY = Hardware identification and configuration data.
diff --git a/pkgs/iana-etc/iana-etc.nm b/pkgs/iana-etc/iana-etc.nm
index 86654f7..b3a40ea 100644
--- a/pkgs/iana-etc/iana-etc.nm
+++ b/pkgs/iana-etc/iana-etc.nm
@@ -30,7 +30,7 @@ PKG_REL = 0
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Base Networking/Tools
PKG_URL = http://www.iana.org/
PKG_LICENSE =
PKG_SUMMARY = The Internet Assigned Numbers Authority.
diff --git a/pkgs/icecream/icecream.nm b/pkgs/icecream/icecream.nm
index ab1e2ee..545bff9 100644
--- a/pkgs/icecream/icecream.nm
+++ b/pkgs/icecream/icecream.nm
@@ -32,7 +32,7 @@ PKG_VER = 0.9.6
PKG_REL = 3
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Compilers
+PKG_GROUPS = Development/Compilers
PKG_URL = http://en.opensuse.org/Icecream
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Distributed compiler.
diff --git a/pkgs/initscripts/initscripts.nm b/pkgs/initscripts/initscripts.nm
index 678c50e..08fbbb2 100644
--- a/pkgs/initscripts/initscripts.nm
+++ b/pkgs/initscripts/initscripts.nm
@@ -29,7 +29,7 @@ PKG_VER = $(DISTRO_VERSION)
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Boot
+PKG_GROUPS = Base System/Boot
PKG_URL =
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The set of scripts that initalize the system.
diff --git a/pkgs/intltool/intltool.nm b/pkgs/intltool/intltool.nm
index 65876e8..74ae1e3 100644
--- a/pkgs/intltool/intltool.nm
+++ b/pkgs/intltool/intltool.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Localization/Tools
+PKG_GROUPS = Localization/Tools
PKG_URL = http://www.gnome.org/
PKG_LICENSE = GPLv2 with exceptions
PKG_SUMMARY = Utility for internationalizing various kinds of data files.
diff --git a/pkgs/iproute2/iproute2.nm b/pkgs/iproute2/iproute2.nm
index cc167e1..c30c942 100644
--- a/pkgs/iproute2/iproute2.nm
+++ b/pkgs/iproute2/iproute2.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.6.37
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Base Networking/Tools
PKG_URL = http://www.linuxfoundation.org/en/Net:Iproute2
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Advanced IP routing and network device configuration tools.
diff --git a/pkgs/iptables/iptables.nm b/pkgs/iptables/iptables.nm
index 355bdcb..43749f4 100644
--- a/pkgs/iptables/iptables.nm
+++ b/pkgs/iptables/iptables.nm
@@ -31,7 +31,8 @@ PKG_REL = 1
PKG_BUILD_DEPS+= libselinux-devel
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
+PKG_GROUPS-iptables = Base $(PKG_GROUPS)
PKG_URL = http://www.netfilter.org/
PKG_LICENSE = GPL+
PKG_SUMMARY = Tools for managing Linux kernel packet filtering capabilities.
diff --git a/pkgs/iputils/iputils.nm b/pkgs/iputils/iputils.nm
index d9cfc9c..618b9f7 100644
--- a/pkgs/iputils/iputils.nm
+++ b/pkgs/iputils/iputils.nm
@@ -29,7 +29,7 @@ PKG_VER = s20071127
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Base Networking/Tools
PKG_URL = http://www.skbuff.net/iputils
PKG_LICENSE = BSD
PKG_SUMMARY = Network monitoring tools including ping.
diff --git a/pkgs/iscsi-initiator-utils/iscsi-initiator-utils.nm b/pkgs/iscsi-initiator-utils/iscsi-initiator-utils.nm
index b07c5c4..c9d9614 100644
--- a/pkgs/iscsi-initiator-utils/iscsi-initiator-utils.nm
+++ b/pkgs/iscsi-initiator-utils/iscsi-initiator-utils.nm
@@ -29,7 +29,7 @@ PKG_VER = 6.2.0.872
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://bridge.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = iSCSI daemon and utility programs.
diff --git a/pkgs/iw/iw.nm b/pkgs/iw/iw.nm
index 61fc6da..41f5e9d 100644
--- a/pkgs/iw/iw.nm
+++ b/pkgs/iw/iw.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9.17
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://www.linuxwireless.org/en/users/Documentation/iw
PKG_LICENSE = BSD
PKG_SUMMARY = A nl80211 based wireless configuration tool.
diff --git a/pkgs/joe/joe.nm b/pkgs/joe/joe.nm
index 970cd33..803d72b 100644
--- a/pkgs/joe/joe.nm
+++ b/pkgs/joe/joe.nm
@@ -31,7 +31,7 @@ PKG_REL = 1
PKG_BUILD_DEPS+= libselinux-devel
PKG_MAINTAINER =
-PKG_GROUP = Applications/Editors
+PKG_GROUPS = Applications/Editors
PKG_URL = http://joe-editor.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A small text editor similar to wordstar in matter of usage.
diff --git a/pkgs/jwhois/jwhois.nm b/pkgs/jwhois/jwhois.nm
index e8a98a1..db3d196 100644
--- a/pkgs/jwhois/jwhois.nm
+++ b/pkgs/jwhois/jwhois.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Internet
+PKG_GROUPS = Base Applications/Internet
PKG_URL = http://www.gnu.org/software/jwhois/
PKG_LICENSE = GPLv3
PKG_SUMMARY = Internet whois/nicname client.
diff --git a/pkgs/kbd/kbd.nm b/pkgs/kbd/kbd.nm
index 43bf61d..e46b59d 100644
--- a/pkgs/kbd/kbd.nm
+++ b/pkgs/kbd/kbd.nm
@@ -30,7 +30,7 @@ PKG_REL = 0
PKG_EPOCH = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://ftp.altlinux.org/pub/people/legion/kbd
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Tools for configuring the console (keyboard, virtual terminals, etc.).
diff --git a/pkgs/kernel/kernel.nm b/pkgs/kernel/kernel.nm
index 0ca32bb..91a24db 100644
--- a/pkgs/kernel/kernel.nm
+++ b/pkgs/kernel/kernel.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.6.37.2
PKG_REL = 2
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = System/Kernels
+PKG_GROUPS = System/Kernels
PKG_URL = http://www.kernel.org/
PKG_LICENSE = GPLv2
PKG_SUMMARY = The Linux kernel.
diff --git a/pkgs/l7-protocols/l7-protocols.nm b/pkgs/l7-protocols/l7-protocols.nm
index 205bf4a..d8bb400 100644
--- a/pkgs/l7-protocols/l7-protocols.nm
+++ b/pkgs/l7-protocols/l7-protocols.nm
@@ -29,7 +29,7 @@ PKG_VER = 2007-11-22
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Firewall
+PKG_GROUPS = Networking/Firewall
PKG_URL = http://l7-filter.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Application Layer Packet Classifier for Linux.
diff --git a/pkgs/ldapvi/ldapvi.nm b/pkgs/ldapvi/ldapvi.nm
index 26c02f7..62a8acb 100644
--- a/pkgs/ldapvi/ldapvi.nm
+++ b/pkgs/ldapvi/ldapvi.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Editors
+PKG_GROUPS = Applications/Editors
PKG_URL = http://www.lichteblau.com/ldapvi/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = An interactive LDAP client.
diff --git a/pkgs/less/less.nm b/pkgs/less/less.nm
index 64a6688..ef771de 100644
--- a/pkgs/less/less.nm
+++ b/pkgs/less/less.nm
@@ -29,7 +29,7 @@ PKG_VER = 436
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Text
+PKG_GROUPS = Base Applications/Text
PKG_URL = http://www.greenwoodsoftware.com/less/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A text file browser similar to more, but better.
diff --git a/pkgs/libICE/libICE.nm b/pkgs/libICE/libICE.nm
index ae668f4..b672585 100644
--- a/pkgs/libICE/libICE.nm
+++ b/pkgs/libICE/libICE.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.6
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libICE runtime library.
diff --git a/pkgs/libSM/libSM.nm b/pkgs/libSM/libSM.nm
index c05f6cf..1bfc15a 100644
--- a/pkgs/libSM/libSM.nm
+++ b/pkgs/libSM/libSM.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.1
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libSM runtime library.
diff --git a/pkgs/libVNCServer/libVNCServer.nm b/pkgs/libVNCServer/libVNCServer.nm
index ef35ea7..4d69435 100644
--- a/pkgs/libVNCServer/libVNCServer.nm
+++ b/pkgs/libVNCServer/libVNCServer.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://libvncserver.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Library to make writing a vnc server easy.
diff --git a/pkgs/libX11/libX11.nm b/pkgs/libX11/libX11.nm
index d82799b..c163bcf 100644
--- a/pkgs/libX11/libX11.nm
+++ b/pkgs/libX11/libX11.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.3.2
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X11 protocol client library.
diff --git a/pkgs/libXau/libXau.nm b/pkgs/libXau/libXau.nm
index 2a0b8c4..089bd01 100644
--- a/pkgs/libXau/libXau.nm
+++ b/pkgs/libXau/libXau.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.6
PKG_REL = 1
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://xcb.freedesktop.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Sample Authorization Protocol for X.
diff --git a/pkgs/libXaw/libXaw.nm b/pkgs/libXaw/libXaw.nm
index 22c7577..46b3f7e 100644
--- a/pkgs/libXaw/libXaw.nm
+++ b/pkgs/libXaw/libXaw.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.7
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X Athena Widget Set.
diff --git a/pkgs/libXdamage/libXdamage.nm b/pkgs/libXdamage/libXdamage.nm
index 1757719..204183b 100644
--- a/pkgs/libXdamage/libXdamage.nm
+++ b/pkgs/libXdamage/libXdamage.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.3
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X Damage extension library.
diff --git a/pkgs/libXdmcp/libXdmcp.nm b/pkgs/libXdmcp/libXdmcp.nm
index ff84969..b1a357d 100644
--- a/pkgs/libXdmcp/libXdmcp.nm
+++ b/pkgs/libXdmcp/libXdmcp.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.3
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X Display Manager Control Protocol library.
diff --git a/pkgs/libXext/libXext.nm b/pkgs/libXext/libXext.nm
index 3669fe6..a8163c9 100644
--- a/pkgs/libXext/libXext.nm
+++ b/pkgs/libXext/libXext.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.2
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXext runtime library.
diff --git a/pkgs/libXfixes/libXfixes.nm b/pkgs/libXfixes/libXfixes.nm
index cdef342..d4209ff 100644
--- a/pkgs/libXfixes/libXfixes.nm
+++ b/pkgs/libXfixes/libXfixes.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.0.5
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X Fixes library.
diff --git a/pkgs/libXfont/libXfont.nm b/pkgs/libXfont/libXfont.nm
index 2b9a5a6..a47de65 100644
--- a/pkgs/libXfont/libXfont.nm
+++ b/pkgs/libXfont/libXfont.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.2
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXfont runtime library.
diff --git a/pkgs/libXft/libXft.nm b/pkgs/libXft/libXft.nm
index 5f17ad9..0a964e6 100644
--- a/pkgs/libXft/libXft.nm
+++ b/pkgs/libXft/libXft.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1.14
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXft runtime library.
diff --git a/pkgs/libXi/libXi.nm b/pkgs/libXi/libXi.nm
index 76f2f27..584c91b 100644
--- a/pkgs/libXi/libXi.nm
+++ b/pkgs/libXi/libXi.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.3.2
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://xcb.freedesktop.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXi runtime library.
diff --git a/pkgs/libXmu/libXmu.nm b/pkgs/libXmu/libXmu.nm
index f18dada..e6b6c98 100644
--- a/pkgs/libXmu/libXmu.nm
+++ b/pkgs/libXmu/libXmu.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.5
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXmu/libXmuu runtime libraries.
diff --git a/pkgs/libXpm/libXpm.nm b/pkgs/libXpm/libXpm.nm
index 73b5658..f8ec211 100644
--- a/pkgs/libXpm/libXpm.nm
+++ b/pkgs/libXpm/libXpm.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.5.8
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXpm runtime library.
diff --git a/pkgs/libXrandr/libXrandr.nm b/pkgs/libXrandr/libXrandr.nm
index bef34b7..29481d6 100644
--- a/pkgs/libXrandr/libXrandr.nm
+++ b/pkgs/libXrandr/libXrandr.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.3.0
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X11 libXrandr runtime library.
diff --git a/pkgs/libXrender/libXrender.nm b/pkgs/libXrender/libXrender.nm
index 69cbfcf..fd5bb07 100644
--- a/pkgs/libXrender/libXrender.nm
+++ b/pkgs/libXrender/libXrender.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9.6
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X11 libXrender runtime library.
diff --git a/pkgs/libXres/libXres.nm b/pkgs/libXres/libXres.nm
index 0ba548c..8d63dc0 100644
--- a/pkgs/libXres/libXres.nm
+++ b/pkgs/libXres/libXres.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.4
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X-Resource extension client library.
diff --git a/pkgs/libXt/libXt.nm b/pkgs/libXt/libXt.nm
index d9105b1..46f581e 100644
--- a/pkgs/libXt/libXt.nm
+++ b/pkgs/libXt/libXt.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.7
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXt runtime library.
diff --git a/pkgs/libXtst/libXtst.nm b/pkgs/libXtst/libXtst.nm
index 1b2c2ff..ed5ecc5 100644
--- a/pkgs/libXtst/libXtst.nm
+++ b/pkgs/libXtst/libXtst.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.0
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXtst runtime library.
diff --git a/pkgs/libXv/libXv.nm b/pkgs/libXv/libXv.nm
index ef05661..0ee04ad 100644
--- a/pkgs/libXv/libXv.nm
+++ b/pkgs/libXv/libXv.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.5
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXv runtime library.
diff --git a/pkgs/libXvMC/libXvMC.nm b/pkgs/libXvMC/libXvMC.nm
index e8b8fd7..74fbe2a 100644
--- a/pkgs/libXvMC/libXvMC.nm
+++ b/pkgs/libXvMC/libXvMC.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.6
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXvMC runtime library.
diff --git a/pkgs/libXxf86vm/libXxf86vm.nm b/pkgs/libXxf86vm/libXxf86vm.nm
index 0c68bd4..c980742 100644
--- a/pkgs/libXxf86vm/libXxf86vm.nm
+++ b/pkgs/libXxf86vm/libXxf86vm.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.0
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libXxf86vm runtime library.
diff --git a/pkgs/libaal/libaal.nm b/pkgs/libaal/libaal.nm
index aa7035a..4da38c2 100644
--- a/pkgs/libaal/libaal.nm
+++ b/pkgs/libaal/libaal.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://www.kernel.org/pub/linux/utils/fs/reiser4/libaal/
PKG_LICENSE = GPL
PKG_SUMMARY = Reiser4's application abstraction library.
diff --git a/pkgs/libaio/libaio.nm b/pkgs/libaio/libaio.nm
index efb81b6..d871de8 100644
--- a/pkgs/libaio/libaio.nm
+++ b/pkgs/libaio/libaio.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.3.109
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = ftp://ftp.kernel.org/pub/linux/libs/aio/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Linux-native asynchronous I/O access library.
diff --git a/pkgs/libart/libart.nm b/pkgs/libart/libart.nm
index ecea742..3922a6f 100644
--- a/pkgs/libart/libart.nm
+++ b/pkgs/libart/libart.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.3.19
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Graphics
+PKG_GROUPS = System/Graphics
PKG_URL = http://www.gnome.org
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Library of graphics routines used by libgnomecanvas.
diff --git a/pkgs/libassuan/libassuan.nm b/pkgs/libassuan/libassuan.nm
index 911a2fa..3f9c2c1 100644
--- a/pkgs/libassuan/libassuan.nm
+++ b/pkgs/libassuan/libassuan.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnupg.org/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = GnuPG IPC library.
diff --git a/pkgs/libatasmart/libatasmart.nm b/pkgs/libatasmart/libatasmart.nm
index 9509ca5..d744b4d 100644
--- a/pkgs/libatasmart/libatasmart.nm
+++ b/pkgs/libatasmart/libatasmart.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.17
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Statistics
+PKG_GROUPS = System/Statistics
PKG_URL = http://git.0pointer.de/?p=libatasmart.git;a=summary
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = ATA S.M.A.R.T. Disk Health Monitoring Library.
diff --git a/pkgs/libcap-ng/libcap-ng.nm b/pkgs/libcap-ng/libcap-ng.nm
index 189f2a0..f056d9d 100644
--- a/pkgs/libcap-ng/libcap-ng.nm
+++ b/pkgs/libcap-ng/libcap-ng.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.6.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://people.redhat.com/sgrubb/libcap-ng
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = An alternate posix capabilities library.
diff --git a/pkgs/libcap/libcap.nm b/pkgs/libcap/libcap.nm
index 34cf31b..b9b5a3d 100644
--- a/pkgs/libcap/libcap.nm
+++ b/pkgs/libcap/libcap.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.19
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
PKG_LICENSE = LGPL2+
PKG_SUMMARY = Library for getting and setting POSIX.1e capabilities.
diff --git a/pkgs/libdaemon/libdaemon.nm b/pkgs/libdaemon/libdaemon.nm
index 9b1265c..7230632 100644
--- a/pkgs/libdaemon/libdaemon.nm
+++ b/pkgs/libdaemon/libdaemon.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.13
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://0pointer.de/lennart/projects/libdaemon/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Library for writing UNIX daemons.
diff --git a/pkgs/libdnet/libdnet.nm b/pkgs/libdnet/libdnet.nm
index b976e41..d49e860 100644
--- a/pkgs/libdnet/libdnet.nm
+++ b/pkgs/libdnet/libdnet.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.12
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://code.google.com/p/libdnet/
PKG_LICENSE = BSD
PKG_SUMMARY = Simple portable interface to lowlevel networking routines.
diff --git a/pkgs/libdrm/libdrm.nm b/pkgs/libdrm/libdrm.nm
index cda7e2c..b2ced13 100644
--- a/pkgs/libdrm/libdrm.nm
+++ b/pkgs/libdrm/libdrm.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.4.21
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://dri.freedesktop.org/libdrm/
PKG_LICENSE = MIT
PKG_SUMMARY = Direct Rendering Manager runtime library.
diff --git a/pkgs/libevent/libevent.nm b/pkgs/libevent/libevent.nm
index e181694..f054b70 100644
--- a/pkgs/libevent/libevent.nm
+++ b/pkgs/libevent/libevent.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.10
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://monkey.org/~provos/libevent/
PKG_LICENSE = BSD
PKG_SUMMARY = Abstract asynchronous event notification library.
diff --git a/pkgs/libffi/libffi.nm b/pkgs/libffi/libffi.nm
index 40811cf..414e5b8 100644
--- a/pkgs/libffi/libffi.nm
+++ b/pkgs/libffi/libffi.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://sourceware.org/libffi
PKG_LICENSE = BSD
PKG_SUMMARY = A portable foreign function interface library.
diff --git a/pkgs/libfontenc/libfontenc.nm b/pkgs/libfontenc/libfontenc.nm
index 7fe0b7e..397fd2d 100644
--- a/pkgs/libfontenc/libfontenc.nm
+++ b/pkgs/libfontenc/libfontenc.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.5
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libfontenc runtime library.
diff --git a/pkgs/libgcrypt/libgcrypt.nm b/pkgs/libgcrypt/libgcrypt.nm
index 080b244..3789401 100644
--- a/pkgs/libgcrypt/libgcrypt.nm
+++ b/pkgs/libgcrypt/libgcrypt.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.6
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnupg.org/
PKG_LICENSE = LGPLv2.1+
PKG_SUMMARY = A general-purpose cryptography library.
diff --git a/pkgs/libgpg-error/libgpg-error.nm b/pkgs/libgpg-error/libgpg-error.nm
index f744656..87754a6 100644
--- a/pkgs/libgpg-error/libgpg-error.nm
+++ b/pkgs/libgpg-error/libgpg-error.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.9
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnupg.org/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Library for error values used by GnuPG components.
diff --git a/pkgs/libgssglue/libgssglue.nm b/pkgs/libgssglue/libgssglue.nm
index e7026ee..82fb3f9 100644
--- a/pkgs/libgssglue/libgssglue.nm
+++ b/pkgs/libgssglue/libgssglue.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/
PKG_LICENSE = BSD
PKG_SUMMARY = This library exports a gssapi interface.
diff --git a/pkgs/libidn/libidn.nm b/pkgs/libidn/libidn.nm
index d7afa25..16c0726 100644
--- a/pkgs/libidn/libidn.nm
+++ b/pkgs/libidn/libidn.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.20
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnu.org/software/libidn/
PKG_LICENSE = LGPLv2+ GPLv3+
PKG_SUMMARY = Internationalized Domain Name support library.
diff --git a/pkgs/libjpeg/libjpeg.nm b/pkgs/libjpeg/libjpeg.nm
index cbbe9bf..74952d2 100644
--- a/pkgs/libjpeg/libjpeg.nm
+++ b/pkgs/libjpeg/libjpeg.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://sourceforge.net/projects/libjpeg-turbo
PKG_LICENSE = wxWidgets
PKG_SUMMARY = A MMX/SSE2 accelerated library for manipulating JPEG image files.
diff --git a/pkgs/libksba/libksba.nm b/pkgs/libksba/libksba.nm
index 02f2fc4..ef19e17 100644
--- a/pkgs/libksba/libksba.nm
+++ b/pkgs/libksba/libksba.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.8
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnugp.org
PKG_LICENSE = GPLv3
PKG_SUMMARY = X.509 Library.
diff --git a/pkgs/libmng/libmng.nm b/pkgs/libmng/libmng.nm
index 3709703..9cdeab0 100644
--- a/pkgs/libmng/libmng.nm
+++ b/pkgs/libmng/libmng.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.10
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.libmng.org
PKG_LICENSE = zlib
PKG_SUMMARY = Library for Multiple-image Network Graphics support.
diff --git a/pkgs/libnet/libnet.nm b/pkgs/libnet/libnet.nm
index 051010b..302c8ca 100644
--- a/pkgs/libnet/libnet.nm
+++ b/pkgs/libnet/libnet.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.sourceforge.net/projects/libnet-dev/
PKG_LICENSE = BSD
PKG_SUMMARY = C library for portable packet creation and injection.
diff --git a/pkgs/libnetfilter_conntrack/libnetfilter_conntrack.nm b/pkgs/libnetfilter_conntrack/libnetfilter_conntrack.nm
index fac8c65..0b995b0 100644
--- a/pkgs/libnetfilter_conntrack/libnetfilter_conntrack.nm
+++ b/pkgs/libnetfilter_conntrack/libnetfilter_conntrack.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.netfilter.org/projects/libnetfilter_conntrack/downloads.html
PKG_LICENSE = GPL
PKG_SUMMARY = libnetfilter_conntrack is a userspace library.
diff --git a/pkgs/libnetfilter_log/libnetfilter_log.nm b/pkgs/libnetfilter_log/libnetfilter_log.nm
index 10e3fd9..eb28dcc 100644
--- a/pkgs/libnetfilter_log/libnetfilter_log.nm
+++ b/pkgs/libnetfilter_log/libnetfilter_log.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.0.16
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.netfilter.org/projects/libnetfilter_log/downloads.html
PKG_LICENSE = GPL
PKG_SUMMARY = The libnetfilter_log userspace library.
diff --git a/pkgs/libnetfilter_queue/libnetfilter_queue.nm b/pkgs/libnetfilter_queue/libnetfilter_queue.nm
index f290e12..d45651c 100644
--- a/pkgs/libnetfilter_queue/libnetfilter_queue.nm
+++ b/pkgs/libnetfilter_queue/libnetfilter_queue.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.0.17
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.netfilter.org/projects/libnetfilter_queue/downloads.html
PKG_LICENSE = GPL
PKG_SUMMARY = The libnetfilter_queue userspace library.
diff --git a/pkgs/libnfnetlink/libnfnetlink.nm b/pkgs/libnfnetlink/libnfnetlink.nm
index b139cbb..d85a768 100644
--- a/pkgs/libnfnetlink/libnfnetlink.nm
+++ b/pkgs/libnfnetlink/libnfnetlink.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.netfilter.org/projects/libnfnetlink/downloads.html
PKG_LICENSE = GPL
PKG_SUMMARY = A low-level library for netfilter.
diff --git a/pkgs/libnfsidmap/libnfsidmap.nm b/pkgs/libnfsidmap/libnfsidmap.nm
index 3a31d7f..188cf52 100644
--- a/pkgs/libnfsidmap/libnfsidmap.nm
+++ b/pkgs/libnfsidmap/libnfsidmap.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.21
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
PKG_LICENSE = BSD
PKG_SUMMARY = Library to help mapping id's, mainly for NFSv4.
diff --git a/pkgs/libnih/libnih.nm b/pkgs/libnih/libnih.nm
index a0fc96f..8981a6f 100644
--- a/pkgs/libnih/libnih.nm
+++ b/pkgs/libnih/libnih.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.3
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = https://launchpad.net/libnih
PKG_LICENSE = GPL2+
PKG_SUMMARY = Small library with advanced functions.
diff --git a/pkgs/libnl/libnl.nm b/pkgs/libnl/libnl.nm
index a2133ad..be5497b 100644
--- a/pkgs/libnl/libnl.nm
+++ b/pkgs/libnl/libnl.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://people.suug.ch/~tgr/libnl/
PKG_LICENSE = LGPLv2
PKG_SUMMARY = Convenience library for kernel netlink sockets.
diff --git a/pkgs/libpcap/libpcap.nm b/pkgs/libpcap/libpcap.nm
index 45dccf3..7b5a6a6 100644
--- a/pkgs/libpcap/libpcap.nm
+++ b/pkgs/libpcap/libpcap.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.tcpdump.org/
PKG_LICENSE = BSD with advertising
PKG_SUMMARY = A system-independent interface for user-level packet capture.
diff --git a/pkgs/libpciaccess/libpciaccess.nm b/pkgs/libpciaccess/libpciaccess.nm
index 44dab49..9a92c85 100644
--- a/pkgs/libpciaccess/libpciaccess.nm
+++ b/pkgs/libpciaccess/libpciaccess.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.11.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Virtualization
+PKG_GROUPS = Applications/Virtualization
PKG_URL = http://cgit.freedesktop.org/xorg/lib/libpciaccess/
PKG_LICENSE = LGPLv2.1+
PKG_SUMMARY = Generic PCI access library.
diff --git a/pkgs/libpng/libpng.nm b/pkgs/libpng/libpng.nm
index 0e6363a..613089e 100644
--- a/pkgs/libpng/libpng.nm
+++ b/pkgs/libpng/libpng.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.5
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.libpng.org/pub/png/
PKG_LICENSE = zlib
PKG_SUMMARY = A library of functions for manipulating PNG image format files.
diff --git a/pkgs/librpcsecgss/librpcsecgss.nm b/pkgs/librpcsecgss/librpcsecgss.nm
index bd4f475..b2af7ac 100644
--- a/pkgs/librpcsecgss/librpcsecgss.nm
+++ b/pkgs/librpcsecgss/librpcsecgss.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.18
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/
PKG_LICENSE = BSD
PKG_SUMMARY = A Library for secure rpc communication.
diff --git a/pkgs/libselinux/libselinux.nm b/pkgs/libselinux/libselinux.nm
index 03e418d..4093117 100644
--- a/pkgs/libselinux/libselinux.nm
+++ b/pkgs/libselinux/libselinux.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.96
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.selinuxproject.org
PKG_LICENSE = Public Domain
PKG_SUMMARY = SELinux library and simple utilities.
diff --git a/pkgs/libsemanage/libsemanage.nm b/pkgs/libsemanage/libsemanage.nm
index c3438e9..4420e68 100644
--- a/pkgs/libsemanage/libsemanage.nm
+++ b/pkgs/libsemanage/libsemanage.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.45
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.selinuxproject.org
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = SELinux binary policy manipulation library.
diff --git a/pkgs/libsepol/libsepol.nm b/pkgs/libsepol/libsepol.nm
index d27fd7b..5ee6810 100644
--- a/pkgs/libsepol/libsepol.nm
+++ b/pkgs/libsepol/libsepol.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.41
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.selinuxproject.org
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = SELinux binary policy manipulation library.
diff --git a/pkgs/libsoup/libsoup.nm b/pkgs/libsoup/libsoup.nm
index 55cebb9..1f022c8 100644
--- a/pkgs/libsoup/libsoup.nm
+++ b/pkgs/libsoup/libsoup.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.33.6
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://live.gnome.org/LibSoup
PKG_LICENSE = GPL
PKG_SUMMARY = HTTP client/server library for GNOME.
diff --git a/pkgs/libssh2/libssh2.nm b/pkgs/libssh2/libssh2.nm
index 3e1509a..fcb5710 100644
--- a/pkgs/libssh2/libssh2.nm
+++ b/pkgs/libssh2/libssh2.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.2.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.libssh2.org/
PKG_LICENSE = BSD
PKG_SUMMARY = A library implementing the SSH2 protocol.
diff --git a/pkgs/libtiff/libtiff.nm b/pkgs/libtiff/libtiff.nm
index 3163fef..e701437 100644
--- a/pkgs/libtiff/libtiff.nm
+++ b/pkgs/libtiff/libtiff.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.0.0beta6
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.libtiff.org
PKG_LICENSE = libtiff ( own )
PKG_SUMMARY = Library of functions for manipulating TIFF format image files.
diff --git a/pkgs/libtool/libtool.nm b/pkgs/libtool/libtool.nm
index f54b0e2..9b8d99d 100644
--- a/pkgs/libtool/libtool.nm
+++ b/pkgs/libtool/libtool.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnu.org/software/libtool/
PKG_LICENSE = GPLv2+ and LGPLv2+ and GFDL
PKG_SUMMARY = Runtime libraries for GNU Libtool Dynamic Module Loader.
diff --git a/pkgs/libusb-compat/libusb-compat.nm b/pkgs/libusb-compat/libusb-compat.nm
index a3b70da..e343718 100644
--- a/pkgs/libusb-compat/libusb-compat.nm
+++ b/pkgs/libusb-compat/libusb-compat.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.1.12
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://sourceforge.net/projects/libusb/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = A library which allows userspace access to USB devices.
diff --git a/pkgs/libusb/libusb.nm b/pkgs/libusb/libusb.nm
index 836378a..26c4651 100644
--- a/pkgs/libusb/libusb.nm
+++ b/pkgs/libusb/libusb.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://sourceforge.net/projects/libusb/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = A library which allows userspace access to USB devices.
diff --git a/pkgs/libuser/libuser.nm b/pkgs/libuser/libuser.nm
index 3858fad..5d8e65b 100644
--- a/pkgs/libuser/libuser.nm
+++ b/pkgs/libuser/libuser.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.56.9
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = https://fedorahosted.org/libuser/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = A user and group account administration library.
diff --git a/pkgs/libvirt/libvirt.nm b/pkgs/libvirt/libvirt.nm
index e0d22a3..6eb548e 100644
--- a/pkgs/libvirt/libvirt.nm
+++ b/pkgs/libvirt/libvirt.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.8.8
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = Applications/Virtualization
+PKG_GROUPS = Applications/Virtualization
PKG_URL = http://www.libvirt.org/
PKG_LICENSE = LGPLv2.1+
PKG_SUMMARY = A library for controlling VMs.
diff --git a/pkgs/libxcb/libxcb.nm b/pkgs/libxcb/libxcb.nm
index 27c8dca..59ab848 100644
--- a/pkgs/libxcb/libxcb.nm
+++ b/pkgs/libxcb/libxcb.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.7
PKG_REL = 1
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://xcb.freedesktop.org/
PKG_LICENSE = MIT
PKG_SUMMARY = A C binding to the X11 protocol.
diff --git a/pkgs/libxkbfile/libxkbfile.nm b/pkgs/libxkbfile/libxkbfile.nm
index 272c04a..5463bae 100644
--- a/pkgs/libxkbfile/libxkbfile.nm
+++ b/pkgs/libxkbfile/libxkbfile.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.6
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 libxkbfile runtime library.
diff --git a/pkgs/libxml2/libxml2.nm b/pkgs/libxml2/libxml2.nm
index 11102a6..81215ac 100644
--- a/pkgs/libxml2/libxml2.nm
+++ b/pkgs/libxml2/libxml2.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.7.7
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://xmlsoft.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Library providing XML and HTML support.
diff --git a/pkgs/libxslt/libxslt.nm b/pkgs/libxslt/libxslt.nm
index 89350ca..2a5c8dc 100644
--- a/pkgs/libxslt/libxslt.nm
+++ b/pkgs/libxslt/libxslt.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.26
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://xmlsoft.org/XSLT/
PKG_LICENSE = MIT
PKG_SUMMARY = Library providing the Gnome XSLT engine.
diff --git a/pkgs/libyaml/libyaml.nm b/pkgs/libyaml/libyaml.nm
index 83a069a..5bed2d2 100644
--- a/pkgs/libyaml/libyaml.nm
+++ b/pkgs/libyaml/libyaml.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.1.3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://pyyaml.org/
PKG_LICENSE = MIT
PKG_SUMMARY = YAML 1.1 parser and emitter written in C.
diff --git a/pkgs/lighttpd/lighttpd.nm b/pkgs/lighttpd/lighttpd.nm
index 0ba373e..f1ae52f 100644
--- a/pkgs/lighttpd/lighttpd.nm
+++ b/pkgs/lighttpd/lighttpd.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.28
PKG_REL = 1
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Networking/Webservers
+PKG_GROUPS = Networking/Webservers
PKG_URL = http://www.lighttpd.net/
PKG_LICENSE = BSD
PKG_SUMMARY = Lightning fast webserver with light system requirements.
diff --git a/pkgs/linux-atm/linux-atm.nm b/pkgs/linux-atm/linux-atm.nm
index d114a75..ff62237 100644
--- a/pkgs/linux-atm/linux-atm.nm
+++ b/pkgs/linux-atm/linux-atm.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.4.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = http://linux-atm.sourceforge.net/
PKG_LICENSE = BSD and GPLv2 and GPLv2+ and LGPLv2+ and MIT
PKG_SUMMARY = Tools to support ATM networking under Linux.
diff --git a/pkgs/linux-firmware/linux-firmware.nm b/pkgs/linux-firmware/linux-firmware.nm
index 70b8f7a..c460fb7 100644
--- a/pkgs/linux-firmware/linux-firmware.nm
+++ b/pkgs/linux-firmware/linux-firmware.nm
@@ -29,7 +29,7 @@ PKG_VER = 20110311
PKG_REL = 0
PKG_MAINTAINER = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/
PKG_LICENSE = Non-GPL
PKG_SUMMARY = Firmware Binaries for some Devices.
diff --git a/pkgs/lldpd/lldpd.nm b/pkgs/lldpd/lldpd.nm
index 1ab9a57..5aa2f15 100644
--- a/pkgs/lldpd/lldpd.nm
+++ b/pkgs/lldpd/lldpd.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.5.0
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = https://trac.luffy.cx/lldpd/
PKG_LICENSE = GPL
PKG_SUMMARY = Utilities for the Link Layer Discovery Protocol.
diff --git a/pkgs/lm-sensors/lm-sensors.nm b/pkgs/lm-sensors/lm-sensors.nm
index 96fc788..ccf7502 100644
--- a/pkgs/lm-sensors/lm-sensors.nm
+++ b/pkgs/lm-sensors/lm-sensors.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Statistics
+PKG_GROUPS = Applications/Statistics
PKG_URL = http://www.lm-sensors.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Hardware monitoring tools.
diff --git a/pkgs/logrotate/logrotate.nm b/pkgs/logrotate/logrotate.nm
index ebc7406..bebadef 100644
--- a/pkgs/logrotate/logrotate.nm
+++ b/pkgs/logrotate/logrotate.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.7.7
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL = https://fedorahosted.org/releases/l/o/logrotate/
PKG_LICENSE = GPL+
PKG_SUMMARY = Rotates, compresses, removes and mails system log files.
diff --git a/pkgs/lsof/lsof.nm b/pkgs/lsof/lsof.nm
index 0b41797..c8f01c6 100644
--- a/pkgs/lsof/lsof.nm
+++ b/pkgs/lsof/lsof.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.82
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Debuggers
+PKG_GROUPS = Base Development/Debuggers
PKG_URL = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
PKG_LICENSE = zlib
PKG_SUMMARY = A utility which lists open files on a Linux/UNIX system.
diff --git a/pkgs/lua/lua.nm b/pkgs/lua/lua.nm
index 7a36b44..4f5475d 100644
--- a/pkgs/lua/lua.nm
+++ b/pkgs/lua/lua.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.1.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://www.lua.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Powerful light-weight programming language.
diff --git a/pkgs/lvm2/lvm2.nm b/pkgs/lvm2/lvm2.nm
index 67adadf..e6741b5 100644
--- a/pkgs/lvm2/lvm2.nm
+++ b/pkgs/lvm2/lvm2.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.02.54
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://sources.redhat.com/lvm2/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Userland logical volume management tools.
diff --git a/pkgs/lzo/lzo.nm b/pkgs/lzo/lzo.nm
index 05aed17..c219755 100644
--- a/pkgs/lzo/lzo.nm
+++ b/pkgs/lzo/lzo.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.04
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Compression
+PKG_GROUPS = Applications/Compression
PKG_URL = http://www.oberhumer.com/opensource/lzo/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Data compression library with very fast (de)compression.
diff --git a/pkgs/m4/m4.nm b/pkgs/m4/m4.nm
index 1bdc0a4..a2132ef 100644
--- a/pkgs/m4/m4.nm
+++ b/pkgs/m4/m4.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.16
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/Text
+PKG_GROUPS = Applications/Text
PKG_URL = http://www.gnu.org/software/m4/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The GNU macro processor.
diff --git a/pkgs/mailcap/mailcap.nm b/pkgs/mailcap/mailcap.nm
index b2532fe..b17f6f3 100644
--- a/pkgs/mailcap/mailcap.nm
+++ b/pkgs/mailcap/mailcap.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = https://fedorahosted.org/released/mailcap/
PKG_LICENSE = Public Domain and MIT
PKG_SUMMARY = Helper application and MIME type associations for file types.
diff --git a/pkgs/make/make.nm b/pkgs/make/make.nm
index d4423dd..63e0b25 100644
--- a/pkgs/make/make.nm
+++ b/pkgs/make/make.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.81
PKG_REL = 0
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/make/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A GNU tool which simplifies the build process for users.
diff --git a/pkgs/man-db/man-db.nm b/pkgs/man-db/man-db.nm
index 59a2459..03ab42a 100644
--- a/pkgs/man-db/man-db.nm
+++ b/pkgs/man-db/man-db.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.5.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Documentation
+PKG_GROUPS = Base Documentation
PKG_URL = http://bzr.savannah.gnu.org/r/man-db/
PKG_LICENSE = GPL
PKG_SUMMARY = man-db is an on-line manual database.
diff --git a/pkgs/man-pages/man-pages.nm b/pkgs/man-pages/man-pages.nm
index 121a0d6..de2cfcc 100644
--- a/pkgs/man-pages/man-pages.nm
+++ b/pkgs/man-pages/man-pages.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Documentation
+PKG_GROUPS = Base Documentation
PKG_URL = http://www.kernel.org/pub/linux/docs/manpages/
PKG_LICENSE = GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
PKG_SUMMARY = Man (manual) pages from the Linux Documentation Project.
diff --git a/pkgs/mc/mc.nm b/pkgs/mc/mc.nm
index 9bfec84..bec6d2e 100644
--- a/pkgs/mc/mc.nm
+++ b/pkgs/mc/mc.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.7.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Applications/System
PKG_URL = http://www.ibiblio.org/mc/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = User-friendly text console file manager and visual shell.
diff --git a/pkgs/mdadm/mdadm.nm b/pkgs/mdadm/mdadm.nm
index 0c9b404..eca2498 100644
--- a/pkgs/mdadm/mdadm.nm
+++ b/pkgs/mdadm/mdadm.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0-devel2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://www.kernel.org/pub/linux/utils/raid/mdadm/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = The mdadm program controls Linux md devices (software RAID arrays).
diff --git a/pkgs/memtest86+/memtest86+.nm b/pkgs/memtest86+/memtest86+.nm
index a8e2958..0556b96 100644
--- a/pkgs/memtest86+/memtest86+.nm
+++ b/pkgs/memtest86+/memtest86+.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.20
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL = http://www.memtest.org/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Stand-alone memory tester for x86 and x86-64 computers.
diff --git a/pkgs/mesa/mesa.nm b/pkgs/mesa/mesa.nm
index b67010b..1d32a8c 100644
--- a/pkgs/mesa/mesa.nm
+++ b/pkgs/mesa/mesa.nm
@@ -29,7 +29,7 @@ PKG_VER = 7.8.2
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.mesa3d.org
PKG_LICENSE = MIT
PKG_SUMMARY = Mesa graphics libraries.
diff --git a/pkgs/module-init-tools/module-init-tools.nm b/pkgs/module-init-tools/module-init-tools.nm
index 53f6e93..284a171 100644
--- a/pkgs/module-init-tools/module-init-tools.nm
+++ b/pkgs/module-init-tools/module-init-tools.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.12
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Kernel module management utilities.
diff --git a/pkgs/mpc/mpc.nm b/pkgs/mpc/mpc.nm
index 61bb7b6..c720c7f 100644
--- a/pkgs/mpc/mpc.nm
+++ b/pkgs/mpc/mpc.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.multiprecision.org/
PKG_LICENSE = LGPLv2.1+
PKG_SUMMARY = Mpc is a C library for the arithmetic of complex numbers.
diff --git a/pkgs/mpfr/mpfr.nm b/pkgs/mpfr/mpfr.nm
index d5a733d..b7074ae 100644
--- a/pkgs/mpfr/mpfr.nm
+++ b/pkgs/mpfr/mpfr.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.mpfr.org/
PKG_LICENSE = LGPLv2+ and GPLv2+ and GFDL
PKG_SUMMARY = A C library for multiple-precision floating-point computations.
diff --git a/pkgs/multipath-tools/multipath-tools.nm b/pkgs/multipath-tools/multipath-tools.nm
index 4fbfe46..783c7ce 100644
--- a/pkgs/multipath-tools/multipath-tools.nm
+++ b/pkgs/multipath-tools/multipath-tools.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.4.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://christophe.varoqui.free.fr/
PKG_LICENSE = GPL+
PKG_SUMMARY = Tools to manage multipath devices using device-mapper.
diff --git a/pkgs/nano/nano.nm b/pkgs/nano/nano.nm
index 6981da0..62c21bb 100644
--- a/pkgs/nano/nano.nm
+++ b/pkgs/nano/nano.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.2.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Application/Editors
+PKG_GROUPS = Application/Editors
PKG_URL = http://www.nano-editor.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A small text editor.
diff --git a/pkgs/nasm/nasm.nm b/pkgs/nasm/nasm.nm
index 9d8536c..4e70aa2 100644
--- a/pkgs/nasm/nasm.nm
+++ b/pkgs/nasm/nasm.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.08.01
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://nasm.sourceforge.net/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = A portable x86 assembler which uses Intel-like syntax.
diff --git a/pkgs/ncurses/ncurses.nm b/pkgs/ncurses/ncurses.nm
index 8fe5f1b..511a078 100644
--- a/pkgs/ncurses/ncurses.nm
+++ b/pkgs/ncurses/ncurses.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.8
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://invisible-island.net/ncurses/ncurses.html
PKG_LICENSE = MIT
PKG_SUMMARY = Ncurses support utilities.
diff --git a/pkgs/net-snmp/net-snmp.nm b/pkgs/net-snmp/net-snmp.nm
index b263321..e9e8c86 100644
--- a/pkgs/net-snmp/net-snmp.nm
+++ b/pkgs/net-snmp/net-snmp.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.4.2.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Networking/Daemons
+PKG_GROUPS = Networking/Daemons
PKG_URL = http://net-snmp.sourceforge.net
PKG_LICENSE = BSD
PKG_SUMMARY = Simple Network Management Protocol Daemon.
diff --git a/pkgs/net-tools/net-tools.nm b/pkgs/net-tools/net-tools.nm
index ec56935..71dea32 100644
--- a/pkgs/net-tools/net-tools.nm
+++ b/pkgs/net-tools/net-tools.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.60
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Sytem/Base
+PKG_GROUPS = Base Sytem/Base
PKG_URL = http://net-tools.berlios.de/
PKG_LICENSE = GPL+
PKG_SUMMARY = Basic networking tools.
diff --git a/pkgs/netplug/netplug.nm b/pkgs/netplug/netplug.nm
index e1bc02c..f5ccc7f 100644
--- a/pkgs/netplug/netplug.nm
+++ b/pkgs/netplug/netplug.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.2.9.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://www.red-bean.com/~bos/
PKG_LICENSE = GPLv2
PKG_SUMMARY = A daemon that manages network interfaces in response to \
diff --git a/pkgs/network/network.nm b/pkgs/network/network.nm
index 08ade00..516cf1a 100644
--- a/pkgs/network/network.nm
+++ b/pkgs/network/network.nm
@@ -30,7 +30,7 @@ PKG_REL = 3
PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Base Networking/Tools
PKG_URL = http://www.ipfire.org/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The IPFire Networking Scripts.
diff --git a/pkgs/newt/newt.nm b/pkgs/newt/newt.nm
index e00a083..9e5f3e5 100644
--- a/pkgs/newt/newt.nm
+++ b/pkgs/newt/newt.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.52.10
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = https://fedorahosted.org/releases/n/e/newt/
PKG_LICENSE = LGPLv2
PKG_SUMMARY = A library for text mode user interfaces.
diff --git a/pkgs/nfs-utils/nfs-utils.nm b/pkgs/nfs-utils/nfs-utils.nm
index ddf9a57..d67254b 100644
--- a/pkgs/nfs-utils/nfs-utils.nm
+++ b/pkgs/nfs-utils/nfs-utils.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.2.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://nfs.sourceforge.net/
PKG_LICENSE = MIT and GPLv2 and GPLv2+
PKG_SUMMARY = NFS utilities and supporting clients and daemons for the NFS server.
diff --git a/pkgs/nmap/nmap.nm b/pkgs/nmap/nmap.nm
index f5f6ca3..8d5b93e 100644
--- a/pkgs/nmap/nmap.nm
+++ b/pkgs/nmap/nmap.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.50
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Networking/Sniffer
+PKG_GROUPS = Networking/Sniffer
PKG_URL = http://nmap.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Network exploration tool and security scanner.
diff --git a/pkgs/noip/noip.nm b/pkgs/noip/noip.nm
index 79da999..d2a816b 100644
--- a/pkgs/noip/noip.nm
+++ b/pkgs/noip/noip.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = http://www.no-ip.com
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A dynamic DNS update client.
diff --git a/pkgs/nspr/nspr.nm b/pkgs/nspr/nspr.nm
index e35383b..5a02887 100644
--- a/pkgs/nspr/nspr.nm
+++ b/pkgs/nspr/nspr.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.8.6
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.mozilla.org/projects/nspr/
PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+
PKG_SUMMARY = Netscape Portable Runtime.
diff --git a/pkgs/nss-softokn/nss-softokn.nm b/pkgs/nss-softokn/nss-softokn.nm
index b44ab3c..4cdcf4e 100644
--- a/pkgs/nss-softokn/nss-softokn.nm
+++ b/pkgs/nss-softokn/nss-softokn.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.12.8
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.mozilla.org/projects/security/pki/nss/
PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+
PKG_SUMMARY = Network Security Services Softoken Module.
diff --git a/pkgs/nss-util/nss-util.nm b/pkgs/nss-util/nss-util.nm
index 01a4c36..b6cad9c 100644
--- a/pkgs/nss-util/nss-util.nm
+++ b/pkgs/nss-util/nss-util.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.12.8
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.mozilla.org/projects/security/pki/nss/
PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+
PKG_SUMMARY = Network Security Services Utilities Library.
diff --git a/pkgs/nss/nss.nm b/pkgs/nss/nss.nm
index dd2ffd8..c2848ba 100644
--- a/pkgs/nss/nss.nm
+++ b/pkgs/nss/nss.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.12.8
PKG_REL = 3
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.mozilla.org/projects/security/pki/nss/
PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+
PKG_SUMMARY = Network Security Services.
diff --git a/pkgs/nss_ldap/nss_ldap.nm b/pkgs/nss_ldap/nss_ldap.nm
index e99ad68..5da085c 100644
--- a/pkgs/nss_ldap/nss_ldap.nm
+++ b/pkgs/nss_ldap/nss_ldap.nm
@@ -29,7 +29,7 @@ PKG_VER = 262
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://www.padl.com/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = NSS library and PAM module for LDAP.
diff --git a/pkgs/ntp/ntp.nm b/pkgs/ntp/ntp.nm
index 5525e55..1c7b20c 100644
--- a/pkgs/ntp/ntp.nm
+++ b/pkgs/ntp/ntp.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.2.6p1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = Base System/Daemons
PKG_URL = http://www.ntp.org/
PKG_LICENSE = MIT, BSD and GPLv2
PKG_SUMMARY = The NTP daemon and utilities.
diff --git a/pkgs/openl2tp/openl2tp.nm b/pkgs/openl2tp/openl2tp.nm
index a1efcc3..5752fba 100644
--- a/pkgs/openl2tp/openl2tp.nm
+++ b/pkgs/openl2tp/openl2tp.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/PPP
+PKG_GROUPS = Networking/PPP
PKG_URL = http://www.openl2tp.org/
PKG_LICENSE = GPL
PKG_SUMMARY = A Linux L2TP solution for enterprise VPN and ISPs.
diff --git a/pkgs/openldap/openldap.nm b/pkgs/openldap/openldap.nm
index ce03d8f..628f395 100644
--- a/pkgs/openldap/openldap.nm
+++ b/pkgs/openldap/openldap.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.4.21
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = http://www.openldap.org/
PKG_LICENSE = OpenLDAP
PKG_SUMMARY = LDAP support libraries.
diff --git a/pkgs/openssh/openssh.nm b/pkgs/openssh/openssh.nm
index 1f3b0db..a7f8de6 100644
--- a/pkgs/openssh/openssh.nm
+++ b/pkgs/openssh/openssh.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.8p1
PKG_REL = 5
PKG_MAINTAINER =
-PKG_GROUP = Application/Internet
+PKG_GROUPS = Application/Internet
PKG_URL = http://www.openssh.com/portable.html
PKG_LICENSE = MIT
PKG_SUMMARY = An open source implementation of SSH protocol versions 1 and 2.
diff --git a/pkgs/openssl/openssl.nm b/pkgs/openssl/openssl.nm
index 494df30..7690d0f 100644
--- a/pkgs/openssl/openssl.nm
+++ b/pkgs/openssl/openssl.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.0d
PKG_REL = 2
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.openssl.org/
PKG_LICENSE = OpenSSL
PKG_SUMMARY = A general purpose cryptography library with TLS implementation.
diff --git a/pkgs/openvpn/openvpn.nm b/pkgs/openvpn/openvpn.nm
index a6850a4..91b1d6c 100644
--- a/pkgs/openvpn/openvpn.nm
+++ b/pkgs/openvpn/openvpn.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1_rc20
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/VPN
+PKG_GROUPS = Networking/VPN
PKG_URL = http://openvpn.net/
PKG_LICENSE = GPLv2
PKG_SUMMARY = A full-featured SSL VPN solution.
diff --git a/pkgs/os-prober/os-prober.nm b/pkgs/os-prober/os-prober.nm
index b37f80f..32c924d 100644
--- a/pkgs/os-prober/os-prober.nm
+++ b/pkgs/os-prober/os-prober.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.38
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://joey.kitenet.net/code/os-prober/
PKG_LICENSE = GPL
PKG_SUMMARY = Utility to detect other OSes on a set of drives.
diff --git a/pkgs/pakfire/pakfire.nm b/pkgs/pakfire/pakfire.nm
index 8d50c08..ff87b61 100644
--- a/pkgs/pakfire/pakfire.nm
+++ b/pkgs/pakfire/pakfire.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = System/Packaging
+PKG_GROUPS = Base System/Packaging
PKG_URL = http://www.ipfire.org/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = Package installer/updater.
diff --git a/pkgs/pam/pam.nm b/pkgs/pam/pam.nm
index 99e4bf9..1287a23 100644
--- a/pkgs/pam/pam.nm
+++ b/pkgs/pam/pam.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.1.0
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://www.us.kernel.org/pub/linux/libs/pam/index.html
PKG_LICENSE = BSD and GPLv2+ and BSD with advertising
PKG_SUMMARY = An extensible library which provides authentication for applications.
diff --git a/pkgs/pam_ldap/pam_ldap.nm b/pkgs/pam_ldap/pam_ldap.nm
index 155d922..d368346 100644
--- a/pkgs/pam_ldap/pam_ldap.nm
+++ b/pkgs/pam_ldap/pam_ldap.nm
@@ -29,7 +29,7 @@ PKG_VER = 184
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://www.padl.com/OSS/pam_ldap.html
PKG_LICENSE = GPL and LGPL
PKG_SUMMARY = A pam/ldap module that supports password changes.
diff --git a/pkgs/pango/pango.nm b/pkgs/pango/pango.nm
index caa4d29..e6dbfa2 100644
--- a/pkgs/pango/pango.nm
+++ b/pkgs/pango/pango.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.28.3
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.pango.org/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = System for layout and rendering of internationalized text.
diff --git a/pkgs/parted/parted.nm b/pkgs/parted/parted.nm
index a50200b..72543cb 100644
--- a/pkgs/parted/parted.nm
+++ b/pkgs/parted/parted.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Applications/System
PKG_URL = http://www.gnu.org/software/parted
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The GNU disk partition manipulation program.
diff --git a/pkgs/passwd/passwd.nm b/pkgs/passwd/passwd.nm
index a59d82e..d506c19 100644
--- a/pkgs/passwd/passwd.nm
+++ b/pkgs/passwd/passwd.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.76
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL = http://fedorahosted.org/passwd
PKG_LICENSE = BSD
PKG_SUMMARY = An utility for setting or changing passwords using PAM.
diff --git a/pkgs/patch/patch.nm b/pkgs/patch/patch.nm
index 2d1d2b5..b696f72 100644
--- a/pkgs/patch/patch.nm
+++ b/pkgs/patch/patch.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.6.1.28-d909
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.gnu.org/software/patch/patch.html
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utility for modifying/upgrading files.
diff --git a/pkgs/pax-utils/pax-utils.nm b/pkgs/pax-utils/pax-utils.nm
index 2829cb9..f6dc4c9 100644
--- a/pkgs/pax-utils/pax-utils.nm
+++ b/pkgs/pax-utils/pax-utils.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.1.19
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Security/Tools
+PKG_GROUPS = Security/Tools
PKG_URL = http://www.gentoo.org/proj/en/hardened/pax-utils.xml
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utilities for checking PaX features.
diff --git a/pkgs/paxctl/paxctl.nm b/pkgs/paxctl/paxctl.nm
index 3f7920c..855a284 100644
--- a/pkgs/paxctl/paxctl.nm
+++ b/pkgs/paxctl/paxctl.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Applications/System
PKG_URL = http://pax.grsecurity.net/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Application to control PaX flags.
diff --git a/pkgs/paxtest/paxtest.nm b/pkgs/paxtest/paxtest.nm
index 3adbadc..cde2a70 100644
--- a/pkgs/paxtest/paxtest.nm
+++ b/pkgs/paxtest/paxtest.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Security/Tools
+PKG_GROUPS = Security/Tools
PKG_URL = http://pax.grsecurity.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utilities for testing PaX configuration.
diff --git a/pkgs/pcapy/pcapy.nm b/pkgs/pcapy/pcapy.nm
index d74ca55..f0cf491 100644
--- a/pkgs/pcapy/pcapy.nm
+++ b/pkgs/pcapy/pcapy.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.10.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://oss.coresecurity.com/projects/pcapy.html
PKG_LICENSE = ASL 1.1
PKG_SUMMARY = A Python interface to libpcap.
diff --git a/pkgs/pciutils/pciutils.nm b/pkgs/pciutils/pciutils.nm
index 6f4be47..5617812 100644
--- a/pkgs/pciutils/pciutils.nm
+++ b/pkgs/pciutils/pciutils.nm
@@ -29,7 +29,8 @@ PKG_VER = 3.1.7
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
+PKG_GROUPS-pciutils = Base $(PKG_GROUPS)
PKG_URL = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
PKG_LICENSE = GPLv2+
PKG_SUMMARY = PCI bus related utilities.
diff --git a/pkgs/pcre/pcre.nm b/pkgs/pcre/pcre.nm
index 103445f..4d7d3fd 100644
--- a/pkgs/pcre/pcre.nm
+++ b/pkgs/pcre/pcre.nm
@@ -29,7 +29,7 @@ PKG_VER = 8.12
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.pcre.org/
PKG_LICENSE = BSD
PKG_SUMMARY = Perl-compatible regular expression library.
diff --git a/pkgs/pdns-recursor/pdns-recursor.nm b/pkgs/pdns-recursor/pdns-recursor.nm
index c9d1ae1..c82b7f0 100644
--- a/pkgs/pdns-recursor/pdns-recursor.nm
+++ b/pkgs/pdns-recursor/pdns-recursor.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.3
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Networking/DNS
+PKG_GROUPS = Networking/DNS
PKG_URL = http://powerdns.com/
PKG_LICENSE = GPLv2
PKG_SUMMARY = A modern, advanced and high performance recursing nameserver.
diff --git a/pkgs/pdns/pdns.nm b/pkgs/pdns/pdns.nm
index cd2587d..b259d56 100644
--- a/pkgs/pdns/pdns.nm
+++ b/pkgs/pdns/pdns.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.9.22
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/DNS
+PKG_GROUPS = Networking/DNS
PKG_URL = http://powerdns.com/
PKG_LICENSE = GPLv2
PKG_SUMMARY = A modern, advanced and high performance authoritative-only nameserver.
diff --git a/pkgs/perl-HTML-Parser/perl-HTML-Parser.nm b/pkgs/perl-HTML-Parser/perl-HTML-Parser.nm
index 457ea1a..f03ff42 100644
--- a/pkgs/perl-HTML-Parser/perl-HTML-Parser.nm
+++ b/pkgs/perl-HTML-Parser/perl-HTML-Parser.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.68
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Libratries
+PKG_GROUPS = Development/Libratries
PKG_URL = http://search.cpan.org/dist/HTML-Parser/
PKG_LICENSE = GPL+ or Artistic
PKG_SUMMARY = Perl module for parsing HTML.
diff --git a/pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm b/pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm
index f8b17ca..95af0db 100644
--- a/pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm
+++ b/pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Libratries
+PKG_GROUPS = Development/Libratries
PKG_URL = http://search.cpan.org/dist/HTML-Tagset/
PKG_LICENSE = GPL+ or Artistic
PKG_SUMMARY = HTML::Tagset - data tables useful in parsing HTML.
diff --git a/pkgs/perl-Test-Simple/perl-Test-Simple.nm b/pkgs/perl-Test-Simple/perl-Test-Simple.nm
index c4a4a44..3e133e2 100644
--- a/pkgs/perl-Test-Simple/perl-Test-Simple.nm
+++ b/pkgs/perl-Test-Simple/perl-Test-Simple.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Libratries
+PKG_GROUPS = Development/Libratries
PKG_URL = http://search.cpan.org/dist/Test-Simple/
PKG_LICENSE = GPL+ or Artistic
PKG_SUMMARY = Basic utilities for writing tests.
diff --git a/pkgs/perl-URI/perl-URI.nm b/pkgs/perl-URI/perl-URI.nm
index 363dd17..00c040d 100644
--- a/pkgs/perl-URI/perl-URI.nm
+++ b/pkgs/perl-URI/perl-URI.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://search.cpan.org/dist/URI/
PKG_LICENSE = GPL+ or Artistic
PKG_SUMMARY = A Perl module implementing URI parsing and manipulation.
diff --git a/pkgs/perl-XML-Parser/perl-XML-Parser.nm b/pkgs/perl-XML-Parser/perl-XML-Parser.nm
index 1011c69..ea9d601 100644
--- a/pkgs/perl-XML-Parser/perl-XML-Parser.nm
+++ b/pkgs/perl-XML-Parser/perl-XML-Parser.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.36
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://search.cpan.org/dist/XML-Parser/
PKG_LICENSE = GPL+ or Artistic
PKG_SUMMARY = Perl module for parsing XML files.
diff --git a/pkgs/perl-libwww-perl/perl-libwww-perl.nm b/pkgs/perl-libwww-perl/perl-libwww-perl.nm
index 20fa29d..323b063 100644
--- a/pkgs/perl-libwww-perl/perl-libwww-perl.nm
+++ b/pkgs/perl-libwww-perl/perl-libwww-perl.nm
@@ -31,7 +31,7 @@ PKG_EPOCH = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://search.cpan.org/dist/libwww-perl/
PKG_LICENSE = GPL+ or Artistic
PKG_SUMMARY = A Perl interface to the World-Wide Web.
diff --git a/pkgs/perl/perl.nm b/pkgs/perl/perl.nm
index a556292..e62675a 100644
--- a/pkgs/perl/perl.nm
+++ b/pkgs/perl/perl.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.12.3
PKG_REL = 3
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://www.perl.org/
PKG_LICENSE = GPL+ or Artistic and GPLv2+ or Artistic
PKG_SUMMARY = Practical Extraction and Report Language.
diff --git a/pkgs/pinentry/pinentry.nm b/pkgs/pinentry/pinentry.nm
index 47ca896..6bbcbf4 100644
--- a/pkgs/pinentry/pinentry.nm
+++ b/pkgs/pinentry/pinentry.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.7.6
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnupg.org
PKG_LICENSE = GPLv2
PKG_SUMMARY = Collection of simple PIN or passphrase entry dialogs.
diff --git a/pkgs/pixman/pixman.nm b/pkgs/pixman/pixman.nm
index bea5379..1a67ead 100644
--- a/pkgs/pixman/pixman.nm
+++ b/pkgs/pixman/pixman.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.18.4
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://xorg.freedesktop.org/archive/individual/lib/
PKG_LICENSE = MIT
PKG_SUMMARY = Pixel manipulation library.
diff --git a/pkgs/pkg-config/pkg-config.nm b/pkgs/pkg-config/pkg-config.nm
index 1b4c818..aca54ba 100644
--- a/pkgs/pkg-config/pkg-config.nm
+++ b/pkgs/pkg-config/pkg-config.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.25
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://pkg-config.freedesktop.org/
PKG_LICENSE = GPLv2
PKG_SUMMARY = A tool for determining compilation options.
diff --git a/pkgs/polkit/polkit.nm b/pkgs/polkit/polkit.nm
index b1b9dc3..6177047 100644
--- a/pkgs/polkit/polkit.nm
+++ b/pkgs/polkit/polkit.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.96
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.freedesktop.org/wiki/Software/PolicyKit
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = PolicyKit Authorization Framework.
diff --git a/pkgs/popt/popt.nm b/pkgs/popt/popt.nm
index 1b6bbb6..24f22aa 100644
--- a/pkgs/popt/popt.nm
+++ b/pkgs/popt/popt.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.15
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.rpm5.org/
PKG_LICENSE = MIT
PKG_SUMMARY = C library for parsing command line parameters.
diff --git a/pkgs/powertop/powertop.nm b/pkgs/powertop/powertop.nm
index 147aabf..3c2b1b2 100644
--- a/pkgs/powertop/powertop.nm
+++ b/pkgs/powertop/powertop.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.13
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Applications/System
PKG_URL = http://www.lesswatts.org/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Power consumption monitor.
diff --git a/pkgs/ppl/ppl.nm b/pkgs/ppl/ppl.nm
index f37768b..897d761 100644
--- a/pkgs/ppl/ppl.nm
+++ b/pkgs/ppl/ppl.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.11.2
PKG_REL = 1
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://www.cs.unipr.it/ppl/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = The Parma Polyhedra Library: a library of numerical abstractions.
diff --git a/pkgs/ppp/ppp.nm b/pkgs/ppp/ppp.nm
index 1268a76..0eb7774 100644
--- a/pkgs/ppp/ppp.nm
+++ b/pkgs/ppp/ppp.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.4.5
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = ftp://ftp.samba.org/pub/ppp/
PKG_LICENSE = BSD and LGPLv2+ and GPLv2+ and Public Domain
PKG_SUMMARY = The PPP (Point-to-Point Protocol) daemon.
diff --git a/pkgs/pptp/pptp.nm b/pkgs/pptp/pptp.nm
index e16ad76..9ddc0b2 100644
--- a/pkgs/pptp/pptp.nm
+++ b/pkgs/pptp/pptp.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.7.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Dialin
+PKG_GROUPS = Networking/Dialin
PKG_URL = http://pptpclient.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Point-to-Point Tunneling Protocol (PPTP) Client.
diff --git a/pkgs/procps/procps.nm b/pkgs/procps/procps.nm
index 19533fd..ed9fc3c 100644
--- a/pkgs/procps/procps.nm
+++ b/pkgs/procps/procps.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.2.8
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Base Applications/System
PKG_URL = http://procps.sourceforge.net/
PKG_LICENSE = GPLv2+ and LGPLv2+
PKG_SUMMARY = System and process monitoring utilities.
diff --git a/pkgs/psmisc/psmisc.nm b/pkgs/psmisc/psmisc.nm
index 4f1a602..95f6126 100644
--- a/pkgs/psmisc/psmisc.nm
+++ b/pkgs/psmisc/psmisc.nm
@@ -29,7 +29,7 @@ PKG_VER = 22.10
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Base Applications/System
PKG_URL = http://sourceforge.net/projects/psmisc
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utilities for managing processes on your system.
diff --git a/pkgs/pth/pth.nm b/pkgs/pth/pth.nm
index f101b9c..8297b44 100644
--- a/pkgs/pth/pth.nm
+++ b/pkgs/pth/pth.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gnu.org/software/pth
PKG_LICENSE = GPLv3+
PKG_SUMMARY = GNU Pth - The GNU Portable Threads.
diff --git a/pkgs/pyQt/pyQt.nm b/pkgs/pyQt/pyQt.nm
index 7659194..7023d91 100644
--- a/pkgs/pyQt/pyQt.nm
+++ b/pkgs/pyQt/pyQt.nm
@@ -30,7 +30,7 @@ PKG_REL = 0
PKG_EPOCH = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://www.riverbankcomputing.com/software/pyqt/
PKG_LICENSE = GPLv3 or GPLv2 with exceptions
PKG_SUMMARY = Python bindings for Qt4.
diff --git a/pkgs/pychecker/pychecker.nm b/pkgs/pychecker/pychecker.nm
index 5b19331..e4ab539 100644
--- a/pkgs/pychecker/pychecker.nm
+++ b/pkgs/pychecker/pychecker.nm
@@ -30,7 +30,7 @@ PKG_REL = 2
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Debuggers
+PKG_GROUPS = Development/Debuggers
PKG_URL = http://pychecker.sourceforge.net
PKG_LICENSE = BSD
PKG_SUMMARY = A python source code checking tool.
diff --git a/pkgs/pyfire/pyfire.nm b/pkgs/pyfire/pyfire.nm
index b138db6..cc4d3ad 100644
--- a/pkgs/pyfire/pyfire.nm
+++ b/pkgs/pyfire/pyfire.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.99.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.ipfire.org
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A python library for easy functions.
diff --git a/pkgs/pygobject2/pygobject2.nm b/pkgs/pygobject2/pygobject2.nm
index beaf8fa..3141808 100644
--- a/pkgs/pygobject2/pygobject2.nm
+++ b/pkgs/pygobject2/pygobject2.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.27.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.pygtk.org/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Python 2 bindings for GObject.
diff --git a/pkgs/pyliblzma/pyliblzma.nm b/pkgs/pyliblzma/pyliblzma.nm
index 90b58d9..d753a81 100644
--- a/pkgs/pyliblzma/pyliblzma.nm
+++ b/pkgs/pyliblzma/pyliblzma.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.5.3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Debuggers
+PKG_GROUPS = Development/Debuggers
PKG_URL = https://launchpad.net/pyliblzma
PKG_LICENSE = LGPLv3+
PKG_SUMMARY = Python bindings for lzma
diff --git a/pkgs/python-IPy/python-IPy.nm b/pkgs/python-IPy/python-IPy.nm
index 4e0788a..1206f05 100644
--- a/pkgs/python-IPy/python-IPy.nm
+++ b/pkgs/python-IPy/python-IPy.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://software.inl.fr/trac/trac.cgi/wiki/IPy
PKG_LICENSE = BSD
PKG_SUMMARY = Python module for handling IPv4 and IPv6 Addresses and Networks.
diff --git a/pkgs/python-cairo/python-cairo.nm b/pkgs/python-cairo/python-cairo.nm
index 70b71f5..2e8476c 100644
--- a/pkgs/python-cairo/python-cairo.nm
+++ b/pkgs/python-cairo/python-cairo.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.8.10
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://cairographics.org/pycairo
PKG_LICENSE = MPLv1.1 or LGPLv2
PKG_SUMMARY = Python bindings for the cairo library.
diff --git a/pkgs/python-cryptsetup/python-cryptsetup.nm b/pkgs/python-cryptsetup/python-cryptsetup.nm
index 01c5ea5..dfe2ffe 100644
--- a/pkgs/python-cryptsetup/python-cryptsetup.nm
+++ b/pkgs/python-cryptsetup/python-cryptsetup.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.0.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://msivak.fedorapeople.org/pycryptsetup
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Python bindings for cryptsetup.
diff --git a/pkgs/python-dbus/python-dbus.nm b/pkgs/python-dbus/python-dbus.nm
index e798d3f..6b671fb 100644
--- a/pkgs/python-dbus/python-dbus.nm
+++ b/pkgs/python-dbus/python-dbus.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.82.4
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.freedesktop.org/software/dbus/
PKG_LICENSE = MIT
PKG_SUMMARY = Dbus Python Bindings.
diff --git a/pkgs/python-decorator/python-decorator.nm b/pkgs/python-decorator/python-decorator.nm
index 1886465..c12b9f9 100644
--- a/pkgs/python-decorator/python-decorator.nm
+++ b/pkgs/python-decorator/python-decorator.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://www.phyast.pitt.edu/~micheles/python/documentation.html
PKG_LICENSE = BSD
PKG_SUMMARY = Module to simplify usage of decorators.
diff --git a/pkgs/python-distutils-extra/python-distutils-extra.nm b/pkgs/python-distutils-extra/python-distutils-extra.nm
index 88b7f9e..75c5307 100644
--- a/pkgs/python-distutils-extra/python-distutils-extra.nm
+++ b/pkgs/python-distutils-extra/python-distutils-extra.nm
@@ -30,7 +30,7 @@ PKG_REL = 0
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = https://launchpad.net/python-distutils-extra
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Integrate more support into Python's distutils.
diff --git a/pkgs/python-gudev/python-gudev.nm b/pkgs/python-gudev/python-gudev.nm
index fcd1ef6..a70b153 100644
--- a/pkgs/python-gudev/python-gudev.nm
+++ b/pkgs/python-gudev/python-gudev.nm
@@ -29,7 +29,7 @@ PKG_VER = 147.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://flex.sourceforge.net/
PKG_LICENSE = LGPLv3+
PKG_SUMMARY = Python (PyGObject) bindings to the GUDev library.
diff --git a/pkgs/python-netfilter_conntrack/python-netfilter_conntrack.nm b/pkgs/python-netfilter_conntrack/python-netfilter_conntrack.nm
index 6219434..be41f56 100644
--- a/pkgs/python-netfilter_conntrack/python-netfilter_conntrack.nm
+++ b/pkgs/python-netfilter_conntrack/python-netfilter_conntrack.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.4.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://software.inl.fr/trac/wiki/pynetfilter_conntrack
PKG_LICENSE =
PKG_SUMMARY = Python binding of libnetfilter_conntrack.
diff --git a/pkgs/python-parted/python-parted.nm b/pkgs/python-parted/python-parted.nm
index 978c577..cc732b9 100644
--- a/pkgs/python-parted/python-parted.nm
+++ b/pkgs/python-parted/python-parted.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://fedorahosted.org/pyparted
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Python module for GNU parted.
diff --git a/pkgs/python-piksemel/python-piksemel.nm b/pkgs/python-piksemel/python-piksemel.nm
index 9353af2..315cb1a 100644
--- a/pkgs/python-piksemel/python-piksemel.nm
+++ b/pkgs/python-piksemel/python-piksemel.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.3.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://cekirdek.pardus.org.tr/~bahadir/piksemel/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A python XML parser.
diff --git a/pkgs/python-progressbar/python-progressbar.nm b/pkgs/python-progressbar/python-progressbar.nm
index 3ad722d..bf107fb 100644
--- a/pkgs/python-progressbar/python-progressbar.nm
+++ b/pkgs/python-progressbar/python-progressbar.nm
@@ -30,7 +30,7 @@ PKG_REL = 0
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://pypi.python.org/pypi/progressbar
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Text progressbar library for python.
diff --git a/pkgs/python-pyaspects/python-pyaspects.nm b/pkgs/python-pyaspects/python-pyaspects.nm
index bd4bb79..3cf4e23 100644
--- a/pkgs/python-pyaspects/python-pyaspects.nm
+++ b/pkgs/python-pyaspects/python-pyaspects.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.4.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://github.com/baris/pyaspects/downloads
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Module to provide aspect-oriented programming.
diff --git a/pkgs/python-pyblock/python-pyblock.nm b/pkgs/python-pyblock/python-pyblock.nm
index 6e7824e..a07e82d 100644
--- a/pkgs/python-pyblock/python-pyblock.nm
+++ b/pkgs/python-pyblock/python-pyblock.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.46
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://git.fedorahosted.org/git/?p=pyblock.git;a=summary
PKG_LICENSE = GPLv2 or GPLv3
PKG_SUMMARY = Python modules for dealing with block devices.
diff --git a/pkgs/python-pycurl/python-pycurl.nm b/pkgs/python-pycurl/python-pycurl.nm
index 27c9777..85cbc80 100644
--- a/pkgs/python-pycurl/python-pycurl.nm
+++ b/pkgs/python-pycurl/python-pycurl.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://pycurl.sourceforge.net/
PKG_LICENSE = LGPLv2+ or MIT
PKG_SUMMARY = A Python interface to libcurl.
diff --git a/pkgs/python-qtermwidget/python-qtermwidget.nm b/pkgs/python-qtermwidget/python-qtermwidget.nm
index 70713fe..b6ff591 100644
--- a/pkgs/python-qtermwidget/python-qtermwidget.nm
+++ b/pkgs/python-qtermwidget/python-qtermwidget.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.1.2
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://code.google.com/p/pyqt4-extrawidgets/downloads/list
PKG_LICENSE = GPLv2+
PKG_SUMMARY = PyQt4 Bindings for QTermWidget.
diff --git a/pkgs/python-setuptools/python-setuptools.nm b/pkgs/python-setuptools/python-setuptools.nm
index d8ffdfa..3d438fc 100644
--- a/pkgs/python-setuptools/python-setuptools.nm
+++ b/pkgs/python-setuptools/python-setuptools.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://pypi.python.org/pypi/setuptools
PKG_LICENSE = Python or ZPLv2.0
PKG_SUMMARY = Easily build and distribute Python packages.
diff --git a/pkgs/python-tornado/python-tornado.nm b/pkgs/python-tornado/python-tornado.nm
index 1509cfb..50ffc92 100644
--- a/pkgs/python-tornado/python-tornado.nm
+++ b/pkgs/python-tornado/python-tornado.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://www.tornadoweb.org/
PKG_LICENSE = Apache2.0
PKG_SUMMARY = A python based non-blocking web server.
diff --git a/pkgs/python-urlgrabber/python-urlgrabber.nm b/pkgs/python-urlgrabber/python-urlgrabber.nm
index ba1fa0e..fc93649 100644
--- a/pkgs/python-urlgrabber/python-urlgrabber.nm
+++ b/pkgs/python-urlgrabber/python-urlgrabber.nm
@@ -30,7 +30,7 @@ PKG_REL = 2
PKG_ARCH = noarch
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://urlgrabber.baseurl.org/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = A high-level cross-protocol url-grabber.
diff --git a/pkgs/python/python.nm b/pkgs/python/python.nm
index 59a2d3a..97d5a74 100644
--- a/pkgs/python/python.nm
+++ b/pkgs/python/python.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.7.1
PKG_REL = 3
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://www.python.org
PKG_LICENSE = Python
PKG_SUMMARY = An interpreted, interactive, object-oriented programming language.
diff --git a/pkgs/pyxattr/pyxattr.nm b/pkgs/pyxattr/pyxattr.nm
index 15bb280..d8c6567 100644
--- a/pkgs/pyxattr/pyxattr.nm
+++ b/pkgs/pyxattr/pyxattr.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.5.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Libraries
+PKG_GROUPS = Development/Libraries
PKG_URL = http://pyxattr.sourceforge.net/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = Extended attributes library wrapper for Python.
diff --git a/pkgs/qemu/qemu.nm b/pkgs/qemu/qemu.nm
index 9aee432..1e4fb2d 100644
--- a/pkgs/qemu/qemu.nm
+++ b/pkgs/qemu/qemu.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.14.0-rc1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Virtualization
+PKG_GROUPS = Applications/Virtualization
PKG_URL = http://www.linux-kvm.org/page/Main_Page
PKG_LICENSE = GPLv2+
PKG_SUMMARY = QEMU is a generic and open source machine emulator and virtualizer.
diff --git a/pkgs/qt/qt.nm b/pkgs/qt/qt.nm
index 94ffa07..dfe1fc7 100644
--- a/pkgs/qt/qt.nm
+++ b/pkgs/qt/qt.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.7.0
PKG_REL = 3
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.qtsoftware.com/
PKG_LICENSE = LGPLv2 with exceptions or GPLv3 with exceptions
PKG_SUMMARY = Qt toolkit.
diff --git a/pkgs/qtermwidget/qtermwidget.nm b/pkgs/qtermwidget/qtermwidget.nm
index b60718b..07a4a91 100644
--- a/pkgs/qtermwidget/qtermwidget.nm
+++ b/pkgs/qtermwidget/qtermwidget.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = /Tools
+PKG_GROUPS = /Tools
PKG_URL = http://qtermwidget.sourceforge.net/
PKG_LICENSE = GPLv2
PKG_SUMMARY = A QT4 terminal emulation widget.
diff --git a/pkgs/quagga/quagga.nm b/pkgs/quagga/quagga.nm
index 664af87..3f4b95f 100644
--- a/pkgs/quagga/quagga.nm
+++ b/pkgs/quagga/quagga.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.99.17
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Routing
+PKG_GROUPS = Networking/Routing
PKG_URL = http://www.quagga.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Quagga is a rounting daemon.
diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm
index 97d0c88..99334fb 100644
--- a/pkgs/radvd/radvd.nm
+++ b/pkgs/radvd/radvd.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.5
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Daemons
+PKG_GROUPS = System/Daemons
PKG_URL = http://flex.sourceforge.net/
PKG_LICENSE = BSD with advertising
PKG_SUMMARY = A Router Advertisement daemon.
diff --git a/pkgs/readline/readline.nm b/pkgs/readline/readline.nm
index 2029aa4..430f0b5 100644
--- a/pkgs/readline/readline.nm
+++ b/pkgs/readline/readline.nm
@@ -29,7 +29,7 @@ PKG_VER = 6.2
PKG_REL = 3
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = ftp://ftp.gnu.org/gnu/readline/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A library for editing typed command lines.
diff --git a/pkgs/reiser4progs/reiser4progs.nm b/pkgs/reiser4progs/reiser4progs.nm
index bd51363..04ff986 100644
--- a/pkgs/reiser4progs/reiser4progs.nm
+++ b/pkgs/reiser4progs/reiser4progs.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.7
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/
PKG_LICENSE = GPL
PKG_SUMMARY = Administration utilities for the Reiser4 filesystem.
diff --git a/pkgs/reiserfsprogs/reiserfsprogs.nm b/pkgs/reiserfsprogs/reiserfsprogs.nm
index 32f94c9..1563a1c 100644
--- a/pkgs/reiserfsprogs/reiserfsprogs.nm
+++ b/pkgs/reiserfsprogs/reiserfsprogs.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.6.21
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://www.kernel.org/pub/linux/utils/fs/reiserfs/
PKG_LICENSE = GPL
PKG_SUMMARY = Tools for ReiserFS filesystems.
diff --git a/pkgs/rrdtool/rrdtool.nm b/pkgs/rrdtool/rrdtool.nm
index b1f5202..9ea3eb5 100644
--- a/pkgs/rrdtool/rrdtool.nm
+++ b/pkgs/rrdtool/rrdtool.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Databases
+PKG_GROUPS = Applications/Databases
PKG_URL = http://oss.oetiker.ch/rrdtool/
PKG_LICENSE = GPLv2+ with exceptions
PKG_SUMMARY = Round Robin Database Tool to store and display time-series data.
diff --git a/pkgs/rstp/rstp.nm b/pkgs/rstp/rstp.nm
index bc682f2..8762a4a 100644
--- a/pkgs/rstp/rstp.nm
+++ b/pkgs/rstp/rstp.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.21
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://git.ipfire.org/?p=thirdparty/rstp.git;a=summary
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Rapid Spanning Tree Protocol for Linux Ethernet bridge.
diff --git a/pkgs/rsync/rsync.nm b/pkgs/rsync/rsync.nm
index cec57fd..f2bbfb9 100644
--- a/pkgs/rsync/rsync.nm
+++ b/pkgs/rsync/rsync.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0.7
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/Internet
+PKG_GROUPS = Applications/Internet
PKG_URL = http://rsync.samba.org/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A program for synchronizing files over a network.
diff --git a/pkgs/samba/samba.nm b/pkgs/samba/samba.nm
index eaa00b2..e2f66f9 100644
--- a/pkgs/samba/samba.nm
+++ b/pkgs/samba/samba.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.5.8
PKG_REL = 1
PKG_MAINTAINER = Christian Schmidt <christian.schmidt(a)ipfire.org>
-PKG_GROUP = Networking/Daemons
+PKG_GROUPS = Networking/Daemons
PKG_URL = http://www.samba.org/
PKG_LICENSE = GPLv3+ and LGPLv3+
PKG_SUMMARY = Server and Client software to interoperate with Windows machines.
diff --git a/pkgs/sane/sane.nm b/pkgs/sane/sane.nm
index de15925..dfffed0 100644
--- a/pkgs/sane/sane.nm
+++ b/pkgs/sane/sane.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.21
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Application/Imaging
+PKG_GROUPS = Application/Imaging
PKG_URL = ftp://ftp2.sane-project.org/pub/sane/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = SANE - Scanner Access Now Easy.
diff --git a/pkgs/screen/screen.nm b/pkgs/screen/screen.nm
index 6e0a662..0fc6b01 100644
--- a/pkgs/screen/screen.nm
+++ b/pkgs/screen/screen.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.0.3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Application/System
+PKG_GROUPS = Application/System
PKG_URL = http://www.gnu.org/software/screen
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A screen manager that supports multiple logins on one terminal.
diff --git a/pkgs/sdl/sdl.nm b/pkgs/sdl/sdl.nm
index 806f4b5..e067c4e 100644
--- a/pkgs/sdl/sdl.nm
+++ b/pkgs/sdl/sdl.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.2.14
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.libsdl.org/
PKG_LICENSE = LGPLv2+
PKG_SUMMARY = A cross-platform multimedia library.
diff --git a/pkgs/sed/sed.nm b/pkgs/sed/sed.nm
index 94115d0..230a348 100644
--- a/pkgs/sed/sed.nm
+++ b/pkgs/sed/sed.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.2.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Text
+PKG_GROUPS = Base Applications/Text
PKG_URL = http://sed.sourceforge.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A GNU stream text editor.
diff --git a/pkgs/setup/setup.nm b/pkgs/setup/setup.nm
index 583abdb..53e6491 100644
--- a/pkgs/setup/setup.nm
+++ b/pkgs/setup/setup.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.0
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL =
PKG_LICENSE = Public Domain
PKG_SUMMARY = A set of system configuration and setup files.
diff --git a/pkgs/sg3-utils/sg3-utils.nm b/pkgs/sg3-utils/sg3-utils.nm
index 3a6e069..6d4e379 100644
--- a/pkgs/sg3-utils/sg3-utils.nm
+++ b/pkgs/sg3-utils/sg3-utils.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.29
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Applications/System
PKG_URL = http://sg.danny.cz/sg/sg3_utils.html
PKG_LICENSE = GPLv2+ and BSD
PKG_SUMMARY = Utilities for devices that use SCSI command sets.
diff --git a/pkgs/shadow/shadow.nm b/pkgs/shadow/shadow.nm
index d9e1e40..a68d1e6 100644
--- a/pkgs/shadow/shadow.nm
+++ b/pkgs/shadow/shadow.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.1.4.3
PKG_REL = 4
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utilities to deal with user accounts.
diff --git a/pkgs/sip/sip.nm b/pkgs/sip/sip.nm
index 489905e..5f60843 100644
--- a/pkgs/sip/sip.nm
+++ b/pkgs/sip/sip.nm
@@ -30,7 +30,7 @@ PKG_REL = 0
PKG_EPOCH = 1
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://www.riverbankcomputing.com/software/sip/intro
PKG_LICENSE = GPLv2 or GPLv3
PKG_SUMMARY = SIP - Python/C++ Bindings Generator.
diff --git a/pkgs/slang/slang.nm b/pkgs/slang/slang.nm
index d100209..d37b669 100644
--- a/pkgs/slang/slang.nm
+++ b/pkgs/slang/slang.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.jedsoft.org/slang/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Shared library for the S-Lang extension language.
diff --git a/pkgs/smartmontools/smartmontools.nm b/pkgs/smartmontools/smartmontools.nm
index 4828494..e965a0e 100644
--- a/pkgs/smartmontools/smartmontools.nm
+++ b/pkgs/smartmontools/smartmontools.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.40
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Statistics
+PKG_GROUPS = System/Statistics
PKG_URL = http://flex.sourceforge.net/
PKG_LICENSE = GPLv2
PKG_SUMMARY = A set of tools that watches HDD S.M.A.R.T status.
diff --git a/pkgs/sqlite/sqlite.nm b/pkgs/sqlite/sqlite.nm
index 180e72b..b987528 100644
--- a/pkgs/sqlite/sqlite.nm
+++ b/pkgs/sqlite/sqlite.nm
@@ -32,7 +32,7 @@ PKG_VER = 3.7.3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Databases
+PKG_GROUPS = System/Databases
PKG_URL = http://www.sqlite.org/
PKG_LICENSE = PublicDomain
PKG_SUMMARY = A small an versative Database, that uses simple text files.
diff --git a/pkgs/squashfs-tools/squashfs-tools.nm b/pkgs/squashfs-tools/squashfs-tools.nm
index cae0e46..dc75ab7 100644
--- a/pkgs/squashfs-tools/squashfs-tools.nm
+++ b/pkgs/squashfs-tools/squashfs-tools.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystem
+PKG_GROUPS = System/Filesystem
PKG_URL = http://squashfs.sf.net/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Utility for the creation of squashfs filesystems.
diff --git a/pkgs/squid/squid.nm b/pkgs/squid/squid.nm
index d8d16e1..d560a62 100644
--- a/pkgs/squid/squid.nm
+++ b/pkgs/squid/squid.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.1.8
PKG_REL = 0
PKG_MAINTAINER = Christian Schmidt <christian.schmidt(a)ipfire.org>
-PKG_GROUP = Networking/Daemons
+PKG_GROUPS = Networking/Daemons
PKG_URL = http://www.squid-cache.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = The Squid proxy caching server.
diff --git a/pkgs/strace/strace.nm b/pkgs/strace/strace.nm
index fc98b7f..12f6351 100644
--- a/pkgs/strace/strace.nm
+++ b/pkgs/strace/strace.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.5.19
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Debuggers
+PKG_GROUPS = Development/Debuggers
PKG_URL = http://sourceforge.net/projects/strace/
PKG_LICENSE = BSD
PKG_SUMMARY = Tracks and displays system calls associated with a running process.
diff --git a/pkgs/strongswan/strongswan.nm b/pkgs/strongswan/strongswan.nm
index 1a6869c..497703b 100644
--- a/pkgs/strongswan/strongswan.nm
+++ b/pkgs/strongswan/strongswan.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.5.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/VPN
+PKG_GROUPS = Networking/VPN
PKG_URL = http://www.strongswan.org/
PKG_LICENSE = GPL
PKG_SUMMARY = IPsec and IKEv1 implementation for Linux 2.4 and 2.6 kernels.
diff --git a/pkgs/sudo/sudo.nm b/pkgs/sudo/sudo.nm
index 679dae3..a10bea6 100644
--- a/pkgs/sudo/sudo.nm
+++ b/pkgs/sudo/sudo.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.7.4p3
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Base Applications/System
PKG_URL = http://www.sudo.ws/sudo/download.html
PKG_LICENSE = BSD
PKG_SUMMARY = Allows restricted root access for specified users.
diff --git a/pkgs/suricata/suricata.nm b/pkgs/suricata/suricata.nm
index f451cda..1c5cc43 100644
--- a/pkgs/suricata/suricata.nm
+++ b/pkgs/suricata/suricata.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/IDS
+PKG_GROUPS = Networking/IDS
PKG_URL = http://www.openinfosecfoundation.org/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Open Source Next Generation Intrusion Detection and Prevention Engine.
diff --git a/pkgs/swig/swig.nm b/pkgs/swig/swig.nm
index 8f0d3aa..7c9a0f7 100644
--- a/pkgs/swig/swig.nm
+++ b/pkgs/swig/swig.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Tools
+PKG_GROUPS = Development/Tools
PKG_URL = http://swig.sourceforge.net/
PKG_LICENSE = GPLv3+ and BSD
PKG_SUMMARY = Connects C/C++/Objective C to some high-level programming \
diff --git a/pkgs/sysfsutils/sysfsutils.nm b/pkgs/sysfsutils/sysfsutils.nm
index 4a13d8b..126137a 100644
--- a/pkgs/sysfsutils/sysfsutils.nm
+++ b/pkgs/sysfsutils/sysfsutils.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1.0
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://sourceforge.net/projects/linux-diag/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Utilities for interfacing with sysfs.
diff --git a/pkgs/syslinux/syslinux.nm b/pkgs/syslinux/syslinux.nm
index 18044d8..2ca02e6 100644
--- a/pkgs/syslinux/syslinux.nm
+++ b/pkgs/syslinux/syslinux.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.02
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Boot
+PKG_GROUPS = System/Boot
PKG_URL = http://syslinux.zytor.com/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Simple kernel loader which boots from a FAT filesystem.
diff --git a/pkgs/syslog-ng/syslog-ng.nm b/pkgs/syslog-ng/syslog-ng.nm
index c010f7b..19024a4 100644
--- a/pkgs/syslog-ng/syslog-ng.nm
+++ b/pkgs/syslog-ng/syslog-ng.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.1.3
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Tools
+PKG_GROUPS = System/Tools
PKG_URL = http://www.balabit.com/network-security/syslog-ng/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Syslog-ng is a daemon that handles the logging stuff.
diff --git a/pkgs/system-release/system-release.nm b/pkgs/system-release/system-release.nm
index 4193efa..9b7ab7e 100644
--- a/pkgs/system-release/system-release.nm
+++ b/pkgs/system-release/system-release.nm
@@ -31,7 +31,7 @@ PKG_EPOCH = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL = http://www.ipfire.org
PKG_LICENSE =
PKG_SUMMARY = $(DISTRO_NAME) release files.
diff --git a/pkgs/sysvinit/sysvinit.nm b/pkgs/sysvinit/sysvinit.nm
index 87ddd70..18b5679 100644
--- a/pkgs/sysvinit/sysvinit.nm
+++ b/pkgs/sysvinit/sysvinit.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.86
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = https://alioth.debian.org/projects/pkg-sysvinit/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Programs which control basic system processes.
diff --git a/pkgs/tar/tar.nm b/pkgs/tar/tar.nm
index 3552a46..e357cf5 100644
--- a/pkgs/tar/tar.nm
+++ b/pkgs/tar/tar.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.26
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Packaging
+PKG_GROUPS = Base System/Packaging
PKG_URL = http://www.gnu.org/software/tar/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = A GNU file archiving program.
diff --git a/pkgs/tcl/tcl.nm b/pkgs/tcl/tcl.nm
index 078f337..d80f4f3 100644
--- a/pkgs/tcl/tcl.nm
+++ b/pkgs/tcl/tcl.nm
@@ -29,7 +29,7 @@ PKG_VER = 8.5.8
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Development/Languages
+PKG_GROUPS = Development/Languages
PKG_URL = http://tcl.sourceforge.net/
PKG_LICENSE = TCL
PKG_SUMMARY = Tool Command Language, pronounced tickle.
diff --git a/pkgs/tcpdump/tcpdump.nm b/pkgs/tcpdump/tcpdump.nm
index 4cce770..2703f8d 100644
--- a/pkgs/tcpdump/tcpdump.nm
+++ b/pkgs/tcpdump/tcpdump.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.1.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Sniffer
+PKG_GROUPS = Networking/Sniffer
PKG_URL = http://www.tcpdump.org/
PKG_LICENSE = BSD with advertising
PKG_SUMMARY = A network traffic monitoring tool.
diff --git a/pkgs/texinfo/texinfo.nm b/pkgs/texinfo/texinfo.nm
index 7f2b102..3bc2a33 100644
--- a/pkgs/texinfo/texinfo.nm
+++ b/pkgs/texinfo/texinfo.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.13a
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Publishing
+PKG_GROUPS = Applications/Publishing
PKG_URL = http://www.gnu.org/software/texinfo/
PKG_LICENSE = GPLv3
PKG_SUMMARY = Tools needed to create Texinfo format documentation files.
diff --git a/pkgs/traceroute/traceroute.nm b/pkgs/traceroute/traceroute.nm
index 88b45ee..48e42ce 100644
--- a/pkgs/traceroute/traceroute.nm
+++ b/pkgs/traceroute/traceroute.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.12
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Application/Internet
+PKG_GROUPS = Application/Internet
PKG_URL = http://traceroute.sourceforge.net
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Traces the route taken by packets over an IPv4/IPv6 network.
diff --git a/pkgs/tunctl/tunctl.nm b/pkgs/tunctl/tunctl.nm
index d487dc0..cd5a668 100644
--- a/pkgs/tunctl/tunctl.nm
+++ b/pkgs/tunctl/tunctl.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://tunctl.sourceforge.net/
PKG_LICENSE = GPL+
PKG_SUMMARY = Create and remove virtual network interfaces.
diff --git a/pkgs/udev/udev.nm b/pkgs/udev/udev.nm
index 7ea4365..2985a2a 100644
--- a/pkgs/udev/udev.nm
+++ b/pkgs/udev/udev.nm
@@ -29,7 +29,7 @@ PKG_VER = 160
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = Base System/Base
PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = A userspace implementation of devfs.
diff --git a/pkgs/udisks/udisks.nm b/pkgs/udisks/udisks.nm
index a645b35..3e9f3e9 100644
--- a/pkgs/udisks/udisks.nm
+++ b/pkgs/udisks/udisks.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.freedesktop.org/wiki/Software/udisks
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Storage Management Service.
diff --git a/pkgs/ulogd2/ulogd2.nm b/pkgs/ulogd2/ulogd2.nm
index 36d7096..89d381a 100644
--- a/pkgs/ulogd2/ulogd2.nm
+++ b/pkgs/ulogd2/ulogd2.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.0.0beta3
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Networking/Statistics
+PKG_GROUPS = Networking/Statistics
PKG_URL = http://netfilter.org/projects/ulogd/index.html
PKG_LICENSE = GPLv2
PKG_SUMMARY = The userspace logging daemon for netfilter.
diff --git a/pkgs/unzip/unzip.nm b/pkgs/unzip/unzip.nm
index 159dee0..11ef403 100644
--- a/pkgs/unzip/unzip.nm
+++ b/pkgs/unzip/unzip.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.52
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/Archiving
+PKG_GROUPS = Applications/Archiving
PKG_URL = ftp://ftp.info-zip.org/pub/infozip/src/
PKG_LICENSE = BSD
PKG_SUMMARY = A utility for unpacking zip files.
diff --git a/pkgs/upower/upower.nm b/pkgs/upower/upower.nm
index 95ca4bb..f3d5abe 100644
--- a/pkgs/upower/upower.nm
+++ b/pkgs/upower/upower.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.9.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://hal.freedesktop.org/releases/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Power Management Service.
diff --git a/pkgs/upstart/upstart.nm b/pkgs/upstart/upstart.nm
index 8e64914..b34b8da 100644
--- a/pkgs/upstart/upstart.nm
+++ b/pkgs/upstart/upstart.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.6.7
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
PKG_URL = http://upstart.ubuntu.com/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = An event-driven init system.
diff --git a/pkgs/usbutils/usbutils.nm b/pkgs/usbutils/usbutils.nm
index 19cda6f..27bf03f 100644
--- a/pkgs/usbutils/usbutils.nm
+++ b/pkgs/usbutils/usbutils.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.86
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Tools
+PKG_GROUPS = System/Tools
PKG_URL = http://www.linux-usb.org/
PKG_LICENSE = GPLv2
PKG_SUMMARY = Tool to provide and enhance USB support in Linux.
diff --git a/pkgs/ustr/ustr.nm b/pkgs/ustr/ustr.nm
index 2d0997b..9b944d3 100644
--- a/pkgs/ustr/ustr.nm
+++ b/pkgs/ustr/ustr.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.4
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.and.org/ustr/
PKG_LICENSE = MIT or LGPLv2+ or BSD
PKG_SUMMARY = String library, very low memory overhead, simple to import.
diff --git a/pkgs/util-linux-ng/util-linux-ng.nm b/pkgs/util-linux-ng/util-linux-ng.nm
index 821c848..129d32e 100644
--- a/pkgs/util-linux-ng/util-linux-ng.nm
+++ b/pkgs/util-linux-ng/util-linux-ng.nm
@@ -29,7 +29,8 @@ PKG_VER = 2.18
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = System/Base
+PKG_GROUPS = System/Base
+PKG_GROUPS-$(PKG_NAME) = Base $(PKG_GROUPS)
PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
PKG_LICENSE = GPLv2 and GPLv2+ and BSD with advertising and Public Domain
PKG_SUMMARY = A collection of basic system utilities.
diff --git a/pkgs/vim/vim.nm b/pkgs/vim/vim.nm
index bb2f41d..598b6a4 100644
--- a/pkgs/vim/vim.nm
+++ b/pkgs/vim/vim.nm
@@ -29,7 +29,7 @@ PKG_VER = 7.3
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/Editors
+PKG_GROUPS = Base Applications/Editors
PKG_URL = http://www.vim.org
PKG_LICENSE = PublicDomain/Charityware
PKG_SUMMARY = Very feature- and powerful editor.
diff --git a/pkgs/vlan/vlan.nm b/pkgs/vlan/vlan.nm
index e1c4d99..f867632 100644
--- a/pkgs/vlan/vlan.nm
+++ b/pkgs/vlan/vlan.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.9
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Tools
+PKG_GROUPS = Networking/Tools
PKG_URL = http://www.candelatech.com/~greear/vlan.html
PKG_LICENSE = GPLv2+
PKG_SUMMARY = Linux 802.1q VLAN configuration utility.
diff --git a/pkgs/vsftpd/vsftpd.nm b/pkgs/vsftpd/vsftpd.nm
index 69458c5..a08613c 100644
--- a/pkgs/vsftpd/vsftpd.nm
+++ b/pkgs/vsftpd/vsftpd.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.3.4
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = Networking/Daemons
+PKG_GROUPS = Networking/Daemons
PKG_URL = ftp://vsftpd.beasts.org/users/cevans/
PKG_LICENSE = GPLv2 with exceptions
PKG_SUMMARY = Very Secure Ftp Daemon.
diff --git a/pkgs/wget/wget.nm b/pkgs/wget/wget.nm
index 00cc492..6683771 100644
--- a/pkgs/wget/wget.nm
+++ b/pkgs/wget/wget.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.12
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Applications/Internet
+PKG_GROUPS = Applications/Internet
PKG_URL = http://www.gnu.org/software/wget/
PKG_LICENSE = GPLv3+
PKG_SUMMARY = Commandline tool to download files.
diff --git a/pkgs/which/which.nm b/pkgs/which/which.nm
index c9f600b..3565d38 100644
--- a/pkgs/which/which.nm
+++ b/pkgs/which/which.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.20
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Applications/System
+PKG_GROUPS = Base Applications/System
PKG_URL = http://www.xs4all.nl/~carlo17/which/
PKG_LICENSE = GPLv3
PKG_SUMMARY = Displays where a particular program in your path is located.
diff --git a/pkgs/wireless-tools/wireless-tools.nm b/pkgs/wireless-tools/wireless-tools.nm
index 910778d..5337add 100644
--- a/pkgs/wireless-tools/wireless-tools.nm
+++ b/pkgs/wireless-tools/wireless-tools.nm
@@ -29,7 +29,7 @@ PKG_VER = 29
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Networking/Wireless
+PKG_GROUPS = Networking/Wireless
PKG_URL = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
PKG_LICENSE = GPL+
PKG_SUMMARY = Wireless ethernet configuration tools.
diff --git a/pkgs/wpa_supplicant/wpa_supplicant.nm b/pkgs/wpa_supplicant/wpa_supplicant.nm
index 28dcac6..4473584 100644
--- a/pkgs/wpa_supplicant/wpa_supplicant.nm
+++ b/pkgs/wpa_supplicant/wpa_supplicant.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.7.3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = Sytem/Base
+PKG_GROUPS = Sytem/Base
PKG_URL = http://hostap.epitest.fi/releases/
PKG_LICENSE = BSD
PKG_SUMMARY = WPA/WPA2/IEEE 802.1X Supplicant.
diff --git a/pkgs/xcb-proto/xcb-proto.nm b/pkgs/xcb-proto/xcb-proto.nm
index e7f790b..2d05e07 100644
--- a/pkgs/xcb-proto/xcb-proto.nm
+++ b/pkgs/xcb-proto/xcb-proto.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Headers
+PKG_GROUPS = X/Headers
PKG_URL = http://xcb.freedesktop.org/
PKG_LICENSE = MIT
PKG_SUMMARY = XCB protocol descriptions.
diff --git a/pkgs/xcb-util/xcb-util.nm b/pkgs/xcb-util/xcb-util.nm
index e50031c..4ec5408 100644
--- a/pkgs/xcb-util/xcb-util.nm
+++ b/pkgs/xcb-util/xcb-util.nm
@@ -29,7 +29,7 @@ PKG_VER = 0.3.6
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://xcb.freedesktop.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Convenience libraries sitting on top of libxcb.
diff --git a/pkgs/xen/xen.nm b/pkgs/xen/xen.nm
index 1c71ce3..c25f876 100644
--- a/pkgs/xen/xen.nm
+++ b/pkgs/xen/xen.nm
@@ -29,7 +29,7 @@ PKG_VER = 4.0.1
PKG_REL = 1
PKG_MAINTAINER = Ben Schweikert <ben.schweikert(a)ipfire.org>
-PKG_GROUP = Applications/Virtualization
+PKG_GROUPS = Applications/Virtualization
PKG_URL = http://www.xen.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = The Xen tools.
diff --git a/pkgs/xfsprogs/xfsprogs.nm b/pkgs/xfsprogs/xfsprogs.nm
index 5e6b08d..865992b 100644
--- a/pkgs/xfsprogs/xfsprogs.nm
+++ b/pkgs/xfsprogs/xfsprogs.nm
@@ -29,7 +29,7 @@ PKG_VER = 3.1.2
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Filesystems
+PKG_GROUPS = System/Filesystems
PKG_URL = http://oss.sgi.com/projects/xfs/
PKG_LICENSE = GPL+ and LGPLv2+
PKG_SUMMARY = Utilities for managing the XFS filesystem
diff --git a/pkgs/xkeyboard-config/xkeyboard-config.nm b/pkgs/xkeyboard-config/xkeyboard-config.nm
index d440aff..6959ce0 100644
--- a/pkgs/xkeyboard-config/xkeyboard-config.nm
+++ b/pkgs/xkeyboard-config/xkeyboard-config.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Utils
+PKG_GROUPS = X/Utils
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X Keyboard Extension configuration data.
diff --git a/pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm b/pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
index 2e427d9..e5883b9 100644
--- a/pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
+++ b/pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
@@ -29,7 +29,7 @@ PKG_VER = 6.13.1
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 ati video driver.
diff --git a/pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
index 226c929..7cabb00 100644
--- a/pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
+++ b/pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.4.99.901
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 evdev input driver.
diff --git a/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
index 1c82190..0068325 100644
--- a/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
+++ b/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.12.0
PKG_REL = 1
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 intel video driver.
diff --git a/pkgs/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/pkgs/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
index 0b8b106..0578c4b 100644
--- a/pkgs/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
+++ b/pkgs/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.4.0
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 keyboard input driver.
diff --git a/pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
index 1e275cc..0499985 100644
--- a/pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
+++ b/pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.5.0
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 mouse input driver.
diff --git a/pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm b/pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
index 7f6b0a5..e056837 100644
--- a/pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
+++ b/pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.1.18
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 nv video driver.
diff --git a/pkgs/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm b/pkgs/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
index 5565cd7..d31f5a6 100644
--- a/pkgs/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
+++ b/pkgs/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.3.0
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 synaptics input driver.
diff --git a/pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
index ed82fce..93cf37f 100644
--- a/pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
+++ b/pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
@@ -29,7 +29,7 @@ PKG_VER = 2.3.0
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 vesa video driver.
diff --git a/pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm b/pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
index 1d64df6..5b2aac4 100644
--- a/pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
+++ b/pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
@@ -29,7 +29,7 @@ PKG_VER = 11.0.2
PKG_REL = 0
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Driver
+PKG_GROUPS = X/Driver
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Xorg X11 vmware video driver.
diff --git a/pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm b/pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm
index 28ba7a2..a4fdaa9 100644
--- a/pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm
+++ b/pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm
@@ -29,7 +29,7 @@ PKG_VER = 7.4
PKG_REL = 2
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Fonts
+PKG_GROUPS = X/Fonts
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 font utilities.
diff --git a/pkgs/xorg-x11-fonts/xorg-x11-fonts.nm b/pkgs/xorg-x11-fonts/xorg-x11-fonts.nm
index 302c8ae..9b7ef98 100644
--- a/pkgs/xorg-x11-fonts/xorg-x11-fonts.nm
+++ b/pkgs/xorg-x11-fonts/xorg-x11-fonts.nm
@@ -30,7 +30,7 @@ PKG_REL = 2
PKG_ARCH = noarch
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Fonts
+PKG_GROUPS = X/Fonts
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 fonts.
diff --git a/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
index 6007663..41f549e 100644
--- a/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
+++ b/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
@@ -30,7 +30,7 @@ PKG_REL = 2
PKG_ARCH = noarch
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = Development/System
+PKG_GROUPS = Development/System
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X11 potocol headers.
diff --git a/pkgs/xorg-x11-server/xorg-x11-server.nm b/pkgs/xorg-x11-server/xorg-x11-server.nm
index 4b4acdb..be83fcc 100644
--- a/pkgs/xorg-x11-server/xorg-x11-server.nm
+++ b/pkgs/xorg-x11-server/xorg-x11-server.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.8.2
PKG_REL = 3
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Server
+PKG_GROUPS = X/Server
PKG_URL = http://www.x.org
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 X server.
diff --git a/pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm b/pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm
index 6ea01f8..ea54e25 100644
--- a/pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm
+++ b/pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 Autotools macros.
diff --git a/pkgs/xorg-x11-xinit/xorg-x11-xinit.nm b/pkgs/xorg-x11-xinit/xorg-x11-xinit.nm
index 74d2175..49fa11e 100644
--- a/pkgs/xorg-x11-xinit/xorg-x11-xinit.nm
+++ b/pkgs/xorg-x11-xinit/xorg-x11-xinit.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.2.1
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = X/Server
+PKG_GROUPS = X/Server
PKG_URL = http://www.x.org
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 X Window System xinit startup scripts.
diff --git a/pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
index 06d762e..4063c53 100644
--- a/pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
+++ b/pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
@@ -29,7 +29,7 @@ PKG_VER = 7.4
PKG_REL = 1
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Fonts
+PKG_GROUPS = X/Fonts
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X.Org X11 xkb utilities.
diff --git a/pkgs/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/pkgs/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
index a490c52..1cad0bf 100644
--- a/pkgs/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
+++ b/pkgs/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
@@ -30,7 +30,7 @@ PKG_REL = 1
PKG_ARCH = noarch
PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org>
-PKG_GROUP = X/Libraries
+PKG_GROUPS = X/Libraries
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = X11 transport library.
diff --git a/pkgs/xrandr/xrandr.nm b/pkgs/xrandr/xrandr.nm
index cedb0d6..651090c 100644
--- a/pkgs/xrandr/xrandr.nm
+++ b/pkgs/xrandr/xrandr.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.3.3
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = X/Tools
+PKG_GROUPS = X/Tools
PKG_URL = http://www.x.org/
PKG_LICENSE = MIT
PKG_SUMMARY = Primitive command line interface to RandR extension.
diff --git a/pkgs/xterm/xterm.nm b/pkgs/xterm/xterm.nm
index 782f21f..8bb516f 100644
--- a/pkgs/xterm/xterm.nm
+++ b/pkgs/xterm/xterm.nm
@@ -29,7 +29,7 @@ PKG_VER = 262
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = X/Application
+PKG_GROUPS = X/Application
PKG_URL = http://invisible-island.net/xterm/
PKG_LICENSE = MIT
PKG_SUMMARY = Terminal emulator for the X Window System.
diff --git a/pkgs/xz/xz.nm b/pkgs/xz/xz.nm
index eea707f..0be081a 100644
--- a/pkgs/xz/xz.nm
+++ b/pkgs/xz/xz.nm
@@ -29,7 +29,7 @@ PKG_VER = 5.0.1
PKG_REL = 2
PKG_MAINTAINER =
-PKG_GROUP = Applications/Compression
+PKG_GROUPS = Applications/Compression
PKG_URL = http://tukaani.org/xz/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = LZMA Utils.
diff --git a/pkgs/zerofree/zerofree.nm b/pkgs/zerofree/zerofree.nm
index 99f2ea1..a007d14 100644
--- a/pkgs/zerofree/zerofree.nm
+++ b/pkgs/zerofree/zerofree.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.0.1
PKG_REL = 1
PKG_MAINTAINER =
-PKG_GROUP = Filesystem/Tools
+PKG_GROUPS = Filesystem/Tools
PKG_URL = http://intgat.tigress.co.uk/rmy/uml/
PKG_LICENSE = GPL+
PKG_SUMMARY = Utility to force unused ext2 inodes and blocks to zero.
diff --git a/pkgs/zlib/zlib.nm b/pkgs/zlib/zlib.nm
index 28ab0f9..20688c5 100644
--- a/pkgs/zlib/zlib.nm
+++ b/pkgs/zlib/zlib.nm
@@ -29,7 +29,7 @@ PKG_VER = 1.2.5
PKG_REL = 0
PKG_MAINTAINER =
-PKG_GROUP = System/Libraries
+PKG_GROUPS = System/Libraries
PKG_URL = http://www.gzip.org/zlib/
PKG_LICENSE = zlib
PKG_SUMMARY = The zlib compression and decompression library.
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7fb4ff755e5bf009e9e6925c5b010e5d71c89566
by git＠ipfire.org 20 Mar '11
by git＠ipfire.org 20 Mar '11
20 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 7fb4ff755e5bf009e9e6925c5b010e5d71c89566 (commit)
via 56e3ad68eccb448b8282776426fe0a2dc9a901c1 (commit)
via 95d5f3df86e69ce88f60eaa16fc80f68e99523df (commit)
from 25224e2adcaaa2044e4ddab2a163050d56ee13de (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7fb4ff755e5bf009e9e6925c5b010e5d71c89566
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date: Sun Mar 20 20:39:16 2011 +0100
Updated nmap to 5.51
commit 56e3ad68eccb448b8282776426fe0a2dc9a901c1
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date: Sun Mar 20 20:38:35 2011 +0100
Updated nano to 2.2.9
commit 95d5f3df86e69ce88f60eaa16fc80f68e99523df
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date: Sun Mar 20 20:37:28 2011 +0100
Updated vsftpd to 2.3.4
-----------------------------------------------------------------------
Summary of changes:
lfs/nano | 6 +++---
lfs/nmap | 6 +++---
lfs/vsftpd | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
Difference in files:
diff --git a/lfs/nano b/lfs/nano
index 1bd26a3..b034677 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
include Config
-VER = 2.0.9
+VER = 2.2.6
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nano
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2be94dc43fb60fff4626a2401a977220
+$(DL_FILE)_MD5 = 03233ae480689a008eb98feb1b599807
install : $(TARGET)
diff --git a/lfs/nmap b/lfs/nmap
index f746b21..5ff3221 100644
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -24,7 +24,7 @@
include Config
-VER = 5.50
+VER = 5.51
THISAPP = nmap-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nmap
-PAK_VER = 4
+PAK_VER = 5
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a4df96e52cb52a1bbe76caace5f21388
+$(DL_FILE)_MD5 = 0b80d2cb92ace5ebba8095a4c2850275
install : $(TARGET)
diff --git a/lfs/vsftpd b/lfs/vsftpd
index d5e8093..f3e74a0 100644
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -24,7 +24,7 @@
include Config
-VER = 2.2.2
+VER = 2.3.4
THISAPP = vsftpd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vsftpd
-PAK_VER = 6
+PAK_VER = 7
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
+$(DL_FILE)_MD5 = 2ea5d19978710527bb7444d93b67767a
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8adaa8e1a04dab1749011e0cb92bd3a192beca4a
by git＠ipfire.org 20 Mar '11
by git＠ipfire.org 20 Mar '11
20 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 8adaa8e1a04dab1749011e0cb92bd3a192beca4a (commit)
via 4b351b64080535581c688d699e1ea00930cd0915 (commit)
via 56fd809a4846bf1ac76eeb668209be7843406efc (commit)
via 24c9c217c0334dc868b4b82e7f562aa52687ffc1 (commit)
via 9549f3dfe1d5e8a1b6afef718e9d823dc6a89cf5 (commit)
via c95e26c8a96af714e4eb12990366c9edc015566c (commit)
via fc3440f6b161686c42f41442e3f47417af4e187c (commit)
via d13664445bfcef1494e11de1241c23c596f6add9 (commit)
via d65c7a92af26c6cef943c65b393a75b0765c0ef0 (commit)
via 8987f278868d879397adfc8ce9dc01e467725e89 (commit)
via 89649c09160fffc78efd05a59b564d4a39c9a253 (commit)
via a5a76995272e10a9035243f0c972e2578c3286f5 (commit)
from d84a4f261da492d5ad2db151e06acd90e37f13e4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8adaa8e1a04dab1749011e0cb92bd3a192beca4a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 20 15:54:00 2011 +0100
linux-firmware: There is no STAGE_CONFIGURE.
commit 4b351b64080535581c688d699e1ea00930cd0915
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 20 15:53:33 2011 +0100
linux-firmware: Fix spelling of Arne's email address.
commit 56fd809a4846bf1ac76eeb668209be7843406efc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 20 15:52:23 2011 +0100
kernel: Let only the kernel itself depend on the firmware.
kernel-headers for example does not need it.
commit 24c9c217c0334dc868b4b82e7f562aa52687ffc1
Merge: 9549f3d fc3440f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 20 15:51:15 2011 +0100
Merge remote-tracking branch 'arne_f/linux-firmware'
commit 9549f3dfe1d5e8a1b6afef718e9d823dc6a89cf5
Merge: c95e26c d65c7a9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 20 15:35:26 2011 +0100
Merge remote-tracking branch 'arne_f/openssh'
commit c95e26c8a96af714e4eb12990366c9edc015566c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 20 15:34:49 2011 +0100
build-essentials: Export missing SUMMARY.
commit fc3440f6b161686c42f41442e3f47417af4e187c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 20 11:35:40 2011 +0100
kernel: add package depency: linux-firmware.
commit d13664445bfcef1494e11de1241c23c596f6add9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 20 11:34:58 2011 +0100
linux-firmware: new package that provide firmware for common devices.
commit d65c7a92af26c6cef943c65b393a75b0765c0ef0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 19 20:50:03 2011 +0100
openssh: needs openssl-1.0.0d-2 or higher.
commit 8987f278868d879397adfc8ce9dc01e467725e89
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 19 20:40:36 2011 +0100
openssl: enable ecdsa for openssh.
commit 89649c09160fffc78efd05a59b564d4a39c9a253
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 18 17:18:55 2011 +0100
build-essentials: Remove a debugging line.
commit a5a76995272e10a9035243f0c972e2578c3286f5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 18 15:27:11 2011 +0100
build-essentials: Make dependency resolution faster.
-----------------------------------------------------------------------
Summary of changes:
pkgs/build-essentials/build-essentials.nm | 2 +-
.../buildsystem-tools/dependency-tracker | 26 ++++++++--------
.../buildsystem-tools/functions-packager-find | 6 +---
pkgs/build-essentials/buildsystem/Targets | 1 +
pkgs/kernel/kernel.nm | 4 +-
.../linux-firmware.nm} | 31 ++++++++++---------
pkgs/openssh/openssh.nm | 6 ++--
pkgs/openssl/openssl.nm | 5 +--
8 files changed, 38 insertions(+), 43 deletions(-)
copy pkgs/{python-distutils-extra/python-distutils-extra.nm => linux-firmware/linux-firmware.nm} (73%)
Difference in files:
diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 4bd680a..8bec9f3 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials
PKG_VER = $(DISTRO_VERSION)
-PKG_REL = 8
+PKG_REL = 10
PKG_EPOCH = 1
PKG_ARCH = noarch
diff --git a/pkgs/build-essentials/buildsystem-tools/dependency-tracker b/pkgs/build-essentials/buildsystem-tools/dependency-tracker
index 5fb9718..bbfb8e9 100755
--- a/pkgs/build-essentials/buildsystem-tools/dependency-tracker
+++ b/pkgs/build-essentials/buildsystem-tools/dependency-tracker
@@ -4,19 +4,19 @@ dirname=$(dirname ${0})
. ${dirname}/common-functions
-action=${1}
-shift
+args=${1}
-case "${action}" in
- requires)
- find_requires $@
- exit $?
- ;;
+if [ -n "${2}" ]; then
+ args=${2}
+fi
- provides)
- find_provides $@
- exit $?
- ;;
-esac
+provides=$(find_provides ${args})
+requires=""
+for require in $(find_requires ${args}); do
+ listmatch ${require} ${provides} || requires="${requires} ${require}"
+done
-exit 1
+echo "provides=\"${provides}\""
+echo "requires=\"${requires}\""
+
+exit 0
diff --git a/pkgs/build-essentials/buildsystem-tools/functions-packager-find b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
index f78eddb..1b488d9 100644
--- a/pkgs/build-essentials/buildsystem-tools/functions-packager-find
+++ b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
@@ -40,10 +40,6 @@ function find_requires() {
others="${others} $(find_perl_requires ${dirs})"
others="${others} $(find_pkgconfig_requires ${dirs})"
- # Get provides, because packages should not depend on features they provide
- # by themselves.
- local provides=$(find_provides ${dirs})
-
# Return a sorted and unique(!) list
local require
local requires
@@ -54,7 +50,7 @@ function find_requires() {
grep -qE "${PKG_REQUIRES_FILTER}" <<< "${require}" && continue
fi
- listmatch ${require} ${provides} || requires="${requires} ${require}"
+ requires="${requires} ${require}"
done
echo ${requires}
diff --git a/pkgs/build-essentials/buildsystem/Targets b/pkgs/build-essentials/buildsystem/Targets
index 8c02cb7..24cbec7 100644
--- a/pkgs/build-essentials/buildsystem/Targets
+++ b/pkgs/build-essentials/buildsystem/Targets
@@ -23,6 +23,7 @@ buildinfo:
@echo "PKG_GROUP=\"$(PKG_GROUP)\""
@echo "PKG_LICENSE=\"$(PKG_LICENSE)\""
@echo "PKG_MAINTAINER=\"$(PKG_MAINTAINER)\""
+ @echo "PKG_SUMMARY=\"$(strip $(PKG_SUMMARY))\""
@echo "PKG_URL=\"$(PKG_URL)\""
@echo "PKG_FILES=\"$(PKG_OBJECTS)\""
diff --git a/pkgs/kernel/kernel.nm b/pkgs/kernel/kernel.nm
index 15a95bc..0ca32bb 100644
--- a/pkgs/kernel/kernel.nm
+++ b/pkgs/kernel/kernel.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = linux
PKG_VER = 2.6.37.2
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
PKG_GROUP = System/Kernels
@@ -35,7 +35,7 @@ PKG_LICENSE = GPLv2
PKG_SUMMARY = The Linux kernel.
PKG_BUILD_DEPS+= module-init-tools ncurses-devel perl
-PKG_DEPS-kernel= dracut
+PKG_DEPS-kernel= dracut linux-firmware
define PKG_DESCRIPTION
The kernel package contains the Linux kernel (vmlinuz), the core of any \
diff --git a/pkgs/linux-firmware/linux-firmware.nm b/pkgs/linux-firmware/linux-firmware.nm
new file mode 100644
index 0000000..70b8f7a
--- /dev/null
+++ b/pkgs/linux-firmware/linux-firmware.nm
@@ -0,0 +1,54 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = linux-firmware
+PKG_VER = 20110311
+PKG_REL = 0
+
+PKG_MAINTAINER = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/
+PKG_LICENSE = Non-GPL
+PKG_SUMMARY = Firmware Binaries for some Devices.
+
+define PKG_DESCRIPTION
+ linux-firmware provides some firmware binaries that \
+ are loaded into the devices at startup. \
+ For detailed license info check the WHENCE and LICENSE.* texts \
+ for the specific firmware.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.gz
+
+PKG_BUILD_DEPS =
+
+define STAGE_BUILD
+endef
+
+define STAGE_INSTALL
+ -mkdir -pv $(BUILDROOT)/lib/firmware
+ cd $(DIR_APP) && cp -prv * $(BUILDROOT)/lib/firmware
+endef
diff --git a/pkgs/openssh/openssh.nm b/pkgs/openssh/openssh.nm
index ac5c2dd..1f3b0db 100644
--- a/pkgs/openssh/openssh.nm
+++ b/pkgs/openssh/openssh.nm
@@ -34,15 +34,15 @@ PKG_URL = http://www.openssh.com/portable.html
PKG_LICENSE = MIT
PKG_SUMMARY = An open source implementation of SSH protocol versions 1 and 2.
-PKG_BUILD_DEPS+= audit-devel libselinux-devel nss-devel openssl-devel pam-devel \
- zlib-devel
+PKG_BUILD_DEPS+= audit-devel libselinux-devel nss-devel openssl-devel>=1.0.0d-2 \
+ pam-devel zlib-devel
PKG_DEPS-openssh = openssh-clients=$(THISVER) openssh-server=$(THISVER)
# /usr/bin/ssh-keygen is needed to generate keys for the ssh server.
PKG_DEPS-openssh-server += /usr/bin/ssh-keygen
define PKG_DESCRIPTION
- SH (Secure SHell) is a program for logging into and executing \
+ SSH (Secure SHell) is a program for logging into and executing \
commands on a remote machine. SSH is intended to replace rlogin and \
rsh, and to provide secure encrypted communications between two \
untrusted hosts over an insecure network.
diff --git a/pkgs/openssl/openssl.nm b/pkgs/openssl/openssl.nm
index 3f2a2fe..494df30 100644
--- a/pkgs/openssl/openssl.nm
+++ b/pkgs/openssl/openssl.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = openssl
PKG_VER = 1.0.0d
-PKG_REL = 1
+PKG_REL = 2
PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org>
PKG_GROUP = System/Libraries
@@ -88,9 +88,6 @@ define STAGE_BUILD
no-idea \
no-mdc2 \
no-rc5 \
- no-ec \
- no-ecdh \
- no-ecdsa \
-DSSL_FORBID_ENULL
# Build.
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core48, updated. a4ff48c0ccd63b25e4388297849e75506308efbe
by git＠ipfire.org 18 Mar '11
by git＠ipfire.org 18 Mar '11
18 Mar '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, core48 has been updated
via a4ff48c0ccd63b25e4388297849e75506308efbe (commit)
via 25224e2adcaaa2044e4ddab2a163050d56ee13de (commit)
from a83dfff09456a0faed80cca999e87ca2981f9849 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a4ff48c0ccd63b25e4388297849e75506308efbe
Merge: a83dfff 25224e2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 18 20:03:30 2011 +0100
Merge branch 'master' into core48
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/48/filelists/perl-modules | 83 ++++++++++++++++++++--
1 files changed, 75 insertions(+), 8 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/48/filelists/perl-modules b/config/rootfiles/core/48/filelists/perl-modules
index d2fd65f..1d14c69 100644
--- a/config/rootfiles/core/48/filelists/perl-modules
+++ b/config/rootfiles/core/48/filelists/perl-modules
@@ -238,13 +238,81 @@ usr/lib/perl5/site_perl/5.12.3/Net/Server/Single.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Net/SSLeay.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Net/SSLeay/Handle.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/SSLeay.so
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Image.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Polygon.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Polyline.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Simple.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/GD/GD.so
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/qd.pl
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/autosplit.ix
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/debug_read.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https2.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx2.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/dump_peer_certificate.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/http_cat.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/https_cat.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/httpx_cat.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/make_form.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/make_headers.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/new_x_ctx.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/open_proxy_tcp_connection.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/open_tcp_connection.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx3.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx4.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/randomize.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_cert_and_key.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_proxy.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_server_cert_and_key.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_CRLF.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_all.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_until.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_write_CRLF.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_write_all.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/sslcat.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_CRLF.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_all.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_until.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_write_CRLF.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_write_all.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcpcat.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcpxcat.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_X509_lookup.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_nothing.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_read.al
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_write.al
usr/lib/perl5/site_perl/5.12.3/RRDp.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/RRDs.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDs/RRDs.so
@@ -310,4 +378,3 @@ usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Stream.p
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Subs.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Tree.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/XML/Parser/Expat/Expat.so
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/autosplit.ix
hooks/post-receive
--
IPFire 2.x development tree
1
0