diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-06-28 03:21:05 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-06-28 03:21:05 +0800 |
| commit | 7b1b5a22cce1f5f464f2e425089e6985950831f0 (patch) | |
| tree | 45068515f8c14505da2b3e9257168a03481d4f7c /x11 | |
| parent | 9cb5055ec734a8cfa64860f0811c17a08938385d (diff) | |
| download | marcuscom-ports-7b1b5a22cce1f5f464f2e425089e6985950831f0.tar marcuscom-ports-7b1b5a22cce1f5f464f2e425089e6985950831f0.tar.gz marcuscom-ports-7b1b5a22cce1f5f464f2e425089e6985950831f0.tar.bz2 marcuscom-ports-7b1b5a22cce1f5f464f2e425089e6985950831f0.tar.lz marcuscom-ports-7b1b5a22cce1f5f464f2e425089e6985950831f0.tar.xz marcuscom-ports-7b1b5a22cce1f5f464f2e425089e6985950831f0.tar.zst marcuscom-ports-7b1b5a22cce1f5f464f2e425089e6985950831f0.zip | |
Correct pkg-descr path and remove unneeded plist files.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4130 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -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 |
7 files changed, 7 insertions, 20 deletions
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 |