Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Dec 2007 06:22:01 -0500
From:      Naram Qashat <cyberbotx@cyberbotx.com>
To:        pav@FreeBSD.org
Cc:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/117983: [MAINTAINER] print/fontforge: update to 20071110
Message-ID:  <47626759.7060302@cyberbotx.com>
In-Reply-To: <1197623123.15488.70.camel@pav.hide.vol.cz>
References:  <200712132344.lBDNiamK059411@freefall.freebsd.org>	 <47621D98.7040509@cyberbotx.com> <1197623123.15488.70.camel@pav.hide.vol.cz>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------090108050801040804030708
Content-Type: text/plain; charset=ISO-8859-2; format=flowed
Content-Transfer-Encoding: 8bit

OK, I've attached a diff to only the Makefile to replace the previous Makefile 
diff.  And I kinda realized after you told me about changing Python's default 
that USE_PYTHON was never defined, so I did at that in as well.

Thanks,
Naram Qashat

Pav Lucistnik wrote:
> Please send me a fresh patch.
> 
> Also I noticed you don't have a dependency on Python specified anywhere.
> You might want to add that.
> 
> Naram Qashat píše v pá 14. 12. 2007 v 01:07 -0500:
>> I have no problem with changing the functionality to have Python be off by 
>> default.  Should I submit a diff for that or will you handle that?  Let me know 
>> in either case.
>>
>> Thanks,
>> Naram Qashat
>>
>> pav@FreeBSD.org wrote:
>>> Synopsis: [MAINTAINER] print/fontforge: update to 20071110
>>>
>>> State-Changed-From-To: open->feedback
>>> State-Changed-By: pav
>>> State-Changed-When: Thu Dec 13 23:41:22 UTC 2007
>>> State-Changed-Why: 
>>> The port, as submitted now, will disable packages outside i386. What about
>>> a) making the python off by default
>>> b) making the python always disabled outside i386
>>> instead?
>>>
>>>
>>> Responsible-Changed-From-To: freebsd-ports-bugs->pav
>>> Responsible-Changed-By: pav
>>> Responsible-Changed-When: Thu Dec 13 23:41:22 UTC 2007
>>> Responsible-Changed-Why: 
>>> The port, as submitted now, will disable packages outside i386. What about
>>> a) making the python off by default
>>> b) making the python always disabled outside i386
>>> instead?
>>>
>>> http://www.freebsd.org/cgi/query-pr.cgi?pr=117983
>>>

--------------090108050801040804030708
Content-Type: text/plain;
 name="fontforge.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="fontforge.diff"

--- /usr/ports/print/fontforge/Makefile	Sun Oct 28 09:37:33 2007
+++ /kirby/shared/ports/fontforge/Makefile	Fri Dec 14 06:13:32 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20071002
+PORTVERSION=	20071210
 CATEGORIES=	print
 MASTER_SITES=	SF
 DISTFILES=	${EXTRACT_ONLY} ${DOCFILES}
@@ -29,7 +29,9 @@
 .endif
 
 .if !defined(NOPORTDOCS)
-DOC_VERSION=	${PORTVERSION}
+#DOC_VERSION=	${PORTVERSION}
+# This version of Fontforge has a different version number for the docs as opposed to the actual source
+DOC_VERSION=	20071211
 DOCFILES=	${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
 .endif
 
@@ -41,16 +43,19 @@
 PATCH_STRIP=	-l
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
 .if !defined(FONTFORGE_NO_MULTILAYER)
 WITH_MULTILAYER=	--with-multilayer
 .endif
+
 .if !defined(WITHOUT_TTF_BYTECODE_ENABLED) && defined(FONTFORGE_WITH_TTF_DEBUGGER)
 WITH_FREETYPE_SRC=	--with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION}
 .else
 WITH_FREETYPE_SRC=	--without-freetype-src
 .endif
+
 CONFIGURE_ARGS=	${WITH_MULTILAYER} --with-devicetables ${WITH_FREETYPE_SRC}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lutil" CFLAGS="${CFLAGS} \
 		-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
 
@@ -67,6 +72,14 @@
 PLIST_SUB+=	NO_PLUGINS=""
 .endif
 
+.if defined(WITH_PYTHON)
+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)
+.else
+CONFIGURE_ARGS+=	--without-python
+.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,"
@@ -84,6 +97,7 @@
 	@${ECHO_MSG} ""
 .endif
 
+.if !defined(NOPORTDOCS)
 post-extract:
 	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
 	for doc in ${DOCFILES} ; \
@@ -91,6 +105,7 @@
 	done
 	${TAR} -xzC ${WRKSRC}/cidmap -f ${WRKDIR}/html/cidmaps.tgz
 	${RM} ${WRKDIR}/html/cidmaps.tgz
+.endif
 
 .if !defined(FONTFORGE_NO_PLUGINS)
 post-build:

--------------090108050801040804030708--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?47626759.7060302>