4 files changed, 24 insertions, 49 deletions

diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile
index 7b8f9e4e807e..a024447bae0b 100644
--- a/deskutils/gtweakui/Makefile
+++ b/deskutils/gtweakui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gTweakUI
-PORTVERSION=	0.0.6
+PORTVERSION=	0.4.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtweakui
@@ -19,6 +19,19 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui gconf2 libglade2
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
+DESKTOP_FILES=	gtweakui-galeon.desktop.in \
+				gtweakui-menus.desktop.in \
+				gtweakui-nautilus.desktop.in \
+				gtweakui-session.desktop.in
+
+post-patch:
+.for FILE in ${DESKTOP_FILES}
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/gnome|g' \
+			-e 's|Settings;|&AdvancedSettings;|g' ${WRKSRC}/${FILE}
+.endfor
+	@${REINPLACE_CMD} 's|$$(datadir)/applications|$$(datadir)/control-center-2.0/capplets|g' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/deskutils/gtweakui/distinfo b/deskutils/gtweakui/distinfo
index 513440e44f19..f17ab6bbd79f 100644
--- a/deskutils/gtweakui/distinfo
+++ b/deskutils/gtweakui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gTweakUI-0.0.6.tar.bz2) = 92a0f0eee8a43e0a158329ffa0465411
-SIZE (gnome2/gTweakUI-0.0.6.tar.bz2) = 182120
+MD5 (gnome2/gTweakUI-0.4.0.tar.bz2) = 9d4725ccf4a83da3f46106c3d0be6cc8
+SIZE (gnome2/gTweakUI-0.4.0.tar.bz2) = 223222
diff --git a/deskutils/gtweakui/files/patch-Makefile.in b/deskutils/gtweakui/files/patch-Makefile.in
deleted file mode 100644
index bc4cc74d0ef0..000000000000
--- a/deskutils/gtweakui/files/patch-Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	Thu Jun 17 15:44:56 2004
-+++ Makefile.in	Thu Jun 17 15:45:47 2004
-@@ -39,9 +39,6 @@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
--AUTOCONF = @AUTOCONF@
--AUTOHEADER = @AUTOHEADER@
--AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
-@@ -175,19 +172,9 @@
- 
- .SUFFIXES:
- 
--am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
- 
--$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
--
- $(ACLOCAL_M4):  configure.ac 
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
-@@ -200,10 +187,6 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
--
--$(srcdir)/config.h.in:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOHEADER)
--	touch $(srcdir)/config.h.in
- 
- distclean-hdr:
- 	-rm -f config.h stamp-h1
diff --git a/deskutils/gtweakui/pkg-plist b/deskutils/gtweakui/pkg-plist
index c629d362245d..361b08877e73 100644
--- a/deskutils/gtweakui/pkg-plist
+++ b/deskutils/gtweakui/pkg-plist
@@ -1,6 +1,7 @@
 bin/gtweakui-menus
 bin/gtweakui-session
 bin/gtweakui-nautilus
+bin/gtweakui-galeon
 share/gnome/gTweakUI/g.png
 share/gnome/gTweakUI/menus0.png
 share/gnome/gTweakUI/menus1.png
@@ -9,10 +10,14 @@ share/gnome/gTweakUI/menus3.png
 share/gnome/gTweakUI/menus.glade
 share/gnome/gTweakUI/session.glade
 share/gnome/gTweakUI/nautilus.glade
+share/gnome/gTweakUI/galeon.glade
 share/gnome/gTweakUI/about.glade
 share/gnome/gTweakUI/notice.glade
 share/gnome/gTweakUI/bullet.png
-share/gnome/applications/gtweakui-menus.desktop
-share/gnome/applications/gtweakui-session.desktop
-share/gnome/applications/gtweakui-nautilus.desktop
+share/gnome/control-center-2.0/capplets/gtweakui-menus.desktop
+share/gnome/control-center-2.0/capplets/gtweakui-session.desktop
+share/gnome/control-center-2.0/capplets/gtweakui-nautilus.desktop
+share/gnome/control-center-2.0/capplets/gtweakui-galeon.desktop
 @dirrm share/gnome/gTweakUI
+@dirrm share/gnome/control-center-2.0/capplets
+@dirrm share/gnome/control-center-2.0