Update to version 0.30 and use new gnome ports.

PR:             11844
Submitted by:   Jeremy Lea <reg@shale.csir.co.za>

4 files changed, 28 insertions, 38 deletions

diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 8c4088b..b15b42b 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	ggv
-# Version required:			0.26
+# Version required:			0.30
 # Date created:				21 August 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/04/08 18:08:35 steve Exp $
+# $Id: Makefile,v 1.7 1999/04/26 21:18:18 mharo Exp $
 #
 
-DISTNAME=	ggv-0.26
+DISTNAME=	ggv-0.30
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ggv
@@ -16,16 +16,15 @@ MAINTAINER=	nacai@iname.com
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
-# implicit dependencies:
-# gettext, xpm, gtk11-devel, gnomelibs
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/print/ggv/distinfo b/print/ggv/distinfo
index 43d7f2f..b2b1f7d 100644
--- a/print/ggv/distinfo
+++ b/print/ggv/distinfo
@@ -1 +1 @@
-MD5 (ggv-0.26.tar.gz) = ff3cf03289b3effd8fc8fb0e29ab6e03
+MD5 (ggv-0.30.tar.gz) = 5283bbc360579c84a82ae033bac65c17
diff --git a/print/ggv/files/patch-aa b/print/ggv/files/patch-aa
index f844d3e..3e3c196 100644
--- a/print/ggv/files/patch-aa
+++ b/print/ggv/files/patch-aa
@@ -1,25 +1,15 @@
---- configure.orig	Wed Dec 16 23:06:18 1998
-+++ configure	Tue Jan 26 14:13:02 1999
-@@ -1076,13 +1076,13 @@
- 	    fi
- 	
- 	    if test "$no_gnome_config" = "yes"; then
--              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1081: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	      if test -f $gnome_prefix/gnomeConf.sh; then
-+              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:1081: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	      if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	        echo "$ac_t""found" 1>&6
- 	        echo "loading gnome configuration from" \
--		     "$gnome_prefix/gnomeConf.sh"
--	        . $gnome_prefix/gnomeConf.sh
-+		     "$prefix/share/gnome/gnomeConf.sh"
-+	        . $prefix/share/gnome/gnomeConf.sh
- 	        
- 	      else
- 	        echo "$ac_t""not found" 1>&6
-@@ -4024,15 +4024,15 @@
+--- configure.orig	Sat Apr 17 04:25:20 1999
++++ configure	Sat May 22 21:58:31 1999
+@@ -2083,7 +2083,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB=""
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -4165,15 +4165,15 @@
  fi
  
          
@@ -29,13 +19,11 @@
          INSTOBJEXT=.mo
          DATADIRNAME=share
 -	INTLDEPS='$(top_builddir)/intl/libintl.a'
--	INTLLIBS=$INTLDEPS
--	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++	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
-+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+#	INTLLIBS=$INTLDEPS
-+#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 +#        nls_cv_header_intl=intl/libintl.h
 +#        nls_cv_header_libgt=intl/libgettext.h
        fi
diff --git a/print/ggv/pkg-plist b/print/ggv/pkg-plist
index 948fb99..7488a7b 100644
--- a/print/ggv/pkg-plist
+++ b/print/ggv/pkg-plist
@@ -1,7 +1,10 @@
 bin/ggv
 share/gnome/apps/Graphics/ggv.desktop
+share/locale/de/LC_MESSAGES/ggv.mo
 share/locale/es/LC_MESSAGES/ggv.mo
+share/locale/fi/LC_MESSAGES/ggv.mo
 share/locale/fr/LC_MESSAGES/ggv.mo
+share/locale/hu/LC_MESSAGES/ggv.mo
 share/locale/ko/LC_MESSAGES/ggv.mo
 share/locale/no/LC_MESSAGES/ggv.mo
 share/locale/pt/LC_MESSAGES/ggv.mo