- Update to 20081224

PR:		129933
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)

4 files changed, 56 insertions, 21 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 87ea85a6531c..3b557b6c4722 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20080927
+PORTVERSION=	20081224
 CATEGORIES=	print
 MASTER_SITES=	SF
 DISTFILES=	${EXTRACT_ONLY} ${DOCFILES}
@@ -42,9 +42,9 @@ USE_ICONV=	yes
 PATCH_STRIP=	-l
 
 .if !defined(FONTFORGE_NO_MULTILAYER)
-WITH_MULTILAYER=	--enable-multilayer
+WITH_MULTILAYER=	--enable-type3
 .else
-WITH_MULTILAYER=	--disable-multilayer
+WITH_MULTILAYER=	--disable-type3
 .endif
 
 .if !defined(WITHOUT_TTF_BYTECODE_ENABLED) && defined(FONTFORGE_WITH_TTF_DEBUGGER)
@@ -80,6 +80,20 @@ CONFIGURE_ARGS+=	--with-python
 CONFIGURE_ARGS+=	--without-python
 .endif
 
+.if defined(WITH_CAIRO)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+CONFIGURE_ARGS+=	--with-cairo
+.else
+CONFIGURE_ARGS+=	--without-cairo
+.endif
+
+.if defined(WITH_PANGO)
+USE_GNOME+=	pango
+CONFIGURE_ARGS+=	--with-pango
+.else
+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,"
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 5bad3969779a..378ec24598a8 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,9 +1,9 @@
-MD5 (fontforge_full-20080927.tar.bz2) = 8866595d4dac77c0c093ed1e104515d3
-SHA256 (fontforge_full-20080927.tar.bz2) = 122da7c4d291b2f0a77bd1c642622a38409c2cb9128b7140bd7d43f37337eb41
-SIZE (fontforge_full-20080927.tar.bz2) = 5072410
+MD5 (fontforge_full-20081224.tar.bz2) = eb00467bff69b15a4137595c16cdbff5
+SHA256 (fontforge_full-20081224.tar.bz2) = 1748614a0d36a1ea44cef276ad2e04e884cd0e6e0f6965a71ed0c055e6ad06fc
+SIZE (fontforge_full-20081224.tar.bz2) = 5236663
 MD5 (freetype-2.3.7.tar.bz2) = 83306194817ebdea554133b4232a34aa
 SHA256 (freetype-2.3.7.tar.bz2) = 4ecf879eb69fc323669981f02aebff1e3045de415303e86ee67f2080cb3ee888
 SIZE (freetype-2.3.7.tar.bz2) = 1310542
-MD5 (fontforge_htdocs-20080927.tar.bz2) = cc3e292e75250e8318cb098c1552c98e
-SHA256 (fontforge_htdocs-20080927.tar.bz2) = 72ee403921b3e01247a62222517dad3cfe809f651722032ade81572b94c36659
-SIZE (fontforge_htdocs-20080927.tar.bz2) = 2408051
+MD5 (fontforge_htdocs-20081224.tar.bz2) = 476b047dc6cdc36d79ac34da1c3fcb58
+SHA256 (fontforge_htdocs-20081224.tar.bz2) = abd78c7ef02ee9f86adc3d323d604c73a47531c76979cc5ef9e94d67fda9b3b1
+SIZE (fontforge_htdocs-20081224.tar.bz2) = 2548702
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index 4cd62957b81f..1e9d111da249 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -1,15 +1,15 @@
---- 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
+--- fontforge/Makefile.dynamic.in.orig	2008-12-23 16:03:34.000000000 -0500
++++ fontforge/Makefile.dynamic.in	2008-12-25 11:20:01.000000000 -0500
+@@ -59,7 +59,7 @@
+ DIFFOBJS = sfddiff.o stamp.o
+ ACORNOBJS = acorn2sfd.o stamp.o
  
--_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
-+_CFLAGS = -I$(LOCALBASE)/include -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
+-_CFLAGS = -I$(top_srcdir)/inc -I../inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
++_CFLAGS = -I$(LOCALBASE)/include -I$(top_srcdir)/inc -I../inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
      @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"' \
      @CPPFLAGS@ '-DPREFIX="@prefix@"'
- CFLAGS = @CFLAGS@ $(_CFLAGS)
-@@ -66,10 +66,10 @@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(_CFLAGS)
+@@ -68,10 +68,10 @@
  LDFLAGS = @LDFLAGS@
  LIBS = -rpath $(libdir) $(X_LIBS) @LINK_WITH_GDRAW@ ../libgutils.la \
      ../libgunicode.la \
@@ -17,8 +17,8 @@
 +    $(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
+-DLIBS = -rpath $(libdir)  ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
++DLIBS = -rpath $(libdir)  ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm -lintl
  
- all: @FINAL_TARGET@ sfddiff fontimage fontlint
+ all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint
  
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index b132803f32a2..6b312e117a29 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -29,6 +29,7 @@ include/fontforge/gimage.h
 include/fontforge/gio.h
 include/fontforge/gkeysym.h
 include/fontforge/gprogress.h
+include/fontforge/gresedit.h
 include/fontforge/gresource.h
 include/fontforge/groups.h
 include/fontforge/gwidget.h
@@ -158,7 +159,20 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/FontForgeSplash.png
 %%PORTDOCS%%%%DOCSDIR%%/FontImage.png
 %%PORTDOCS%%%%DOCSDIR%%/FontSample.png
+%%PORTDOCS%%%%DOCSDIR%%/GButton.png
+%%PORTDOCS%%%%DOCSDIR%%/GCancelButton.png
+%%PORTDOCS%%%%DOCSDIR%%/GComboBox.png
+%%PORTDOCS%%%%DOCSDIR%%/GComboBoxMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/GDefaultButton.png
+%%PORTDOCS%%%%DOCSDIR%%/GDropList.png
+%%PORTDOCS%%%%DOCSDIR%%/GLabel.png
+%%PORTDOCS%%%%DOCSDIR%%/GListMark.png
+%%PORTDOCS%%%%DOCSDIR%%/GMatrixEdit.png
+%%PORTDOCS%%%%DOCSDIR%%/GNumericField.png
+%%PORTDOCS%%%%DOCSDIR%%/GNumericFieldSpinner.png
+%%PORTDOCS%%%%DOCSDIR%%/GRadio.png
 %%PORTDOCS%%%%DOCSDIR%%/GSUB-Order.png
+%%PORTDOCS%%%%DOCSDIR%%/GTextField.png
 %%PORTDOCS%%%%DOCSDIR%%/GenerateFamily.png
 %%PORTDOCS%%%%DOCSDIR%%/GenerateOptions.png
 %%PORTDOCS%%%%DOCSDIR%%/GlossaryFS.html
@@ -332,6 +346,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/cidmapformat.html
 %%PORTDOCS%%%%DOCSDIR%%/cidmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/cliargs.html
+%%PORTDOCS%%%%DOCSDIR%%/colorbutton.png
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-class.png
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-classlist.png
 %%PORTDOCS%%%%DOCSDIR%%/contextchain-coverage.png
@@ -389,6 +404,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/eItalic.png
 %%PORTDOCS%%%%DOCSDIR%%/editcvt.png
 %%PORTDOCS%%%%DOCSDIR%%/editexample-fr.html
+%%PORTDOCS%%%%DOCSDIR%%/editexample-full.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample2.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample3.html
@@ -682,6 +698,8 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/realindex.html
 %%PORTDOCS%%%%DOCSDIR%%/ref-caveats.html
 %%PORTDOCS%%%%DOCSDIR%%/removefeature.png
+%%PORTDOCS%%%%DOCSDIR%%/resedit.html
+%%PORTDOCS%%%%DOCSDIR%%/resedit.png
 %%PORTDOCS%%%%DOCSDIR%%/retagfeature.png
 %%PORTDOCS%%%%DOCSDIR%%/rgetinfo.png
 %%PORTDOCS%%%%DOCSDIR%%/rparen-108.png
@@ -944,11 +962,14 @@ share/locale/es/LC_MESSAGES/FontForge.mo
 share/locale/fr/LC_MESSAGES/FontForge.mo
 share/locale/it/LC_MESSAGES/FontForge.mo
 share/locale/ja/LC_MESSAGES/FontForge.mo
+share/locale/mal/LC_MESSAGES/FontForge.mo
 share/locale/pl/LC_MESSAGES/FontForge.mo
 share/locale/ru/LC_MESSAGES/FontForge.mo
 share/locale/vi/LC_MESSAGES/FontForge.mo
 share/locale/zh_CN/LC_MESSAGES/FontForge.mo
 share/locale/zh_TW/LC_MESSAGES/FontForge.mo
+@dirrmtry share/locale/mal/LC_MESSAGES
+@dirrmtry share/locale/mal
 @dirrm %%DATADIR%%/python
 %%NO_PLUGINS%%@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/pixmaps