diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-21 04:13:59 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-21 04:13:59 +0000 |
| commit | 76781ee4ad25b49749f5dd2a1c2046267d11d7f4 (patch) | |
| tree | 9116ab6d0f112f244f51a35c551d3f07f6391405 /net | |
| parent | Stop abusing IPPORT_USERRESERVED. This fixes builds on 5.0. (diff) | |
Fix the plist in the case where esound support is built without libpanel
support.
Reported by: kdulzo@sockpuppet.org
Notes
Notes:
svn path=/head/; revision=68471
Diffstat (limited to 'net')
| -rw-r--r-- | net/gaim-snapshot/Makefile | 2 | ||||
| -rw-r--r-- | net/gaim-snapshot/pkg-plist | 22 | ||||
| -rw-r--r-- | net/gaim/Makefile | 2 | ||||
| -rw-r--r-- | net/gaim/pkg-plist | 22 |
4 files changed, 26 insertions, 22 deletions
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 |