3 files changed, 30 insertions, 40 deletions

diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 9b633df82cf2..77865121c845 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	glade2
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/sources/glade
+MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
 DISTNAME=	glade-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,18 +22,15 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	ues
+USE_GNOME=	gnomeprefix gnomehack
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index 236b46d56191..ab218bec4704 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glade-1.1.0.tar.bz2) = da40a2c2a55e2e25dcc7f893cc896dd4
+MD5 (gnome2/glade-1.1.1.tar.bz2) = ff809f2875ddc30f6ace8e3ccf1b2bd2
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index a96a950811dc..74f2848bdbe3 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -1,33 +1,32 @@
 bin/glade-2
 share/gnome/applications/glade-2.desktop
 share/gnome/glade-2/gtk/autogen.sh
-share/gnome/help/glade-faq/C/glade-faq.xml
-share/gnome/help/glade-faq/C/legal.xml
-share/gnome/help/glade-turbo-start/C/glade-turbo-start.xml
-share/gnome/help/glade-turbo-start/C/legal.xml
-share/gnome/help/glade-user-guide/C/figures/edit-menu.png
-share/gnome/help/glade-user-guide/C/figures/file-menu.png
-share/gnome/help/glade-user-guide/C/figures/grid-options.png
-share/gnome/help/glade-user-guide/C/figures/help-menu.png
-share/gnome/help/glade-user-guide/C/figures/menu.png
-share/gnome/help/glade-user-guide/C/figures/options-c.png
-share/gnome/help/glade-user-guide/C/figures/options-general.png
-share/gnome/help/glade-user-guide/C/figures/options-libglade.png
-share/gnome/help/glade-user-guide/C/figures/settings-menu.png
-share/gnome/help/glade-user-guide/C/figures/snap-options.png
-share/gnome/help/glade-user-guide/C/figures/toolbar.png
-share/gnome/help/glade-user-guide/C/figures/view-menu.png
-share/gnome/help/glade-user-guide/C/figures/window-main.png
-share/gnome/help/glade-user-guide/C/figures/window-palette-add.png
-share/gnome/help/glade-user-guide/C/figures/window-palette-basic.png
-share/gnome/help/glade-user-guide/C/figures/window-palette-gnome.png
-share/gnome/help/glade-user-guide/C/glade-user-guide.xml
-share/gnome/help/glade-user-guide/C/legal.xml
+share/gnome/help/glade-2/C/figures/edit-menu.png
+share/gnome/help/glade-2/C/figures/file-menu.png
+share/gnome/help/glade-2/C/figures/grid-options.png
+share/gnome/help/glade-2/C/figures/help-menu.png
+share/gnome/help/glade-2/C/figures/menu.png
+share/gnome/help/glade-2/C/figures/options-c.png
+share/gnome/help/glade-2/C/figures/options-general.png
+share/gnome/help/glade-2/C/figures/options-libglade.png
+share/gnome/help/glade-2/C/figures/settings-menu.png
+share/gnome/help/glade-2/C/figures/snap-options.png
+share/gnome/help/glade-2/C/figures/toolbar.png
+share/gnome/help/glade-2/C/figures/view-menu.png
+share/gnome/help/glade-2/C/figures/window-main.png
+share/gnome/help/glade-2/C/figures/window-palette-add.png
+share/gnome/help/glade-2/C/figures/window-palette-basic.png
+share/gnome/help/glade-2/C/figures/window-palette-gnome.png
+share/gnome/help/glade-2/C/glade-faq.xml
+share/gnome/help/glade-2/C/glade-turbo-start.xml
+share/gnome/help/glade-2/C/glade-user-guide.xml
+share/gnome/help/glade-2/C/legal.xml
 share/gnome/omf/glade-2/glade-faq-C.omf
 share/gnome/omf/glade-2/glade-turbo-start-C.omf
 share/gnome/omf/glade-2/glade-user-guide-C.omf
 share/gnome/pixmaps/glade-2.png
 share/gnome/pixmaps/glade-2/glade_logo.png
+share/locale/ar/LC_MESSAGES/glade-2.0.mo
 share/locale/az/LC_MESSAGES/glade-2.0.mo
 share/locale/ca/LC_MESSAGES/glade-2.0.mo
 share/locale/cs/LC_MESSAGES/glade-2.0.mo
@@ -59,14 +58,8 @@ share/locale/vi/LC_MESSAGES/glade-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/glade-2.0.mo
 @dirrm share/gnome/pixmaps/glade-2
 @dirrm share/gnome/omf/glade-2
-@dirrm share/gnome/help/glade-user-guide/C/figures
-@dirrm share/gnome/help/glade-user-guide/C
-@dirrm share/gnome/help/glade-user-guide
-@dirrm share/gnome/help/glade-turbo-start/C/figures
-@dirrm share/gnome/help/glade-turbo-start/C
-@dirrm share/gnome/help/glade-turbo-start
-@dirrm share/gnome/help/glade-faq/C/figures
-@dirrm share/gnome/help/glade-faq/C
-@dirrm share/gnome/help/glade-faq
+@dirrm share/gnome/help/glade-2/C/figures
+@dirrm share/gnome/help/glade-2/C
+@dirrm share/gnome/help/glade-2
 @dirrm share/gnome/glade-2/gtk
 @dirrm share/gnome/glade-2