aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2002-10-21 12:13:59 +0800
committermarcus <marcus@FreeBSD.org>2002-10-21 12:13:59 +0800
commit504a47b8c1c0a442a3253c957676dd6d1af21f0e (patch)
tree24f39ac32e62620c9c2872618894f7dd172d9e09
parentaf9bbcd2979abd2aae9aee9404c7d41e53857d13 (diff)
downloadfreebsd-ports-gnome-504a47b8c1c0a442a3253c957676dd6d1af21f0e.tar.gz
freebsd-ports-gnome-504a47b8c1c0a442a3253c957676dd6d1af21f0e.tar.zst
freebsd-ports-gnome-504a47b8c1c0a442a3253c957676dd6d1af21f0e.zip
Fix the plist in the case where esound support is built without libpanel
support. Reported by: kdulzo@sockpuppet.org
-rw-r--r--net-im/gaim/Makefile2
-rw-r--r--net-im/gaim/pkg-plist22
-rw-r--r--net/gaim-snapshot/Makefile2
-rw-r--r--net/gaim-snapshot/pkg-plist22
-rw-r--r--net/gaim/Makefile2
-rw-r--r--net/gaim/pkg-plist22
6 files changed, 39 insertions, 33 deletions
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index bc4debe3ecb6..9a858edde58a 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -43,8 +43,10 @@ USE_GNOME+= libpanel
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
CONFIGURE_ARGS+= --enable-panel
PKGNAMESUFFIX= -gnome
+PLIST_SUB+= PANEL:="" NOPANEL:="@comment "
.else
CONFIGURE_ARGS+= --disable-gnome
+PLIST_SUB+= PANEL:="@comment " NOPANEL:=""
.endif
.if ${HAVE_GNOME:Mesound}!=""
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 192b1cdbff06..e7318029b5e6 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -1,6 +1,6 @@
bin/gaim
-%%GNOME:%%bin/gaim_applet
-%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba
+%%PANEL:%%bin/gaim_applet
+%%PANEL:%%etc/CORBA/servers/gaim_applet.gnorba
lib/gaim/autorecon.so
lib/gaim/chatlist.so
lib/gaim/iconaway.so
@@ -14,14 +14,14 @@ lib/gaim/libyahoo.so
lib/gaim/libzephyr.so
lib/gaim/notify.so
lib/gaim/spellchk.so
-%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop
-%%GNOME:%%share/gnome/apps/Internet/gaim.desktop
+%%PANEL:%%share/gnome/applets/Network/gaim_applet.desktop
+%%PANEL:%%share/gnome/apps/Internet/gaim.desktop
share/gnome/pixmaps/gaim.png
-%%GNOME:%%share/gnome/pixmaps/gaim/away.png
-%%GNOME:%%share/gnome/pixmaps/gaim/connect.png
-%%GNOME:%%share/gnome/pixmaps/gaim/msgpend.png
-%%GNOME:%%share/gnome/pixmaps/gaim/offline.png
-%%GNOME:%%share/gnome/pixmaps/gaim/online.png
+%%PANEL:%%share/gnome/pixmaps/gaim/away.png
+%%PANEL:%%share/gnome/pixmaps/gaim/connect.png
+%%PANEL:%%share/gnome/pixmaps/gaim/msgpend.png
+%%PANEL:%%share/gnome/pixmaps/gaim/offline.png
+%%PANEL:%%share/gnome/pixmaps/gaim/online.png
share/locale/bg/LC_MESSAGES/gaim.mo
share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/LC_MESSAGES/gaim.mo
@@ -40,6 +40,6 @@ share/locale/sk/LC_MESSAGES/gaim.mo
share/locale/sv/LC_MESSAGES/gaim.mo
share/locale/zh_CN/LC_MESSAGES/gaim.mo
share/locale/zh_TW/LC_MESSAGES/gaim.mo
-%%GNOME:%%@dirrm share/gnome/pixmaps/gaim
-%%NOGNOME:%%@dirrm share/gnome/pixmaps
+%%PANEL:%%@dirrm share/gnome/pixmaps/gaim
+%%NOPANEL:%%@dirrm share/gnome/pixmaps
@dirrm lib/gaim
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index bc4debe3ecb6..9a858edde58a 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -43,8 +43,10 @@ USE_GNOME+= libpanel
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
CONFIGURE_ARGS+= --enable-panel
PKGNAMESUFFIX= -gnome
+PLIST_SUB+= PANEL:="" NOPANEL:="@comment "
.else
CONFIGURE_ARGS+= --disable-gnome
+PLIST_SUB+= PANEL:="@comment " NOPANEL:=""
.endif
.if ${HAVE_GNOME:Mesound}!=""
diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist
index 192b1cdbff06..e7318029b5e6 100644
--- a/net/gaim-snapshot/pkg-plist
+++ b/net/gaim-snapshot/pkg-plist
@@ -1,6 +1,6 @@
bin/gaim
-%%GNOME:%%bin/gaim_applet
-%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba
+%%PANEL:%%bin/gaim_applet
+%%PANEL:%%etc/CORBA/servers/gaim_applet.gnorba
lib/gaim/autorecon.so
lib/gaim/chatlist.so
lib/gaim/iconaway.so
@@ -14,14 +14,14 @@ lib/gaim/libyahoo.so
lib/gaim/libzephyr.so
lib/gaim/notify.so
lib/gaim/spellchk.so
-%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop
-%%GNOME:%%share/gnome/apps/Internet/gaim.desktop
+%%PANEL:%%share/gnome/applets/Network/gaim_applet.desktop
+%%PANEL:%%share/gnome/apps/Internet/gaim.desktop
share/gnome/pixmaps/gaim.png
-%%GNOME:%%share/gnome/pixmaps/gaim/away.png
-%%GNOME:%%share/gnome/pixmaps/gaim/connect.png
-%%GNOME:%%share/gnome/pixmaps/gaim/msgpend.png
-%%GNOME:%%share/gnome/pixmaps/gaim/offline.png
-%%GNOME:%%share/gnome/pixmaps/gaim/online.png
+%%PANEL:%%share/gnome/pixmaps/gaim/away.png
+%%PANEL:%%share/gnome/pixmaps/gaim/connect.png
+%%PANEL:%%share/gnome/pixmaps/gaim/msgpend.png
+%%PANEL:%%share/gnome/pixmaps/gaim/offline.png
+%%PANEL:%%share/gnome/pixmaps/gaim/online.png
share/locale/bg/LC_MESSAGES/gaim.mo
share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/LC_MESSAGES/gaim.mo
@@ -40,6 +40,6 @@ share/locale/sk/LC_MESSAGES/gaim.mo
share/locale/sv/LC_MESSAGES/gaim.mo
share/locale/zh_CN/LC_MESSAGES/gaim.mo
share/locale/zh_TW/LC_MESSAGES/gaim.mo
-%%GNOME:%%@dirrm share/gnome/pixmaps/gaim
-%%NOGNOME:%%@dirrm share/gnome/pixmaps
+%%PANEL:%%@dirrm share/gnome/pixmaps/gaim
+%%NOPANEL:%%@dirrm share/gnome/pixmaps
@dirrm lib/gaim
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index bc4debe3ecb6..9a858edde58a 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -43,8 +43,10 @@ USE_GNOME+= libpanel
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
CONFIGURE_ARGS+= --enable-panel
PKGNAMESUFFIX= -gnome
+PLIST_SUB+= PANEL:="" NOPANEL:="@comment "
.else
CONFIGURE_ARGS+= --disable-gnome
+PLIST_SUB+= PANEL:="@comment " NOPANEL:=""
.endif
.if ${HAVE_GNOME:Mesound}!=""
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index 192b1cdbff06..e7318029b5e6 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -1,6 +1,6 @@
bin/gaim
-%%GNOME:%%bin/gaim_applet
-%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba
+%%PANEL:%%bin/gaim_applet
+%%PANEL:%%etc/CORBA/servers/gaim_applet.gnorba
lib/gaim/autorecon.so
lib/gaim/chatlist.so
lib/gaim/iconaway.so
@@ -14,14 +14,14 @@ lib/gaim/libyahoo.so
lib/gaim/libzephyr.so
lib/gaim/notify.so
lib/gaim/spellchk.so
-%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop
-%%GNOME:%%share/gnome/apps/Internet/gaim.desktop
+%%PANEL:%%share/gnome/applets/Network/gaim_applet.desktop
+%%PANEL:%%share/gnome/apps/Internet/gaim.desktop
share/gnome/pixmaps/gaim.png
-%%GNOME:%%share/gnome/pixmaps/gaim/away.png
-%%GNOME:%%share/gnome/pixmaps/gaim/connect.png
-%%GNOME:%%share/gnome/pixmaps/gaim/msgpend.png
-%%GNOME:%%share/gnome/pixmaps/gaim/offline.png
-%%GNOME:%%share/gnome/pixmaps/gaim/online.png
+%%PANEL:%%share/gnome/pixmaps/gaim/away.png
+%%PANEL:%%share/gnome/pixmaps/gaim/connect.png
+%%PANEL:%%share/gnome/pixmaps/gaim/msgpend.png
+%%PANEL:%%share/gnome/pixmaps/gaim/offline.png
+%%PANEL:%%share/gnome/pixmaps/gaim/online.png
share/locale/bg/LC_MESSAGES/gaim.mo
share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/LC_MESSAGES/gaim.mo
@@ -40,6 +40,6 @@ share/locale/sk/LC_MESSAGES/gaim.mo
share/locale/sv/LC_MESSAGES/gaim.mo
share/locale/zh_CN/LC_MESSAGES/gaim.mo
share/locale/zh_TW/LC_MESSAGES/gaim.mo
-%%GNOME:%%@dirrm share/gnome/pixmaps/gaim
-%%NOGNOME:%%@dirrm share/gnome/pixmaps
+%%PANEL:%%@dirrm share/gnome/pixmaps/gaim
+%%NOPANEL:%%@dirrm share/gnome/pixmaps
@dirrm lib/gaim