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 --- Makefile 16 Jun 2010 10:13:40 -0000 1.16 +++ Makefile 20 Jun 2010 12:49:29 -0000 @@ -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 \ - gunicode 4.1 \ - gutils 1.1 +SHARED_LIBS= fontforge 3.0 \ + gdraw 5.0 \ + gioftp 2.0 \ + gunicode 5.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 --- distinfo 22 Apr 2009 12:23:00 -0000 1.7 +++ distinfo 20 Jun 2010 12:49:29 -0000 @@ -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) = 6666386 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 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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; foo.Function=3; ], echo " " yes , [echo " " no -- ac_cv_lib_ungif_DGifOpenFileName=no -- AC_DEFINE(_NO_LIBUNGIF)]) -- ] , AC_DEFINE(_NO_LIBUNGIF))]) -+] , AC_DEFINE(_NO_LIBUNGIF)) - - dnl some people have installed libraries without include files. - dnl bloody useless thing to do, but check for both (don't need to check for Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/print/fontforge/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 22 Apr 2009 12:23:00 -0000 1.6 +++ pkg/PLIST 20 Jun 2010 12:49:29 -0000 @@ -6,6 +6,7 @@ bin/sfddiff include/fontforge/ include/fontforge/PfEd.h include/fontforge/autowidth.h +include/fontforge/autowidth2.h include/fontforge/baseviews.h include/fontforge/basics.h include/fontforge/bezctx_ff.h @@ -14,6 +15,7 @@ include/fontforge/chardata.h include/fontforge/charset.h include/fontforge/config.h include/fontforge/configure-pfaedit.h +include/fontforge/delta.h include/fontforge/dynamic.h include/fontforge/edgelist.h include/fontforge/edgelist2.h @@ -41,11 +43,11 @@ include/fontforge/intl.h include/fontforge/libffstamp.h include/fontforge/lookups.h include/fontforge/mm.h +include/fontforge/namehash.h include/fontforge/nonlineartrans.h include/fontforge/ofl.h include/fontforge/pfaedit.h include/fontforge/plugins.h -include/fontforge/prefpage.h include/fontforge/print.h include/fontforge/psfont.h include/fontforge/savefont.h @@ -210,6 +212,24 @@ share/fontforge/pixmaps/stylesshadow.png share/fontforge/pixmaps/stylessmallcaps.png share/fontforge/pixmaps/stylessubsuper.png share/fontforge/pixmaps/styleswireframe.png +share/fontforge/pixmaps/tools3drotate.png +share/fontforge/pixmaps/toolselipse.png +share/fontforge/pixmaps/toolsflip.png +share/fontforge/pixmaps/toolsfreehand.png +share/fontforge/pixmaps/toolsknife.png +share/fontforge/pixmaps/toolsmagnify.png +share/fontforge/pixmaps/toolspen.png +share/fontforge/pixmaps/toolsperspective.png +share/fontforge/pixmaps/toolspointer.png +share/fontforge/pixmaps/toolspoly.png +share/fontforge/pixmaps/toolsrect.png +share/fontforge/pixmaps/toolsrotate.png +share/fontforge/pixmaps/toolsruler.png +share/fontforge/pixmaps/toolsscale.png +share/fontforge/pixmaps/toolsscroll.png +share/fontforge/pixmaps/toolsskew.png +share/fontforge/pixmaps/toolsspiro.png +share/fontforge/pixmaps/toolsstar.png share/fontforge/pixmaps/transformfliphor.png share/fontforge/pixmaps/transformflipvert.png share/fontforge/pixmaps/transformrotate180.png @@ -246,6 +266,7 @@ share/locale/mal/LC_MESSAGES/ share/locale/mal/LC_MESSAGES/FontForge.mo share/locale/pl/LC_MESSAGES/FontForge.mo share/locale/ru/LC_MESSAGES/FontForge.mo +share/locale/uk/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