12 files changed, 183 insertions, 66 deletions

diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index b09de3258704..7c7f39d978b0 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	gnomeprint
-# Version required:			0.1.1
+# Version required:			0.4
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1999/04/22 07:57:18 mharo Exp $
+# $Id: Makefile,v 1.6 1999/05/30 03:52:57 steve Exp $
 #
 
-DISTNAME=	gnome-print-0.1.1
-PKGNAME=	gnomeprint-0.1.1
+DISTNAME=	gnome-print-0.4
+PKGNAME=	gnomeprint-0.4
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-print
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs \
+		xml.4:${PORTSDIR}/textproc/libxml \
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo
index 4a5996bd3ef6..cc9e2656c155 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.1.1.tar.gz) = 4816c6e1efda50a7f7860408eb7a20ff
+MD5 (gnome-print-0.4.tar.gz) = 137571ca9dbb625f54731e9b73ed5ed3
diff --git a/print/gnome-print/files/patch-ab b/print/gnome-print/files/patch-ab
index df0232a828a7..687571490f12 100644
--- a/print/gnome-print/files/patch-ab
+++ b/print/gnome-print/files/patch-ab
@@ -1,20 +1,11 @@
---- Makefile.in.orig	Tue Feb  2 08:05:00 1999
-+++ Makefile.in	Thu Feb 18 17:14:57 1999
-@@ -161,7 +161,7 @@
+--- 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	
  
- EXTRA_DIST = printConf.sh.in gnome-font-install.in
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = printConf.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -562,7 +562,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-confexecDATA \
- 		uninstall-libgnomeprintincHEADERS
- uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
- 		$(HEADERS) config.h
- all-redirect: all-recursive-am
- install-strip:
+ 
+ gnome_font_install_SOURCES = gnome-font-install.c
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index e0b8c1605672..15ac5d83b4ad 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -10,16 +10,63 @@ include/libgnomeprint/gnome-printer.h
 include/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.so
-lib/libgnomeprint.so.0
+lib/libgnomeprint.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/fonts/fontmap
 share/gnome/gnome-print/profiles/Postscript.profile
+share/locale/de/LC_MESSAGES/gnome-print.mo
 share/locale/es/LC_MESSAGES/gnome-print.mo
+share/locale/fr/LC_MESSAGES/gnome-print.mo
+share/locale/hu/LC_MESSAGES/gnome-print.mo
+share/locale/it/LC_MESSAGES/gnome-print.mo
 share/locale/no/LC_MESSAGES/gnome-print.mo
 share/locale/pl/LC_MESSAGES/gnome-print.mo
 share/locale/ru/LC_MESSAGES/gnome-print.mo
 @dirrm share/gnome/gnome-print/profiles
 @dirrm share/gnome/gnome-print
+share/gnome/fonts/afms/adobe/pagd8a.afm
+share/gnome/fonts/afms/adobe/pagdo8a.afm
+share/gnome/fonts/afms/adobe/pagk8a.afm
+share/gnome/fonts/afms/adobe/pagko8a.afm
+share/gnome/fonts/afms/adobe/pbkd8a.afm
+share/gnome/fonts/afms/adobe/pbkdi8a.afm
+share/gnome/fonts/afms/adobe/pbkl8a.afm
+share/gnome/fonts/afms/adobe/pbkli8a.afm
+share/gnome/fonts/afms/adobe/pcrb8a.afm
+share/gnome/fonts/afms/adobe/pcrbo8a.afm
+share/gnome/fonts/afms/adobe/pcrr8a.afm
+share/gnome/fonts/afms/adobe/pcrro8a.afm
+share/gnome/fonts/afms/adobe/phvb8a.afm
+share/gnome/fonts/afms/adobe/phvb8an.afm
+share/gnome/fonts/afms/adobe/phvbo8a.afm
+share/gnome/fonts/afms/adobe/phvbo8an.afm
+share/gnome/fonts/afms/adobe/phvl8a.afm
+share/gnome/fonts/afms/adobe/phvlo8a.afm
+share/gnome/fonts/afms/adobe/phvr8a.afm
+share/gnome/fonts/afms/adobe/phvr8an.afm
+share/gnome/fonts/afms/adobe/phvro8a.afm
+share/gnome/fonts/afms/adobe/phvro8an.afm
+share/gnome/fonts/afms/adobe/pncb8a.afm
+share/gnome/fonts/afms/adobe/pncbi8a.afm
+share/gnome/fonts/afms/adobe/pncr8a.afm
+share/gnome/fonts/afms/adobe/pncri8a.afm
+share/gnome/fonts/afms/adobe/pplb8a.afm
+share/gnome/fonts/afms/adobe/pplbi8a.afm
+share/gnome/fonts/afms/adobe/pplr8a.afm
+share/gnome/fonts/afms/adobe/pplri8a.afm
+share/gnome/fonts/afms/adobe/psyr.afm
+share/gnome/fonts/afms/adobe/ptmb8a.afm
+share/gnome/fonts/afms/adobe/ptmbi8a.afm
+share/gnome/fonts/afms/adobe/ptmr8a.afm
+share/gnome/fonts/afms/adobe/ptmri8a.afm
+share/gnome/fonts/afms/adobe/putb8a.afm
+share/gnome/fonts/afms/adobe/putbi8a.afm
+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
+@dirrm share/gnome/fonts/afms/adobe
+@dirrm share/gnome/fonts/afms
 @dirrm share/gnome/fonts
 @dirrm include/libgnomeprint
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index b09de3258704..7c7f39d978b0 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	gnomeprint
-# Version required:			0.1.1
+# Version required:			0.4
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1999/04/22 07:57:18 mharo Exp $
+# $Id: Makefile,v 1.6 1999/05/30 03:52:57 steve Exp $
 #
 
-DISTNAME=	gnome-print-0.1.1
-PKGNAME=	gnomeprint-0.1.1
+DISTNAME=	gnome-print-0.4
+PKGNAME=	gnomeprint-0.4
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-print
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs \
+		xml.4:${PORTSDIR}/textproc/libxml \
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/print/gnomeprint/distinfo b/print/gnomeprint/distinfo
index 4a5996bd3ef6..cc9e2656c155 100644
--- a/print/gnomeprint/distinfo
+++ b/print/gnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.1.1.tar.gz) = 4816c6e1efda50a7f7860408eb7a20ff
+MD5 (gnome-print-0.4.tar.gz) = 137571ca9dbb625f54731e9b73ed5ed3
diff --git a/print/gnomeprint/files/patch-ab b/print/gnomeprint/files/patch-ab
index df0232a828a7..687571490f12 100644
--- a/print/gnomeprint/files/patch-ab
+++ b/print/gnomeprint/files/patch-ab
@@ -1,20 +1,11 @@
---- Makefile.in.orig	Tue Feb  2 08:05:00 1999
-+++ Makefile.in	Thu Feb 18 17:14:57 1999
-@@ -161,7 +161,7 @@
+--- 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	
  
- EXTRA_DIST = printConf.sh.in gnome-font-install.in
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = printConf.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -562,7 +562,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-confexecDATA \
- 		uninstall-libgnomeprintincHEADERS
- uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
- 		$(HEADERS) config.h
- all-redirect: all-recursive-am
- install-strip:
+ 
+ gnome_font_install_SOURCES = gnome-font-install.c
diff --git a/print/gnomeprint/pkg-plist b/print/gnomeprint/pkg-plist
index e0b8c1605672..15ac5d83b4ad 100644
--- a/print/gnomeprint/pkg-plist
+++ b/print/gnomeprint/pkg-plist
@@ -10,16 +10,63 @@ include/libgnomeprint/gnome-printer.h
 include/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.so
-lib/libgnomeprint.so.0
+lib/libgnomeprint.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/fonts/fontmap
 share/gnome/gnome-print/profiles/Postscript.profile
+share/locale/de/LC_MESSAGES/gnome-print.mo
 share/locale/es/LC_MESSAGES/gnome-print.mo
+share/locale/fr/LC_MESSAGES/gnome-print.mo
+share/locale/hu/LC_MESSAGES/gnome-print.mo
+share/locale/it/LC_MESSAGES/gnome-print.mo
 share/locale/no/LC_MESSAGES/gnome-print.mo
 share/locale/pl/LC_MESSAGES/gnome-print.mo
 share/locale/ru/LC_MESSAGES/gnome-print.mo
 @dirrm share/gnome/gnome-print/profiles
 @dirrm share/gnome/gnome-print
+share/gnome/fonts/afms/adobe/pagd8a.afm
+share/gnome/fonts/afms/adobe/pagdo8a.afm
+share/gnome/fonts/afms/adobe/pagk8a.afm
+share/gnome/fonts/afms/adobe/pagko8a.afm
+share/gnome/fonts/afms/adobe/pbkd8a.afm
+share/gnome/fonts/afms/adobe/pbkdi8a.afm
+share/gnome/fonts/afms/adobe/pbkl8a.afm
+share/gnome/fonts/afms/adobe/pbkli8a.afm
+share/gnome/fonts/afms/adobe/pcrb8a.afm
+share/gnome/fonts/afms/adobe/pcrbo8a.afm
+share/gnome/fonts/afms/adobe/pcrr8a.afm
+share/gnome/fonts/afms/adobe/pcrro8a.afm
+share/gnome/fonts/afms/adobe/phvb8a.afm
+share/gnome/fonts/afms/adobe/phvb8an.afm
+share/gnome/fonts/afms/adobe/phvbo8a.afm
+share/gnome/fonts/afms/adobe/phvbo8an.afm
+share/gnome/fonts/afms/adobe/phvl8a.afm
+share/gnome/fonts/afms/adobe/phvlo8a.afm
+share/gnome/fonts/afms/adobe/phvr8a.afm
+share/gnome/fonts/afms/adobe/phvr8an.afm
+share/gnome/fonts/afms/adobe/phvro8a.afm
+share/gnome/fonts/afms/adobe/phvro8an.afm
+share/gnome/fonts/afms/adobe/pncb8a.afm
+share/gnome/fonts/afms/adobe/pncbi8a.afm
+share/gnome/fonts/afms/adobe/pncr8a.afm
+share/gnome/fonts/afms/adobe/pncri8a.afm
+share/gnome/fonts/afms/adobe/pplb8a.afm
+share/gnome/fonts/afms/adobe/pplbi8a.afm
+share/gnome/fonts/afms/adobe/pplr8a.afm
+share/gnome/fonts/afms/adobe/pplri8a.afm
+share/gnome/fonts/afms/adobe/psyr.afm
+share/gnome/fonts/afms/adobe/ptmb8a.afm
+share/gnome/fonts/afms/adobe/ptmbi8a.afm
+share/gnome/fonts/afms/adobe/ptmr8a.afm
+share/gnome/fonts/afms/adobe/ptmri8a.afm
+share/gnome/fonts/afms/adobe/putb8a.afm
+share/gnome/fonts/afms/adobe/putbi8a.afm
+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
+@dirrm share/gnome/fonts/afms/adobe
+@dirrm share/gnome/fonts/afms
 @dirrm share/gnome/fonts
 @dirrm include/libgnomeprint
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index b09de3258704..7c7f39d978b0 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	gnomeprint
-# Version required:			0.1.1
+# Version required:			0.4
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1999/04/22 07:57:18 mharo Exp $
+# $Id: Makefile,v 1.6 1999/05/30 03:52:57 steve Exp $
 #
 
-DISTNAME=	gnome-print-0.1.1
-PKGNAME=	gnomeprint-0.1.1
+DISTNAME=	gnome-print-0.4
+PKGNAME=	gnomeprint-0.4
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-print
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs \
+		xml.4:${PORTSDIR}/textproc/libxml \
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 4a5996bd3ef6..cc9e2656c155 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.1.1.tar.gz) = 4816c6e1efda50a7f7860408eb7a20ff
+MD5 (gnome-print-0.4.tar.gz) = 137571ca9dbb625f54731e9b73ed5ed3
diff --git a/print/libgnomeprint/files/patch-ab b/print/libgnomeprint/files/patch-ab
index df0232a828a7..687571490f12 100644
--- a/print/libgnomeprint/files/patch-ab
+++ b/print/libgnomeprint/files/patch-ab
@@ -1,20 +1,11 @@
---- Makefile.in.orig	Tue Feb  2 08:05:00 1999
-+++ Makefile.in	Thu Feb 18 17:14:57 1999
-@@ -161,7 +161,7 @@
+--- 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	
  
- EXTRA_DIST = printConf.sh.in gnome-font-install.in
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = printConf.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -562,7 +562,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-confexecDATA \
- 		uninstall-libgnomeprintincHEADERS
- uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
- 		$(HEADERS) config.h
- all-redirect: all-recursive-am
- install-strip:
+ 
+ gnome_font_install_SOURCES = gnome-font-install.c
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index e0b8c1605672..15ac5d83b4ad 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -10,16 +10,63 @@ include/libgnomeprint/gnome-printer.h
 include/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.so
-lib/libgnomeprint.so.0
+lib/libgnomeprint.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/fonts/fontmap
 share/gnome/gnome-print/profiles/Postscript.profile
+share/locale/de/LC_MESSAGES/gnome-print.mo
 share/locale/es/LC_MESSAGES/gnome-print.mo
+share/locale/fr/LC_MESSAGES/gnome-print.mo
+share/locale/hu/LC_MESSAGES/gnome-print.mo
+share/locale/it/LC_MESSAGES/gnome-print.mo
 share/locale/no/LC_MESSAGES/gnome-print.mo
 share/locale/pl/LC_MESSAGES/gnome-print.mo
 share/locale/ru/LC_MESSAGES/gnome-print.mo
 @dirrm share/gnome/gnome-print/profiles
 @dirrm share/gnome/gnome-print
+share/gnome/fonts/afms/adobe/pagd8a.afm
+share/gnome/fonts/afms/adobe/pagdo8a.afm
+share/gnome/fonts/afms/adobe/pagk8a.afm
+share/gnome/fonts/afms/adobe/pagko8a.afm
+share/gnome/fonts/afms/adobe/pbkd8a.afm
+share/gnome/fonts/afms/adobe/pbkdi8a.afm
+share/gnome/fonts/afms/adobe/pbkl8a.afm
+share/gnome/fonts/afms/adobe/pbkli8a.afm
+share/gnome/fonts/afms/adobe/pcrb8a.afm
+share/gnome/fonts/afms/adobe/pcrbo8a.afm
+share/gnome/fonts/afms/adobe/pcrr8a.afm
+share/gnome/fonts/afms/adobe/pcrro8a.afm
+share/gnome/fonts/afms/adobe/phvb8a.afm
+share/gnome/fonts/afms/adobe/phvb8an.afm
+share/gnome/fonts/afms/adobe/phvbo8a.afm
+share/gnome/fonts/afms/adobe/phvbo8an.afm
+share/gnome/fonts/afms/adobe/phvl8a.afm
+share/gnome/fonts/afms/adobe/phvlo8a.afm
+share/gnome/fonts/afms/adobe/phvr8a.afm
+share/gnome/fonts/afms/adobe/phvr8an.afm
+share/gnome/fonts/afms/adobe/phvro8a.afm
+share/gnome/fonts/afms/adobe/phvro8an.afm
+share/gnome/fonts/afms/adobe/pncb8a.afm
+share/gnome/fonts/afms/adobe/pncbi8a.afm
+share/gnome/fonts/afms/adobe/pncr8a.afm
+share/gnome/fonts/afms/adobe/pncri8a.afm
+share/gnome/fonts/afms/adobe/pplb8a.afm
+share/gnome/fonts/afms/adobe/pplbi8a.afm
+share/gnome/fonts/afms/adobe/pplr8a.afm
+share/gnome/fonts/afms/adobe/pplri8a.afm
+share/gnome/fonts/afms/adobe/psyr.afm
+share/gnome/fonts/afms/adobe/ptmb8a.afm
+share/gnome/fonts/afms/adobe/ptmbi8a.afm
+share/gnome/fonts/afms/adobe/ptmr8a.afm
+share/gnome/fonts/afms/adobe/ptmri8a.afm
+share/gnome/fonts/afms/adobe/putb8a.afm
+share/gnome/fonts/afms/adobe/putbi8a.afm
+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
+@dirrm share/gnome/fonts/afms/adobe
+@dirrm share/gnome/fonts/afms
 @dirrm share/gnome/fonts
 @dirrm include/libgnomeprint