Date: Wed, 05 May 2004 20:51:06 +0100 From: Tim Bishop <tim@bishnet.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tim@bishnet.net Subject: ports/66302: [MAINTAINER] mail/gnubiff: Make better use of Gnome features Message-ID: <E1BLSQ6-000ArU-G8@pendennis.ukc.ac.uk> Resent-Message-ID: <200405052000.i45K0TYn090491@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 66302
>Category: ports
>Synopsis: [MAINTAINER] mail/gnubiff: Make better use of Gnome features
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 05 13:00:28 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Tim Bishop
>Release: FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD pendennis.ukc.ac.uk 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #0: Fri Apr 30 17:57:19 BST 2004
>Description:
Make better use of the Gnome features available in the ports. Now installs
with gnome support if gnomepanel is already installed.
Thanks to mezz for suggesting this.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- gnubiff-1.2.0_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /u1/freebsd/cvs/ports/mail/gnubiff/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 4 May 2004 07:56:15 -0000 1.1
+++ Makefile 5 May 2004 19:49:28 -0000
@@ -7,6 +7,7 @@
PORTNAME= gnubiff
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -30,14 +31,21 @@
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=""
-PLIST_SUB+= SHAREDIR="share/gnome"
+PKGNAMESUFFIX= -gnome
+PLIST_SUB+= DATADIR="share/gnome"
+PLIST_SUB+= WITH_GNOME=""
.else
-PLIST_SUB+= WITH_GNUBIFF_GNOME="@comment "
-PLIST_SUB+= SHAREDIR="share"
+PLIST_SUB+= DATADIR="share"
+PLIST_SUB+= WITH_GNOME="@comment "
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /u1/freebsd/cvs/ports/mail/gnubiff/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 4 May 2004 07:56:15 -0000 1.1
+++ pkg-plist 5 May 2004 19:49:28 -0000
@@ -5,56 +5,56 @@
share/locale/ro/LC_MESSAGES/gnubiff.mo
share/locale/es/LC_MESSAGES/gnubiff.mo
share/locale/sv/LC_MESSAGES/gnubiff.mo
-%%SHAREDIR%%/gnubiff/Setup.glade2
-%%SHAREDIR%%/gnubiff/AppletGTK.glade2
-%%SHAREDIR%%/gnubiff/AppletGNOME.glade2
-%%SHAREDIR%%/gnubiff/Popup.glade2
-%%SHAREDIR%%/gnubiff/BiffCredits.png
-%%SHAREDIR%%/gnubiff/BiffFont.png
-%%SHAREDIR%%/gnubiff/BiffGeometry.png
-%%SHAREDIR%%/gnubiff/BiffLayout.png
-%%SHAREDIR%%/gnubiff/BiffMailbox.png
-%%SHAREDIR%%/gnubiff/BiffOptions.png
-%%SHAREDIR%%/gnubiff/entry-list.png
-%%SHAREDIR%%/gnubiff/gnome-mail.png
-%%SHAREDIR%%/gnubiff/gnome-nomail.png
-%%SHAREDIR%%/gnubiff/gnubiff.png
-%%SHAREDIR%%/gnubiff/gnubiff_icon.png
-%%SHAREDIR%%/gnubiff/gtk-mail.png
-%%SHAREDIR%%/gnubiff/gtk-nomail.png
-%%SHAREDIR%%/gnubiff/logo.png
-%%SHAREDIR%%/gnubiff/menu-mode-RGB-alt.png
-%%SHAREDIR%%/gnubiff/menu_about.png
-%%SHAREDIR%%/gnubiff/menu_mail_read.png
-%%SHAREDIR%%/gnubiff/menu_mail_start.png
-%%SHAREDIR%%/gnubiff/stock-adress.png
-%%SHAREDIR%%/gnubiff/stock-alarm.png
-%%SHAREDIR%%/gnubiff/stock-biff.png
-%%SHAREDIR%%/gnubiff/stock-clock.png
-%%SHAREDIR%%/gnubiff/stock-file.png
-%%SHAREDIR%%/gnubiff/stock-mailbox.png
-%%SHAREDIR%%/gnubiff/stock-network.png
-%%SHAREDIR%%/gnubiff/stock-nossl.png
-%%SHAREDIR%%/gnubiff/stock-panel.png
-%%SHAREDIR%%/gnubiff/stock-password.png
-%%SHAREDIR%%/gnubiff/stock-popup.png
-%%SHAREDIR%%/gnubiff/stock-sound.png
-%%SHAREDIR%%/gnubiff/stock-soundfile.png
-%%SHAREDIR%%/gnubiff/stock-ssl-file-small.png
-%%SHAREDIR%%/gnubiff/stock-ssl-file.png
-%%SHAREDIR%%/gnubiff/stock-ssl.png
-%%SHAREDIR%%/gnubiff/stock-timer-stopped.png
-%%SHAREDIR%%/gnubiff/stock-timer.png
-%%SHAREDIR%%/gnubiff/stock-users.png
-%%SHAREDIR%%/gnubiff/stock-volume.png
-%%SHAREDIR%%/gnubiff/stock_left.png
-%%SHAREDIR%%/gnubiff/stock_right.png
-%%SHAREDIR%%/gnubiff/gnome-mail.gif
-%%SHAREDIR%%/gnubiff/gtk-mail.gif
-%%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
-@dirrm %%SHAREDIR%%/gnubiff
-@dirrm %%SHAREDIR%%/sounds/gnubiff
+%%DATADIR%%/gnubiff/Setup.glade2
+%%DATADIR%%/gnubiff/AppletGTK.glade2
+%%DATADIR%%/gnubiff/AppletGNOME.glade2
+%%DATADIR%%/gnubiff/Popup.glade2
+%%DATADIR%%/gnubiff/BiffCredits.png
+%%DATADIR%%/gnubiff/BiffFont.png
+%%DATADIR%%/gnubiff/BiffGeometry.png
+%%DATADIR%%/gnubiff/BiffLayout.png
+%%DATADIR%%/gnubiff/BiffMailbox.png
+%%DATADIR%%/gnubiff/BiffOptions.png
+%%DATADIR%%/gnubiff/entry-list.png
+%%DATADIR%%/gnubiff/gnome-mail.png
+%%DATADIR%%/gnubiff/gnome-nomail.png
+%%DATADIR%%/gnubiff/gnubiff.png
+%%DATADIR%%/gnubiff/gnubiff_icon.png
+%%DATADIR%%/gnubiff/gtk-mail.png
+%%DATADIR%%/gnubiff/gtk-nomail.png
+%%DATADIR%%/gnubiff/logo.png
+%%DATADIR%%/gnubiff/menu-mode-RGB-alt.png
+%%DATADIR%%/gnubiff/menu_about.png
+%%DATADIR%%/gnubiff/menu_mail_read.png
+%%DATADIR%%/gnubiff/menu_mail_start.png
+%%DATADIR%%/gnubiff/stock-adress.png
+%%DATADIR%%/gnubiff/stock-alarm.png
+%%DATADIR%%/gnubiff/stock-biff.png
+%%DATADIR%%/gnubiff/stock-clock.png
+%%DATADIR%%/gnubiff/stock-file.png
+%%DATADIR%%/gnubiff/stock-mailbox.png
+%%DATADIR%%/gnubiff/stock-network.png
+%%DATADIR%%/gnubiff/stock-nossl.png
+%%DATADIR%%/gnubiff/stock-panel.png
+%%DATADIR%%/gnubiff/stock-password.png
+%%DATADIR%%/gnubiff/stock-popup.png
+%%DATADIR%%/gnubiff/stock-sound.png
+%%DATADIR%%/gnubiff/stock-soundfile.png
+%%DATADIR%%/gnubiff/stock-ssl-file-small.png
+%%DATADIR%%/gnubiff/stock-ssl-file.png
+%%DATADIR%%/gnubiff/stock-ssl.png
+%%DATADIR%%/gnubiff/stock-timer-stopped.png
+%%DATADIR%%/gnubiff/stock-timer.png
+%%DATADIR%%/gnubiff/stock-users.png
+%%DATADIR%%/gnubiff/stock-volume.png
+%%DATADIR%%/gnubiff/stock_left.png
+%%DATADIR%%/gnubiff/stock_right.png
+%%DATADIR%%/gnubiff/gnome-mail.gif
+%%DATADIR%%/gnubiff/gtk-mail.gif
+%%DATADIR%%/pixmaps/gnubiff_icon.png
+%%DATADIR%%/sounds/gnubiff/mail.wav
+%%DATADIR%%/sounds/gnubiff/coin.wav
+%%WITH_GNOME%%libdata/bonobo/servers/GNOME_gnubiffApplet.server
+%%WITH_GNOME%%%%DATADIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
+@dirrm %%DATADIR%%/gnubiff
+@dirrm %%DATADIR%%/sounds/gnubiff
--- gnubiff-1.2.0_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BLSQ6-000ArU-G8>