4 files changed, 19 insertions, 55 deletions

diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile
index 5d2a77ef35e6..429a545dafe9 100644
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@@ -8,27 +8,34 @@
 
 PORTNAME=	gfontview
 PORTVERSION=	0.5.0
-CATEGORIES=	print
+PORTREVISION=	1
+CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	t1:${PORTSDIR}/devel/t1lib \
-		ungif:${PORTSDIR}/graphics/libungif \
-		intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	t1.3:${PORTSDIR}/devel/t1lib
 
 USE_X_PREFIX=	yes
-USE_FREETYPE=	yes
-USE_GTK=	yes
 USE_GNOME=	yes
-USE_AUTOCONF=	yes
+USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-libungif
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		SPOOLER="/usr/bin/lpr" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-fontdir="${LOCALBASE}/share/ghostscript/fonts" \
+		--with-libungif
 
 post-patch:
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile.in
+	@${PERL} -pi -e 's|CXXFLAGS="-O2"|CXXFLAGS="\$$CXXFLAGS"|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' \
+			${WRKSRC}/configure
+	@${PERL} -pi -e 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g ; \
+		 s|/usr/include/freetype|${LOCALBASE}/include/freetype|g' \
+			${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/print/gfontview/files/patch-Makefile.in b/print/gfontview/files/patch-Makefile.in
deleted file mode 100644
index 5cd394f0c3ee..000000000000
--- a/print/gfontview/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Jul 27 02:34:27 2001
-+++ Makefile.in	Fri Jul 27 02:34:49 2001
-@@ -90,7 +90,7 @@
- l = @l@
- 
- SUBDIRS = po intl
--INCLUDES = -DLOCALEDIR=\""$(datadir)/locale"\" -I/usr/include/freetype
-+INCLUDES = -DLOCALEDIR=\""$(datadir)/locale"\" -I%%LOCALBASE%%/include/freetype
- bin_PROGRAMS = gfontview
- gfontview_SOURCES = gfont.C dialogs.C t1.C tt.C gfont.h ps.h t1enc.h
- EXTRA_DIST = ABOUT-NLS gfv.m4 emptypixmap.xpm error.xpm font.xpm mini-ofolder.xpm openhand.xpm t1.xpm tt.xpm stipple.xbm gfontview.lsm gfontview.spec gfontview.desktop gfontview.png gfontviewrc 
diff --git a/print/gfontview/files/patch-configure.in b/print/gfontview/files/patch-configure.in
deleted file mode 100644
index b85f447cc376..000000000000
--- a/print/gfontview/files/patch-configure.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.in.orig	Wed Jul 11 02:23:30 2001
-+++ configure.in	Wed Jul 11 02:28:16 2001
-@@ -41,14 +41,6 @@
- 
- 
- dnl ---------------------------------------------------------------------------
--dnl i18n
--dnl ---------------------------------------------------------------------------
--ALL_LINGUAS="es de fr ru"
--AM_GNU_GETTEXT
--LIBS="$LIBS $INTLLIBS"
--
--
--dnl ---------------------------------------------------------------------------
- dnl checks for needed compilers
- dnl ---------------------------------------------------------------------------
- AC_PROG_CXX
-@@ -120,6 +112,14 @@
- else
-  	AC_CHECK_LIB(ungif, EGifOpenFileName,, AC_MSG_ERROR(Cannot find ungif library))
- fi
-+
-+
-+dnl ---------------------------------------------------------------------------
-+dnl i18n
-+dnl ---------------------------------------------------------------------------
-+ALL_LINGUAS="es de fr ru"
-+AM_GNU_GETTEXT
-+LIBS="$LIBS $INTLLIBS"
- 
- 
- dnl ---------------------------------------------------------------------------
diff --git a/print/gfontview/pkg-plist b/print/gfontview/pkg-plist
index 776f3b1f81b7..196217ed532f 100644
--- a/print/gfontview/pkg-plist
+++ b/print/gfontview/pkg-plist
@@ -1,6 +1,6 @@
 bin/gfontview
 share/gnome/gfontviewrc
-share/gnome/gnome/apps/Utilities/gfontview.desktop
+share/gnome/apps/Utilities/gfontview.desktop
 share/gnome/pixmaps/gfontview.png
 share/locale/de/LC_MESSAGES/gfontview.mo
 share/locale/es/LC_MESSAGES/gfontview.mo