diff options
| -rw-r--r-- | devel/gnome2-hacker-tools/Makefile | 2 | ||||
| -rw-r--r-- | devel/gnome2-hacker-tools/pkg-plist | 1 | ||||
| -rw-r--r-- | editors/gnome2-office/Makefile | 2 | ||||
| -rw-r--r-- | editors/gnome2-office/pkg-plist | 1 | ||||
| -rw-r--r-- | x11/gnome2-fifth-toe/Makefile | 2 | ||||
| -rw-r--r-- | x11/gnome2-fifth-toe/pkg-plist | 1 | ||||
| -rw-r--r-- | x11/gnome2-lite/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnome2-lite/pkg-install | 17 | ||||
| -rw-r--r-- | x11/gnome2-lite/pkg-plist | 1 | ||||
| -rw-r--r-- | x11/gnome2-power-tools/Makefile | 2 | ||||
| -rw-r--r-- | x11/gnome2-power-tools/pkg-plist | 1 |
11 files changed, 11 insertions, 22 deletions
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index 502d0bf4e..7e9e147f9 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -24,4 +24,6 @@ RUN_DEPENDS= mlv:${PORTSDIR}/editors/mlview \ MASTERDIR= ${.CURDIR}/../../x11/gnome2 GNOME_SLAVE= yes +DESCR= ${.CURDIR}/pkg-descr + .include "${MASTERDIR}/Makefile" diff --git a/devel/gnome2-hacker-tools/pkg-plist b/devel/gnome2-hacker-tools/pkg-plist deleted file mode 100644 index 549a621fe..000000000 --- a/devel/gnome2-hacker-tools/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile index 3ff78b5ea..34db1a46b 100644 --- a/editors/gnome2-office/Makefile +++ b/editors/gnome2-office/Makefile @@ -20,4 +20,6 @@ RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric \ MASTERDIR= ${.CURDIR}/../../x11/gnome2 GNOME_SLAVE= yes +DESCR= ${.CURDIR}/pkg-descr + .include "${MASTERDIR}/Makefile" diff --git a/editors/gnome2-office/pkg-plist b/editors/gnome2-office/pkg-plist deleted file mode 100644 index 549a621fe..000000000 --- a/editors/gnome2-office/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index c0b3fb278..2700505a1 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -37,4 +37,6 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ MASTERDIR= ${.CURDIR}/../gnome2 GNOME_SLAVE= yes +DESCR= ${.CURDIR}/pkg-descr + .include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-fifth-toe/pkg-plist b/x11/gnome2-fifth-toe/pkg-plist deleted file mode 100644 index 549a621fe..000000000 --- a/x11/gnome2-fifth-toe/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index e010dc505..0da6652d6 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -36,4 +36,7 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 MASTERDIR= ${.CURDIR}/../gnome2 CONFLICTS= gnome2-[0-9]* +DESCR= ${.CURDIR}/pkg-descr +PKGMESSAGE= ${.CURDIR}/pkg-message + .include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install deleted file mode 100644 index 3040e98bd..000000000 --- a/x11/gnome2-lite/pkg-install +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH} -export PATH - -if [ "$2" = "PRE-INSTALL" ]; then - GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames gnomeaudio" - for package in ${GNOME_ONE_DESKTOP}; do - if pkg_info | grep "^${package}-[0-9]" >/dev/null 2>&1; then - echo "${package} was detected on the system. This package is part of the GNOME 1.x" - echo "desktop, and cannot coexist with the GNOME 2 desktop." - echo "" - echo "Please deinstall the GNOME 1.x desktop before installing this package." - false - fi - done -fi diff --git a/x11/gnome2-lite/pkg-plist b/x11/gnome2-lite/pkg-plist deleted file mode 100644 index 549a621fe..000000000 --- a/x11/gnome2-lite/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index bb5508fef..bfbdc7724 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -27,5 +27,7 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PO MASTERDIR= ${.CURDIR}/../gnome2 GNOME_SLAVE= yes +DESCR= ${.CURDIR}/pkg-descr + .include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-power-tools/pkg-plist b/x11/gnome2-power-tools/pkg-plist deleted file mode 100644 index 549a621fe..000000000 --- a/x11/gnome2-power-tools/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty |