12 files changed, 110 insertions, 16 deletions

diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index a5bd84c81e8e..e2555f3e068c 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ggv
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ggv
@@ -17,10 +17,12 @@ RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/print/ggv/distinfo b/print/ggv/distinfo
index 656a897150df..dd05cf5d3b45 100644
--- a/print/ggv/distinfo
+++ b/print/ggv/distinfo
@@ -1 +1 @@
-MD5 (ggv-1.0.1.tar.gz) = c24ee85caf3d522c0d905794f3abd248
+MD5 (ggv-1.0.2.tar.gz) = e0ee798f23a87493d2184cf9409be87d
diff --git a/print/ggv/files/patch-aa b/print/ggv/files/patch-aa
index 0b27e1d93ee4..984e279f6233 100644
--- a/print/ggv/files/patch-aa
+++ b/print/ggv/files/patch-aa
@@ -1,9 +1,12 @@
---- configure.orig	Tue May  9 17:06:45 2000
-+++ configure	Fri Aug 25 11:04:07 2000
-@@ -4506,15 +4506,15 @@
+
+$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
diff --git a/print/ggv/files/patch-ltmain.sh b/print/ggv/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/print/ggv/files/patch-ltmain.sh
@@ -0,0 +1,28 @@
+
+$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/ggv/files/patch-src::Makefile.in b/print/ggv/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..5789553a8881
--- /dev/null
+++ b/print/ggv/files/patch-src::Makefile.in
@@ -0,0 +1,14 @@
+
+$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/ggv/pkg-plist b/print/ggv/pkg-plist
index 455c76bdb43a..caa8d523a7dd 100644
--- a/print/ggv/pkg-plist
+++ b/print/ggv/pkg-plist
@@ -86,6 +86,7 @@ share/locale/fi/LC_MESSAGES/ggv.mo
 share/locale/fr/LC_MESSAGES/ggv.mo
 share/locale/ga/LC_MESSAGES/ggv.mo
 share/locale/gl/LC_MESSAGES/ggv.mo
+share/locale/hr/LC_MESSAGES/ggv.mo
 share/locale/hu/LC_MESSAGES/ggv.mo
 share/locale/it/LC_MESSAGES/ggv.mo
 share/locale/ja/LC_MESSAGES/ggv.mo
@@ -104,7 +105,6 @@ 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/zh_TW.Big5/LC_MESSAGES/ggv.mo
 @dirrm share/gnome/omf/ggv
 @dirrm share/gnome/help/ggv/ja/stylesheet-images
 @dirrm share/gnome/help/ggv/ja
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index a5bd84c81e8e..e2555f3e068c 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ggv
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ggv
@@ -17,10 +17,12 @@ RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo
index 656a897150df..dd05cf5d3b45 100644
--- a/print/ggv2/distinfo
+++ b/print/ggv2/distinfo
@@ -1 +1 @@
-MD5 (ggv-1.0.1.tar.gz) = c24ee85caf3d522c0d905794f3abd248
+MD5 (ggv-1.0.2.tar.gz) = e0ee798f23a87493d2184cf9409be87d
diff --git a/print/ggv2/files/patch-aa b/print/ggv2/files/patch-aa
index 0b27e1d93ee4..984e279f6233 100644
--- a/print/ggv2/files/patch-aa
+++ b/print/ggv2/files/patch-aa
@@ -1,9 +1,12 @@
---- configure.orig	Tue May  9 17:06:45 2000
-+++ configure	Fri Aug 25 11:04:07 2000
-@@ -4506,15 +4506,15 @@
+
+$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
diff --git a/print/ggv2/files/patch-ltmain.sh b/print/ggv2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/print/ggv2/files/patch-ltmain.sh
@@ -0,0 +1,28 @@
+
+$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
new file mode 100644
index 000000000000..5789553a8881
--- /dev/null
+++ b/print/ggv2/files/patch-src::Makefile.in
@@ -0,0 +1,14 @@
+
+$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/pkg-plist b/print/ggv2/pkg-plist
index 455c76bdb43a..caa8d523a7dd 100644
--- a/print/ggv2/pkg-plist
+++ b/print/ggv2/pkg-plist
@@ -86,6 +86,7 @@ share/locale/fi/LC_MESSAGES/ggv.mo
 share/locale/fr/LC_MESSAGES/ggv.mo
 share/locale/ga/LC_MESSAGES/ggv.mo
 share/locale/gl/LC_MESSAGES/ggv.mo
+share/locale/hr/LC_MESSAGES/ggv.mo
 share/locale/hu/LC_MESSAGES/ggv.mo
 share/locale/it/LC_MESSAGES/ggv.mo
 share/locale/ja/LC_MESSAGES/ggv.mo
@@ -104,7 +105,6 @@ 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/zh_TW.Big5/LC_MESSAGES/ggv.mo
 @dirrm share/gnome/omf/ggv
 @dirrm share/gnome/help/ggv/ja/stylesheet-images
 @dirrm share/gnome/help/ggv/ja