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
--- Makefile 12 Oct 2007 16:52:56 -0000 1.11
+++ Makefile 26 Oct 2008 19:49:18 -0000
@@ -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 \
- gunicode 3.0
+SHARED_LIBS= fontforge 1.0 \
+ gdraw 3.0 \
+ gioftp 1.0 \
+ gunicode 4.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
--- distinfo 23 Sep 2007 18:45:45 -0000 1.5
+++ distinfo 26 Oct 2008 19:49:18 -0000
@@ -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 -0000 1.3
+++ patches/patch-Makefile_dynamic_in 26 Oct 2008 19:49:18 -0000
@@ -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.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
+--- Makefile.dynamic.in.orig Tue Jul 29 02:01:36 2008
++++ Makefile.dynamic.in Sun 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 -0000 1.3
+++ patches/patch-configure_in 26 Oct 2008 19:49:18 -0000
@@ -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 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-fontforge_fontview_c,v 1.3 2007/09/23 18:45:45 kili Exp $
---- 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;
-- styles = 0;
- SplineChar *sc;
-+ styles = 0;
- if ( fv->mapping!=NULL ) {
- if ( index>=fv->mapcnt ) index = fv->map->enccount;
- else
Index: patches/patch-fontforge_http_c
===================================================================
RCS file: patches/patch-fontforge_http_c
diff -N patches/patch-fontforge_http_c
--- patches/patch-fontforge_http_c 23 Sep 2007 18:45:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-fontforge_http_c,v 1.1 2007/09/23 18:45:45 kili Exp $
---- 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.3
diff -u -p -r1.3 patch-gdraw_Makefile_dynamic_in
--- patches/patch-gdraw_Makefile_dynamic_in 23 Sep 2007 18:45:45 -0000
1.3
+++ patches/patch-gdraw_Makefile_dynamic_in 26 Oct 2008 19:49:18 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-gdraw_Makefile_dynamic_in,v 1.3 2007/09/23 18:45:45 kili Exp $
---- 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 gdrawable.lo gspacer.lo
+--- gdraw/Makefile.dynamic.in.orig Wed Aug 27 16:39:23 2008
++++ gdraw/Makefile.dynamic.in Sun Oct 26 14:24:19 2008
+@@ -34,7 +34,7 @@ libgdraw_OBJECTS = choosericons.lo ctlvalues.lo drawb
+ gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo \
+ ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo xkeysyms_unicode.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
--- patches/patch-gdraw_gimagereadjpeg_c 23 Sep 2007 18:45:45 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-gdraw_gimagereadjpeg_c,v 1.1 2007/09/23 18:45:45 kili Exp $
---- 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
--- patches/patch-gdraw_gimagewritepng_c 23 Sep 2007 18:45:45 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-gdraw_gimagewritepng_c,v 1.1 2007/09/23 18:45:45 kili Exp $
---- 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.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 23 Sep 2007 18:45:45 -0000 1.4
+++ pkg/PLIST 26 Oct 2008 19:49:18 -0000
@@ -1,20 +1,237 @@
@comment $OpenBSD: PLIST,v 1.4 2007/09/23 18:45:45 kili Exp $
-bin/fontforge
[EMAIL PROTECTED] bin/fontforge
bin/fontimage
bin/fontlint
bin/sfddiff
+include/fontforge/
+include/fontforge/PfEd.h
+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/libffstamp.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
[EMAIL PROTECTED] lib/libfontforge.so.${LIBfontforge_VERSION}
lib/libgdraw.a
lib/libgdraw.la
@lib lib/libgdraw.so.${LIBgdraw_VERSION}
+lib/libgioftp.a
+lib/libgioftp.la
[EMAIL PROTECTED] lib/libgioftp.so.${LIBgioftp_VERSION}
lib/libgunicode.a
lib/libgunicode.la
@lib lib/libgunicode.so.${LIBgunicode_VERSION}
+lib/libgutils.a
+lib/libgutils.la
[EMAIL PROTECTED] lib/libgutils.so.${LIBgutils_VERSION}
lib/pkgconfig/fontforge.pc
@man man/man1/fontforge.1
@man man/man1/fontimage.1
@man man/man1/fontlint.1
@man man/man1/sfddiff.1
share/fontforge/
+share/fontforge/pixmaps/
+share/fontforge/pixmaps/colorwheel.png
+share/fontforge/pixmaps/editclear.png
+share/fontforge/pixmaps/editclearback.png
+share/fontforge/pixmaps/editcopy.png
+share/fontforge/pixmaps/editcopyfg2bg.png
+share/fontforge/pixmaps/editcopylayer2layer.png
+share/fontforge/pixmaps/editcopylbearing.png
+share/fontforge/pixmaps/editcopylookupdata.png
+share/fontforge/pixmaps/editcopyrbearing.png
+share/fontforge/pixmaps/editcopyref.png
+share/fontforge/pixmaps/editcopyvwidth.png
+share/fontforge/pixmaps/editcopywidth.png
+share/fontforge/pixmaps/editcut.png
+share/fontforge/pixmaps/editfind.png
+share/fontforge/pixmaps/editjoin.png
+share/fontforge/pixmaps/editmerge.png
+share/fontforge/pixmaps/editpaste.png
+share/fontforge/pixmaps/editpasteafter.png
+share/fontforge/pixmaps/editpasteinto.png
+share/fontforge/pixmaps/editredo.png
+share/fontforge/pixmaps/editrmundoes.png
+share/fontforge/pixmaps/editrplref.png
+share/fontforge/pixmaps/editsameas.png
+share/fontforge/pixmaps/editselect.png
+share/fontforge/pixmaps/editundo.png
+share/fontforge/pixmaps/editunlink.png
+share/fontforge/pixmaps/elementaddextrema.png
+share/fontforge/pixmaps/elementalign.png
+share/fontforge/pixmaps/elementanticlock.png
+share/fontforge/pixmaps/elementautotrace.png
+share/fontforge/pixmaps/elementbdfinfo.png
+share/fontforge/pixmaps/elementbitmapsavail.png
+share/fontforge/pixmaps/elementbuildaccent.png
+share/fontforge/pixmaps/elementbuildcomposit.png
+share/fontforge/pixmaps/elementclockwise.png
+share/fontforge/pixmaps/elementcomparefonts.png
+share/fontforge/pixmaps/elementcomparelayers.png
+share/fontforge/pixmaps/elementcorrectdir.png
+share/fontforge/pixmaps/elementexpandstroke.png
+share/fontforge/pixmaps/elementfindprobs.png
+share/fontforge/pixmaps/elementfontinfo.png
+share/fontforge/pixmaps/elementgetinfo.png
+share/fontforge/pixmaps/elementglyphinfo.png
+share/fontforge/pixmaps/elementhbaselines.png
+share/fontforge/pixmaps/elementinterpolatefonts.png
+share/fontforge/pixmaps/elementmathinfo.png
+share/fontforge/pixmaps/elementmergefonts.png
+share/fontforge/pixmaps/elementorder.png
+share/fontforge/pixmaps/elementotherinfo.png
+share/fontforge/pixmaps/elementregenbitmaps.png
+share/fontforge/pixmaps/elementremovebitmaps.png
+share/fontforge/pixmaps/elementrenameglyph.png
+share/fontforge/pixmaps/elementround.png
+share/fontforge/pixmaps/elementshowdep.png
+share/fontforge/pixmaps/elementsimplify.png
+share/fontforge/pixmaps/elementstyles.png
+share/fontforge/pixmaps/elementtilepath.png
+share/fontforge/pixmaps/elementtilepattern.png
+share/fontforge/pixmaps/elementtransform.png
+share/fontforge/pixmaps/elementvalidate.png
+share/fontforge/pixmaps/elementvbaselines.png
+share/fontforge/pixmaps/fileclose.png
+share/fontforge/pixmaps/fileexecute.png
+share/fontforge/pixmaps/fileexport.png
+share/fontforge/pixmaps/filegenerate.png
+share/fontforge/pixmaps/filegeneratefamily.png
+share/fontforge/pixmaps/fileimport.png
+share/fontforge/pixmaps/filemergefeature.png
+share/fontforge/pixmaps/filenew.png
+share/fontforge/pixmaps/fileopen.png
+share/fontforge/pixmaps/fileprefs.png
+share/fontforge/pixmaps/fileprint.png
+share/fontforge/pixmaps/filequit.png
+share/fontforge/pixmaps/filerecent.png
+share/fontforge/pixmaps/filerevert.png
+share/fontforge/pixmaps/filerevertbackup.png
+share/fontforge/pixmaps/filerevertglyph.png
+share/fontforge/pixmaps/filesave.png
+share/fontforge/pixmaps/filesaveall.png
+share/fontforge/pixmaps/filesaveas.png
+share/fontforge/pixmaps/helpabout.png
+share/fontforge/pixmaps/helphelp.png
+share/fontforge/pixmaps/helpindex.png
+share/fontforge/pixmaps/hintsadddstem.png
+share/fontforge/pixmaps/hintsaddhstem.png
+share/fontforge/pixmaps/hintsaddvstem.png
+share/fontforge/pixmaps/hintsautohint.png
+share/fontforge/pixmaps/hintscleardstems.png
+share/fontforge/pixmaps/hintsclearhstems.png
+share/fontforge/pixmaps/hintsclearvstems.png
+share/fontforge/pixmaps/hintsdontautohint.png
+share/fontforge/pixmaps/hintsreviewhints.png
+share/fontforge/pixmaps/menuempty.png
+share/fontforge/pixmaps/metricscenter.png
+share/fontforge/pixmaps/metricssetlbearing.png
+share/fontforge/pixmaps/metricssetrbearing.png
+share/fontforge/pixmaps/metricssetvwidth.png
+share/fontforge/pixmaps/metricssetwidth.png
+share/fontforge/pixmaps/overlapexclude.png
+share/fontforge/pixmaps/overlapfindinter.png
+share/fontforge/pixmaps/overlapintersection.png
+share/fontforge/pixmaps/overlaprm.png
+share/fontforge/pixmaps/pointsG2curve.png
+share/fontforge/pixmaps/pointsaddanchor.png
+share/fontforge/pixmaps/pointscorner.png
+share/fontforge/pixmaps/pointscurve.png
+share/fontforge/pixmaps/pointshvcurve.png
+share/fontforge/pixmaps/pointsmakearc.png
+share/fontforge/pixmaps/pointsmakeline.png
+share/fontforge/pixmaps/pointsnamecontour.png
+share/fontforge/pixmaps/pointsspironext.png
+share/fontforge/pixmaps/pointsspiroprev.png
+share/fontforge/pixmaps/pointstangent.png
+share/fontforge/pixmaps/python.png
+share/fontforge/pixmaps/styleschangeweight.png
+share/fontforge/pixmaps/styleschangexheight.png
+share/fontforge/pixmaps/stylesextendcondense.png
+share/fontforge/pixmaps/stylesinline.png
+share/fontforge/pixmaps/stylesitalic.png
+share/fontforge/pixmaps/stylesoblique.png
+share/fontforge/pixmaps/stylesoutline.png
+share/fontforge/pixmaps/stylesshadow.png
+share/fontforge/pixmaps/stylessmallcaps.png
+share/fontforge/pixmaps/stylessubsuper.png
+share/fontforge/pixmaps/styleswireframe.png
+share/fontforge/pixmaps/transformfliphor.png
+share/fontforge/pixmaps/transformflipvert.png
+share/fontforge/pixmaps/transformrotate180.png
+share/fontforge/pixmaps/transformrotateccw.png
+share/fontforge/pixmaps/transformrotatecw.png
+share/fontforge/pixmaps/transformskew.png
+share/fontforge/pixmaps/viewbiggersize.png
+share/fontforge/pixmaps/viewfindinfont.png
+share/fontforge/pixmaps/viewfit.png
+share/fontforge/pixmaps/viewformer.png
+share/fontforge/pixmaps/viewgoto.png
+share/fontforge/pixmaps/viewinsertafter.png
+share/fontforge/pixmaps/viewinsertbefore.png
+share/fontforge/pixmaps/viewnext.png
+share/fontforge/pixmaps/viewnextdef.png
+share/fontforge/pixmaps/viewpalettes.png
+share/fontforge/pixmaps/viewprev.png
+share/fontforge/pixmaps/viewprevdef.png
+share/fontforge/pixmaps/viewreplace.png
+share/fontforge/pixmaps/viewsmallersize.png
+share/fontforge/pixmaps/viewzoomin.png
+share/fontforge/pixmaps/viewzoomout.png
+share/fontforge/python/
+share/fontforge/python/excepthook.py
share/locale/de/LC_MESSAGES/FontForge.mo
share/locale/el/LC_MESSAGES/FontForge.mo
share/locale/en_GB/
