Update fontforge to the latest release (with some additional fixes).
Tested in scripted mode (for print/lilypond) on arm, i386, powerpc,
and in interactive mode (but only some light testing) on i386.
Test reports for other platforms and with real-interactive use are
welcome.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/fontforge/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 15 Sep 2007 21:36:44 -0000 1.9
+++ Makefile 19 Sep 2007 17:26:27 -0000
@@ -4,16 +4,16 @@ SHARED_ONLY= Yes
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20060822
+DISTNAME= fontforge_full-20070915
PKGNAME= ${DISTNAME:S,_full,,}
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= gdraw 1.10 \
- gunicode 2.3
+SHARED_LIBS= gdraw 2.0 \
+ gunicode 3.0
CATEGORIES= print
HOMEPAGE= http://fontforge.sourceforge.net/
-MAINTAINER= Matthias Kilian <[EMAIL PROTECTED]>
+MAINTAINER= Matthias Kilian <[EMAIL PROTECTED]>
# BSD
PERMIT_PACKAGE_FTP= Yes
@@ -23,24 +23,26 @@ PERMIT_DISTFILES_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/}
-WANTLIB= ICE SM X11 Xi c freetype m xkbui z
+WANTLIB= ICE SM X11 Xau Xdmcp Xext Xi c freetype m \
+ pthread xkbfile xkbui z
-MODULES= devel/gettext
+MODULES= devel/gettext lang/python
LIB_DEPENDS= png.>=5::graphics/png \
- tiff.>=38::graphics/tiff \
+ tiff.>=38::graphics/tiff \
ungif.>=5::graphics/libungif \
- jpeg.>=62::graphics/jpeg \
+ jpeg.>=62::graphics/jpeg \
xml2.>=9::textproc/libxml
WRKDIST= ${WRKDIR}/${DISTNAME:S,_full,,}
AUTOCONF_VERSION= 2.59
-CONFIGURE_STYLE= gnu autoconf no-autoheader dest
+CONFIGURE_STYLE= gnu autoconf no-autoheader
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/libpng" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl -liconv"
-CONFIGURE_ARGS= --with-regular-link
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib \
+ -lintl -liconv -lz"
+CONFIGURE_ARGS= --with-regular-link --without-freetype-src
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_X11= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/fontforge/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 5 Apr 2007 16:20:18 -0000 1.4
+++ distinfo 19 Sep 2007 17:26:27 -0000
@@ -1,5 +1,5 @@
-MD5 (fontforge_full-20060822.tar.bz2) = hyqAE76C4yJnf3wlQQFUTQ==
-RMD160 (fontforge_full-20060822.tar.bz2) = pd0Zsg5X5DiPg81qP+I0pFv8kFc=
-SHA1 (fontforge_full-20060822.tar.bz2) = lJYQSwVpB6VtHlkKwhibF8fry70=
-SHA256 (fontforge_full-20060822.tar.bz2) =
V5mZuYBPnGieW2H9QvMcSUR5LWwncryZTFfdS3eXlbk=
-SIZE (fontforge_full-20060822.tar.bz2) = 3421669
+MD5 (fontforge_full-20070915.tar.bz2) = 0ySNW9fGO+nN/Z2vN4ZrNQ==
+RMD160 (fontforge_full-20070915.tar.bz2) = r5C07vElgjeSDvUIyzcHpjnuFoM=
+SHA1 (fontforge_full-20070915.tar.bz2) = zcxAYn/24s+9OcWMeT9xDCae204=
+SHA256 (fontforge_full-20070915.tar.bz2) =
EtDsxz1sHegLnuL+dfeDAGUpxBMT2bh+ARCB6JOpdKM=
+SIZE (fontforge_full-20070915.tar.bz2) = 4227110
Index: patches/patch-Makefile_dynamic_in
===================================================================
RCS file: /cvs/ports/print/fontforge/patches/patch-Makefile_dynamic_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_dynamic_in
--- patches/patch-Makefile_dynamic_in 21 Jul 2006 09:20:34 -0000 1.2
+++ patches/patch-Makefile_dynamic_in 19 Sep 2007 17:26:27 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile_dynamic_in,v 1.2 2006/07/21 09:20:34 steven Exp $
---- Makefile.dynamic.in.orig Fri Jul 14 22:20:20 2006
-+++ Makefile.dynamic.in Sun Jul 16 16:40:43 2006
-@@ -53,7 +53,6 @@ install_libs: libs
- $(LIBTOOL) --mode=install $(INSTALL) -c libgdraw.la
$(libdir)/libgdraw.la
- $(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la
$(libdir)/libgunicode.la
- #cp .libs/*.so.*.* $(libdir)
-- $(LIBTOOL) --mode=finish $(libdir)
- mkdir -p $(libdir)/pkgconfig
- $(INSTALL_DATA) fontforge.pc $(libdir)/pkgconfig
+--- Makefile.dynamic.in.orig Sat Aug 18 04:06:04 2007
++++ Makefile.dynamic.in Fri Sep 7 17:27:02 2007
+@@ -56,7 +56,6 @@ install_libs: libs
+ #-rm $(DESTDIR)$(libdir)/libgdraw.so*
$(DESTDIR)$(libdir)/libgunicode.so.*
+ $(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la
$(DESTDIR)$(libdir)/libgunicode.la
+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdraw.la
$(DESTDIR)$(libdir)/libgdraw.la
+- $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ $(INSTALL_DATA) fontforge.pc $(DESTDIR)$(libdir)/pkgconfig
Index: patches/patch-Unicode_Makefile_dynamic_in
===================================================================
RCS file: /cvs/ports/print/fontforge/patches/patch-Unicode_Makefile_dynamic_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Unicode_Makefile_dynamic_in
--- patches/patch-Unicode_Makefile_dynamic_in 18 Jun 2006 13:33:25 -0000
1.1.1.1
+++ patches/patch-Unicode_Makefile_dynamic_in 19 Sep 2007 17:26:27 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Unicode_Makefile_dynamic_in,v 1.1.1.1 2006/06/18 13:33:25
steven Exp $
---- Unicode/Makefile.dynamic.in.orig Fri Sep 30 15:10:58 2005
-+++ Unicode/Makefile.dynamic.in Mon Jun 12 20:56:00 2006
-@@ -16,7 +16,7 @@ libgunicode_OBJECTS = ArabicForms.lo al
+--- Unicode/Makefile.dynamic.in.orig Mon May 28 16:20:55 2007
++++ Unicode/Makefile.dynamic.in Sat Aug 25 14:59:42 2007
+@@ -18,7 +18,7 @@ libgunicode_OBJECTS = ArabicForms.lo alphabet.lo back
cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \
usprintf.lo gwwiconv.lo
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/print/fontforge/patches/patch-configure_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_in
--- patches/patch-configure_in 15 Oct 2006 18:53:00 -0000 1.2
+++ patches/patch-configure_in 19 Sep 2007 17:26:27 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.2 2006/10/15 18:53:00 kili Exp $
---- configure.in.orig Fri Aug 18 21:33:41 2006
-+++ configure.in Sat Oct 7 16:53:26 2006
-@@ -165,22 +165,15 @@ AC_CHECK_FILE(/usr/include/libxml2/libxm
+--- configure.in.orig Wed Aug 22 22:27:47 2007
++++ configure.in Fri Sep 7 17:25:22 2007
+@@ -220,22 +220,15 @@ AC_CHECK_FILE(/usr/include/libxml2/libxml,[CFLAGS="$CF
AC_CHECK_FILE(/usr/local/include/libxml2/libxml,[CFLAGS="$CFLAGS
-I/usr/local/include -I/usr/local/include/libxml2/"],
AC_DEFINE(_NO_LIBXML))])
Index: patches/patch-fontforge_fontview_c
===================================================================
RCS file: /cvs/ports/print/fontforge/patches/patch-fontforge_fontview_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-fontforge_fontview_c
--- patches/patch-fontforge_fontview_c 15 Oct 2006 18:53:00 -0000 1.2
+++ patches/patch-fontforge_fontview_c 19 Sep 2007 17:26:27 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-fontforge_fontview_c,v 1.2 2006/10/15 18:53:00 kili Exp $
---- fontforge/fontview.c.orig Fri Aug 18 03:37:33 2006
-+++ fontforge/fontview.c Sat Oct 7 16:53:23 2006
-@@ -9056,8 +9056,8 @@ static void FVExpose(FontView *fv,GWindo
+--- fontforge/fontview.c.orig Sun Sep 16 03:01:08 2007
++++ fontforge/fontview.c Mon Sep 17 23:35:33 2007
+@@ -9513,8 +9513,8 @@ static void FVExpose(FontView *fv,GWindow pixmap,GEven
(event->u.expose.rect.y+event->u.expose.rect.height+fv->cbh-1)/fv->cbh; ++i )
for ( j=0; j<fv->colcnt; ++j ) {
int index = (i+fv->rowoff)*fv->colcnt+j;
int feat_gid;
Index: patches/patch-fontforge_http_c
===================================================================
RCS file: patches/patch-fontforge_http_c
diff -N patches/patch-fontforge_http_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-fontforge_http_c 19 Sep 2007 17:26:27 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- fontforge/http.c.orig Thu Sep 13 22:35:11 2007
++++ fontforge/http.c Tue Sep 18 00:17:29 2007
+@@ -33,6 +33,7 @@
+ #include <sys/select.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <string.h>
Index: patches/patch-gdraw_Makefile_dynamic_in
===================================================================
RCS file: /cvs/ports/print/fontforge/patches/patch-gdraw_Makefile_dynamic_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gdraw_Makefile_dynamic_in
--- patches/patch-gdraw_Makefile_dynamic_in 15 Oct 2006 18:53:00 -0000
1.2
+++ patches/patch-gdraw_Makefile_dynamic_in 19 Sep 2007 17:26:27 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-gdraw_Makefile_dynamic_in,v 1.2 2006/10/15 18:53:00 kili Exp $
---- gdraw/Makefile.dynamic.in.orig Tue Aug 22 08:14:00 2006
-+++ gdraw/Makefile.dynamic.in Sat Oct 7 16:53:23 2006
-@@ -36,7 +36,7 @@ libgdraw_OBJECTS = choosericons.lo divi
+--- gdraw/Makefile.dynamic.in.orig Wed Aug 8 23:10:19 2007
++++ gdraw/Makefile.dynamic.in Sat Aug 25 14:59:42 2007
+@@ -38,7 +38,7 @@ libgdraw_OBJECTS = choosericons.lo divisors.lo drawbo
gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo dynamic.lo \
- ghvbox.lo gmatrixedit.lo
+ ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo
-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
+Incs = -I$(top_srcdir)/inc
Index: patches/patch-gdraw_gimagereadjpeg_c
===================================================================
RCS file: patches/patch-gdraw_gimagereadjpeg_c
diff -N patches/patch-gdraw_gimagereadjpeg_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-gdraw_gimagereadjpeg_c 19 Sep 2007 17:26:27 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- gdraw/gimagereadjpeg.c.orig Sun Sep 2 23:35:33 2007
++++ gdraw/gimagereadjpeg.c Mon Sep 17 23:55:09 2007
+@@ -255,7 +255,7 @@ static void transferBufferToImage(struct jpegState *js
+ }
+ }
+
+-GImage *GImageReadJpeg(FILE *infile) {
++GImage *GImageRead_Jpeg(FILE *infile) {
+ GImage *ret;
+ struct _GImage *base;
+ struct jpeg_decompress_struct cinfo;
Index: patches/patch-gdraw_gimagewritepng_c
===================================================================
RCS file: patches/patch-gdraw_gimagewritepng_c
diff -N patches/patch-gdraw_gimagewritepng_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-gdraw_gimagewritepng_c 19 Sep 2007 17:26:27 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- gdraw/gimagewritepng.c.orig Sun Sep 2 22:33:42 2007
++++ gdraw/gimagewritepng.c Tue Sep 18 00:12:50 2007
+@@ -329,6 +329,7 @@ return( 1 );
+
+ int GImageWritePng(GImage *gi, char *filename, int progressive) {
+ FILE *fp;
++ int ret;
+
+ /* open the file */
+ fp = fopen(filename, "wb");
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/fontforge/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 15 Oct 2006 18:53:00 -0000 1.3
+++ pkg/PLIST 19 Sep 2007 17:26:27 -0000
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2006/10/15 18:53:00 kili Exp $
bin/fontforge
+bin/fontimage
+bin/fontlint
bin/sfddiff
lib/libgdraw.a
lib/libgdraw.la
@@ -9,14 +11,21 @@ lib/libgunicode.la
@lib lib/libgunicode.so.${LIBgunicode_VERSION}
lib/pkgconfig/fontforge.pc
@man man/man1/fontforge.1
[EMAIL PROTECTED] man/man1/fontimage.1
[EMAIL PROTECTED] man/man1/fontlint.1
@man man/man1/sfddiff.1
share/fontforge/
+share/locale/de/LC_MESSAGES/FontForge.mo
+share/locale/el/LC_MESSAGES/FontForge.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
+share/locale/en_GB/LC_MESSAGES/FontForge.mo
share/locale/es/LC_MESSAGES/FontForge.mo
share/locale/fr/LC_MESSAGES/FontForge.mo
-share/locale/gr/
-share/locale/gr/LC_MESSAGES/
-share/locale/gr/LC_MESSAGES/FontForge.mo
share/locale/it/LC_MESSAGES/FontForge.mo
share/locale/ja/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
