- Update to 20071210

PR:		ports/118637
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)

4 files changed, 132 insertions, 25 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index b9921d21d343..f7bbccb04887 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20071002
+PORTVERSION=	20071210
 CATEGORIES=	print
 MASTER_SITES=	SF
 DISTFILES=	${EXTRACT_ONLY} ${DOCFILES}
@@ -29,7 +29,9 @@ EXTRACT_ONLY+=	freetype-${FREETYPE_VERSION}.tar.bz2
 .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 @@ USE_XLIB=	yes
 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,13 +72,21 @@ PLIST_SUB+=	NO_PLUGINS="@comment "
 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,"
 	@${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/"
+	@${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
@@ -84,6 +97,7 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 
+.if !defined(NOPORTDOCS)
 post-extract:
 	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
 	for doc in ${DOCFILES} ; \
@@ -91,6 +105,7 @@ post-extract:
 	done
 	${TAR} -xzC ${WRKSRC}/cidmap -f ${WRKDIR}/html/cidmaps.tgz
 	${RM} ${WRKDIR}/html/cidmaps.tgz
+.endif
 
 .if !defined(FONTFORGE_NO_PLUGINS)
 post-build:
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 2a186ee67431..b39368e3d0a2 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,9 +1,9 @@
-MD5 (fontforge_full-20071002.tar.bz2) = 0f4090b9035e50befee39d1b8c16cff2
-SHA256 (fontforge_full-20071002.tar.bz2) = af08861c48e8f53e6c0f6e71d77ec227b7339dd0b5ce8253da4e4be79caa2866
-SIZE (fontforge_full-20071002.tar.bz2) = 4264337
+MD5 (fontforge_full-20071210.tar.bz2) = 971a9a36a98efc8bb4e623b3d3fd0591
+SHA256 (fontforge_full-20071210.tar.bz2) = c38e6ea0b0e0bdc70262781995c953071431225a17452551e732ca5480cfe6ba
+SIZE (fontforge_full-20071210.tar.bz2) = 4160548
 MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
 SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
 SIZE (freetype-2.1.10.tar.bz2) = 1037107
-MD5 (fontforge_htdocs-20071002.tar.bz2) = bc0be7d21cf039e6a24c81b65b3f30d9
-SHA256 (fontforge_htdocs-20071002.tar.bz2) = 7006287299edecf5cb1eadd63d52976e7999a593c37eda5614771f709602e6ce
-SIZE (fontforge_htdocs-20071002.tar.bz2) = 2648480
+MD5 (fontforge_htdocs-20071211.tar.bz2) = 5ed3cff928f49fbe103deecee373686f
+SHA256 (fontforge_htdocs-20071211.tar.bz2) = 4489e29ff3e54aec97e8c5e3b88eaa54ab195c30fc6597bbf4009ca583656320
+SIZE (fontforge_htdocs-20071211.tar.bz2) = 2711818
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index 7e9f8f322ad8..4cd62957b81f 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -1,6 +1,6 @@
---- fontforge/Makefile.dynamic.in.orig	Tue Oct 16 12:59:51 2007
-+++ fontforge/Makefile.dynamic.in	Tue Oct 16 13:00:38 2007
-@@ -51,7 +51,7 @@
+--- fontforge/Makefile.dynamic.in.orig	Fri Dec  7 14:01:38 2007
++++ fontforge/Makefile.dynamic.in	Wed Dec 12 20:25:55 2007
+@@ -57,7 +57,7 @@
  DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o namelist.o pua.o
  ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
  
@@ -9,13 +9,15 @@
      @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"' \
      @CPPFLAGS@ '-DPREFIX="@prefix@"'
  CFLAGS = @CFLAGS@ $(_CFLAGS)
-@@ -59,8 +59,8 @@
- #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles
+@@ -66,10 +66,10 @@
  LDFLAGS = @LDFLAGS@
- LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
+ LIBS = -rpath $(libdir) $(X_LIBS) @LINK_WITH_GDRAW@ ../libgutils.la \
+     ../libgunicode.la \
 -    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
--DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
 +    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm -lintl
+ LIBLIBS = -rpath $(libdir) ../libgutils.la ../libgunicode.la \
+     @LIBS@ $(STATIC_LIBS) -lm
+-DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
 +DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm -lintl
  
  all: @FINAL_TARGET@ sfddiff fontimage fontlint
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 76acd839329d..e0c89849cdaa 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -2,6 +2,61 @@ bin/fontforge
 bin/fontimage
 bin/fontlint
 bin/sfddiff
+include/fontforge/autowidth.h
+include/fontforge/baseviews.h
+include/fontforge/basics.h
+include/fontforge/bezctx_ff.h
+include/fontforge/bitmapcontrol.h
+include/fontforge/chardata.h
+include/fontforge/charset.h
+include/fontforge/config.h
+include/fontforge/configure-pfaedit.h
+include/fontforge/dynamic.h
+include/fontforge/edgelist.h
+include/fontforge/edgelist2.h
+include/fontforge/encoding.h
+include/fontforge/fffreetype.h
+include/fontforge/ffpython.h
+include/fontforge/fileutil.h
+include/fontforge/fontforgevw.h
+include/fontforge/fvmetrics.h
+include/fontforge/gdraw.h
+include/fontforge/gfile.h
+include/fontforge/ggadget.h
+include/fontforge/gicons.h
+include/fontforge/gimage.h
+include/fontforge/gio.h
+include/fontforge/gkeysym.h
+include/fontforge/gprogress.h
+include/fontforge/gresource.h
+include/fontforge/groups.h
+include/fontforge/gwidget.h
+include/fontforge/gwwiconv.h
+include/fontforge/import.h
+include/fontforge/intl.h
+include/fontforge/lookups.h
+include/fontforge/mm.h
+include/fontforge/nonlineartrans.h
+include/fontforge/ofl.h
+include/fontforge/pfaedit.h
+include/fontforge/plugins.h
+include/fontforge/print.h
+include/fontforge/psfont.h
+include/fontforge/savefont.h
+include/fontforge/scriptfuncs.h
+include/fontforge/scripting.h
+include/fontforge/sd.h
+include/fontforge/search.h
+include/fontforge/sfd1.h
+include/fontforge/sflayoutP.h
+include/fontforge/splinefont.h
+include/fontforge/stemdb.h
+include/fontforge/ttf.h
+include/fontforge/ttfinstrs.h
+include/fontforge/uiinterface.h
+include/fontforge/unicoderange.h
+include/fontforge/ustring.h
+include/fontforge/utype.h
 lib/libfontforge.a
 lib/libfontforge.la
 lib/libfontforge.so
@@ -9,7 +64,11 @@ lib/libfontforge.so.1
 lib/libgdraw.a
 lib/libgdraw.la
 lib/libgdraw.so
-lib/libgdraw.so.2
+lib/libgdraw.so.3
+lib/libgutils.a
+lib/libgutils.la
+lib/libgutils.so
+lib/libgutils.so.1
 lib/libgunicode.a
 lib/libgunicode.la
 lib/libgunicode.so
@@ -51,6 +110,19 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/Constrain1_2.png
 %%PORTDOCS%%%%DOCSDIR%%/Constrain2_1.png
 %%PORTDOCS%%%%DOCSDIR%%/Constrain2_2.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspirals.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro0.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro1.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro10.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro2.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro3.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro4.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro5.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro6.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro6_5.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro7.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro8.png
+%%PORTDOCS%%%%DOCSDIR%%/Cspiro9.png
 %%PORTDOCS%%%%DOCSDIR%%/CyrilItalicComp.png
 %%PORTDOCS%%%%DOCSDIR%%/DisplayFonts.png
 %%PORTDOCS%%%%DOCSDIR%%/Eback.png
@@ -88,7 +160,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/ItalicCompCaslon.png
 %%PORTDOCS%%%%DOCSDIR%%/ItalicCompGalliard.png
 %%PORTDOCS%%%%DOCSDIR%%/KernPairs.png
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/MATH-Constants.png
 %%PORTDOCS%%%%DOCSDIR%%/MATH-Exten.png
 %%PORTDOCS%%%%DOCSDIR%%/MATH-GlyphConstructed.png
@@ -247,6 +319,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/cvflipicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvfreehandicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvhandicon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvhvcurveicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvknifeicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvmagicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvpenicon.png
@@ -258,6 +331,12 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/cvrulericon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvscaleicon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvskewicon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvspiroG2icon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvspiroG4icon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvspirocornericon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvspirolefticon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvspiromodeicon.png
+%%PORTDOCS%%%%DOCSDIR%%/cvspirorighticon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvstaricon.png
 %%PORTDOCS%%%%DOCSDIR%%/cvt-to-mac.png
 %%PORTDOCS%%%%DOCSDIR%%/cvtangenticon.png
@@ -280,11 +359,13 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/editexample7.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample8.html
 %%PORTDOCS%%%%DOCSDIR%%/editmenu.html
+%%PORTDOCS%%%%DOCSDIR%%/editspiro.html
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-context.png
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-indic.png
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-insert.png
 %%PORTDOCS%%%%DOCSDIR%%/edittransition-kern.png
 %%PORTDOCS%%%%DOCSDIR%%/elementmenu.html
+%%PORTDOCS%%%%DOCSDIR%%/emptyfont-A-sel.png
 %%PORTDOCS%%%%DOCSDIR%%/emptyhlig.png
 %%PORTDOCS%%%%DOCSDIR%%/encodingmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/englishkernpairs.txt
@@ -322,6 +403,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/filemenu.html
 %%PORTDOCS%%%%DOCSDIR%%/files.html
 %%PORTDOCS%%%%DOCSDIR%%/findprobs-att.png
+%%PORTDOCS%%%%DOCSDIR%%/findprobs-bb.png
 %%PORTDOCS%%%%DOCSDIR%%/findprobs-cid.png
 %%PORTDOCS%%%%DOCSDIR%%/findprobs-hint.png
 %%PORTDOCS%%%%DOCSDIR%%/findprobs-paths.png
@@ -341,6 +423,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/flags/UnionJack.gif
 %%PORTDOCS%%%%DOCSDIR%%/flags/VietnamFlag.png
 %%PORTDOCS%%%%DOCSDIR%%/flags/taiwan.png
+%%PORTDOCS%%%%DOCSDIR%%/floating-A.png
 %%PORTDOCS%%%%DOCSDIR%%/fontcompdlg.png
 %%PORTDOCS%%%%DOCSDIR%%/fontcompresults.png
 %%PORTDOCS%%%%DOCSDIR%%/fontforge-themes.html
@@ -426,6 +509,8 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/i2.png
 %%PORTDOCS%%%%DOCSDIR%%/i3.png
 %%PORTDOCS%%%%DOCSDIR%%/i4.png
+%%PORTDOCS%%%%DOCSDIR%%/import.png
+%%PORTDOCS%%%%DOCSDIR%%/importexample.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/intersect-post.png
 %%PORTDOCS%%%%DOCSDIR%%/k1.png
@@ -607,6 +692,9 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/source-build.html
 %%PORTDOCS%%%%DOCSDIR%%/spacekappaiotaspace.png
 %%PORTDOCS%%%%DOCSDIR%%/spacer1x20.png
+%%PORTDOCS%%%%DOCSDIR%%/spironextconstraint.png
+%%PORTDOCS%%%%DOCSDIR%%/spiropointinfo.png
+%%PORTDOCS%%%%DOCSDIR%%/spiroprevconstraint.png
 %%PORTDOCS%%%%DOCSDIR%%/splash.png
 %%PORTDOCS%%%%DOCSDIR%%/splinefont.html
 %%PORTDOCS%%%%DOCSDIR%%/splines.gif
@@ -637,6 +725,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/tilepath-ts.png
 %%PORTDOCS%%%%DOCSDIR%%/tilepath.html
 %%PORTDOCS%%%%DOCSDIR%%/tools.png
+%%PORTDOCS%%%%DOCSDIR%%/toolsmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/transform.html
 %%PORTDOCS%%%%DOCSDIR%%/transform.png
 %%PORTDOCS%%%%DOCSDIR%%/transition-context.png
@@ -664,12 +753,12 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/x-height.png
 %%PORTDOCS%%%%DOCSDIR%%/xim.html
 %%PORTDOCS%%%%DOCSDIR%%/xres.html
-%%DATADIR%%/Adobe-CNS1-4.cidmap
-%%DATADIR%%/Adobe-GB1-4.cidmap
-%%DATADIR%%/Adobe-Identity-0.cidmap
-%%DATADIR%%/Adobe-Japan1-6.cidmap
-%%DATADIR%%/Adobe-Japan2-0.cidmap
-%%DATADIR%%/Adobe-Korea1-2.cidmap
+%%PORTDOCS%%%%DATADIR%%/Adobe-CNS1-4.cidmap
+%%PORTDOCS%%%%DATADIR%%/Adobe-GB1-4.cidmap
+%%PORTDOCS%%%%DATADIR%%/Adobe-Identity-0.cidmap
+%%PORTDOCS%%%%DATADIR%%/Adobe-Japan1-6.cidmap
+%%PORTDOCS%%%%DATADIR%%/Adobe-Japan2-0.cidmap
+%%PORTDOCS%%%%DATADIR%%/Adobe-Korea1-2.cidmap
 %%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.a
 %%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.la
 %%NO_PLUGINS%%%%DATADIR%%/plugins/gb12345.lai
@@ -692,3 +781,4 @@ share/locale/zh_TW/LC_MESSAGES/FontForge.mo
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/flags
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/fontforge