ports/84193: [PATCH] x11/Terminal: unbreak and update to 0.2.4

[Mark Daniel Reidel]

>Number:         84193
>Category:       ports
>Synopsis:       [PATCH] x11/Terminal: unbreak and update to 0.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 27 21:20:10 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Mark Daniel Reidel
>Release:        FreeBSD 6.0-BETA1 amd64
>Organization:
>Environment:
System: FreeBSD alu.reidel.info 6.0-BETA1 FreeBSD 6.0-BETA1 #0: Tue Jul 26 23:28:22 UTC 2005
>Description:
- Update to 0.2.4
- Unbreak incorrect pkg-plist
- Make dependency on dbus an option
- Depends on x11/libexo being updated to 0.3.0

Port maintainer (matt at bsdfly.org) is cc'd, but hasn't answered any of my mails
>How-To-Repeat:
>Fix:

--- Terminal-0.2.4.patch begins here ---
diff -ruN --exclude=CVS /var/tmp/portbackup/x11/Terminal/Makefile /usr/ports/x11/Terminal/Makefile
--- /var/tmp/portbackup/x11/Terminal/Makefile	Sat Jul 23 02:53:40 2005
+++ /usr/ports/x11/Terminal/Makefile	Wed Jul 27 21:04:34 2005
@@ -6,28 +6,35 @@
 #
 
 PORTNAME=	Terminal
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.2.4
 CATEGORIES=	x11
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 
 MAINTAINER=	matt at bsdfly.org
 COMMENT=	Terminal emulator for the X windowing system
 
-LIB_DEPENDS=	exo-0.2:${PORTSDIR}/x11/libexo \
+LIB_DEPENDS=	exo-0.3:${PORTSDIR}/x11/libexo \
 		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 vte
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+
+OPTIONS=	DBUS "Utilize the D-BUS framework" on
 
 MAN1=		Terminal.1
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_DBUS)
+CONFIGURE_ARGS+=--disable-dbus
+.else
+LIB_DEPENDS+=	dbus-1.1:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=--enable-dbus
+.endif
+
 post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|	doc[	]*||' ${WRKSRC}/Makefile.in
@@ -38,4 +45,4 @@
 		${WRKSRC}/doc/Makefile.in
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /var/tmp/portbackup/x11/Terminal/distinfo /usr/ports/x11/Terminal/distinfo
--- /var/tmp/portbackup/x11/Terminal/distinfo	Thu Jan 27 18:27:41 2005
+++ /usr/ports/x11/Terminal/distinfo	Wed Jul 27 22:36:00 2005
@@ -1,2 +1,2 @@
-MD5 (Terminal-0.2.2.tar.gz) = 6842b632702fe5edf5222b4f04b3d0fd
-SIZE (Terminal-0.2.2.tar.gz) = 916778
+MD5 (Terminal-0.2.4.tar.gz) = 954727a2f5e54bd9ffcc3c69918efdef
+SIZE (Terminal-0.2.4.tar.gz) = 1248992
diff -ruN --exclude=CVS /var/tmp/portbackup/x11/Terminal/pkg-plist /usr/ports/x11/Terminal/pkg-plist
--- /var/tmp/portbackup/x11/Terminal/pkg-plist	Thu Jan 27 18:27:41 2005
+++ /usr/ports/x11/Terminal/pkg-plist	Wed Jul 27 20:52:07 2005
@@ -1,13 +1,33 @@
 bin/Terminal
 bin/terminal
 libexec/TerminalHelp
+%%DATADIR%%/Terminal-toolbars.ui
+%%DATADIR%%/Terminal.ui
+%%DATADIR%%/apps/balsa.desktop
+%%DATADIR%%/apps/epiphany.desktop
+%%DATADIR%%/apps/evolution.desktop
+%%DATADIR%%/apps/firefox.desktop
+%%DATADIR%%/apps/galeon.desktop
+%%DATADIR%%/apps/kmail.desktop
+%%DATADIR%%/apps/konqueror.desktop
+%%DATADIR%%/apps/lynx.desktop
+%%DATADIR%%/apps/mozilla-browser.desktop
+%%DATADIR%%/apps/mozilla-mailer.desktop
+%%DATADIR%%/apps/mutt.desktop
+%%DATADIR%%/apps/opera-browser.desktop
+%%DATADIR%%/apps/opera-mailer.desktop
+%%DATADIR%%/apps/sensible-browser.desktop
+%%DATADIR%%/apps/thunderbird.desktop
 share/applications/Terminal.desktop
-share/Terminal/Terminal-toolbars.ui
-share/Terminal/Terminal.ui
-share/icons/hicolor/48x48/apps/Terminal.png
-share/icons/hicolor/scalable/apps/Terminal.svg
-share/pixmaps/terminal.xpm
+%%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/C/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/C/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/C/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-applications-dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-applications-menu.png
+%%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-choose-custom-webbrowser.png
 %%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-compose-shortcut.png
+%%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-edit-applications.png
 %%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-edit-preferences.png
 %%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-first-time.png
 %%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-multiple-tabs.png
@@ -18,16 +38,24 @@
 %%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-preferences-shortcuts.png
 %%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-set-title.png
 %%PORTDOCS%%%%DOCSDIR%%/C/images/terminal-toolbars.png
-%%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/C/copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/C/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/C/getting-started.html
 %%PORTDOCS%%%%DOCSDIR%%/C/index.html
 %%PORTDOCS%%%%DOCSDIR%%/C/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/C/preferred-applications.html
 %%PORTDOCS%%%%DOCSDIR%%/C/support.html
 %%PORTDOCS%%%%DOCSDIR%%/C/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/terminal.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm share/Terminal
+share/icons/hicolor/48x48/apps/Terminal.png
+share/icons/hicolor/scalable/apps/Terminal.svg
+share/pixmaps/terminal.xpm
+ at unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
+ at unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
+ at unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+ at unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+ at unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+ at unexec rmdir %D/share/icons 2>/dev/null || true
+ at unexec rmdir %D/share/applications 2>/dev/null || true
+ at dirrm %%DOCSDIR%%/C/images
+ at dirrm %%DOCSDIR%%/C
+ at dirrm %%DOCSDIR%%
+ at dirrm %%DATADIR%%/apps
+ at dirrm %%DATADIR%%
--- Terminal-0.2.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: