From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 30 08:40:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 308B9D87 for ; Sun, 30 Dec 2012 08:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 00EFD8FC13 for ; Sun, 30 Dec 2012 08:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qBU8e0qg083517 for ; Sun, 30 Dec 2012 08:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qBU8e0GF083513; Sun, 30 Dec 2012 08:40:00 GMT (envelope-from gnats) Resent-Date: Sun, 30 Dec 2012 08:40:00 GMT Resent-Message-Id: <201212300840.qBU8e0GF083513@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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48FD5D58 for ; Sun, 30 Dec 2012 08:32:50 +0000 (UTC) (envelope-from root@cyberbotx.com) Received: from qmta03.emeryville.ca.mail.comcast.net (qmta03.emeryville.ca.mail.comcast.net [IPv6:2001:558:fe2d:43:76:96:30:32]) by mx1.freebsd.org (Postfix) with ESMTP id 2213B8FC0A for ; Sun, 30 Dec 2012 08:32:49 +0000 (UTC) Received: from omta02.emeryville.ca.mail.comcast.net ([76.96.30.19]) by qmta03.emeryville.ca.mail.comcast.net with comcast id hkX61k0010QkzPwA3kYpQj; Sun, 30 Dec 2012 08:32:49 +0000 Received: from kirby.cyberbotx.com ([69.244.146.119]) by omta02.emeryville.ca.mail.comcast.net with comcast id hkYn1k00F2anbQt8NkYo0y; Sun, 30 Dec 2012 08:32:49 +0000 Received: by kirby.cyberbotx.com (Postfix, from userid 0) id 64E17289C0; Sun, 30 Dec 2012 03:32:41 -0500 (EST) Message-Id: <20121230083241.64E17289C0@kirby.cyberbotx.com> Date: Sun, 30 Dec 2012 03:32:41 -0500 (EST) From: Naram Qashat To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/174823: [MAINTAINER] print/fontforge: update freetype2 version, update to OptionsNG X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2012 08:40:01 -0000 >Number: 174823 >Category: ports >Synopsis: [MAINTAINER] print/fontforge: update freetype2 version, update to OptionsNG >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 Dec 30 08:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 8.3-RELEASE-p4 amd64 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 8.3-RELEASE-p4 FreeBSD 8.3-RELEASE-p4 #4: Mon Oct 1 19:56:21 EDT >Description: - Update freetype2 version to 2.4.11. - Update to OptionsNG. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- fontforge-20120731.b.patch begins here --- diff -ruN --exclude=CVS /usr/ports/print/fontforge/Makefile ./Makefile --- /usr/ports/print/fontforge/Makefile 2012-10-07 17:07:08.000000000 -0400 +++ ./Makefile 2012-12-30 03:00:02.000000000 -0500 @@ -1,9 +1,5 @@ -# New ports collection makefile for: fontforge -# Date created: 25 March 2001 -# Whom: KANOU Hiroki -# +# Created by: KANOU Hiroki # $FreeBSD: head/print/fontforge/Makefile 302608 2012-08-15 22:56:17Z scheidell $ -# PORTNAME= fontforge DISTVERSION= 20120731-b @@ -24,18 +20,6 @@ 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 - -.if !defined(NOPORTDOCS) -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 USE_GETTEXT= yes USE_XORG= x11 xi ice xkbfile @@ -43,13 +27,28 @@ USE_ICONV= yes PATCH_STRIP= -l -.if !defined(FONTFORGE_NO_MULTILAYER) -WITH_MULTILAYER= --enable-type3 +OPTIONS_DEFINE= DOCS MULTILAYER FREETYPE PLUGINS PYTHON CAIRO PYTHON +OPTIONS_DEFAULT= DOCS MULTILAYER PLUGINS +MULTILAYER_DESC= type3/SVG multilayer font support + +.include + +.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 + +.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 +EXTRACT_ONLY+= freetype-${FREETYPE_VERSION}.tar.bz2 WITH_FREETYPE_SRC= --enable-freetype --with-freetype-bytecode \ --with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION} .else @@ -57,7 +56,7 @@ --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 @@ -68,13 +67,13 @@ 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) @@ -84,14 +83,14 @@ 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 @@ -99,23 +98,23 @@ .endif pre-everything:: -.if !defined(WITHOUT_TTF_BYTECODE_ENABLED) && !defined(FONTFORGE_WITH_TTF_DEBUGGER) +.if !${PORT_OPTIONS:MFREETYPE} @${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} "you can use TTF instruction debugger by compiling fontforge port" + @${ECHO_MSG} "with the FREETYPE option enabled." @${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} "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} ; \ @@ -130,7 +129,7 @@ post-patch: @${CHMOD} +x ${WRKSRC}/configure -.if !defined(FONTFORGE_NO_PLUGINS) +.if ${PORT_OPTIONS:MPLUGINS} post-build: cd ${WRKSRC}/plugins; ${GMAKE} .endif @@ -138,11 +137,11 @@ 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} diff -ruN --exclude=CVS /usr/ports/print/fontforge/distinfo ./distinfo --- /usr/ports/print/fontforge/distinfo 2012-10-07 17:07:08.000000000 -0400 +++ ./distinfo 2012-12-30 02:40:34.000000000 -0500 @@ -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 (freetype-2.4.11.tar.bz2) = ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f +SIZE (freetype-2.4.11.tar.bz2) = 1546087 SHA256 (fontforge_htdocs-20120731-b.tar.bz2) = 6c3f178484d21814762c52859ffead25564a93e88cd5fe7cc9877e4b7e85105d SIZE (fontforge_htdocs-20120731-b.tar.bz2) = 3506833 --- fontforge-20120731.b.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: