Bug 174823
| Summary: | [MAINTAINER] print/fontforge: update freetype2 version, update to OptionsNG | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Naram Qashat <cyberbotx> | ||||||||
| Component: | Individual Port(s) | Assignee: | Guido Falsi <madpilot> | ||||||||
| Status: | Closed FIXED | ||||||||||
| Severity: | Affects Only Me | ||||||||||
| Priority: | Normal | ||||||||||
| Version: | Latest | ||||||||||
| Hardware: | Any | ||||||||||
| OS: | Any | ||||||||||
| Attachments: |
|
||||||||||
|
Description
Naram Qashat
2012-12-30 08:40:00 UTC
Responsible Changed From-To: freebsd-ports-bugs->bapt I'll take it. I am attaching a new version of the patch, based on a suggestion from bapt@ to have fontforge fetch the freetype tarball as if it was one of it's own distfiles, instead of relying on the user to fetch the freetype tarball themselves. As an aside, I removed freetype from the lib depends, but I am unable to test if this will cause the building of fontforge to fail if the FREETYPE option is chosen. fontforge's configure script seems to look for the freetype library when --enable-freetype is passed to it, so it may be that freetype is still needed as a lib depend. If this can be tested before the port is committed, that would be great. Thanks, Naram Qashat Responsible Changed From-To: bapt->freebsd-ports-bugs Back to the pool as I don't have time for it. Responsible Changed From-To: freebsd-ports-bugs->madpilot I'll take it. Hi! I have tested building the port with the FREETYPE option turned on in tinderbox. It does compile and package, but I'm not able to tell if the freetype option has been actually compiled in. I suspect it has not. configure does look for it and fails to find it. Here is the build log for 9.1 amd64: http://tb.madpilot.net/tb/logs/9.1-RELEASE-amd64-mpports/fontforge-20120731.b_1.log If you want I can send you the generated package for analysis, I have it for 8.3, 9.1 and current. Just to be on the safe side I'd add the dependency conditionally like in the attached patch, if you approve that. Thanks. -- Guido Falsi <madpilot@FreeBSD.org> State Changed From-To: open->feedback Ask for maintainer approval. Not sure why I didn't notice this feedback, but yes, I approve of the patch modification. Thanks, Naram Qashat State Changed From-To: feedback->open Maintainer has approved. Author: madpilot Date: Fri May 3 20:36:33 2013 New Revision: 317239 URL: http://svnweb.freebsd.org/changeset/ports/317239 Log: - Update to use freetype2 2.4.11 - Convert to new options framework - Make dependency on freetype2 conditional - Bump PORTVERSION PR: ports/174823 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) Modified: head/print/fontforge/Makefile head/print/fontforge/distinfo (contents, props changed) Modified: head/print/fontforge/Makefile ============================================================================== --- head/print/fontforge/Makefile Fri May 3 20:32:10 2013 (r317238) +++ head/print/fontforge/Makefile Fri May 3 20:36:33 2013 (r317239) @@ -3,11 +3,16 @@ PORTNAME= fontforge DISTVERSION= 20120731-b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source -DISTFILES= ${EXTRACT_ONLY} -EXTRACT_ONLY= ${PORTNAME}_full-${DISTVERSION}.tar.bz2 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source \ + SF/freetype/${PORTNAME}/${PORTVERSION}:freetype \ + http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/:freetype \ + http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \ + http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \ + ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,}:freetype \ + ftp://ftp.freetype.org/freetype/freetype2/:freetype +DISTFILES= ${PORTNAME}_full-${DISTVERSION}.tar.bz2 MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Type 1/TrueType/OpenType/bitmap font editor @@ -17,43 +22,47 @@ LIB_DEPENDS= uninameslist:${PORTSDIR}/te jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ gif:${PORTSDIR}/graphics/giflib \ - freetype:${PORTSDIR}/print/freetype2 \ xml2:${PORTSDIR}/textproc/libxml2 \ spiro:${PORTSDIR}/graphics/libspiro -.if defined(FONTFORGE_WITH_TTF_DEBUGGER) -FREETYPE_VERSION= 2.4.9 -EXTRACT_ONLY+= freetype-${FREETYPE_VERSION}.tar.bz2 -.endif +USE_BZIP2= yes +USES= gettext iconv +USE_XORG= x11 xi ice xkbui +USE_GMAKE= yes +PATCH_STRIP= -l + +OPTIONS_DEFINE= DOCS MULTILAYER FREETYPE PLUGINS PYTHON CAIRO PYTHON +OPTIONS_DEFAULT= DOCS MULTILAYER PLUGINS +MULTILAYER_DESC= type3/SVG multilayer font support + +.include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} DOC_VERSION= ${DISTVERSION} MASTER_SITES+= SF/${PORTNAME}/${PORTNAME}-docs:docs DOCFILES= ${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2 DISTFILES+= ${DOCFILES:C/$/:docs/} .endif -USE_BZIP2= yes -USES= gettext iconv -USE_XORG= x11 xi ice xkbui -USE_GMAKE= yes -PATCH_STRIP= -l - -.if !defined(FONTFORGE_NO_MULTILAYER) -WITH_MULTILAYER= --enable-type3 +.if ${PORT_OPTIONS:MMULTILAYER} +WITH_TYPE3_MULTILAYER= --enable-type3 .else -WITH_MULTILAYER= --disable-type3 +WITH_TYPE3_MULTILAYER= --disable-type3 .endif -.if !defined(WITHOUT_TTF_BYTECODE_ENABLED) && defined(FONTFORGE_WITH_TTF_DEBUGGER) +.if ${PORT_OPTIONS:MFREETYPE} +FREETYPE_VERSION= 2.4.11 +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_MULTILAYER} --enable-devicetables ${WITH_FREETYPE_SRC} \ +CONFIGURE_ARGS= ${WITH_TYPE3_MULTILAYER} --enable-devicetables ${WITH_FREETYPE_SRC} \ --enable-pasteafter --enable-tilepath CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -64,13 +73,13 @@ USE_AUTOTOOLS= libtool MAN1= fontforge.1 fontimage.1 fontlint.1 sfddiff.1 -.if defined(FONTFORGE_NO_PLUGINS) -PLIST_SUB+= NO_PLUGINS="@comment " -.else +.if ${PORT_OPTIONS:MPLUGINS} PLIST_SUB+= NO_PLUGINS="" +.else +PLIST_SUB+= NO_PLUGINS="@comment " .endif -.if defined(WITH_PYTHON) +.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) @@ -80,14 +89,14 @@ LDFLAGS+= -lutil CONFIGURE_ARGS+= --without-python .endif -.if defined(WITH_CAIRO) +.if ${PORT_OPTIONS:MCAIRO} LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo CONFIGURE_ARGS+= --with-cairo .else CONFIGURE_ARGS+= --without-cairo .endif -.if defined(WITH_PANGO) +.if ${PORT_OPTIONS:MPANGO} USE_GNOME+= pango CONFIGURE_ARGS+= --with-pango .else @@ -95,23 +104,14 @@ CONFIGURE_ARGS+= --without-pango .endif pre-everything:: -.if !defined(WITHOUT_TTF_BYTECODE_ENABLED) && !defined(FONTFORGE_WITH_TTF_DEBUGGER) - @${ECHO_MSG} "If you have built freetype2 port with bytecode interpreter enabled," - @${ECHO_MSG} "You can use TTF instruction debugger by compiling fontforge port" - @${ECHO_MSG} "with FONTFORGE_WITH_TTF_DEBUGGER defined." - @${ECHO_MSG} "Note that you must put the source archive of FreeType in ${DISTDIR}." - @${ECHO_MSG} "If you have installed freetype2 from a package, chdir to ${PORTSDIR}/print/freetype2" - @${ECHO_MSG} "and execute 'make fetch' before building this port". - @${ECHO_MSG} "" -.endif -.if !defined(FONTFORGE_NO_MULTILAYER) +.if !${PORT_OPTIONS:MMULTILAYER} @${ECHO_MSG} "If your machine has small memory and you have to edit fonts with a lot" - @${ECHO_MSG} "of glyphs, you can save memory by defining FONTFORGE_NO_MULTILAYER." + @${ECHO_MSG} "of glyphs, you can save memory by enabling the MULTILAYER option." @${ECHO_MSG} "Enabling multilayer editing increases memory consumption per glyph." @${ECHO_MSG} "" .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-extract: ${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap for doc in ${DOCFILES} ; \ @@ -126,7 +126,7 @@ post-extract: post-patch: @${CHMOD} +x ${WRKSRC}/configure -.if !defined(FONTFORGE_NO_PLUGINS) +.if ${PORT_OPTIONS:MPLUGINS} post-build: cd ${WRKSRC}/plugins; ${GMAKE} .endif @@ -134,11 +134,11 @@ post-build: post-install: ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} -.if !defined(FONTFORGE_NO_PLUGINS) +.if ${PORT_OPTIONS:MPLUGINS} ${MKDIR} ${PREFIX}/share/fontforge/plugins - (cd ${WRKSRC}/plugins; ${INSTALL_DATA} .libs/* ${PREFIX}/share/fontforge/plugins ) + (cd ${WRKSRC}/plugins; ${INSTALL_DATA} .libs/* ${PREFIX}/share/fontforge/plugins) .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} # Ditto the above note in post-extract for these comments # ${MKDIR} ${DOCSDIR}/flags ${INSTALL_DATA} ${WRKDIR}/html/*.* ${DOCSDIR} Modified: head/print/fontforge/distinfo ============================================================================== --- head/print/fontforge/distinfo Fri May 3 20:32:10 2013 (r317238) +++ head/print/fontforge/distinfo Fri May 3 20:36:33 2013 (r317239) @@ -1,6 +1,6 @@ SHA256 (fontforge_full-20120731-b.tar.bz2) = 1b6184caff211e315783a029256f56cf05f1d4fd3cbcb41820d21c7745040fb6 SIZE (fontforge_full-20120731-b.tar.bz2) = 5541994 -SHA256 (freetype-2.4.9.tar.bz2) = c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9 -SIZE (freetype-2.4.9.tar.bz2) = 1504819 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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed, with minor changes. Thanks! |
