4 files changed, 132 insertions, 15 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 6df009dd0bbd..4c95e70110d2 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -3,30 +3,56 @@
 # Whom:			Matt Lancereau <ports@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/Terminal/Makefile,v 1.2 2006/10/08 00:20:31 mezz Exp $
 #
 
 PORTNAME=	Terminal
-PORTVERSION=	0.2.4
-PORTREVISION=	3
-CATEGORIES=	x11
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+PORTVERSION=	0.2.6
+PORTREVISION=	0
+CATEGORIES=	x11 xfce
+MASTER_SITES=	${MASTER_SITES_XFCE}
+DIST_SUBDIR=	xfce4
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Terminal emulator for the X windowing system
 
-LIB_DEPENDS=	exo-0.3:${PORTSDIR}/x11/libexo \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS= yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 vte intlhack
+USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig vte
+USE_XFCE=	configenv libexo libutil panel
+USE_XLIB=	yes
+
+OPTIONS=	DBUS	"Enable D-BUS support"			on \
+		STARTUP "Enable startup notification support"	on
 
 MAN1=		Terminal.1
 
+.include  <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=--enable-dbus
+PLIST_SUB+=	WITH_DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus
+PLIST_SUB+=	WITH_DBUS="@comment "
+.endif
+
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
+.else
+CONFIGURE_ARGS+=--disable-startup-notification
+.endif
+
 post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|	doc[    ]*||' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index 61ba83082352..025c6591911b 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (Terminal-0.2.4.tar.gz) = 954727a2f5e54bd9ffcc3c69918efdef
-SHA256 (Terminal-0.2.4.tar.gz) = 221b1e028917487cfd8e4c3668893a436a12216a15e231292271477ee3b9cfd8
-SIZE (Terminal-0.2.4.tar.gz) = 1248992
+MD5 (xfce4/Terminal-0.2.6.tar.bz2) = ed091c02e002e2402e3203a2ab2f7c9a
+SHA256 (xfce4/Terminal-0.2.6.tar.bz2) = a1dcb1a86e79780acb1f3548466eba1fb03a9d9e9bd31e6ff3496b07504e53d8
+SIZE (xfce4/Terminal-0.2.6.tar.bz2) = 1582076
diff --git a/x11/Terminal/pkg-descr b/x11/Terminal/pkg-descr
index bb98ac08d0c3..4a02064836df 100644
--- a/x11/Terminal/pkg-descr
+++ b/x11/Terminal/pkg-descr
@@ -1,4 +1,4 @@
 This is the Terminal emulator application. Terminal is a lightweight and
 easy to use terminal emulator for the X windowing system.
 
-WWW: http://www.os-cillation.com
+WWW: http://www.os-cillation.com/
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index c1e1fb3e156c..df3599687e8e 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -6,6 +6,8 @@ share/Terminal/Terminal.ui
 share/Terminal/apps/balsa.desktop
 share/Terminal/apps/epiphany.desktop
 share/Terminal/apps/evolution.desktop
+share/Terminal/apps/exo-open-browser.desktop
+share/Terminal/apps/exo-open-mailer.desktop
 share/Terminal/apps/firefox.desktop
 share/Terminal/apps/galeon.desktop
 share/Terminal/apps/kmail.desktop
@@ -17,6 +19,7 @@ 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/sylpheed-claws.desktop
 share/Terminal/apps/thunderbird.desktop
 share/applications/Terminal.desktop
 %%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
@@ -43,18 +46,106 @@ share/applications/Terminal.desktop
 %%PORTDOCS%%%%DOCSDIR%%/C/preferred-applications.html
 %%PORTDOCS%%%%DOCSDIR%%/C/support.html
 %%PORTDOCS%%%%DOCSDIR%%/C/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-applications-dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-applications-menu.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-choose-custom-webbrowser.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-compose-shortcut.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-edit-applications.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-edit-preferences.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-first-time.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-multiple-tabs.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-advanced.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-appearance.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-colors.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-set-title.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-general.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-shortcuts.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-toolbars.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/preferred-applications.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/terminal.css
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-closetab.png
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-closewindow.png
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-newtab.png
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-newwindow.png
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-reportbug.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-closetab.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-closewindow.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-fullscreen.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-newtab.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-newwindow.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-reportbug.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-showborders.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-showmenu.png
 share/icons/hicolor/48x48/apps/Terminal.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-advanced.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-appearance.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-colors.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-general.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-mailreader.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-shortcuts.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-webbrowser.png
 share/icons/hicolor/scalable/apps/Terminal.svg
+share/locale/be/LC_MESSAGES/Terminal.mo
+share/locale/de/LC_MESSAGES/Terminal.mo
+share/locale/dz/LC_MESSAGES/Terminal.mo
+share/locale/en_GB/LC_MESSAGES/Terminal.mo
+share/locale/eo/LC_MESSAGES/Terminal.mo
+share/locale/es/LC_MESSAGES/Terminal.mo
+share/locale/eu/LC_MESSAGES/Terminal.mo
+share/locale/fr/LC_MESSAGES/Terminal.mo
+share/locale/he/LC_MESSAGES/Terminal.mo
+share/locale/hu/LC_MESSAGES/Terminal.mo
+share/locale/it/LC_MESSAGES/Terminal.mo
+share/locale/ja/LC_MESSAGES/Terminal.mo
+share/locale/lt/LC_MESSAGES/Terminal.mo
+share/locale/nl/LC_MESSAGES/Terminal.mo
+share/locale/pa/LC_MESSAGES/Terminal.mo
+share/locale/pt_BR/LC_MESSAGES/Terminal.mo
+share/locale/ru/LC_MESSAGES/Terminal.mo
+share/locale/sv/LC_MESSAGES/Terminal.mo
+share/locale/vi/LC_MESSAGES/Terminal.mo
+share/locale/ca/LC_MESSAGES/Terminal.mo
+share/locale/cs/LC_MESSAGES/Terminal.mo
+share/locale/el/LC_MESSAGES/Terminal.mo
+share/locale/fi/LC_MESSAGES/Terminal.mo
+share/locale/gl/LC_MESSAGES/Terminal.mo
+share/locale/ko/LC_MESSAGES/Terminal.mo
+share/locale/pl/LC_MESSAGES/Terminal.mo
+share/locale/sk/LC_MESSAGES/Terminal.mo
+share/locale/uk/LC_MESSAGES/Terminal.mo
+share/locale/zh_CN/LC_MESSAGES/Terminal.mo
+share/locale/zh_TW/LC_MESSAGES/Terminal.mo
 share/pixmaps/terminal.xpm
 @dirrmtry share/pixmaps
 @dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/24x24/stock/navigation
+@dirrmtry share/icons/hicolor/24x24/stock
+@dirrmtry share/icons/hicolor/24x24
 @dirrmtry share/icons/hicolor
 @dirrmtry icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/C
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm share/Terminal/apps
 @dirrm share/Terminal
+@dirrmtry share/icons/hicolor/16x16/stock/navigation
+@dirrmtry share/icons/hicolor/16x16/stock
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/48x48/stock/navigation
+@dirrmtry share/icons/hicolor/48x48/stock
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz