Re-add libgnomeprint-2.0 for ports that will need it:

misc/gretl
deskutils/glabels
www/screem
graphics/gthumb2
graphics/sodipodi

libgnomeprint[ui]-2.0 will be removed as soon as all dependent ports are
upgraded to the new API.

9 files changed, 241 insertions, 0 deletions

diff --git a/print/Makefile b/print/Makefile
index a2ac88224554..65f4e6c96f36 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -89,6 +89,7 @@
     SUBDIR += latex2slides
     SUBDIR += lgrind
     SUBDIR += libgnomeprint
+    SUBDIR += libgnomeprint20
     SUBDIR += libijs
     SUBDIR += lilypond
     SUBDIR += lout
diff --git a/print/libgnomeprint20/Makefile b/print/libgnomeprint20/Makefile
new file mode 100644
index 000000000000..7757b3149784
--- /dev/null
+++ b/print/libgnomeprint20/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for:	libgnomeprint
+# Date created:				15 Jan 1999
+# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libgnomeprint
+PORTVERSION=	1.116.3
+CATEGORIES=	print gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.116
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Gnome print support library
+
+LIB_DEPENDS=	bonobo-2.0:${PORTSDIR}/devel/libbonobo \
+		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
+
+LATEST_LINK=	libgnomeprint20
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name '*.[ch]' | xargs ${REINPLACE_CMD} -e \
+		's|<malloc[.]h>|<stdlib.h>|'
+
+post-install:
+	@${MKDIR} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts
+	@${TOUCH} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
+
+.include <bsd.port.mk>
diff --git a/print/libgnomeprint20/distinfo b/print/libgnomeprint20/distinfo
new file mode 100644
index 000000000000..2c67dbea3035
--- /dev/null
+++ b/print/libgnomeprint20/distinfo
@@ -0,0 +1 @@
+MD5 (gnome2/libgnomeprint-1.116.3.tar.bz2) = 1257c22c5d8f68033fa47bc25793f651
diff --git a/print/libgnomeprint20/files/patch-ab b/print/libgnomeprint20/files/patch-ab
new file mode 100644
index 000000000000..a691e5034c5a
--- /dev/null
+++ b/print/libgnomeprint20/files/patch-ab
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/print/libgnomeprint20/files/Attic/patch-ab,v 1.1 2003-02-20 18:29:05 marcus Exp $
+
+--- Makefile.in.orig	Mon Jun 10 22:13:33 2002
++++ Makefile.in	Mon Jun 10 22:14:58 2002
+@@ -105,7 +105,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ cxxflags_set = @cxxflags_set@
+ 
+-SUBDIRS = libgnomeprint fonts installer tests data po doc
++SUBDIRS = libgnomeprint fonts installer data po doc
+ 
+ EXTRA_DIST = message-of-doom ChangeLog ChangeLog.old ChangeLog.old.2
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/print/libgnomeprint20/files/patch-configure b/print/libgnomeprint20/files/patch-configure
new file mode 100644
index 000000000000..75b1bebe4a31
--- /dev/null
+++ b/print/libgnomeprint20/files/patch-configure
@@ -0,0 +1,22 @@
+
+$FreeBSD: /tmp/pcvs/ports/print/libgnomeprint20/files/Attic/patch-configure,v 1.1 2003-02-20 18:29:05 marcus Exp $
+
+--- configure.orig	Fri Apr 26 12:49:10 2002
++++ configure	Fri Apr 26 12:49:40 2002
+@@ -5591,6 +5591,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7180,7 +7181,7 @@
+   INSTALL_FONTS_TRUE='#'
+   INSTALL_FONTS_FALSE=
+ fi
+-FONTMAPDIR_STATIC=$datadir/gnome/libgnomeprint-2.0/fonts
++FONTMAPDIR_STATIC=$datadir/libgnomeprint-2.0/fonts
+ FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts
+ 
+ 
diff --git a/print/libgnomeprint20/files/patch-libgnomeprint::drivers::Makefile.in b/print/libgnomeprint20/files/patch-libgnomeprint::drivers::Makefile.in
new file mode 100644
index 000000000000..3f5fd9e7e1d5
--- /dev/null
+++ b/print/libgnomeprint20/files/patch-libgnomeprint::drivers::Makefile.in
@@ -0,0 +1,21 @@
+
+$FreeBSD: /tmp/pcvs/ports/print/libgnomeprint20/files/Attic/patch-libgnomeprint::drivers::Makefile.in,v 1.1 2003-02-20 18:29:05 marcus Exp $
+
+--- libgnomeprint/drivers/Makefile.in	2002/03/19 16:44:23	1.1
++++ libgnomeprint/drivers/Makefile.in	2002/03/19 16:48:12
+@@ -118,13 +118,13 @@
+ OMNI2_SRC = gnome-print-omni2.cpp gnome-print-omni2.hpp
+ OMNI2_LAD = -L$(OMNI_LIBDIR) -lomni
+ libgnomeprint_omni2_la_SOURCES = $(OMNI2_SRC)
+-libgnomeprint_omni2_la_LDFLAGS = -version-info 0:0:0 -module
++libgnomeprint_omni2_la_LDFLAGS = -avoid-version -module
+ libgnomeprint_omni2_la_LIBADD = $(OMNI2_LAD)
+ 
+ FAX_LIB = libgnomeprint-fax.la
+ FAX_SRC = gnome-print-fax.c gnome-print-fax.h gnome-print-fax-g3.h
+ libgnomeprint_fax_la_SOURCES = $(FAX_SRC)
+-libgnomeprint_fax_la_LDFLAGS = -version-info 0:0:0 -module
++libgnomeprint_fax_la_LDFLAGS = -avoid-version -module
+ libgnomeprint_fax_la_LIBADD = 
+ 
+ libexecdir = $(libdir)/gnome-print-2.0/drivers
diff --git a/print/libgnomeprint20/files/patch-libgnomeprint::transports::Makefile.in b/print/libgnomeprint20/files/patch-libgnomeprint::transports::Makefile.in
new file mode 100644
index 000000000000..fd2c0da7ea23
--- /dev/null
+++ b/print/libgnomeprint20/files/patch-libgnomeprint::transports::Makefile.in
@@ -0,0 +1,29 @@
+--- libgnomeprint/transports/Makefile.in.orig	Mon Jun 10 22:16:36 2002
++++ libgnomeprint/transports/Makefile.in	Mon Jun 10 22:22:35 2002
+@@ -121,7 +121,7 @@
+ 
+ libgnomeprint_file_la_SOURCES = $(FILE_SRC)
+ 
+-libgnomeprint_file_la_LDFLAGS = -version-info 0:0:0 -module
++libgnomeprint_file_la_LDFLAGS = -avoid-version -module
+ 
+ libgnomeprint_file_la_LIBADD = 
+ 
+@@ -132,7 +132,7 @@
+ 
+ libgnomeprint_lpr_la_SOURCES = $(LPR_SRC)
+ 
+-libgnomeprint_lpr_la_LDFLAGS = -version-info 0:0:0 -module
++libgnomeprint_lpr_la_LDFLAGS = -avoid-version -module
+ 
+ libgnomeprint_lpr_la_LIBADD = 
+ 
+@@ -143,7 +143,7 @@
+ 
+ libgnomeprint_custom_la_SOURCES = $(CUSTOM_SRC)
+ 
+-libgnomeprint_custom_la_LDFLAGS = -version-info 0:0:0 -module
++libgnomeprint_custom_la_LDFLAGS = -avoid-version -module
+ 
+ libgnomeprint_custom_la_LIBADD = 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/print/libgnomeprint20/pkg-descr b/print/libgnomeprint20/pkg-descr
new file mode 100644
index 000000000000..f7ae47f42231
--- /dev/null
+++ b/print/libgnomeprint20/pkg-descr
@@ -0,0 +1,4 @@
+This is a prototype implementation of the Gnome Printing Architecture,
+as described in:
+
+WWW: http://www.gnome.org/projects/gnome-print/
diff --git a/print/libgnomeprint20/pkg-plist b/print/libgnomeprint20/pkg-plist
new file mode 100644
index 000000000000..b39c2407ecce
--- /dev/null
+++ b/print/libgnomeprint20/pkg-plist
@@ -0,0 +1,104 @@
+bin/libgnomeprint-2.0-font-install
+etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
+include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-pgl.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-config.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-master.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-paper.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-unit.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-rfont.h
+include/libgnomeprint-2.0/libgnomeprint/gp-gc.h
+include/libgnomeprint-2.0/libgnomeprint/private/gnome-font-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gnome-print-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gp-gc-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gpa-private.h
+lib/gnome-print-2.0/drivers/libgnomeprint-fax.so
+lib/gnome-print-2.0/transports/libgnomeprint-custom.so
+lib/gnome-print-2.0/transports/libgnomeprint-file.so
+lib/gnome-print-2.0/transports/libgnomeprint-lpr.so
+lib/libgnomeprint-2.a
+lib/libgnomeprint-2.so
+lib/libgnomeprint-2.so.0
+libdata/pkgconfig/libgnomeprint-2.0.pc
+share/doc/libgnomeprint/index.html
+share/doc/libgnomeprint/index.sgml
+share/doc/libgnomeprint/libgnomeprint-building.html
+share/doc/libgnomeprint/libgnomeprint-compiling.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font.html
+share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
+share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-master.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print.html
+share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
+share/doc/libgnomeprint/libgnomeprint-question-index.html
+share/doc/libgnomeprint/libgnomeprint-resources.html
+share/doc/libgnomeprint/libgnomeprint.html
+share/doc/libgnomeprint/libgnomeprintunsorted.html
+share/gnome/fonts/README.installer
+share/gnome/gnome-print-2.0/media/media.xml
+share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model
+share/gnome/gnome-print-2.0/models/HP-LASERJET-4ML.model
+share/gnome/gnome-print-2.0/models/STYLUS-COLOR-740.model
+share/gnome/gnome-print-2.0/printers/GENERIC.printer
+share/gnome/gnome-print-2.0/vendors/EPSON.vendor
+share/gnome/gnome-print-2.0/vendors/GNOME.vendor
+share/gnome/gnome-print-2.0/vendors/HP.vendor
+share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
+share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
+share/locale/am/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ar/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/be/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/bg/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/cs/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/he/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/it/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ja/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/lv/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/nn/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/no/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/pl/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/pt/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ro/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ru/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/sk/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/sl/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/sv/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ta/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/tr/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/vi/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
+@dirrm share/gnome/libgnomeprint-2.0/fonts
+@dirrm share/gnome/libgnomeprint-2.0
+@dirrm share/gnome/gnome-print-2.0/vendors
+@dirrm share/gnome/gnome-print-2.0/printers
+@dirrm share/gnome/gnome-print-2.0/models
+@dirrm share/gnome/gnome-print-2.0/media
+@dirrm share/gnome/gnome-print-2.0
+@dirrm share/doc/libgnomeprint
+@dirrm lib/gnome-print-2.0/transports
+@dirrm lib/gnome-print-2.0/drivers
+@dirrm lib/gnome-print-2.0
+@dirrm include/libgnomeprint-2.0/libgnomeprint/private
+@dirrm include/libgnomeprint-2.0/libgnomeprint
+@dirrm include/libgnomeprint-2.0