Upgrade to 0.99.5, and portlint

PR:		ports/9818
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

8 files changed, 72 insertions, 40 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 5bcfa19a96fe..afa832d7eb62 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -1,22 +1,21 @@
-# New ports collection makefile for:   gnomeutils
-# Version required:    0.99.1
-# Date created:        03 July 1998
-# Whom:                Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for:	gnomeutils
+# Version required:			0.99.5
+# Date created:				03 July 1998
+# Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.4 1999/01/17 20:00:33 vanilla Exp $
+# $Id: Makefile,v 1.5 1999/01/27 08:31:51 fenner Exp $
 #
 
-DISTNAME=	gnome-utils-0.99.1
-PKGNAME=	gnomeutils-0.99.1
+DISTNAME=	gnome-utils-0.99.5
+PKGNAME=	gnomeutils-0.99.5
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	gnome-utils
 
 MAINTAINER=	nacai@iname.com
 
+BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
-		gtop.1:${PORTSDIR}/devel/libgtop
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -24,10 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 MAN1=		gtt.1
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 8a8a6779c242..32cec07ed8c2 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-0.99.1.tar.gz) = 4957d79f5fcb7ded90ef1b53a6a8a262
+MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583
diff --git a/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa
index be0052528f43..7d8da8ddc7e7 100644
--- a/deskutils/gnome-utils/files/patch-aa
+++ b/deskutils/gnome-utils/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Mon Jan  4 04:26:35 1999
-+++ configure	Tue Jan  5 17:15:09 1999
-@@ -1087,13 +1087,13 @@
+--- configure.orig	Tue Feb  2 09:42:09 1999
++++ configure	Tue Feb  2 09:43:37 1999
+@@ -1108,13 +1108,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:1092: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-echo "configure:1113: 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:1092: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++echo "configure:1113: 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" \
@@ -19,3 +19,18 @@
  	        
  	      else
  	        echo "$ac_t""not found" 1>&6
+@@ -3121,10 +3121,10 @@
+ 
+ if test $OBJECTIVE_C = yes; then
+   
+-        echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:3126: checking for obGnomeConf.sh file in $gnome_prefix" >&5
+-	if test -f $gnome_prefix/obGnomeConf.sh; then
+-	    . $gnome_prefix/obGnomeConf.sh
++        echo $ac_n "checking for obGnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:3126: checking for obGnomeConf.sh file in $prefix/share/gnome" >&5
++	if test -f $prefix/share/gnome/obGnomeConf.sh; then
++	    . $prefix/share/gnome/obGnomeConf.sh
+ 	    echo "$ac_t""found" 1>&6
+ 	else
+ 	    echo "$ac_t""not found" 1>&6
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 7f55fe5cfb56..61b605449a7b 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -11,7 +11,6 @@ bin/gsearchtool
 bin/gshutdown
 bin/gstripchart
 bin/gtt
-bin/guname
 bin/gw
 bin/splac
 bin/splash
@@ -24,14 +23,17 @@ share/gnome/apps/Utilities/gfontsel.desktop
 share/gnome/apps/Utilities/gless.desktop
 share/gnome/apps/Utilities/gsearchtool.desktop
 share/gnome/apps/Utilities/gstripchart.desktop
-share/gnome/apps/Utilities/guname.desktop
 share/gnome/apps/Utilities/gw.desktop
 share/gnome/apps/gnome-run.desktop
 share/gnome/gstripchart/gstripchart.conf
 share/gnome/help/ghex/C/index.html
 share/gnome/help/ghex/C/topic.dat
+share/gnome/help/ghex/es/index.html
+share/gnome/help/ghex/es/topic.dat
 share/gnome/help/gshutdown/C/index.html
 share/gnome/help/gshutdown/C/topic.dat
+share/gnome/help/gshutdown/es/index.html
+share/gnome/help/gshutdown/es/topic.dat
 share/gnome/help/gstripchart/C/gstripchart.html
 share/gnome/help/gstripchart/C/index.html
 share/gnome/help/gstripchart/C/topic.dat
@@ -52,8 +54,10 @@ share/locale/pt/LC_MESSAGES/gnome-utils.mo
 share/locale/sv/LC_MESSAGES/gnome-utils.mo
 @dirrm share/gnome/gstripchart
 @dirrm share/gnome/help/ghex/C
+@dirrm share/gnome/help/ghex/es
 @dirrm share/gnome/help/ghex
 @dirrm share/gnome/help/gshutdown/C
+@dirrm share/gnome/help/gshutdown/es
 @dirrm share/gnome/help/gshutdown
 @dirrm share/gnome/help/gstripchart/C
 @dirrm share/gnome/help/gstripchart
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 5bcfa19a96fe..afa832d7eb62 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -1,22 +1,21 @@
-# New ports collection makefile for:   gnomeutils
-# Version required:    0.99.1
-# Date created:        03 July 1998
-# Whom:                Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for:	gnomeutils
+# Version required:			0.99.5
+# Date created:				03 July 1998
+# Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.4 1999/01/17 20:00:33 vanilla Exp $
+# $Id: Makefile,v 1.5 1999/01/27 08:31:51 fenner Exp $
 #
 
-DISTNAME=	gnome-utils-0.99.1
-PKGNAME=	gnomeutils-0.99.1
+DISTNAME=	gnome-utils-0.99.5
+PKGNAME=	gnomeutils-0.99.5
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	gnome-utils
 
 MAINTAINER=	nacai@iname.com
 
+BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
-		gtop.1:${PORTSDIR}/devel/libgtop
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -24,10 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 MAN1=		gtt.1
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index 8a8a6779c242..32cec07ed8c2 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-0.99.1.tar.gz) = 4957d79f5fcb7ded90ef1b53a6a8a262
+MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583
diff --git a/deskutils/gnomeutils2/files/patch-aa b/deskutils/gnomeutils2/files/patch-aa
index be0052528f43..7d8da8ddc7e7 100644
--- a/deskutils/gnomeutils2/files/patch-aa
+++ b/deskutils/gnomeutils2/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Mon Jan  4 04:26:35 1999
-+++ configure	Tue Jan  5 17:15:09 1999
-@@ -1087,13 +1087,13 @@
+--- configure.orig	Tue Feb  2 09:42:09 1999
++++ configure	Tue Feb  2 09:43:37 1999
+@@ -1108,13 +1108,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:1092: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-echo "configure:1113: 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:1092: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++echo "configure:1113: 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" \
@@ -19,3 +19,18 @@
  	        
  	      else
  	        echo "$ac_t""not found" 1>&6
+@@ -3121,10 +3121,10 @@
+ 
+ if test $OBJECTIVE_C = yes; then
+   
+-        echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:3126: checking for obGnomeConf.sh file in $gnome_prefix" >&5
+-	if test -f $gnome_prefix/obGnomeConf.sh; then
+-	    . $gnome_prefix/obGnomeConf.sh
++        echo $ac_n "checking for obGnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:3126: checking for obGnomeConf.sh file in $prefix/share/gnome" >&5
++	if test -f $prefix/share/gnome/obGnomeConf.sh; then
++	    . $prefix/share/gnome/obGnomeConf.sh
+ 	    echo "$ac_t""found" 1>&6
+ 	else
+ 	    echo "$ac_t""not found" 1>&6
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 7f55fe5cfb56..61b605449a7b 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -11,7 +11,6 @@ bin/gsearchtool
 bin/gshutdown
 bin/gstripchart
 bin/gtt
-bin/guname
 bin/gw
 bin/splac
 bin/splash
@@ -24,14 +23,17 @@ share/gnome/apps/Utilities/gfontsel.desktop
 share/gnome/apps/Utilities/gless.desktop
 share/gnome/apps/Utilities/gsearchtool.desktop
 share/gnome/apps/Utilities/gstripchart.desktop
-share/gnome/apps/Utilities/guname.desktop
 share/gnome/apps/Utilities/gw.desktop
 share/gnome/apps/gnome-run.desktop
 share/gnome/gstripchart/gstripchart.conf
 share/gnome/help/ghex/C/index.html
 share/gnome/help/ghex/C/topic.dat
+share/gnome/help/ghex/es/index.html
+share/gnome/help/ghex/es/topic.dat
 share/gnome/help/gshutdown/C/index.html
 share/gnome/help/gshutdown/C/topic.dat
+share/gnome/help/gshutdown/es/index.html
+share/gnome/help/gshutdown/es/topic.dat
 share/gnome/help/gstripchart/C/gstripchart.html
 share/gnome/help/gstripchart/C/index.html
 share/gnome/help/gstripchart/C/topic.dat
@@ -52,8 +54,10 @@ share/locale/pt/LC_MESSAGES/gnome-utils.mo
 share/locale/sv/LC_MESSAGES/gnome-utils.mo
 @dirrm share/gnome/gstripchart
 @dirrm share/gnome/help/ghex/C
+@dirrm share/gnome/help/ghex/es
 @dirrm share/gnome/help/ghex
 @dirrm share/gnome/help/gshutdown/C
+@dirrm share/gnome/help/gshutdown/es
 @dirrm share/gnome/help/gshutdown
 @dirrm share/gnome/help/gstripchart/C
 @dirrm share/gnome/help/gstripchart