7 files changed, 104 insertions, 44 deletions

diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 6e3d02e896b0..cd320ae50b2e 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeprint
-PORTVERSION=	0.29
+PORTVERSION=	0.30
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-print
@@ -22,15 +22,15 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOMECTRL=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo
index 256b67006648..9d81eb062a86 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.29.tar.gz) = 3b28ad04f1137b7e475396410597a1eb
+MD5 (gnome-print-0.30.tar.gz) = 4a3c0dff05f649d59616c7652d149759
diff --git a/print/gnome-print/files/patch-ab b/print/gnome-print/files/patch-ab
index 687571490f12..f4479734a47b 100644
--- a/print/gnome-print/files/patch-ab
+++ b/print/gnome-print/files/patch-ab
@@ -1,11 +1,32 @@
---- Makefile.in.orig	Fri Jul  9 00:54:02 1999
-+++ Makefile.in	Mon Jul 12 13:21:25 1999
-@@ -163,7 +163,7 @@
- EXTRA_DIST =  	printConf.sh.in 		gnome-print.spec	
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri Oct  5 11:37:00 2001
++++ Makefile.in	Fri Oct  5 11:40:45 2001
+@@ -157,7 +157,7 @@
+ @LIBGPA_TRUE@LIBGPA_DIR = libgpa data
+ @LIBGPA_FALSE@LIBGPA_DIR = 
+ 
+-SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts tests  $(INSTALLER_DIR)
++SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts $(INSTALLER_DIR)
+ 
+ INCLUDES =  	$(GTK_CFLAGS)			-I$(top_srcdir)/intl 		-I$(top_builddir)/intl		$(GNOME_INCLUDEDIR)		@PRINT_INCLUDEDIR@		-DPROFILEDIR=\""$(profilesdir)"\"
+ 
+@@ -171,7 +171,7 @@
+ EXTRA_DIST =  	printConf.sh.in 		gnome-print.spec.in		gnome-print.spec		run-gnome-font-install
  
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = printConf.sh
  
- gnome_font_install_SOURCES = gnome-font-install.c
+ CLEANFILES = printConf.sh
+@@ -192,7 +192,7 @@
+ TAR = gtar
+ GZIP_ENV = --best
+ DIST_SUBDIRS =  intl po libgpa data libgnomeprint afms profiles fonts \
+-tests installer
++installer
+ all: all-redirect
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
diff --git a/print/gnome-print/files/patch-ac b/print/gnome-print/files/patch-ac
deleted file mode 100644
index a299a643f671..000000000000
--- a/print/gnome-print/files/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- installer/gf-pfb.c.orig	Thu Nov 16 20:22:10 2000
-+++ installer/gf-pfb.c	Thu Mar 15 19:26:11 2001
-@@ -6,4 +6,4 @@
- 
--#include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
diff --git a/print/gnome-print/files/patch-ltmain.sh b/print/gnome-print/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/print/gnome-print/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,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/gnome-print/files/patch-po::Makefile.in.in b/print/gnome-print/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..3c2510227fc6
--- /dev/null
+++ b/print/gnome-print/files/patch-po::Makefile.in.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/10/05 11:35:53	1.1
++++ po/Makefile.in.in	2001/10/05 11:36:35
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
+@@ -126,7 +126,7 @@
+ 	catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
+ 	done
+ 	if test "$(PACKAGE)" = "gettext"; then \
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index 5959bf93cf80..00e3b5b41218 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -1,30 +1,32 @@
 bin/gnome-font-install
+etc/gnome/fonts/gnome-print-ghostscript.fontmap
 etc/printConf.sh
-include/libgnomeprint/gnome-font-dialog.h
-include/libgnomeprint/gnome-font-face.h
-include/libgnomeprint/gnome-font.h
-include/libgnomeprint/gnome-glyphlist.h
-include/libgnomeprint/gnome-pgl.h
-include/libgnomeprint/gnome-print-copies.h
-include/libgnomeprint/gnome-print-dialog.h
-include/libgnomeprint/gnome-print-encode.h
-include/libgnomeprint/gnome-print-frgba.h
-include/libgnomeprint/gnome-print-master-preview.h
-include/libgnomeprint/gnome-print-master.h
-include/libgnomeprint/gnome-print-meta.h
-include/libgnomeprint/gnome-print-multipage.h
-include/libgnomeprint/gnome-print-pdf.h
-include/libgnomeprint/gnome-print-pixbuf.h
-include/libgnomeprint/gnome-print-preview.h
-include/libgnomeprint/gnome-print-rbuf.h
-include/libgnomeprint/gnome-print.h
-include/libgnomeprint/gnome-printer-dialog.h
-include/libgnomeprint/gnome-printer.h
-include/libgnomeprint/gnome-rfont.h
-include/libgnomeprint/gnome-text.h
+include/gnome-1.0/libgnomeprint/gnome-font-dialog.h
+include/gnome-1.0/libgnomeprint/gnome-font-face.h
+include/gnome-1.0/libgnomeprint/gnome-font.h
+include/gnome-1.0/libgnomeprint/gnome-glyphlist.h
+include/gnome-1.0/libgnomeprint/gnome-pgl.h
+include/gnome-1.0/libgnomeprint/gnome-print-copies.h
+include/gnome-1.0/libgnomeprint/gnome-print-dialog.h
+include/gnome-1.0/libgnomeprint/gnome-print-encode.h
+include/gnome-1.0/libgnomeprint/gnome-print-frgba.h
+include/gnome-1.0/libgnomeprint/gnome-print-master-preview.h
+include/gnome-1.0/libgnomeprint/gnome-print-master.h
+include/gnome-1.0/libgnomeprint/gnome-print-meta.h
+include/gnome-1.0/libgnomeprint/gnome-print-multipage.h
+include/gnome-1.0/libgnomeprint/gnome-print-pdf.h
+include/gnome-1.0/libgnomeprint/gnome-print-pixbuf.h
+include/gnome-1.0/libgnomeprint/gnome-print-preview.h
+include/gnome-1.0/libgnomeprint/gnome-print-rbuf.h
+include/gnome-1.0/libgnomeprint/gnome-print.h
+include/gnome-1.0/libgnomeprint/gnome-printer-dialog.h
+include/gnome-1.0/libgnomeprint/gnome-printer.h
+include/gnome-1.0/libgnomeprint/gnome-rfont.h
+include/gnome-1.0/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.so
 lib/libgnomeprint.so.16
+share/gnome/fonts/README.binaries
 share/gnome/fonts/README.installer
 share/gnome/fonts/afms/adobe/pagd8a.afm
 share/gnome/fonts/afms/adobe/pagdo8a.afm
@@ -67,7 +69,6 @@ share/gnome/fonts/afms/adobe/putr8a.afm
 share/gnome/fonts/afms/adobe/putri8a.afm
 share/gnome/fonts/afms/adobe/pzcmi8a.afm
 share/gnome/fonts/afms/adobe/pzdr.afm
-share/gnome/fonts/fontmap2
 share/gnome/gnome-print/%%VERSION%%/profiles/PostscriptOptimized.profile
 share/gnome/gnome-print/%%VERSION%%/profiles/fax-g3.profile
 share/gnome/gnome-print/%%VERSION%%/profiles/pdf.profile
@@ -88,6 +89,7 @@ share/locale/ja/LC_MESSAGES/gnome-print.mo
 share/locale/ko/LC_MESSAGES/gnome-print.mo
 share/locale/lt/LC_MESSAGES/gnome-print.mo
 share/locale/nl/LC_MESSAGES/gnome-print.mo
+share/locale/nn/LC_MESSAGES/gnome-print.mo
 share/locale/no/LC_MESSAGES/gnome-print.mo
 share/locale/pl/LC_MESSAGES/gnome-print.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-print.mo
@@ -99,10 +101,14 @@ share/locale/sv/LC_MESSAGES/gnome-print.mo
 share/locale/tr/LC_MESSAGES/gnome-print.mo
 share/locale/uk/LC_MESSAGES/gnome-print.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-print.mo
-@dirrm share/gnome/fonts/afms/adobe
-@dirrm share/gnome/fonts/afms
-@dirrm share/gnome/fonts
+share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
 @dirrm share/gnome/gnome-print/%%VERSION%%/profiles
 @dirrm share/gnome/gnome-print/%%VERSION%%
 @dirrm share/gnome/gnome-print
-@dirrm include/libgnomeprint
+@dirrm share/gnome/fonts/afms/adobe
+@dirrm share/gnome/fonts/afms
+@dirrm share/gnome/fonts
+@dirrm include/gnome-1.0/libgnomeprint
+@dirrm include/gnome-1.0
+@dirrm etc/gnome/fonts
+@dirrm etc/gnome