update print/fontforge
Update to fontforge-20110222.
libfontforge gets a major bump (some functions changed arguments),
all other libraries get a minor bump just to be on the save side
(probably not needed at all).
While here, patch away some weird attempts to get something meaningful
by dividing the address of the timezone(3) function by 3600 (ouch).
Tests/comments/oks are welcome. I'll run a lilypond build with it
to see wether the scripting part of fontforge still works correctly.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/fontforge/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile8 Jun 2011 17:37:36 - 1.29
+++ Makefile8 Jul 2011 15:46:39 -
@@ -4,15 +4,14 @@ SHARED_ONLY= Yes
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20100501
+DISTNAME= fontforge_full-20110222
PKGNAME= ${DISTNAME:S,_full,,}
-REVISION = 6
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= fontforge 3.0 \
- gdraw 5.0 \
- gioftp 2.0 \
- gunicode5.0 \
- gutils 2.0
+SHARED_LIBS= fontforge 4.0 \
+ gdraw 5.1 \
+ gioftp 2.1 \
+ gunicode5.1 \
+ gutils 2.1
CATEGORIES=print
Index: distinfo
===
RCS file: /cvs/ports/print/fontforge/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo23 Jun 2010 08:00:42 - 1.8
+++ distinfo8 Jul 2011 15:46:39 -
@@ -1,5 +1,5 @@
-MD5 (fontforge_full-20100501.tar.bz2) = Xz0g1kXsGqK3tIdjht+HFw==
-RMD160 (fontforge_full-20100501.tar.bz2) = Te4uzb0yvzhUEF8ZWYTZyr8Zj9g=
-SHA1 (fontforge_full-20100501.tar.bz2) = SDQlEWxq9q2Q43+a2gwo408lHsM=
-SHA256 (fontforge_full-20100501.tar.bz2) =
7kkosN90gMMaQiZFhU2fP09nGN1CO2iFvTPoeopu3Xk=
-SIZE (fontforge_full-20100501.tar.bz2) = 386
+MD5 (fontforge_full-20110222.tar.bz2) = W+Tdo0W11zonzDmd+W5GOg==
+RMD160 (fontforge_full-20110222.tar.bz2) = fydunj72c7eDVbt75Q9rJYeu5jM=
+SHA1 (fontforge_full-20110222.tar.bz2) = j62gdkfxAjUbsdfRxNpIc1bnFC8=
+SHA256 (fontforge_full-20110222.tar.bz2) =
j6KBgCb4S7e4p3RR0hyrfp3qiqkE5SGK+hWL5qMgQz4=
+SIZE (fontforge_full-20110222.tar.bz2) = 5126031
Index: patches/patch-fontforge_Makefile_dynamic_in
===
RCS file:
/cvs/ports/print/fontforge/patches/patch-fontforge_Makefile_dynamic_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fontforge_Makefile_dynamic_in
--- patches/patch-fontforge_Makefile_dynamic_in 23 Jun 2010 08:00:42 -
1.1
+++ patches/patch-fontforge_Makefile_dynamic_in 8 Jul 2011 15:46:39 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-fontforge_Makefile_dynamic_in,v 1.1 2010/06/23 08:00:42 kili
Exp $
fontforge/Makefile.dynamic.in.orig Tue Feb 2 06:23:06 2010
-+++ fontforge/Makefile.dynamic.in Sun Jun 20 15:24:37 2010
-@@ -135,12 +135,12 @@ splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir
+--- fontforge/Makefile.dynamic.in.orig Tue Feb 15 04:37:39 2011
fontforge/Makefile.dynamic.in Fri Jul 8 16:50:10 2011
+@@ -136,12 +136,12 @@ splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir
%.o: %.c
%.o: %.c $(srcdir)/splinefont.h $(srcdir)/views.h $(srcdir)/stemdb.h
$(srcdir)/ttf.h $(srcdir)/unicoderange.h $(srcdir)/psfont.h $(srcdir)/groups.h
$(srcdir)/edgelist.h $(srcdir)/edgelist2.h $(srcdir)/uiinterface.h
$(srcdir)/fontforgevw.h
Index: patches/patch-fontforge_cvexport_c
===
RCS file: patches/patch-fontforge_cvexport_c
diff -N patches/patch-fontforge_cvexport_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-fontforge_cvexport_c 8 Jul 2011 15:46:39 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- fontforge/cvexport.c.orig Tue Feb 15 04:37:39 2011
fontforge/cvexport.c Fri Jul 8 17:24:12 2011
+@@ -219,15 +219,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc,int layer) {
+ fprintf( pdf, /CreationDate (D:%04d%02d%02d%02d%2d%02d,
+ 1900+tm-tm_year, tm-tm_mon+1, tm-tm_mday,
+ tm-tm_hour, tm-tm_min, tm-tm_sec );
+-#ifdef _NO_TZSET
+ fprintf( pdf, Z)\n );
+-#else
+-tzset();
+-if ( timezone==0 )
+- fprintf( pdf, Z)\n );
+-else
+- fprintf( pdf, %+02d')\n, (int) timezone/3600 ); /* doesn't
handle half-hour zones */
+-#endif
+ fprintf( pdf, /Title (%s from %s)\n, sc-name, sc-parent-fontname
);
+ if ( author!=NULL )
+ fprintf( pdf, /Author (%s)\n, author );
Index: patches/patch-fontforge_ffpython_h
===
RCS file:
Re: update: print/fontforge
On Sat, Jun 19, 2010 at 10:17:57PM +0200, Matthias Kilian wrote:
Update to fontforge-20100501.
Tested with lilypond on amd64.
Someone has to punish me for forgetting shared library bumps.
This one bumps the majors to be on the safe side:
Index: Makefile
===
RCS file: /cvs/ports/print/fontforge/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile16 Jun 2010 10:13:40 - 1.16
+++ Makefile20 Jun 2010 12:49:29 -
@@ -4,14 +4,14 @@ SHARED_ONLY= Yes
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20090408
-PKGNAME= ${DISTNAME:S,_full,,}p1
+DISTNAME= fontforge_full-20100501
+PKGNAME= ${DISTNAME:S,_full,,}
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= fontforge 2.0 \
- gdraw 4.0 \
- gioftp 1.0 \
- gunicode4.1 \
- gutils 1.1
+SHARED_LIBS= fontforge 3.0 \
+ gdraw 5.0 \
+ gioftp 2.0 \
+ gunicode5.0 \
+ gutils 2.0
CATEGORIES=print
@@ -23,14 +23,15 @@ MAINTAINER= Matthias Kilian k...@openb
PERMIT_PACKAGE_FTP=Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-PERMIT_DISTFILES_CDROM=Yes
+PERMIT_DISTFILES_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/}
WANTLIB= ICE SM X11 Xau Xdmcp Xext Xft Xi Xrender c \
-expat fontconfig freetype glib-2.0 glitz \
-gmodule-2.0 gobject-2.0 m pcre pixman-1 \
-pthread pthread-stubs util xcb xkbfile xkbui z
+ expat fontconfig freetype glib-2.0 glitz \
+ gmodule-2.0 gobject-2.0 gthread-2.0 m pcre pixman-1 \
+ pthread pthread-stubs util xcb xcb-render \
+ xcb-render-util xkbfile xkbui z
MODULES= devel/gettext lang/python
@@ -40,13 +41,12 @@ LIB_DEPENDS=${MODPY_LIB_DEPENDS}
\
pango-1.0.=1800,pangocairo-1.0.=1800,pangoft2-1.0.=1800,pangoxft-1.0.=1800::devel/pango
\
png.=5::graphics/png \
tiff.=38::graphics/tiff\
- ungif.=5::graphics/libungif\
+ gif.=5::graphics/libungif \
xml2.=9::textproc/libxml
WRKDIST= ${WRKDIR}/${DISTNAME:S,_full,,}
-AUTOCONF_VERSION= 2.59
-CONFIGURE_STYLE= gnu autoconf no-autoheader
+CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include\
-I${LOCALBASE}/include/libpng\
LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib\
Index: distinfo
===
RCS file: /cvs/ports/print/fontforge/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo22 Apr 2009 12:23:00 - 1.7
+++ distinfo20 Jun 2010 12:49:29 -
@@ -1,5 +1,5 @@
-MD5 (fontforge_full-20090408.tar.bz2) = WoWr0FuNzvy14h4k2ZKZ+Q==
-RMD160 (fontforge_full-20090408.tar.bz2) = 8PD8OHagEubdLpCdxjxmUV2644c=
-SHA1 (fontforge_full-20090408.tar.bz2) = C8ElWXBf8LIUo9aw2vh873mjeeg=
-SHA256 (fontforge_full-20090408.tar.bz2) =
xCNvEYM82XkKVqFhnrJ8UBRt7thCtmy6LFuXvF4NKuk=
-SIZE (fontforge_full-20090408.tar.bz2) = 5240192
+MD5 (fontforge_full-20100501.tar.bz2) = Xz0g1kXsGqK3tIdjht+HFw==
+RMD160 (fontforge_full-20100501.tar.bz2) = Te4uzb0yvzhUEF8ZWYTZyr8Zj9g=
+SHA1 (fontforge_full-20100501.tar.bz2) = SDQlEWxq9q2Q43+a2gwo408lHsM=
+SHA256 (fontforge_full-20100501.tar.bz2) =
7kkosN90gMMaQiZFhU2fP09nGN1CO2iFvTPoeopu3Xk=
+SIZE (fontforge_full-20100501.tar.bz2) = 386
Index: patches/patch-configure_in
===
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in 22 Apr 2009 12:23:00 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.5 2009/04/22 12:23:00 kili Exp $
configure.in.orig Wed Dec 24 22:04:17 2008
-+++ configure.in Mon Mar 9 21:27:44 2009
-@@ -335,22 +335,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))])
-
--dnl Some old versions of lib(un)gif don't work for us, they've got the
-+dnl Some old versions of libungif don't work for us, they've got the
- dnl Function argument in the wrong place. So check the header files.
Re: update: print/fontforge
On Sun, 20 Jun 2010, Matthias Kilian wrote: On Sat, Jun 19, 2010 at 10:17:57PM +0200, Matthias Kilian wrote: Update to fontforge-20100501. Tested with lilypond on amd64. Someone has to punish me for forgetting shared library bumps. I own a whip, does it qualify me? -- Antoine
Re: update: print/fontforge
On Sun, Jun 20, 2010 at 06:12:14PM +0200, Antoine Jacoutot wrote: Someone has to punish me for forgetting shared library bumps. I own a whip, does it qualify me? You're doing a lot of stuff in /usr/ports/print. That qualifies you even more ;-) Ciao, Kili
update: print/fontforge
Update to fontforge-20100501.
Tested with lilypond on amd64.
Index: Makefile
===
RCS file: /cvs/ports/print/fontforge/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile16 Jun 2010 10:13:40 - 1.16
+++ Makefile19 Jun 2010 19:52:30 -
@@ -4,8 +4,8 @@ SHARED_ONLY=Yes
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20090408
-PKGNAME= ${DISTNAME:S,_full,,}p1
+DISTNAME= fontforge_full-20100501
+PKGNAME= ${DISTNAME:S,_full,,}
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= fontforge 2.0 \
gdraw 4.0 \
@@ -23,14 +23,15 @@ MAINTAINER= Matthias Kilian k...@openb
PERMIT_PACKAGE_FTP=Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-PERMIT_DISTFILES_CDROM=Yes
+PERMIT_DISTFILES_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/}
WANTLIB= ICE SM X11 Xau Xdmcp Xext Xft Xi Xrender c \
-expat fontconfig freetype glib-2.0 glitz \
-gmodule-2.0 gobject-2.0 m pcre pixman-1 \
-pthread pthread-stubs util xcb xkbfile xkbui z
+ expat fontconfig freetype glib-2.0 glitz \
+ gmodule-2.0 gobject-2.0 gthread-2.0 m pcre pixman-1 \
+ pthread pthread-stubs util xcb xcb-render \
+ xcb-render-util xkbfile xkbui z
MODULES= devel/gettext lang/python
@@ -40,13 +41,12 @@ LIB_DEPENDS=${MODPY_LIB_DEPENDS}
\
pango-1.0.=1800,pangocairo-1.0.=1800,pangoft2-1.0.=1800,pangoxft-1.0.=1800::devel/pango
\
png.=5::graphics/png \
tiff.=38::graphics/tiff\
- ungif.=5::graphics/libungif\
+ gif.=5::graphics/libungif \
xml2.=9::textproc/libxml
WRKDIST= ${WRKDIR}/${DISTNAME:S,_full,,}
-AUTOCONF_VERSION= 2.59
-CONFIGURE_STYLE= gnu autoconf no-autoheader
+CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include\
-I${LOCALBASE}/include/libpng\
LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib\
Index: distinfo
===
RCS file: /cvs/ports/print/fontforge/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo22 Apr 2009 12:23:00 - 1.7
+++ distinfo19 Jun 2010 19:52:30 -
@@ -1,5 +1,5 @@
-MD5 (fontforge_full-20090408.tar.bz2) = WoWr0FuNzvy14h4k2ZKZ+Q==
-RMD160 (fontforge_full-20090408.tar.bz2) = 8PD8OHagEubdLpCdxjxmUV2644c=
-SHA1 (fontforge_full-20090408.tar.bz2) = C8ElWXBf8LIUo9aw2vh873mjeeg=
-SHA256 (fontforge_full-20090408.tar.bz2) =
xCNvEYM82XkKVqFhnrJ8UBRt7thCtmy6LFuXvF4NKuk=
-SIZE (fontforge_full-20090408.tar.bz2) = 5240192
+MD5 (fontforge_full-20100501.tar.bz2) = Xz0g1kXsGqK3tIdjht+HFw==
+RMD160 (fontforge_full-20100501.tar.bz2) = Te4uzb0yvzhUEF8ZWYTZyr8Zj9g=
+SHA1 (fontforge_full-20100501.tar.bz2) = SDQlEWxq9q2Q43+a2gwo408lHsM=
+SHA256 (fontforge_full-20100501.tar.bz2) =
7kkosN90gMMaQiZFhU2fP09nGN1CO2iFvTPoeopu3Xk=
+SIZE (fontforge_full-20100501.tar.bz2) = 386
Index: patches/patch-configure_in
===
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in 22 Apr 2009 12:23:00 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.5 2009/04/22 12:23:00 kili Exp $
configure.in.orig Wed Dec 24 22:04:17 2008
-+++ configure.in Mon Mar 9 21:27:44 2009
-@@ -335,22 +335,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))])
-
--dnl Some old versions of lib(un)gif don't work for us, they've got the
-+dnl Some old versions of libungif don't work for us, they've got the
- dnl Function argument in the wrong place. So check the header files.
--dnl check for both libgif and libungif, I think they use the same args.
-
--AC_CHECK_LIB(gif, DGifOpenFileName, [
-+AC_CHECK_LIB(ungif, DGifOpenFileName, [
- echo -n checking for ExtensionBlock.Function in gif_lib.h...
- AC_TRY_COMPILE([#include gif_lib.h], [ ExtensionBlock foo; foo.Function=3;
], echo yes , [echo no
- ac_cv_lib_ungif_DGifOpenFileName=no
- AC_DEFINE(_NO_LIBUNGIF)])
--] , [
-- AC_CHECK_LIB(ungif, DGifOpenFileName, [
-- echo -n checking for ExtensionBlock.Function in gif_lib.h...
-- AC_TRY_COMPILE([#include gif_lib.h], [ ExtensionBlock foo;
update: print/fontforge
Update to fontforge-20090408.
Tests by real fontforge users are welcome.
I'm using it only in scripting mode for print/lilypond.
Tested on amd64 by building lilypond-2.12.2 (to be committed really
soon now[tm]).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/fontforge/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile18 Mar 2009 20:49:50 - 1.13
+++ Makefile15 Apr 2009 19:51:52 -
@@ -4,14 +4,14 @@ SHARED_ONLY= Yes
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20080927
-PKGNAME= ${DISTNAME:S,_full,,}p0
+DISTNAME= fontforge_full-20090408
+PKGNAME= ${DISTNAME:S,_full,,}
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= fontforge 1.0 \
- gdraw 3.0 \
+SHARED_LIBS= fontforge 2.0 \
+ gdraw 4.0 \
gioftp 1.0 \
- gunicode4.0 \
- gutils 1.0
+ gunicode4.1 \
+ gutils 1.1
CATEGORIES=print
@@ -27,18 +27,22 @@ PERMIT_DISTFILES_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/}
-WANTLIB= ICE SM X11 Xau Xdmcp Xext Xi c freetype m \
- pthread util xkbfile xkbui z
-
+WANTLIB= ICE SM X11 Xau Xdmcp Xext Xft Xi Xrender c \
+expat fontconfig freetype glib-2.0 glitz \
+gmodule-2.0 gobject-2.0 m pcre pixman-1 \
+pthread util xkbfile xkbui z
+
MODULES= devel/gettext lang/python
MODPY_VERSION= 2.5
-LIB_DEPENDS= png.=5::graphics/png \
+LIB_DEPENDS= ${MODPY_LIB_DEPENDS}\
+ cairo.=9::graphics/cairo \
+ jpeg.=62::graphics/jpeg\
+
pango-1.0.=1800,pangocairo-1.0.=1800,pangoft2-1.0.=1800,pangoxft-1.0.=1800::devel/pango
\
+ png.=5::graphics/png \
tiff.=38::graphics/tiff\
ungif.=5::graphics/libungif\
- jpeg.=62::graphics/jpeg\
- xml2.=9::textproc/libxml \
- ${MODPY_LIB_DEPENDS}
+ xml2.=9::textproc/libxml
WRKDIST= ${WRKDIR}/${DISTNAME:S,_full,,}
Index: distinfo
===
RCS file: /cvs/ports/print/fontforge/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo27 Oct 2008 17:58:52 - 1.6
+++ distinfo15 Apr 2009 19:51:52 -
@@ -1,5 +1,5 @@
-MD5 (fontforge_full-20080927.tar.bz2) = iGZZXU2sd8DAk+0eEEUV0w==
-RMD160 (fontforge_full-20080927.tar.bz2) = j4+wAmuWdgIYS/79g9UjT8aE80A=
-SHA1 (fontforge_full-20080927.tar.bz2) = v4DdA10P8m2h9cxKpV3Nm2/550g=
-SHA256 (fontforge_full-20080927.tar.bz2) =
Ei2nxNKRsvCne9HGQmIqOECcLLkSi3FAvX1D83M360E=
-SIZE (fontforge_full-20080927.tar.bz2) = 5072410
+MD5 (fontforge_full-20090408.tar.bz2) = WoWr0FuNzvy14h4k2ZKZ+Q==
+RMD160 (fontforge_full-20090408.tar.bz2) = 8PD8OHagEubdLpCdxjxmUV2644c=
+SHA1 (fontforge_full-20090408.tar.bz2) = C8ElWXBf8LIUo9aw2vh873mjeeg=
+SHA256 (fontforge_full-20090408.tar.bz2) =
xCNvEYM82XkKVqFhnrJ8UBRt7thCtmy6LFuXvF4NKuk=
+SIZE (fontforge_full-20090408.tar.bz2) = 5240192
Index: patches/patch-Unicode_Makefile_dynamic_in
===
RCS file: /cvs/ports/print/fontforge/patches/patch-Unicode_Makefile_dynamic_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Unicode_Makefile_dynamic_in
--- patches/patch-Unicode_Makefile_dynamic_in 23 Sep 2007 18:45:45 -
1.2
+++ patches/patch-Unicode_Makefile_dynamic_in 15 Apr 2009 19:51:52 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-Unicode_Makefile_dynamic_in,v 1.2 2007/09/23 18:45:45 kili Exp
$
Unicode/Makefile.dynamic.in.orig Mon May 28 16:20:55 2007
-+++ Unicode/Makefile.dynamic.inSat Aug 25 14:59:42 2007
+--- Unicode/Makefile.dynamic.in.orig Tue Dec 23 22:03:33 2008
Unicode/Makefile.dynamic.inMon Mar 9 21:29:26 2009
@@ -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
--Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
-+Incs = -I$(top_srcdir)/inc
+-Incs = -I$(top_srcdir)/inc -I../inc -I/usr/pkg/include
-I/usr/pkg/include/giflib
++Incs = -I$(top_srcdir)/inc -I../inc
CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
../libgunicode.la: $(libgunicode_OBJECTS)
Index: patches/patch-configure_in
update: print/fontforge
overdue update. tested on macppc and i386 in scripting mode (building
lilypond) and lightly in interactive mode (just fiddling around
with some arbitrary fonts)
comments and more tests are welcome
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/fontforge/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile12 Oct 2007 16:52:56 - 1.11
+++ Makefile26 Oct 2008 19:49:18 -
@@ -4,11 +4,15 @@ SHARED_ONLY= Yes
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20070915
-PKGNAME= ${DISTNAME:S,_full,,}p0
+DISTNAME= fontforge_full-20080927
+PKGNAME= ${DISTNAME:S,_full,,}
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= gdraw 2.0 \
- gunicode3.0
+SHARED_LIBS= fontforge 1.0 \
+ gdraw 3.0 \
+ gioftp 1.0 \
+ gunicode4.0 \
+ gutils 1.0
+
CATEGORIES=print
HOMEPAGE= http://fontforge.sourceforge.net/
Index: distinfo
===
RCS file: /cvs/ports/print/fontforge/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo23 Sep 2007 18:45:45 - 1.5
+++ distinfo26 Oct 2008 19:49:18 -
@@ -1,5 +1,5 @@
-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
+MD5 (fontforge_full-20080927.tar.bz2) = iGZZXU2sd8DAk+0eEEUV0w==
+RMD160 (fontforge_full-20080927.tar.bz2) = j4+wAmuWdgIYS/79g9UjT8aE80A=
+SHA1 (fontforge_full-20080927.tar.bz2) = v4DdA10P8m2h9cxKpV3Nm2/550g=
+SHA256 (fontforge_full-20080927.tar.bz2) =
Ei2nxNKRsvCne9HGQmIqOECcLLkSi3FAvX1D83M360E=
+SIZE (fontforge_full-20080927.tar.bz2) = 5072410
Index: patches/patch-Makefile_dynamic_in
===
RCS file: /cvs/ports/print/fontforge/patches/patch-Makefile_dynamic_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_dynamic_in
--- patches/patch-Makefile_dynamic_in 23 Sep 2007 18:45:45 - 1.3
+++ patches/patch-Makefile_dynamic_in 26 Oct 2008 19:49:18 -
@@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_dynamic_in,v 1.3 2007/09/23 18:45:45 kili Exp $
Makefile.dynamic.in.orig Sat Aug 18 04:06:04 2007
-+++ Makefile.dynamic.inFri 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
+--- Makefile.dynamic.in.orig Tue Jul 29 02:01:36 2008
Makefile.dynamic.inSun Oct 26 14:25:29 2008
+@@ -75,7 +75,6 @@ install_libs: libs
+ if test -r libgdraw.la ; then $(LIBTOOL) --mode=install $(INSTALL) -c
libgdraw.la $(DESTDIR)$(libdir)/libgdraw.la ; fi
+ #We don't always build libfontforge
+ if test -r libfontforge.la ; then $(LIBTOOL) --mode=install $(INSTALL)
-c libfontforge.la $(DESTDIR)$(libdir)/libfontforge.la ; fi
- $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
mkdir -p $(DESTDIR)$(libdir)/pkgconfig
$(INSTALL_DATA) fontforge.pc $(DESTDIR)$(libdir)/pkgconfig
Index: patches/patch-configure_in
===
RCS file: /cvs/ports/print/fontforge/patches/patch-configure_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_in
--- patches/patch-configure_in 23 Sep 2007 18:45:45 - 1.3
+++ patches/patch-configure_in 26 Oct 2008 19:49:18 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.3 2007/09/23 18:45:45 kili Exp $
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
+--- configure.in.orig Mon Sep 15 01:29:52 2008
configure.in Sun Oct 26 14:24:17 2008
+@@ -297,22 +297,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: patches/patch-fontforge_fontview_c
diff -N patches/patch-fontforge_fontview_c
--- patches/patch-fontforge_fontview_c 23 Sep 2007 18:45:45 - 1.3
+++ /dev/null 1
update: print/fontforge
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
--- Makefile15 Sep 2007 21:36:44 - 1.9
+++ Makefile19 Sep 2007 17:26:27 -
@@ -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 \
- gunicode2.3
+SHARED_LIBS= gdraw 2.0 \
+ gunicode3.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
--- distinfo5 Apr 2007 16:20:18 - 1.4
+++ distinfo19 Sep 2007 17:26:27 -
@@ -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 - 1.2
+++ patches/patch-Makefile_dynamic_in 19 Sep 2007 17:26:27 -
@@ -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.inSun 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.inFri Sep 7 17:27:02 2007
+@@ -56,7 +56,6 @@ install_libs: libs
+ #-rm $(DESTDIR)$(libdir)/libgdraw.so*
Re: update: print/fontforge
On Sat, Oct 14, 2006 at 11:17:35AM +0200, Matthias Kilian wrote:
update to 20060822, which contains several bugfixes and improvements.
Complete changelog: http://fontforge.sourceforge.net/changelog.html
Please test and comment.
Two fixes noted by steven@: minor version bumps in SHARED_LIBS and
two new directories in PLIST (don't ask me why I removed them).
Index: print/fontforge/Makefile
===
RCS file: /var/cvs/OpenBSD/ports/print/fontforge/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- print/fontforge/Makefile3 Aug 2006 23:28:11 - 1.6
+++ print/fontforge/Makefile15 Oct 2006 14:23:01 -
@@ -4,11 +4,11 @@
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20060715
+DISTNAME= fontforge_full-20060822
PKGNAME= ${DISTNAME:S,_full,,}
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= gdraw 1.9 \
- gunicode2.2
+SHARED_LIBS= gdraw 1.10 \
+ gunicode2.3
CATEGORIES=print
HOMEPAGE= http://fontforge.sourceforge.net/
Index: print/fontforge/distinfo
===
RCS file: /var/cvs/OpenBSD/ports/print/fontforge/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- print/fontforge/distinfo21 Jul 2006 09:20:34 - 1.2
+++ print/fontforge/distinfo15 Oct 2006 14:23:01 -
@@ -1,4 +1,4 @@
-MD5 (fontforge_full-20060715.tar.bz2) = 47bed2600fd7066179363c6e7b01cd78
-RMD160 (fontforge_full-20060715.tar.bz2) =
ffb5a6c204527e77a96268b7de55ec5446bce400
-SHA1 (fontforge_full-20060715.tar.bz2) =
a95bbb949ce8efb63c48d5b6356007bcf0132bbd
-SIZE (fontforge_full-20060715.tar.bz2) = 3361637
+MD5 (fontforge_full-20060822.tar.bz2) = 872a8013be82e322677f7c254101544d
+RMD160 (fontforge_full-20060822.tar.bz2) =
a5dd19b20e57e4388f83cd6a3fe234a45bfc9057
+SHA1 (fontforge_full-20060822.tar.bz2) =
9496104b056907a56d1e590ac2189b17c7ebcbbd
+SIZE (fontforge_full-20060822.tar.bz2) = 3421669
Index: print/fontforge/patches/patch-configure_in
===
RCS file: /var/cvs/OpenBSD/ports/print/fontforge/patches/patch-configure_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure_in
--- print/fontforge/patches/patch-configure_in 18 Jun 2006 13:33:25 -
1.1.1.1
+++ print/fontforge/patches/patch-configure_in 15 Oct 2006 14:23:01 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2006/06/18 13:33:25 steven Exp $
configure.in.orig Sun Apr 9 18:30:21 2006
-+++ configure.in Wed Jun 14 21:52:36 2006
-@@ -163,22 +163,15 @@ AC_CHECK_FILE(/usr/include/libxml2/libxm
+--- 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
AC_CHECK_FILE(/usr/local/include/libxml2/libxml,[CFLAGS=$CFLAGS
-I/usr/local/include -I/usr/local/include/libxml2/],
AC_DEFINE(_NO_LIBXML))])
Index: print/fontforge/patches/patch-fontforge_fontview_c
===
RCS file:
/var/cvs/OpenBSD/ports/print/fontforge/patches/patch-fontforge_fontview_c,v
retrieving revision 1.1
diff -u -r1.1 patch-fontforge_fontview_c
--- print/fontforge/patches/patch-fontforge_fontview_c 21 Jul 2006 09:20:34
- 1.1
+++ print/fontforge/patches/patch-fontforge_fontview_c 15 Oct 2006 14:23:01
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-fontforge_fontview_c,v 1.1 2006/07/21 09:20:34 steven Exp $
fontforge/fontview.c.orig Thu Jul 20 14:28:20 2006
-+++ fontforge/fontview.c Thu Jul 20 14:28:47 2006
-@@ -9021,8 +9021,8 @@ static void FVExpose(FontView *fv,GWindo
+--- 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
(event-u.expose.rect.y+event-u.expose.rect.height+fv-cbh-1)/fv-cbh; ++i )
for ( j=0; jfv-colcnt; ++j ) {
int index = (i+fv-rowoff)*fv-colcnt+j;
int feat_gid;
Index: print/fontforge/patches/patch-gdraw_Makefile_dynamic_in
===
RCS file:
/var/cvs/OpenBSD/ports/print/fontforge/patches/patch-gdraw_Makefile_dynamic_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-gdraw_Makefile_dynamic_in
--- print/fontforge/patches/patch-gdraw_Makefile_dynamic_in 18 Jun 2006
13:33:25 - 1.1.1.1
+++ print/fontforge/patches/patch-gdraw_Makefile_dynamic_in 15 Oct 2006
14:23:01 -
@@ -1,9 +1,9 @@
$OpenBSD: patch-gdraw_Makefile_dynamic_in,v 1.1.1.1 2006/06/18 13:33:25 steven
Exp $
gdraw/Makefile.dynamic.in.orig Fri Sep 30 15:06:22 2005
-+++ gdraw/Makefile.dynamic.in Mon Jun 12 20:30:20 2006
-@@ -31,7 +31,7 @@
update: print/fontforge
update to 20060822, which contains several bugfixes and improvements.
Complete changelog: http://fontforge.sourceforge.net/changelog.html
Please test and comment.
Ciao,
Kili
Index: print/fontforge/Makefile
===
RCS file: /var/cvs/OpenBSD/ports/print/fontforge/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- print/fontforge/Makefile3 Aug 2006 23:28:11 - 1.6
+++ print/fontforge/Makefile13 Oct 2006 18:27:25 -
@@ -4,7 +4,7 @@
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20060715
+DISTNAME= fontforge_full-20060822
PKGNAME= ${DISTNAME:S,_full,,}
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= gdraw 1.9 \
Index: print/fontforge/distinfo
===
RCS file: /var/cvs/OpenBSD/ports/print/fontforge/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- print/fontforge/distinfo21 Jul 2006 09:20:34 - 1.2
+++ print/fontforge/distinfo13 Oct 2006 18:27:25 -
@@ -1,4 +1,4 @@
-MD5 (fontforge_full-20060715.tar.bz2) = 47bed2600fd7066179363c6e7b01cd78
-RMD160 (fontforge_full-20060715.tar.bz2) =
ffb5a6c204527e77a96268b7de55ec5446bce400
-SHA1 (fontforge_full-20060715.tar.bz2) =
a95bbb949ce8efb63c48d5b6356007bcf0132bbd
-SIZE (fontforge_full-20060715.tar.bz2) = 3361637
+MD5 (fontforge_full-20060822.tar.bz2) = 872a8013be82e322677f7c254101544d
+RMD160 (fontforge_full-20060822.tar.bz2) =
a5dd19b20e57e4388f83cd6a3fe234a45bfc9057
+SHA1 (fontforge_full-20060822.tar.bz2) =
9496104b056907a56d1e590ac2189b17c7ebcbbd
+SIZE (fontforge_full-20060822.tar.bz2) = 3421669
Index: print/fontforge/patches/patch-configure_in
===
RCS file: /var/cvs/OpenBSD/ports/print/fontforge/patches/patch-configure_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure_in
--- print/fontforge/patches/patch-configure_in 18 Jun 2006 13:33:25 -
1.1.1.1
+++ print/fontforge/patches/patch-configure_in 13 Oct 2006 18:27:25 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2006/06/18 13:33:25 steven Exp $
configure.in.orig Sun Apr 9 18:30:21 2006
-+++ configure.in Wed Jun 14 21:52:36 2006
-@@ -163,22 +163,15 @@ AC_CHECK_FILE(/usr/include/libxml2/libxm
+--- 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
AC_CHECK_FILE(/usr/local/include/libxml2/libxml,[CFLAGS=$CFLAGS
-I/usr/local/include -I/usr/local/include/libxml2/],
AC_DEFINE(_NO_LIBXML))])
Index: print/fontforge/patches/patch-fontforge_fontview_c
===
RCS file:
/var/cvs/OpenBSD/ports/print/fontforge/patches/patch-fontforge_fontview_c,v
retrieving revision 1.1
diff -u -r1.1 patch-fontforge_fontview_c
--- print/fontforge/patches/patch-fontforge_fontview_c 21 Jul 2006 09:20:34
- 1.1
+++ print/fontforge/patches/patch-fontforge_fontview_c 13 Oct 2006 18:27:25
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-fontforge_fontview_c,v 1.1 2006/07/21 09:20:34 steven Exp $
fontforge/fontview.c.orig Thu Jul 20 14:28:20 2006
-+++ fontforge/fontview.c Thu Jul 20 14:28:47 2006
-@@ -9021,8 +9021,8 @@ static void FVExpose(FontView *fv,GWindo
+--- 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
(event-u.expose.rect.y+event-u.expose.rect.height+fv-cbh-1)/fv-cbh; ++i )
for ( j=0; jfv-colcnt; ++j ) {
int index = (i+fv-rowoff)*fv-colcnt+j;
int feat_gid;
Index: print/fontforge/patches/patch-gdraw_Makefile_dynamic_in
===
RCS file:
/var/cvs/OpenBSD/ports/print/fontforge/patches/patch-gdraw_Makefile_dynamic_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-gdraw_Makefile_dynamic_in
--- print/fontforge/patches/patch-gdraw_Makefile_dynamic_in 18 Jun 2006
13:33:25 - 1.1.1.1
+++ print/fontforge/patches/patch-gdraw_Makefile_dynamic_in 13 Oct 2006
18:27:25 -
@@ -1,9 +1,9 @@
$OpenBSD: patch-gdraw_Makefile_dynamic_in,v 1.1.1.1 2006/06/18 13:33:25 steven
Exp $
gdraw/Makefile.dynamic.in.orig Fri Sep 30 15:06:22 2005
-+++ gdraw/Makefile.dynamic.in Mon Jun 12 20:30:20 2006
-@@ -31,7 +31,7 @@ libgdraw_OBJECTS = choosericons.lo divi
- gresourceimage.lo gsavefiledlg.lo gscrollbar.lo gtabset.lo \
- gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo dynamic.lo
+--- 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
+ gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo dynamic.lo \
+
update: print/fontforge
Update to fontforge 20060715. This obsoletes most of our local
patches and also fixes some problems for the (not-to-be-released)
ec-fonts-mftraced port.
I've tested it on i386 and macppc, but only in scripted mode (for
lilypond and above-mentioned ec-fonts-mftraced).
Test reports and comments are welcome, especially for other platforms.
Ciao,
Kili
diff -x CVS -rNu ../fontforge.orig/Makefile ./Makefile
--- ../fontforge.orig/Makefile Sat Jul 1 16:46:15 2006
+++ ./Makefile Sun Jul 16 16:40:23 2006
@@ -4,8 +4,8 @@
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20060413
-PKGNAME= ${DISTNAME:S,_full,,}p1
+DISTNAME= fontforge_full-20060715
+PKGNAME= ${DISTNAME:S,_full,,}
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= gdraw 1.9 \
gunicode2.2
@@ -47,6 +47,6 @@
NO_REGRESS=Yes
post-extract:
- find ${WRKSRC} -name \*.orig | xargs rm
+ find ${WRKSRC} -name \*.orig -o -name \*.rej | xargs rm
.include bsd.port.mk
diff -x CVS -rNu ../fontforge.orig/distinfo ./distinfo
--- ../fontforge.orig/distinfo Sat Jul 1 16:46:15 2006
+++ ./distinfo Sun Jul 16 16:37:54 2006
@@ -1,4 +1,4 @@
-MD5 (fontforge_full-20060413.tar.bz2) = 5058e33dbbd5c0ca344dc73c6ff7a428
-RMD160 (fontforge_full-20060413.tar.bz2) =
f9d098e9135f0074beac2ea919177f1dbb985d0e
-SHA1 (fontforge_full-20060413.tar.bz2) =
b99341f2f1f02dbfd9182bd38afb805125e36ea2
-SIZE (fontforge_full-20060413.tar.bz2) = 3226436
+MD5 (fontforge_full-20060715.tar.bz2) = 47bed2600fd7066179363c6e7b01cd78
+RMD160 (fontforge_full-20060715.tar.bz2) =
ffb5a6c204527e77a96268b7de55ec5446bce400
+SHA1 (fontforge_full-20060715.tar.bz2) =
a95bbb949ce8efb63c48d5b6356007bcf0132bbd
+SIZE (fontforge_full-20060715.tar.bz2) = 3361637
diff -x CVS -rNu ../fontforge.orig/patches/patch-Makefile_dynamic_in
./patches/patch-Makefile_dynamic_in
--- ../fontforge.orig/patches/patch-Makefile_dynamic_in Sun Jun 18 15:33:25 2006
+++ ./patches/patch-Makefile_dynamic_in Sun Jul 16 16:46:31 2006
@@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile_dynamic_in,v 1.1.1.1 2006/06/18 13:33:25 steven Exp $
Makefile.dynamic.in.orig Sat Apr 8 21:24:14 2006
-+++ Makefile.dynamic.inSun Jun 11 13:21:21 2006
+--- Makefile.dynamic.in.orig Fri Jul 14 22:20:20 2006
Makefile.dynamic.inSun 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
- $(LIBTOOL) --mode=install $(INSTALL) -c fontforge.pc $(libdir)/pkgconfig
+ $(INSTALL_DATA) fontforge.pc $(libdir)/pkgconfig
diff -x CVS -rNu ../fontforge.orig/patches/patch-fontforge_charinfo_c
./patches/patch-fontforge_charinfo_c
--- ../fontforge.orig/patches/patch-fontforge_charinfo_cSun Jun 18
15:33:25 2006
+++ ./patches/patch-fontforge_charinfo_cThu Jan 1 01:00:00 1970
@@ -1,18 +0,0 @@
-$OpenBSD: patch-fontforge_charinfo_c,v 1.1.1.1 2006/06/18 13:33:25 steven Exp $
fontforge/charinfo.c.orig Mon Jun 12 16:14:30 2006
-+++ fontforge/charinfo.c Mon Jun 12 16:14:53 2006
-@@ -4288,13 +4288,13 @@ return( true );
-
- static int CI_NameCheck(const unichar_t *name) {
- int bad, questionable;
-+extern int allow_utf8_glyphnames;
- #if defined(FONTFORGE_CONFIG_GDRAW)
- char *buts[3];
- buts[0] = _(_Yes); buts[1]=_(_No); buts[2] = NULL;
- #elif defined(FONTFORGE_CONFIG_GTK)
- static char *buts[] = { GTK_STOCK_YES, GTK_STOCK_CANCEL, NULL };
- #endif
--extern int allow_utf8_glyphnames;
-
- if ( uc_strcmp(name,.notdef)==0 ) /* This name is a
special case and doesn't follow conventions */
- return( true );
diff -x CVS -rNu ../fontforge.orig/patches/patch-fontforge_fontinfo_c
./patches/patch-fontforge_fontinfo_c
--- ../fontforge.orig/patches/patch-fontforge_fontinfo_cSun Jun 18
15:33:25 2006
+++ ./patches/patch-fontforge_fontinfo_cThu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
-$OpenBSD: patch-fontforge_fontinfo_c,v 1.1.1.1 2006/06/18 13:33:25 steven Exp $
fontforge/fontinfo.c.orig Mon Jun 12 12:49:10 2006
-+++ fontforge/fontinfo.c Mon Jun 12 12:49:42 2006
-@@ -5361,6 +5361,7 @@ return(true);
-(sf-xuid!=NULL uc_strcmp(txt,sf-xuid)==0) ||
-ttfuniqueidmatch(sf,d)) ) {
- char *buts[4];
-+ int ans;
- buts[0] = _(Change);
- buts[1] = _(Retain);
- #if defined(FONTFORGE_CONFIG_GDRAW)
-@@ -5369,7 +5370,7 @@ return(true);
- buts[2] = GTK_STOCK_CANCEL;
- #endif
- buts[3] = NULL;
-- int ans = gwwv_ask(_(Change UniqueID?),(const char **)
buts,0,2,_(You have changed this font's name without changing the
