14 files changed, 92 insertions, 198 deletions

diff --git a/print/Makefile b/print/Makefile
index 7a8d9c26eabf..e5a1642000fe 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -57,6 +57,7 @@
     SUBDIR += ft2demos
     SUBDIR += gfontview
     SUBDIR += ggv
+    SUBDIR += ggv2
     SUBDIR += ghostscript-afpl
     SUBDIR += ghostscript-afpl-nox11
     SUBDIR += ghostscript-gnu
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index f21f6b258e2c..d21b167fa69a 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,35 +1,42 @@
-# New ports collection makefile for:	ggv
-# Date created:				21 August 1998
-# Whom:					Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for:	ggv2
+# Date created:				07 July 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	ggv
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTNAME=	ggv2
+PORTVERSION=	1.99.8
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/ggv
+MASTER_SITE_SUBDIR=	2.0.0/latest/sources
+DISTNAME=	ggv-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-bonobo
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+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:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@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 dd05cf5d3b45..ca9aa4727731 100644
--- a/print/ggv2/distinfo
+++ b/print/ggv2/distinfo
@@ -1 +1 @@
-MD5 (ggv-1.0.2.tar.gz) = e0ee798f23a87493d2184cf9409be87d
+MD5 (gnome2/ggv-1.99.8.tar.bz2) = 2b7ea6e255a24e9af335ea8f364174e6
diff --git a/print/ggv2/files/patch-aa b/print/ggv2/files/patch-aa
deleted file mode 100644
index 984e279f6233..000000000000
--- a/print/ggv2/files/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- configure	2001/11/12 12:25:30	1.1
-+++ configure	2001/11/12 12:25:34
-@@ -10454,15 +10454,15 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--	USE_INCLUDED_LIBINTL=yes
-+#	USE_INCLUDED_LIBINTL=yes
-         CATOBJEXT=.gmo
-         INSTOBJEXT=.mo
-         DATADIRNAME=share
--	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+	INTLDEPS='-lintl'
- 	INTLLIBS=$INTLDEPS
- 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
--        nls_cv_header_intl=intl/libintl.h
--        nls_cv_header_libgt=intl/libgettext.h
-+#        nls_cv_header_intl=intl/libintl.h
-+#        nls_cv_header_libgt=intl/libgettext.h
-       fi
- 
-             if test "$XGETTEXT" != ":"; then
diff --git a/print/ggv2/files/patch-ad b/print/ggv2/files/patch-ad
deleted file mode 100644
index d346879b7abe..000000000000
--- a/print/ggv2/files/patch-ad
+++ /dev/null
@@ -1,6 +0,0 @@
---- src/ps.h.orig	Tue Feb 13 12:21:25 2001
-+++ src/ps.h	Tue Feb 27 18:50:19 2001
-@@ -45,2 +45,3 @@
- 
-+#undef NONE
- enum { ATEND = -1, NONE = 0, PORTRAIT, LANDSCAPE, ASCEND, DESCEND, SPECIAL };
diff --git a/print/ggv2/files/patch-ae b/print/ggv2/files/patch-ae
deleted file mode 100644
index 6a062e098c79..000000000000
--- a/print/ggv2/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Tue Feb 17 00:59:01 1998
-+++ po/Makefile.in.in	Tue May 16 12:57:23 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/print/ggv2/files/patch-af b/print/ggv2/files/patch-af
deleted file mode 100644
index 6f2b5511f022..000000000000
--- a/print/ggv2/files/patch-af
+++ /dev/null
@@ -1,6 +0,0 @@
---- app-docs.make.orig	Tue Mar 27 14:36:27 2001
-+++ app-docs.make	Tue Apr 17 19:42:48 2001
-@@ -1,2 +1,2 @@
--helpdir = $(datadir)/gnome/help/$(app)/$(lang)
-+helpdir = $(datadir)/help/$(app)/$(lang)
- help_DATA = \
diff --git a/print/ggv2/files/patch-configure b/print/ggv2/files/patch-configure
new file mode 100644
index 000000000000..113117d728ef
--- /dev/null
+++ b/print/ggv2/files/patch-configure
@@ -0,0 +1,17 @@
+--- configure.orig	Sun Jul  7 18:20:21 2002
++++ configure	Sun Jul  7 18:20:31 2002
+@@ -12015,12 +12015,12 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   CATOBJEXT=.gmo
+-	         DATADIRNAME=share
++	         DATADIRNAME=share/gnome
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
+-	         DATADIRNAME=share
++	         DATADIRNAME=share/gnome
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	      INSTOBJEXT=.mo
diff --git a/print/ggv2/files/patch-ltmain.sh b/print/ggv2/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/print/ggv2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/print/ggv2/files/patch-src::Makefile.in b/print/ggv2/files/patch-src::Makefile.in
deleted file mode 100644
index 5789553a8881..000000000000
--- a/print/ggv2/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in	2001/11/12 12:29:36	1.1
-+++ src/Makefile.in	2001/11/12 12:31:39
-@@ -139,7 +139,7 @@
- 
- SUBDIRS = stock
- 
--INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
-+INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	$(EXTRA_GNOME_CFLAGS)
- 
- 
- @BONOBO_TRUE@bonobo_components = bonobo-application-ps
diff --git a/print/ggv2/files/patch-src::gtkgs.c b/print/ggv2/files/patch-src::gtkgs.c
deleted file mode 100644
index 85407be0e274..000000000000
--- a/print/ggv2/files/patch-src::gtkgs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkgs.c.orig	Tue Oct 23 23:37:33 2001
-+++ src/gtkgs.c	Sat Feb  2 19:14:29 2002
-@@ -1273,7 +1273,7 @@
- 		fname = ggv_quote_filename (filename);
- 		filename_dsc = tempnam (g_get_tmp_dir(), "dsc");
- 		filename_err = tempnam (g_get_tmp_dir(), "err");
--		cmd = g_strdup_printf (gs_scan_pdf_cmd, "\"", fname ,"\"", "\", filename_dsc");
-+		cmd = g_strdup_printf (gs_scan_pdf_cmd, fname, filename_dsc);
- 		g_free (fname);
- 		/* this command (sometimes?) prints error messages to stdout! */
- 		cmdline = g_strdup_printf ("%s >%s 2>&1", cmd, filename_err);
diff --git a/print/ggv2/pkg-comment b/print/ggv2/pkg-comment
index 4104aa4014ae..3ba11e5d0bbd 100644
--- a/print/ggv2/pkg-comment
+++ b/print/ggv2/pkg-comment
@@ -1 +1 @@
-GNOME ghostscript viewer
+GNOME 2.0 ghostscript viewer
diff --git a/print/ggv2/pkg-descr b/print/ggv2/pkg-descr
index 4104aa4014ae..3ba11e5d0bbd 100644
--- a/print/ggv2/pkg-descr
+++ b/print/ggv2/pkg-descr
@@ -1 +1 @@
-GNOME ghostscript viewer
+GNOME 2.0 ghostscript viewer
diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist
index 8a703da50da8..42767a7790bc 100644
--- a/print/ggv2/pkg-plist
+++ b/print/ggv2/pkg-plist
@@ -1,87 +1,45 @@
-bin/bonobo-application-ps
 bin/ggv
-share/gnome/apps/Graphics/ggv.desktop
-share/gnome/help/ggv/C/docbook.css
-share/gnome/help/ggv/C/ggv.sgml
-share/gnome/help/ggv/C/index.html
-share/gnome/help/ggv/C/intro.html
-share/gnome/help/ggv/C/ln21.html
-share/gnome/help/ggv/C/mainwin.html
-share/gnome/help/ggv/C/menuopts.html
-share/gnome/help/ggv/C/options.html
-share/gnome/help/ggv/C/prefs.html
-share/gnome/help/ggv/C/probs.html
-share/gnome/help/ggv/C/stylesheet-images/caution.gif
-share/gnome/help/ggv/C/stylesheet-images/home.gif
-share/gnome/help/ggv/C/stylesheet-images/important.gif
-share/gnome/help/ggv/C/stylesheet-images/next.gif
-share/gnome/help/ggv/C/stylesheet-images/note.gif
-share/gnome/help/ggv/C/stylesheet-images/prev.gif
-share/gnome/help/ggv/C/stylesheet-images/tip.gif
-share/gnome/help/ggv/C/stylesheet-images/toc-blank.gif
-share/gnome/help/ggv/C/stylesheet-images/toc-minus.gif
-share/gnome/help/ggv/C/stylesheet-images/toc-plus.gif
-share/gnome/help/ggv/C/stylesheet-images/up.gif
-share/gnome/help/ggv/C/stylesheet-images/warning.gif
+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
+etc/gconf/gconf.xml.defaults/apps/ggv/gtkgs/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/ggv/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/ggv/printing/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/ggv/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/ggv/control/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/ggv/coordinates/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/ggv/gtkgs/%gconf.xml
+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
+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
+share/gnome/gnome-2.0/ui/ggv-ui.xml
+share/gnome/help/ggv/C/figures/example_screenshot.png
+share/gnome/help/ggv/C/ggv.xml
+share/gnome/help/ggv/C/legal.xml
 share/gnome/help/ggv/C/topic.dat
-share/gnome/help/ggv/it/docbook.css
-share/gnome/help/ggv/it/ggv.sgml
-share/gnome/help/ggv/it/index.html
-share/gnome/help/ggv/it/intro.html
-share/gnome/help/ggv/it/ln21.html
-share/gnome/help/ggv/it/mainwin.html
-share/gnome/help/ggv/it/menuopts.html
-share/gnome/help/ggv/it/options.html
-share/gnome/help/ggv/it/prefs.html
-share/gnome/help/ggv/it/probs.html
-share/gnome/help/ggv/it/stylesheet-images/caution.gif
-share/gnome/help/ggv/it/stylesheet-images/home.gif
-share/gnome/help/ggv/it/stylesheet-images/important.gif
-share/gnome/help/ggv/it/stylesheet-images/next.gif
-share/gnome/help/ggv/it/stylesheet-images/note.gif
-share/gnome/help/ggv/it/stylesheet-images/prev.gif
-share/gnome/help/ggv/it/stylesheet-images/tip.gif
-share/gnome/help/ggv/it/stylesheet-images/toc-blank.gif
-share/gnome/help/ggv/it/stylesheet-images/toc-minus.gif
-share/gnome/help/ggv/it/stylesheet-images/toc-plus.gif
-share/gnome/help/ggv/it/stylesheet-images/up.gif
-share/gnome/help/ggv/it/stylesheet-images/warning.gif
-share/gnome/help/ggv/it/topic.dat
-share/gnome/help/ggv/ja/docbook.css
-share/gnome/help/ggv/ja/ggv.sgml
-share/gnome/help/ggv/ja/index.html
-share/gnome/help/ggv/ja/intro.html
-share/gnome/help/ggv/ja/ln21.html
-share/gnome/help/ggv/ja/mainwin.html
-share/gnome/help/ggv/ja/menuopts.html
-share/gnome/help/ggv/ja/options.html
-share/gnome/help/ggv/ja/prefs.html
-share/gnome/help/ggv/ja/probs.html
-share/gnome/help/ggv/ja/stylesheet-images/caution.gif
-share/gnome/help/ggv/ja/stylesheet-images/home.gif
-share/gnome/help/ggv/ja/stylesheet-images/important.gif
-share/gnome/help/ggv/ja/stylesheet-images/next.gif
-share/gnome/help/ggv/ja/stylesheet-images/note.gif
-share/gnome/help/ggv/ja/stylesheet-images/prev.gif
-share/gnome/help/ggv/ja/stylesheet-images/tip.gif
-share/gnome/help/ggv/ja/stylesheet-images/toc-blank.gif
-share/gnome/help/ggv/ja/stylesheet-images/toc-minus.gif
-share/gnome/help/ggv/ja/stylesheet-images/toc-plus.gif
-share/gnome/help/ggv/ja/stylesheet-images/up.gif
-share/gnome/help/ggv/ja/stylesheet-images/warning.gif
-share/gnome/help/ggv/ja/topic.dat
-share/gnome/oaf/Bonobo_GGV.oafinfo
+share/gnome/idl/Ggv.idl
 share/gnome/omf/ggv/ggv-C.omf
-share/gnome/omf/ggv/ggv-it.omf
-share/gnome/omf/ggv/ggv-ja.omf
-share/gnome/pixmaps/ggv-splash.png
+share/gnome/pixmaps/ggv/clearall.xpm
+share/gnome/pixmaps/ggv/ggv-splash.png
+share/gnome/pixmaps/ggv/toggleall.xpm
+share/gnome/pixmaps/ggv/toggleeven.xpm
+share/gnome/pixmaps/ggv/toggleodd.xpm
+share/gnome/pixmaps/ggv/zoom.xpm
 share/gnome/pixmaps/gnome-ghostview.png
+share/locale/az/LC_MESSAGES/ggv.mo
+share/locale/bg/LC_MESSAGES/ggv.mo
 share/locale/ca/LC_MESSAGES/ggv.mo
 share/locale/cs/LC_MESSAGES/ggv.mo
 share/locale/da/LC_MESSAGES/ggv.mo
 share/locale/de/LC_MESSAGES/ggv.mo
 share/locale/el/LC_MESSAGES/ggv.mo
 share/locale/es/LC_MESSAGES/ggv.mo
+share/locale/eu/LC_MESSAGES/ggv.mo
 share/locale/fi/LC_MESSAGES/ggv.mo
 share/locale/fr/LC_MESSAGES/ggv.mo
 share/locale/ga/LC_MESSAGES/ggv.mo
@@ -92,7 +50,9 @@ share/locale/it/LC_MESSAGES/ggv.mo
 share/locale/ja/LC_MESSAGES/ggv.mo
 share/locale/ko/LC_MESSAGES/ggv.mo
 share/locale/lt/LC_MESSAGES/ggv.mo
+share/locale/ms/LC_MESSAGES/ggv.mo
 share/locale/nl/LC_MESSAGES/ggv.mo
+share/locale/nn/LC_MESSAGES/ggv.mo
 share/locale/no/LC_MESSAGES/ggv.mo
 share/locale/pl/LC_MESSAGES/ggv.mo
 share/locale/pt/LC_MESSAGES/ggv.mo
@@ -104,13 +64,23 @@ share/locale/sl/LC_MESSAGES/ggv.mo
 share/locale/sv/LC_MESSAGES/ggv.mo
 share/locale/tr/LC_MESSAGES/ggv.mo
 share/locale/uk/LC_MESSAGES/ggv.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/ggv.mo
+share/locale/vi/LC_MESSAGES/ggv.mo
+share/locale/zh_CN/LC_MESSAGES/ggv.mo
 share/locale/zh_TW/LC_MESSAGES/ggv.mo
+@dirrm share/gnome/pixmaps/ggv
 @dirrm share/gnome/omf/ggv
-@dirrm share/gnome/help/ggv/ja/stylesheet-images
-@dirrm share/gnome/help/ggv/ja
-@dirrm share/gnome/help/ggv/it/stylesheet-images
-@dirrm share/gnome/help/ggv/it
-@dirrm share/gnome/help/ggv/C/stylesheet-images
+@dirrm share/gnome/help/ggv/C/figures
 @dirrm share/gnome/help/ggv/C
 @dirrm share/gnome/help/ggv
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/printing
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/layout
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/gtkgs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/coordinates
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/control
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv
+@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/printing
+@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/layout
+@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/gtkgs
+@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/coordinates
+@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/control
+@dirrm etc/gconf/gconf.xml.defaults/apps/ggv