From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 16 20:50:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE4F81E3 for ; Sun, 16 Mar 2014 20:50:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AA6141E1 for ; Sun, 16 Mar 2014 20:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2GKo0Xf073153 for ; Sun, 16 Mar 2014 20:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2GKo0wt073152; Sun, 16 Mar 2014 20:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 16 Mar 2014 20:50:00 GMT Resent-Message-Id: <201403162050.s2GKo0wt073152@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Naram Qashat Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC1AA170 for ; Sun, 16 Mar 2014 20:44:37 +0000 (UTC) Received: from qmta13.westchester.pa.mail.comcast.net (qmta13.westchester.pa.mail.comcast.net [IPv6:2001:558:fe14:44:76:96:59:243]) by mx1.freebsd.org (Postfix) with ESMTP id 79C711B5 for ; Sun, 16 Mar 2014 20:44:37 +0000 (UTC) Received: from omta18.westchester.pa.mail.comcast.net ([76.96.62.90]) by qmta13.westchester.pa.mail.comcast.net with comcast id eLPs1n0041wpRvQ5DLkbXp; Sun, 16 Mar 2014 20:44:35 +0000 Received: from kirby.cyberbotx.com ([107.5.48.95]) by omta18.westchester.pa.mail.comcast.net with comcast id eLkb1n00H23DSHF3eLkbdb; Sun, 16 Mar 2014 20:44:35 +0000 Received: by kirby.cyberbotx.com (Postfix, from userid 0) id 0A83E2846A; Sun, 16 Mar 2014 16:44:34 -0400 (EDT) Message-Id: <20140316204435.0A83E2846A@kirby.cyberbotx.com> Date: Sun, 16 Mar 2014 16:44:34 -0400 (EDT) From: Naram Qashat To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187641: [MAINTAINER] print/fontforge: Staging, OPTIONS, freetype X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Mar 2014 20:50:00 -0000 >Number: 187641 >Category: ports >Synopsis: [MAINTAINER] print/fontforge: Staging, OPTIONS, freetype >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Mar 16 20:50:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 9.2-STABLE FreeBSD 9.2-STABLE #0 r258460: Thu Nov 21 22:30:13 EST >Description: - Support staging - Use OPTIONS helpers - Catch up to latest freetype2 version - Updates to LIB_DEPENDS and USES Generated with FreeBSD Port Tools 1.00.2014.03.11 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- fontforge-20120731.b.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 348426) +++ Makefile (working copy) @@ -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 @@ 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_SUB= yes OPTIONS_DEFAULT= DOCS MULTILAYER PLUGINS MULTILAYER_DESC= type3/SVG multilayer font support -NO_STAGE= yes +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 + .include .if ${PORT_OPTIONS:MDOCS} @@ -45,65 +67,20 @@ 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 +CONFIGURE_ARGS+= --with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION} .else -WITH_FREETYPE_SRC= --disable-freetype --without-freetype-bytecode \ - --without-freetype-src +CONFIGURE_ARGS+= --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="" -.else -PLIST_SUB+= NO_PLUGINS="@comment " -.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:: .if !${PORT_OPTIONS:MMULTILAYER} @${ECHO_MSG} "If your machine has small memory and you have to edit fonts with a lot" @@ -133,17 +110,17 @@ .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) + ${MKDIR} ${STAGEDIR}${PREFIX}/share/fontforge/plugins + (cd ${WRKSRC}/plugins; ${INSTALL_DATA} .libs/* ${STAGEDIR}${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}${DOCSDIR}/flags + ${INSTALL_DATA} ${WRKDIR}/html/*.* ${STAGEDIR}${DOCSDIR} +# ${INSTALL_DATA} ${WRKDIR}/html/flags/*.* ${STAGEDIR}${DOCSDIR}/flags .endif .include Index: distinfo =================================================================== --- distinfo (revision 348426) +++ distinfo (working copy) @@ -2,5 +2,5 @@ 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 Index: files/patch-Makefile.dynamic.in =================================================================== --- files/patch-Makefile.dynamic.in (revision 348426) +++ files/patch-Makefile.dynamic.in (working copy) @@ -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) Index: pkg-plist =================================================================== --- pkg-plist (revision 348426) +++ pkg-plist (working copy) @@ -84,6 +84,10 @@ 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 @@ %%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/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%% --- fontforge-20120731.b.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: