Upgrade to 0.99.5, and portlint

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

8 files changed, 100 insertions, 62 deletions

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index ad065d2e70ed..989ccf7cedc2 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	gnomepim
-# Version required:			0.99.3
+# Version required:			0.99.5
 # Date created:				17 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/17 20:15:26 vanilla Exp $
+# $Id: Makefile,v 1.2 1999/01/27 08:31:49 fenner Exp $
 #
 
-DISTNAME=	gnome-pim-0.99.3
-PKGNAME=	gnomepim-0.99.3
-CATEGORIES=	deskutils
+DISTNAME=	gnome-pim-0.99.5
+PKGNAME=	gnomepim-0.99.5
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	gnome-pim
 
 MAINTAINER=	nacai@iname.com
 
+BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -23,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"
 
 post-install:
diff --git a/deskutils/gnome-pim/distinfo b/deskutils/gnome-pim/distinfo
index 6c61ac285dcb..e76ab18a7571 100644
--- a/deskutils/gnome-pim/distinfo
+++ b/deskutils/gnome-pim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-0.99.3.tar.gz) = e7dbbb6ac2e2ad3404d66c788aed4920
+MD5 (gnome-pim-0.99.5.tar.gz) = dfa213f444162d2d72ab23062643867d
diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab
index 710dfefd18f2..e7a8e2b3ab95 100644
--- a/deskutils/gnome-pim/files/patch-ab
+++ b/deskutils/gnome-pim/files/patch-ab
@@ -1,39 +1,48 @@
---- gncal/Makefile.in.orig	Wed Jan 13 11:13:50 1999
-+++ gncal/Makefile.in	Mon Jan 18 03:14:33 1999
-@@ -112,12 +112,12 @@
+--- gncal/Makefile.in.orig	Tue Feb  2 09:08:47 1999
++++ gncal/Makefile.in	Tue Feb  2 09:09:32 1999
+@@ -111,11 +111,11 @@
  YACC = @YACC@
  l = @l@
  
 -help_base = $(datadir)/gnome/help/cal
 +help_base = $(datadir)/help/cal
  
- INCLUDES = 			\
- 	-I$(includedir)					\
- 	$(GNOME_INCLUDEDIR)				\
--        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
+ CFLAGS = @CFLAGS@ -Wall
+ 
+-INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
+ 
  
  bin_PROGRAMS = gnomecal
+--- gnomecard/Makefile.in.orig	Tue Feb  2 09:09:12 1999
++++ gnomecard/Makefile.in	Tue Feb  2 09:10:02 1999
+@@ -113,11 +113,11 @@
  
---- gnomecard/Makefile.in.orig	Mon Jan 18 03:15:06 1999
-+++ gnomecard/Makefile.in	Mon Jan 18 03:15:29 1999
-@@ -112,12 +112,12 @@
- YACC = @YACC@
- l = @l@
+ SUBDIRS = help
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
 +xpmhelp_base = $(datadir)/help/cal
  
- INCLUDES = 			\
- 	-I$(includedir)					\
- 	$(GNOME_INCLUDEDIR)				\
--        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-+        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
- 	-I../../gcalendar
+ CFLAGS = @CFLAGS@ -Wall
+ 
+-INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I../../gcalendar
++INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I../../gcalendar
+ 
  
  bin_PROGRAMS = gnomecard
---- po/Makefile.in.in.orig	Mon Jan 18 03:13:29 1999
-+++ po/Makefile.in.in	Mon Jan 18 03:13:39 1999
+--- gnomecard/help/C/Makefile.in.orig	Tue Feb  2 09:10:22 1999
++++ gnomecard/help/C/Makefile.in	Tue Feb  2 09:10:30 1999
+@@ -112,7 +112,7 @@
+ YACC = @YACC@
+ l = @l@
+ 
+-gnomecard_helpdir = $(datadir)/gnome/help/gnomecard/C
++gnomecard_helpdir = $(datadir)/help/gnomecard/C
+ 
+ gnomecard_help_DATA =  	index.html			topic.dat
+ 
+--- po/Makefile.in.in.orig	Tue Feb  2 09:11:11 1999
++++ po/Makefile.in.in	Tue Feb  2 09:11:19 1999
 @@ -18,7 +18,7 @@
  
  prefix = @prefix@
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index f8ce2fdc0015..cf54e85b463e 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -7,6 +7,16 @@ share/gnome/apps/Productivity/gnomecard.desktop
 share/gnome/help/cal/C/gnome-cal.html
 share/gnome/help/cal/C/index.html
 share/gnome/help/cal/C/topic.dat
+share/gnome/help/gnomecard/C/description.html
+share/gnome/help/gnomecard/C/dialogs.html
+share/gnome/help/gnomecard/C/display.html
+share/gnome/help/gnomecard/C/docbook.css
+share/gnome/help/gnomecard/C/index.html
+share/gnome/help/gnomecard/C/ln9.html
+share/gnome/help/gnomecard/C/menubar.html
+share/gnome/help/gnomecard/C/recordview.html
+share/gnome/help/gnomecard/C/toolbar.html
+share/gnome/help/gnomecard/C/topic.dat
 share/gnome/idl/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
 share/locale/cs/LC_MESSAGES/gnome-pim.mo
@@ -23,3 +33,5 @@ share/locale/pt/LC_MESSAGES/gnome-pim.mo
 share/locale/sv/LC_MESSAGES/gnome-pim.mo
 @dirrm share/gnome/help/cal/C
 @dirrm share/gnome/help/cal
+@dirrm share/gnome/help/gnomecard/C
+@dirrm share/gnome/help/gnomecard
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index ad065d2e70ed..989ccf7cedc2 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	gnomepim
-# Version required:			0.99.3
+# Version required:			0.99.5
 # Date created:				17 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/17 20:15:26 vanilla Exp $
+# $Id: Makefile,v 1.2 1999/01/27 08:31:49 fenner Exp $
 #
 
-DISTNAME=	gnome-pim-0.99.3
-PKGNAME=	gnomepim-0.99.3
-CATEGORIES=	deskutils
+DISTNAME=	gnome-pim-0.99.5
+PKGNAME=	gnomepim-0.99.5
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	gnome-pim
 
 MAINTAINER=	nacai@iname.com
 
+BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -23,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"
 
 post-install:
diff --git a/deskutils/gnomepim/distinfo b/deskutils/gnomepim/distinfo
index 6c61ac285dcb..e76ab18a7571 100644
--- a/deskutils/gnomepim/distinfo
+++ b/deskutils/gnomepim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-0.99.3.tar.gz) = e7dbbb6ac2e2ad3404d66c788aed4920
+MD5 (gnome-pim-0.99.5.tar.gz) = dfa213f444162d2d72ab23062643867d
diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab
index 710dfefd18f2..e7a8e2b3ab95 100644
--- a/deskutils/gnomepim/files/patch-ab
+++ b/deskutils/gnomepim/files/patch-ab
@@ -1,39 +1,48 @@
---- gncal/Makefile.in.orig	Wed Jan 13 11:13:50 1999
-+++ gncal/Makefile.in	Mon Jan 18 03:14:33 1999
-@@ -112,12 +112,12 @@
+--- gncal/Makefile.in.orig	Tue Feb  2 09:08:47 1999
++++ gncal/Makefile.in	Tue Feb  2 09:09:32 1999
+@@ -111,11 +111,11 @@
  YACC = @YACC@
  l = @l@
  
 -help_base = $(datadir)/gnome/help/cal
 +help_base = $(datadir)/help/cal
  
- INCLUDES = 			\
- 	-I$(includedir)					\
- 	$(GNOME_INCLUDEDIR)				\
--        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
+ CFLAGS = @CFLAGS@ -Wall
+ 
+-INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
+ 
  
  bin_PROGRAMS = gnomecal
+--- gnomecard/Makefile.in.orig	Tue Feb  2 09:09:12 1999
++++ gnomecard/Makefile.in	Tue Feb  2 09:10:02 1999
+@@ -113,11 +113,11 @@
  
---- gnomecard/Makefile.in.orig	Mon Jan 18 03:15:06 1999
-+++ gnomecard/Makefile.in	Mon Jan 18 03:15:29 1999
-@@ -112,12 +112,12 @@
- YACC = @YACC@
- l = @l@
+ SUBDIRS = help
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
 +xpmhelp_base = $(datadir)/help/cal
  
- INCLUDES = 			\
- 	-I$(includedir)					\
- 	$(GNOME_INCLUDEDIR)				\
--        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-+        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
- 	-I../../gcalendar
+ CFLAGS = @CFLAGS@ -Wall
+ 
+-INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I../../gcalendar
++INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I../../gcalendar
+ 
  
  bin_PROGRAMS = gnomecard
---- po/Makefile.in.in.orig	Mon Jan 18 03:13:29 1999
-+++ po/Makefile.in.in	Mon Jan 18 03:13:39 1999
+--- gnomecard/help/C/Makefile.in.orig	Tue Feb  2 09:10:22 1999
++++ gnomecard/help/C/Makefile.in	Tue Feb  2 09:10:30 1999
+@@ -112,7 +112,7 @@
+ YACC = @YACC@
+ l = @l@
+ 
+-gnomecard_helpdir = $(datadir)/gnome/help/gnomecard/C
++gnomecard_helpdir = $(datadir)/help/gnomecard/C
+ 
+ gnomecard_help_DATA =  	index.html			topic.dat
+ 
+--- po/Makefile.in.in.orig	Tue Feb  2 09:11:11 1999
++++ po/Makefile.in.in	Tue Feb  2 09:11:19 1999
 @@ -18,7 +18,7 @@
  
  prefix = @prefix@
diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index f8ce2fdc0015..cf54e85b463e 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -7,6 +7,16 @@ share/gnome/apps/Productivity/gnomecard.desktop
 share/gnome/help/cal/C/gnome-cal.html
 share/gnome/help/cal/C/index.html
 share/gnome/help/cal/C/topic.dat
+share/gnome/help/gnomecard/C/description.html
+share/gnome/help/gnomecard/C/dialogs.html
+share/gnome/help/gnomecard/C/display.html
+share/gnome/help/gnomecard/C/docbook.css
+share/gnome/help/gnomecard/C/index.html
+share/gnome/help/gnomecard/C/ln9.html
+share/gnome/help/gnomecard/C/menubar.html
+share/gnome/help/gnomecard/C/recordview.html
+share/gnome/help/gnomecard/C/toolbar.html
+share/gnome/help/gnomecard/C/topic.dat
 share/gnome/idl/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
 share/locale/cs/LC_MESSAGES/gnome-pim.mo
@@ -23,3 +33,5 @@ share/locale/pt/LC_MESSAGES/gnome-pim.mo
 share/locale/sv/LC_MESSAGES/gnome-pim.mo
 @dirrm share/gnome/help/cal/C
 @dirrm share/gnome/help/cal
+@dirrm share/gnome/help/gnomecard/C
+@dirrm share/gnome/help/gnomecard