4 files changed, 11 insertions, 15 deletions

diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 9ca144965b07..47237fd1570c 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ggv2
-PORTVERSION=	1.99.8
+PORTVERSION=	1.99.9
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
@@ -22,21 +22,16 @@ RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/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|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo
index ca9aa4727731..c84d1d458491 100644
--- a/print/ggv2/distinfo
+++ b/print/ggv2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ggv-1.99.8.tar.bz2) = 2b7ea6e255a24e9af335ea8f364174e6
+MD5 (gnome2/ggv-1.99.9.tar.bz2) = 81ee6c46c41a646bc1984fdd72683758
diff --git a/print/ggv2/files/patch-configure b/print/ggv2/files/patch-configure
index 113117d728ef..663ad3ec4027 100644
--- a/print/ggv2/files/patch-configure
+++ b/print/ggv2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Jul  7 18:20:21 2002
-+++ configure	Sun Jul  7 18:20:31 2002
-@@ -12015,12 +12015,12 @@
+--- configure.orig	Mon Jul 29 16:36:08 2002
++++ configure	Mon Jul 29 21:22:15 2002
+@@ -11833,12 +11833,12 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    CATOBJEXT=.gmo
@@ -10,7 +10,7 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  CATOBJEXT=.mo
--	         DATADIRNAME=share
+-	         DATADIRNAME=lib
 +	         DATADIRNAME=share/gnome
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist
index 42767a7790bc..7d6dbab78c53 100644
--- a/print/ggv2/pkg-plist
+++ b/print/ggv2/pkg-plist
@@ -1,5 +1,4 @@
 bin/ggv
-bin/ggv-postscript-viewer
 etc/gconf/gconf.xml.defaults/apps/ggv/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/ggv/control/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/ggv/coordinates/%gconf.xml
@@ -14,6 +13,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/ggv/layout/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/ggv/printing/%gconf.xml
 etc/gconf/schemas/ggv.schemas
 libdata/bonobo/servers/GNOME_GGV.server
+libexec/ggv-postscript-viewer
 share/gnome/applications/ggv.desktop
 share/gnome/gnome-2.0/ui/ggv-control-ui.xml
 share/gnome/gnome-2.0/ui/ggv-postscript-view-ui.xml
@@ -25,6 +25,7 @@ share/gnome/help/ggv/C/topic.dat
 share/gnome/idl/Ggv.idl
 share/gnome/omf/ggv/ggv-C.omf
 share/gnome/pixmaps/ggv/clearall.xpm
+share/gnome/pixmaps/ggv/fitwidth.png
 share/gnome/pixmaps/ggv/ggv-splash.png
 share/gnome/pixmaps/ggv/toggleall.xpm
 share/gnome/pixmaps/ggv/toggleeven.xpm