13 files changed, 2 insertions, 283 deletions

diff --git a/print/Makefile b/print/Makefile
index fe7c683deac3..ea5e550af04c 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -94,8 +94,8 @@
     SUBDIR += gimp-print
     SUBDIR += gl2ps
     SUBDIR += gnome-cups-manager
+    SUBDIR += gnome-print
     SUBDIR += gnomephotoprinter
-    SUBDIR += gnomeprint
     SUBDIR += gribouy
     SUBDIR += gsfonts
     SUBDIR += gtklp
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index f4fb6e884448..921f0ad61893 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomeprint
+PORTNAME=	gnome-print
 PORTVERSION=	0.37
 PORTREVISION=	2
 CATEGORIES=	print gnome
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
deleted file mode 100644
index f4fb6e884448..000000000000
--- a/print/gnomeprint/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for:	gnomeprint
-# Date created:				15 Jan 1999
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomeprint
-PORTVERSION=	0.37
-PORTREVISION=	2
-CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-print/0.37
-DISTNAME=	gnome-print-${PORTVERSION}
-DIST_SUBDIR=	gnome
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Gnome print support library
-
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
-
-USE_GHOSTSCRIPT_RUN=	yes
-
-PLIST_SUB=	VERSION=${PORTVERSION}
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
-USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-pre-everything::
-.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO_MSG} ""
-.endif
-
-post-install:
-	@${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap
-
-.include <bsd.port.mk>
diff --git a/print/gnomeprint/distinfo b/print/gnomeprint/distinfo
deleted file mode 100644
index ce464376ff12..000000000000
--- a/print/gnomeprint/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome/gnome-print-0.37.tar.bz2) = f9e13f4f17b04baceec1cdeed0f88eae
-SHA256 (gnome/gnome-print-0.37.tar.bz2) = 9d901f9ec9991e76e9fcfb53ac71b5351e86d2aeaa6d6b5539c8dd66ab4c174d
-SIZE (gnome/gnome-print-0.37.tar.bz2) = 768373
diff --git a/print/gnomeprint/files/patch-ab b/print/gnomeprint/files/patch-ab
deleted file mode 100644
index f4479734a47b..000000000000
--- a/print/gnomeprint/files/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$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
- 
- 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/gnomeprint/files/patch-installer_gf-pfb.c b/print/gnomeprint/files/patch-installer_gf-pfb.c
deleted file mode 100644
index 6774d50122b7..000000000000
--- a/print/gnomeprint/files/patch-installer_gf-pfb.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- installer/gf-pfb.c.orig	Mon Mar 22 23:33:20 2004
-+++ installer/gf-pfb.c	Mon Mar 22 23:33:36 2004
-@@ -12,7 +12,8 @@
- #include <fcntl.h>
- #include <string.h>
- #include <ctype.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include "gf-pfb.h"
- 
- #define noVERBOSE
diff --git a/print/gnomeprint/files/patch-installer_gf-ttf.c b/print/gnomeprint/files/patch-installer_gf-ttf.c
deleted file mode 100644
index ad7cf3779c56..000000000000
--- a/print/gnomeprint/files/patch-installer_gf-ttf.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- installer/gf-ttf.c.orig	Mon Mar 22 23:34:10 2004
-+++ installer/gf-ttf.c	Mon Mar 22 23:34:23 2004
-@@ -32,7 +32,8 @@
- #include <fcntl.h>
- #include <string.h>
- #include <ctype.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #include "gf-ttf.h"
- 
diff --git a/print/gnomeprint/files/patch-installer_gnome-font-install.c b/print/gnomeprint/files/patch-installer_gnome-font-install.c
deleted file mode 100644
index d1ee9d152f7d..000000000000
--- a/print/gnomeprint/files/patch-installer_gnome-font-install.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- installer/gnome-font-install.c.orig	Mon Mar 22 23:32:31 2004
-+++ installer/gnome-font-install.c	Mon Mar 22 23:32:44 2004
-@@ -26,7 +26,8 @@
- #include <parser.h>
- #include <xmlmemory.h>
- /* End of ugly thing */
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <libgnome/gnome-defs.h>
- #include <libgnome/gnome-util.h>
- #include <libgnome/gnome-i18n.h>
diff --git a/print/gnomeprint/files/patch-libgnomeprint_gnome-font-private.h b/print/gnomeprint/files/patch-libgnomeprint_gnome-font-private.h
deleted file mode 100644
index f2a1a880c410..000000000000
--- a/print/gnomeprint/files/patch-libgnomeprint_gnome-font-private.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomeprint/gnome-font-private.h.orig	Mon Mar 22 23:31:37 2004
-+++ libgnomeprint/gnome-font-private.h	Mon Mar 22 23:31:52 2004
-@@ -22,7 +22,8 @@
- 
- BEGIN_GNOME_DECLS
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <libgnomeprint/gp-character-block.h>
- #include <libgnomeprint/gp-fontmap.h>
- #include <libgnomeprint/gnome-font.h>
diff --git a/print/gnomeprint/files/patch-libgnomeprint_parseTT.c b/print/gnomeprint/files/patch-libgnomeprint_parseTT.c
deleted file mode 100644
index 218bdd1438d6..000000000000
--- a/print/gnomeprint/files/patch-libgnomeprint_parseTT.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomeprint/parseTT.c.orig	Mon Mar 22 23:29:57 2004
-+++ libgnomeprint/parseTT.c	Mon Mar 22 23:30:15 2004
-@@ -107,7 +107,8 @@
- #include <config.h>
- 
- #include <parseTT.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <freetype/ftglyph.h>
- #include <freetype/ftoutln.h>
- #include <stdio.h>
diff --git a/print/gnomeprint/files/patch-libgnomeprint_parseTT.h b/print/gnomeprint/files/patch-libgnomeprint_parseTT.h
deleted file mode 100644
index f938cc0d4d5a..000000000000
--- a/print/gnomeprint/files/patch-libgnomeprint_parseTT.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomeprint/parseTT.h.orig	Mon Mar 22 23:30:50 2004
-+++ libgnomeprint/parseTT.h	Mon Mar 22 23:31:05 2004
-@@ -22,7 +22,8 @@
- BEGIN_GNOME_DECLS
- 
- #include <glib.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- /*
-  * Convert loaded Freetype TTF face to Type1
diff --git a/print/gnomeprint/pkg-descr b/print/gnomeprint/pkg-descr
deleted file mode 100644
index f7ae47f42231..000000000000
--- a/print/gnomeprint/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-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/gnomeprint/pkg-plist b/print/gnomeprint/pkg-plist
deleted file mode 100644
index 0ebdefdb5faa..000000000000
--- a/print/gnomeprint/pkg-plist
+++ /dev/null
@@ -1,121 +0,0 @@
-bin/gnome-font-install
-etc/gnome/fonts/gnome-print-ghostscript.fontmap
-etc/gnome/fonts/gnome-print-x11.fontmap
-etc/gnome/fonts/gnome-print.fontmap
-etc/printConf.sh
-include/gnome-1.0/libgnomeprint/gnome-font-dialog.h
-include/gnome-1.0/libgnomeprint/gnome-font-face-private.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.la
-lib/libgnomeprint.so
-lib/libgnomeprint.so.16
-share/gnome/fonts/README.binaries
-share/gnome/fonts/README.installer
-share/gnome/fonts/adobe-urw.font
-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
-share/gnome/fonts/defaults.fontmap
-share/gnome/gnome-print/profiles/PostscriptOptimized.profile
-share/gnome/gnome-print/profiles/fax-g3.profile
-share/gnome/gnome-print/profiles/pdf.profile
-share/locale/az/LC_MESSAGES/gnome-print.mo
-share/locale/bg/LC_MESSAGES/gnome-print.mo
-share/locale/ca/LC_MESSAGES/gnome-print.mo
-share/locale/da/LC_MESSAGES/gnome-print.mo
-share/locale/de/LC_MESSAGES/gnome-print.mo
-share/locale/el/LC_MESSAGES/gnome-print.mo
-share/locale/es/LC_MESSAGES/gnome-print.mo
-share/locale/et/LC_MESSAGES/gnome-print.mo
-share/locale/eu/LC_MESSAGES/gnome-print.mo
-share/locale/fi/LC_MESSAGES/gnome-print.mo
-share/locale/fr/LC_MESSAGES/gnome-print.mo
-share/locale/gl/LC_MESSAGES/gnome-print.mo
-share/locale/hr/LC_MESSAGES/gnome-print.mo
-share/locale/hu/LC_MESSAGES/gnome-print.mo
-share/locale/it/LC_MESSAGES/gnome-print.mo
-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/lv/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/LC_MESSAGES/gnome-print.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-print.mo
-share/locale/ro/LC_MESSAGES/gnome-print.mo
-share/locale/ru/LC_MESSAGES/gnome-print.mo
-share/locale/sk/LC_MESSAGES/gnome-print.mo
-share/locale/sl/LC_MESSAGES/gnome-print.mo
-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/wa/LC_MESSAGES/gnome-print.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-print.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
-@dirrm share/gnome/gnome-print/profiles
-@dirrm share/gnome/gnome-print
-@dirrm share/gnome/fonts/afms/adobe
-@dirrm share/gnome/fonts/afms
-@dirrm include/gnome-1.0/libgnomeprint
-@dirrm etc/gnome/fonts