4 files changed, 39 insertions, 41 deletions

diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 4af531cc2eab..b09de3258704 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,33 +1,32 @@
 # New ports collection makefile for:	gnomeprint
-# Version required:			0.0.3
+# Version required:			0.1.1
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/04/08 18:08:36 steve Exp $
+# $Id: Makefile,v 1.5 1999/04/22 07:57:18 mharo Exp $
 #
 
-DISTNAME=	gnome-print-0.0.3
-PKGNAME=	gnomeprint-0.0.3
+DISTNAME=	gnome-print-0.1.1
+PKGNAME=	gnomeprint-0.1.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-print
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PERL5=	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"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		--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/gnome-print/distinfo b/print/gnome-print/distinfo
index 74c34dcd86ef..4a5996bd3ef6 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.0.3.tar.gz) = 3337f7fa507b39ff0f888e445e723722
+MD5 (gnome-print-0.1.1.tar.gz) = 4816c6e1efda50a7f7860408eb7a20ff
diff --git a/print/gnome-print/files/patch-ab b/print/gnome-print/files/patch-ab
index d8b59d3bf5c5..df0232a828a7 100644
--- a/print/gnome-print/files/patch-ab
+++ b/print/gnome-print/files/patch-ab
@@ -1,31 +1,20 @@
---- Makefile.in.orig	Fri Jan 15 20:58:53 1999
-+++ Makefile.in	Fri Jan 15 21:01:08 1999
-@@ -174,7 +174,7 @@
+--- Makefile.in.orig	Tue Feb  2 08:05:00 1999
++++ Makefile.in	Thu Feb 18 17:14:57 1999
+@@ -161,7 +161,7 @@
  
  EXTRA_DIST = printConf.sh.in gnome-font-install.in
  
--confexecdir=$(libdir)
-+confexecdir=$(datadir)
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
  confexec_DATA = printConf.sh
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -504,7 +504,7 @@
- all-recursive-am: config.h
- 	$(MAKE) all-recursive
- 
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) config.h
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) config.h
- 
- install-exec-am: install-libLTLIBRARIES install-confexecDATA
- 
---- po/Makefile.in.in.orig	Fri Jan 15 21:01:12 1999
-+++ po/Makefile.in.in	Fri Jan 15 21:01:54 1999
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
+@@ -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:
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index 51bdde9869c7..e0b8c1605672 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -1,15 +1,25 @@
+bin/gnome-font-install
+etc/printConf.sh
+include/libgnomeprint/gnome-font-dialog.h
 include/libgnomeprint/gnome-font.h
+include/libgnomeprint/gnome-print-i18n.h
 include/libgnomeprint/gnome-print.h
 include/libgnomeprint/gnome-printer-dialog.h
+include/libgnomeprint/gnome-printer-profile.h
 include/libgnomeprint/gnome-printer.h
 include/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
-lib/libgnomeprint.la
 lib/libgnomeprint.so
 lib/libgnomeprint.so.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/printConf.sh
 share/gnome/fonts/fontmap
+share/gnome/gnome-print/profiles/Postscript.profile
+share/locale/es/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
 @dirrm share/gnome/fonts
+@dirrm include/libgnomeprint