summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/gnubiff/Makefile15
-rw-r--r--mail/gnubiff/pkg-plist4
2 files changed, 13 insertions, 6 deletions
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 37c6610..8f1738f 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -30,14 +30,21 @@ INFO= gnubiff
CONFIGURE_ARGS+= --with-password
.endif
-.if defined(WITH_GNUBIFF_GNOME)
+# This application can dock in the GNOME panel, or it can not.
+# Only install support if gnomepanel is already installed.
+WANT_GNOME= yes
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mgnomepanel}!=""
CONFIGURE_ARGS+= --with-gnome
USE_GNOME+= gnomepanel gconf2 gnomeprefix gnomehack
-PLIST_SUB+= WITH_GNUBIFF_GNOME=""
+PKGNAMESUFFIX= -gnome
PLIST_SUB+= SHAREDIR="share/gnome"
+PLIST_SUB+= WITH_GNOME=""
.else
-PLIST_SUB+= WITH_GNUBIFF_GNOME="@comment "
PLIST_SUB+= SHAREDIR="share"
+PLIST_SUB+= WITH_GNOME="@comment "
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 4e62982..de62e19 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -54,7 +54,7 @@ share/locale/sv/LC_MESSAGES/gnubiff.mo
%%SHAREDIR%%/pixmaps/gnubiff_icon.png
%%SHAREDIR%%/sounds/gnubiff/mail.wav
%%SHAREDIR%%/sounds/gnubiff/coin.wav
-%%WITH_GNUBIFF_GNOME%%libdata/bonobo/servers/GNOME_gnubiffApplet.server
-%%WITH_GNUBIFF_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
+%%WITH_GNOME%%libdata/bonobo/servers/GNOME_gnubiffApplet.server
+%%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
@dirrm %%SHAREDIR%%/gnubiff
@dirrm %%SHAREDIR%%/sounds/gnubiff
OpenPOWER on IntegriCloud