- Support staging [1]

- Use OPTIONS helpers [1]
- Catch up to latest freetype2 version [1]
- Updates to LIB_DEPENDS and USES [1]
- Strip program, libs and plugins

PR:		ports/187641 [1]
Submitted by:	maintainer

4 files changed, 64 insertions, 83 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 5db4461954ae..7ccaa6e0bf53 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fontforge
 DISTVERSION=	20120731-b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source \
 		SF/freetype/${PORTNAME}/${PORTVERSION}:freetype \
@@ -17,25 +17,47 @@ DISTFILES=	${PORTNAME}_full-${DISTVERSION}.tar.bz2
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
 
-LIB_DEPENDS=	uninameslist:${PORTSDIR}/textproc/libuninameslist \
-		tiff:${PORTSDIR}/graphics/tiff \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		gif:${PORTSDIR}/graphics/giflib \
-		xml2:${PORTSDIR}/textproc/libxml2 \
-		spiro:${PORTSDIR}/graphics/libspiro
+LIB_DEPENDS=	libuninameslist.so:${PORTSDIR}/textproc/libuninameslist \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
+		libspiro.so:${PORTSDIR}/graphics/libspiro
 
-USE_BZIP2=	yes
-USES=		gettext iconv
+USES=		gettext gmake iconv tar:bzip2
 USE_XORG=	x11 xi ice xkbui
-USE_GMAKE=	yes
 PATCH_STRIP=	-l
 
+CONFIGURE_ARGS=	--enable-devicetables --enable-pasteafter --enable-tilepath
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool
+
 OPTIONS_DEFINE=	DOCS MULTILAYER FREETYPE PLUGINS PYTHON CAIRO PANGO
-OPTIONS_DEFAULT=	DOCS MULTILAYER PLUGINS
-MULTILAYER_DESC=	type3/SVG multilayer font support
+OPTIONS_SUB=	yes
+OPTIONS_DEFAULT=	MULTILAYER PLUGINS
+MULTILAYER_DESC=	Type3/SVG multilayer font support
+
+FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_CONFIGURE_ENABLE=	freetype
+FREETYPE_CONFIGURE_WITH=	freetype-bytecode
+
+MULTILAYER_CONFIGURE_ENABLE=	type3
+
+PYTHON_USE=	PYTHON=yes
+PYTHON_CONFIGURE_WITH=	python
+PYTHON_LDFLAGS=	-lutil
+
+CAIRO_USE=	GNOME=cairo
+CAIRO_CONFIGURE_WITH=	cairo
+
+PANGO_USE=	GNOME=pango
+PANGO_CONFIGURE_WITH=	pango
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -45,63 +67,18 @@ DOCFILES=	${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
 DISTFILES+=	${DOCFILES:C/$/:docs/}
 .endif
 
-.if ${PORT_OPTIONS:MMULTILAYER}
-WITH_TYPE3_MULTILAYER=	--enable-type3
-.else
-WITH_TYPE3_MULTILAYER=	--disable-type3
-.endif
-
 .if ${PORT_OPTIONS:MFREETYPE}
-FREETYPE_VERSION=	2.4.11
+FREETYPE_VERSION=	2.5.3
 FREETYPE_SRC=	freetype-${FREETYPE_VERSION}.tar.bz2
 DISTFILES+=	${FREETYPE_SRC:C/$/:freetype/}
-WITH_FREETYPE_SRC=	--enable-freetype --with-freetype-bytecode \
-			--with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION}
-LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
-.else
-WITH_FREETYPE_SRC=	--disable-freetype --without-freetype-bytecode \
-			--without-freetype-src
-.endif
-
-CONFIGURE_ARGS=	${WITH_TYPE3_MULTILAYER} --enable-devicetables ${WITH_FREETYPE_SRC} \
-		--enable-pasteafter --enable-tilepath
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool
-
-MAN1=		fontforge.1 fontimage.1 fontlint.1 sfddiff.1
-
-.if ${PORT_OPTIONS:MPLUGINS}
-PLIST_SUB+=	NO_PLUGINS=""
+CONFIGURE_ARGS+=	--with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION}
 .else
-PLIST_SUB+=	NO_PLUGINS="@comment "
+CONFIGURE_ARGS+=	--without-freetype-src
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	Python on non-i386 systems doesn't link with Fontforge (issues with use of Python's .a file)
-CONFIGURE_ARGS+=	--with-python
-LDFLAGS+=	-lutil
-.else
-CONFIGURE_ARGS+=	--without-python
-.endif
-
-.if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
-CONFIGURE_ARGS+=	--with-cairo
-.else
-CONFIGURE_ARGS+=	--without-cairo
-.endif
-
-.if ${PORT_OPTIONS:MPANGO}
-USE_GNOME+=	pango
-CONFIGURE_ARGS+=	--with-pango
-.else
-CONFIGURE_ARGS+=	--without-pango
 .endif
 
 pre-everything::
@@ -133,17 +110,17 @@ post-build:
 .endif
 
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
 .if ${PORT_OPTIONS:MPLUGINS}
-	${MKDIR} ${PREFIX}/share/fontforge/plugins
-	(cd ${WRKSRC}/plugins; ${INSTALL_DATA} .libs/* ${PREFIX}/share/fontforge/plugins)
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-# Ditto the above note in post-extract for these comments
-#	${MKDIR} ${DOCSDIR}/flags
-	${INSTALL_DATA} ${WRKDIR}/html/*.* ${DOCSDIR}
-#	${INSTALL_DATA} ${WRKDIR}/html/flags/*.* ${DOCSDIR}/flags
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/fontforge/plugins
+	@(cd ${WRKSRC}/plugins/.libs && ${STRIP_CMD} gb12345.o gb12345.so)
+	(cd ${WRKSRC}/plugins; ${INSTALL_DATA} .libs/* \
+		${STAGEDIR}${PREFIX}/share/fontforge/plugins)
 .endif
+	${INSTALL_DATA} ${WRKDIR}/html/*.* ${STAGEDIR}${DOCSDIR}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@(cd ${STAGEDIR}${PREFIX}/lib && ${STRIP_CMD} libgunicode.so.3 \
+		libgutils.so.1 libgioftp.so.1 libgdraw.so.4 libfontforge.so.1)
 
 .include <bsd.port.mk>
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 32a25461889b..f5b9480fa5cb 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -2,5 +2,5 @@ SHA256 (fontforge_full-20120731-b.tar.bz2) = 1b6184caff211e315783a029256f56cf05f
 SIZE (fontforge_full-20120731-b.tar.bz2) = 5541994
 SHA256 (fontforge_htdocs-20120731-b.tar.bz2) = 6c3f178484d21814762c52859ffead25564a93e88cd5fe7cc9877e4b7e85105d
 SIZE (fontforge_htdocs-20120731-b.tar.bz2) = 3506833
-SHA256 (freetype-2.4.11.tar.bz2) = ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f
-SIZE (freetype-2.4.11.tar.bz2) = 1546087
+SHA256 (freetype-2.5.3.tar.bz2) = c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e
+SIZE (freetype-2.5.3.tar.bz2) = 1703842
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index 03bf23022128..9511ff301950 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -6,8 +6,8 @@
  	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 -	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
 -	$(INSTALL_DATA) fontforge.pc $(DESTDIR)$(libdir)/pkgconfig
-+	mkdir -p $(prefix)/libdata/pkgconfig
-+	$(INSTALL_DATA) fontforge.pc $(prefix)/libdata/pkgconfig
++	mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
++	$(INSTALL_DATA) fontforge.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
 
  install_docs:
  	mkdir -p $(DESTDIR)$(docdir)
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 1cd669e5b0be..13c32584f434 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -84,6 +84,10 @@ lib/libgunicode.la
 lib/libgunicode.so
 lib/libgunicode.so.3
 libdata/pkgconfig/fontforge.pc
+man/man1/fontforge.1.gz
+man/man1/fontimage.1.gz
+man/man1/fontlint.1.gz
+man/man1/sfddiff.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AA-Comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/AddLookup-Liga.png
 %%PORTDOCS%%%%DOCSDIR%%/AmbrosiaFV-bm.png
@@ -1083,12 +1087,12 @@ libdata/pkgconfig/fontforge.pc
 %%DATADIR%%/pixmaps/viewsmallersize.png
 %%DATADIR%%/pixmaps/viewzoomin.png
 %%DATADIR%%/pixmaps/viewzoomout.png
-%%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.a
-%%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.la
-%%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.lai
-%%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.o
-%%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.so
-%%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.so.0
+%%PLUGINS%%%%DATADIR%%/plugins/gb12345.a
+%%PLUGINS%%%%DATADIR%%/plugins/gb12345.la
+%%PLUGINS%%%%DATADIR%%/plugins/gb12345.lai
+%%PLUGINS%%%%DATADIR%%/plugins/gb12345.o
+%%PLUGINS%%%%DATADIR%%/plugins/gb12345.so
+%%PLUGINS%%%%DATADIR%%/plugins/gb12345.so.0
 %%DATADIR%%/python/excepthook.py
 share/locale/ca/LC_MESSAGES/FontForge.mo
 share/locale/de/LC_MESSAGES/FontForge.mo
@@ -1106,7 +1110,7 @@ share/locale/vi/LC_MESSAGES/FontForge.mo
 share/locale/zh_CN/LC_MESSAGES/FontForge.mo
 share/locale/zh_TW/LC_MESSAGES/FontForge.mo
 @dirrm %%DATADIR%%/python
-%%NO_PLUGINS%%@dirrm %%DATADIR%%/plugins
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%