- Update to 0.2.4

- Unbreak

PR:		ports/83533
Submitted by:	Gunter Wambaugh <gunter@six-two.net>
Approved by:	maintainer timeout (14 days)

3 files changed, 41 insertions, 24 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 9c7188eb67c1..e76ff3c07d5c 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -6,23 +6,19 @@
 #
 
 PORTNAME=	Terminal
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.2.4
 CATEGORIES=	x11
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 
 MAINTAINER=	matt@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_GMAKE=	yes
+USE_GNOME=	glib20 vte intlhack
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
@@ -30,12 +26,7 @@ MAN1=		Terminal.1
 
 post-patch:
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|	doc[	]*||' ${WRKSRC}/Makefile.in
-.else
-	@${REINPLACE_CMD} -e 's|$$(datadir)/doc/Terminal|${DOCSDIR}|g' \
-		${WRKSRC}/doc/C/images/Makefile.in \
-		${WRKSRC}/doc/C/Makefile.in \
-		${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|	doc[    ]*||' ${WRKSRC}/Makefile.in
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index f3fdfb2f11e6..8a9a85ab753e 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -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 --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index 0011143bd438..261b0336fba7 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -1,13 +1,33 @@
 bin/Terminal
 bin/terminal
 libexec/TerminalHelp
-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
+share/Terminal/apps/balsa.desktop
+share/Terminal/apps/epiphany.desktop
+share/Terminal/apps/evolution.desktop
+share/Terminal/apps/firefox.desktop
+share/Terminal/apps/galeon.desktop
+share/Terminal/apps/kmail.desktop
+share/Terminal/apps/konqueror.desktop
+share/Terminal/apps/lynx.desktop
+share/Terminal/apps/mozilla-browser.desktop
+share/Terminal/apps/mozilla-mailer.desktop
+share/Terminal/apps/mutt.desktop
+share/Terminal/apps/opera-browser.desktop
+share/Terminal/apps/opera-mailer.desktop
+share/Terminal/apps/sensible-browser.desktop
+share/Terminal/apps/thunderbird.desktop
+share/applications/Terminal.desktop
+%%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,22 @@ share/pixmaps/terminal.xpm
 %%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
+share/icons/hicolor/48x48/apps/Terminal.png
+share/icons/hicolor/scalable/apps/Terminal.svg
+share/pixmaps/terminal.xpm
+@unexec rmdir %D/share/icons/hicolor/scalable 2> /dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48 2> /dev/null || true
+@unexec rmdir %D/share/icons/hicolor 2> /dev/null || true
+@unexec rmdir %D/icons 2> /dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/C
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrm share/Terminal/apps
 @dirrm share/Terminal