Sun Oct 11 08:01:47 2009 UTC ()
Changes 20090923:
* Bug fixes.


(adam)
diff -r1.61 -r1.62 pkgsrc/fonts/fontforge/Makefile
diff -r1.27 -r1.28 pkgsrc/fonts/fontforge/PLIST
diff -r1.49 -r1.50 pkgsrc/fonts/fontforge/distinfo
diff -r1.19 -r1.20 pkgsrc/fonts/fontforge/patches/patch-ae
cvs diff -r1.61 -r1.62 pkgsrc/fonts/fontforge/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/Makefile 2009/08/26 19:57:28 1.61
+++ pkgsrc/fonts/fontforge/Makefile 2009/10/11 08:01:47 1.62
@@ -1,27 +1,26 @@ @@ -1,27 +1,26 @@
1# $NetBSD: Makefile,v 1.61 2009/08/26 19:57:28 sno Exp $ 1# $NetBSD: Makefile,v 1.62 2009/10/11 08:01:47 adam Exp $
2 2
3DISTNAME= fontforge_full-${VERSION} 3DISTNAME= fontforge_full-${VERSION}
4PKGNAME= fontforge-${VERSION} 4PKGNAME= fontforge-${VERSION}
5PKGREVISION= 1 
6CATEGORIES= fonts editors 5CATEGORIES= fonts editors
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
11HOMEPAGE= http://fontforge.sourceforge.net/ 10HOMEPAGE= http://fontforge.sourceforge.net/
12COMMENT= Postscript font editor 11COMMENT= Postscript font editor
13 12
14VERSION= 20090622 13VERSION= 20090923
15 14
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 17WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
19 18
20MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 19MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
21 20
22GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
23USE_LANGUAGES= c 22USE_LANGUAGES= c
24USE_LIBTOOL= yes 23USE_LIBTOOL= yes
25USE_PKGLOCALEDIR= yes 24USE_PKGLOCALEDIR= yes
26USE_TOOLS+= gmake msgfmt 25USE_TOOLS+= gmake msgfmt
27CONFIGURE_ARGS+= --without-freetype-src 26CONFIGURE_ARGS+= --without-freetype-src
cvs diff -r1.27 -r1.28 pkgsrc/fonts/fontforge/PLIST (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/PLIST 2009/07/24 08:02:59 1.27
+++ pkgsrc/fonts/fontforge/PLIST 2009/10/11 08:01:47 1.28
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1@comment $NetBSD: PLIST,v 1.27 2009/07/24 08:02:59 adam Exp $ 1@comment $NetBSD: PLIST,v 1.28 2009/10/11 08:01:47 adam Exp $
2bin/fontforge 2bin/fontforge
3bin/fontimage 3bin/fontimage
4bin/fontlint 4bin/fontlint
5bin/sfddiff 5bin/sfddiff
6include/fontforge/PfEd.h 6include/fontforge/PfEd.h
7include/fontforge/autowidth.h 7include/fontforge/autowidth.h
8include/fontforge/baseviews.h 8include/fontforge/baseviews.h
9include/fontforge/basics.h 9include/fontforge/basics.h
10include/fontforge/bezctx_ff.h 10include/fontforge/bezctx_ff.h
11include/fontforge/bitmapcontrol.h 11include/fontforge/bitmapcontrol.h
12include/fontforge/chardata.h 12include/fontforge/chardata.h
13include/fontforge/charset.h 13include/fontforge/charset.h
14include/fontforge/config.h 14include/fontforge/config.h
15include/fontforge/configure-pfaedit.h 15include/fontforge/configure-pfaedit.h
 16include/fontforge/delta.h
16include/fontforge/dynamic.h 17include/fontforge/dynamic.h
17include/fontforge/edgelist.h 18include/fontforge/edgelist.h
18include/fontforge/edgelist2.h 19include/fontforge/edgelist2.h
19include/fontforge/encoding.h 20include/fontforge/encoding.h
20include/fontforge/fffreetype.h 21include/fontforge/fffreetype.h
21include/fontforge/ffpython.h 22include/fontforge/ffpython.h
22include/fontforge/fileutil.h 23include/fontforge/fileutil.h
23include/fontforge/fontforgevw.h 24include/fontforge/fontforgevw.h
24include/fontforge/fvmetrics.h 25include/fontforge/fvmetrics.h
25include/fontforge/gdraw.h 26include/fontforge/gdraw.h
26include/fontforge/gfile.h 27include/fontforge/gfile.h
27include/fontforge/ggadget.h 28include/fontforge/ggadget.h
28include/fontforge/gicons.h 29include/fontforge/gicons.h
@@ -30,31 +31,31 @@ include/fontforge/gimage.h @@ -30,31 +31,31 @@ include/fontforge/gimage.h
30include/fontforge/gio.h 31include/fontforge/gio.h
31include/fontforge/gkeysym.h 32include/fontforge/gkeysym.h
32include/fontforge/gprogress.h 33include/fontforge/gprogress.h
33include/fontforge/gresedit.h 34include/fontforge/gresedit.h
34include/fontforge/gresource.h 35include/fontforge/gresource.h
35include/fontforge/groups.h 36include/fontforge/groups.h
36include/fontforge/gwidget.h 37include/fontforge/gwidget.h
37include/fontforge/gwwiconv.h 38include/fontforge/gwwiconv.h
38include/fontforge/import.h 39include/fontforge/import.h
39include/fontforge/intl.h 40include/fontforge/intl.h
40include/fontforge/libffstamp.h 41include/fontforge/libffstamp.h
41include/fontforge/lookups.h 42include/fontforge/lookups.h
42include/fontforge/mm.h 43include/fontforge/mm.h
 44include/fontforge/namehash.h
43include/fontforge/nonlineartrans.h 45include/fontforge/nonlineartrans.h
44include/fontforge/ofl.h 46include/fontforge/ofl.h
45include/fontforge/pfaedit.h 47include/fontforge/pfaedit.h
46include/fontforge/plugins.h 48include/fontforge/plugins.h
47include/fontforge/prefpage.h 
48include/fontforge/print.h 49include/fontforge/print.h
49include/fontforge/psfont.h 50include/fontforge/psfont.h
50include/fontforge/savefont.h 51include/fontforge/savefont.h
51include/fontforge/scriptfuncs.h 52include/fontforge/scriptfuncs.h
52include/fontforge/scripting.h 53include/fontforge/scripting.h
53include/fontforge/sd.h 54include/fontforge/sd.h
54include/fontforge/search.h 55include/fontforge/search.h
55include/fontforge/sfd1.h 56include/fontforge/sfd1.h
56include/fontforge/sflayoutP.h 57include/fontforge/sflayoutP.h
57include/fontforge/splinefont.h 58include/fontforge/splinefont.h
58include/fontforge/stemdb.h 59include/fontforge/stemdb.h
59include/fontforge/ttf.h 60include/fontforge/ttf.h
60include/fontforge/ttfinstrs.h 61include/fontforge/ttfinstrs.h
@@ -187,26 +188,44 @@ share/fontforge/pixmaps/pointsspiroprev. @@ -187,26 +188,44 @@ share/fontforge/pixmaps/pointsspiroprev.
187share/fontforge/pixmaps/pointstangent.png 188share/fontforge/pixmaps/pointstangent.png
188share/fontforge/pixmaps/python.png 189share/fontforge/pixmaps/python.png
189share/fontforge/pixmaps/styleschangeweight.png 190share/fontforge/pixmaps/styleschangeweight.png
190share/fontforge/pixmaps/styleschangexheight.png 191share/fontforge/pixmaps/styleschangexheight.png
191share/fontforge/pixmaps/stylesextendcondense.png 192share/fontforge/pixmaps/stylesextendcondense.png
192share/fontforge/pixmaps/stylesinline.png 193share/fontforge/pixmaps/stylesinline.png
193share/fontforge/pixmaps/stylesitalic.png 194share/fontforge/pixmaps/stylesitalic.png
194share/fontforge/pixmaps/stylesoblique.png 195share/fontforge/pixmaps/stylesoblique.png
195share/fontforge/pixmaps/stylesoutline.png 196share/fontforge/pixmaps/stylesoutline.png
196share/fontforge/pixmaps/stylesshadow.png 197share/fontforge/pixmaps/stylesshadow.png
197share/fontforge/pixmaps/stylessmallcaps.png 198share/fontforge/pixmaps/stylessmallcaps.png
198share/fontforge/pixmaps/stylessubsuper.png 199share/fontforge/pixmaps/stylessubsuper.png
199share/fontforge/pixmaps/styleswireframe.png 200share/fontforge/pixmaps/styleswireframe.png
 201share/fontforge/pixmaps/tools3drotate.png
 202share/fontforge/pixmaps/toolselipse.png
 203share/fontforge/pixmaps/toolsflip.png
 204share/fontforge/pixmaps/toolsfreehand.png
 205share/fontforge/pixmaps/toolsknife.png
 206share/fontforge/pixmaps/toolsmagnify.png
 207share/fontforge/pixmaps/toolspen.png
 208share/fontforge/pixmaps/toolsperspective.png
 209share/fontforge/pixmaps/toolspointer.png
 210share/fontforge/pixmaps/toolspoly.png
 211share/fontforge/pixmaps/toolsrect.png
 212share/fontforge/pixmaps/toolsrotate.png
 213share/fontforge/pixmaps/toolsruler.png
 214share/fontforge/pixmaps/toolsscale.png
 215share/fontforge/pixmaps/toolsscroll.png
 216share/fontforge/pixmaps/toolsskew.png
 217share/fontforge/pixmaps/toolsspiro.png
 218share/fontforge/pixmaps/toolsstar.png
200share/fontforge/pixmaps/transformfliphor.png 219share/fontforge/pixmaps/transformfliphor.png
201share/fontforge/pixmaps/transformflipvert.png 220share/fontforge/pixmaps/transformflipvert.png
202share/fontforge/pixmaps/transformrotate180.png 221share/fontforge/pixmaps/transformrotate180.png
203share/fontforge/pixmaps/transformrotateccw.png 222share/fontforge/pixmaps/transformrotateccw.png
204share/fontforge/pixmaps/transformrotatecw.png 223share/fontforge/pixmaps/transformrotatecw.png
205share/fontforge/pixmaps/transformskew.png 224share/fontforge/pixmaps/transformskew.png
206share/fontforge/pixmaps/viewbiggersize.png 225share/fontforge/pixmaps/viewbiggersize.png
207share/fontforge/pixmaps/viewfindinfont.png 226share/fontforge/pixmaps/viewfindinfont.png
208share/fontforge/pixmaps/viewfit.png 227share/fontforge/pixmaps/viewfit.png
209share/fontforge/pixmaps/viewformer.png 228share/fontforge/pixmaps/viewformer.png
210share/fontforge/pixmaps/viewgoto.png 229share/fontforge/pixmaps/viewgoto.png
211share/fontforge/pixmaps/viewinsertafter.png 230share/fontforge/pixmaps/viewinsertafter.png
212share/fontforge/pixmaps/viewinsertbefore.png 231share/fontforge/pixmaps/viewinsertbefore.png
cvs diff -r1.49 -r1.50 pkgsrc/fonts/fontforge/distinfo (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/distinfo 2009/07/24 08:02:59 1.49
+++ pkgsrc/fonts/fontforge/distinfo 2009/10/11 08:01:47 1.50
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.49 2009/07/24 08:02:59 adam Exp $ 1$NetBSD: distinfo,v 1.50 2009/10/11 08:01:47 adam Exp $
2 2
3SHA1 (fontforge_full-20090622.tar.bz2) = bc638eeeb4cf2d540773bacc52cc6bac1c6ca76f 3SHA1 (fontforge_full-20090923.tar.bz2) = cccf78ddf074ea5ddc3ce13a988dc17d383eabdd
4RMD160 (fontforge_full-20090622.tar.bz2) = ba9983bf667091e0e9b88fcabf865c65ba2debbd 4RMD160 (fontforge_full-20090923.tar.bz2) = 704a623f506500c839f378393f11ef14b5dec367
5Size (fontforge_full-20090622.tar.bz2) = 5359385 bytes 5Size (fontforge_full-20090923.tar.bz2) = 5492119 bytes
6SHA1 (patch-aa) = bb06cfc2ba3a6310a1d423166613140def0a06ea 6SHA1 (patch-aa) = bb06cfc2ba3a6310a1d423166613140def0a06ea
7SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd 7SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
8SHA1 (patch-ae) = 64a289cc5b921d54a6785e71338de45737b8a01c 8SHA1 (patch-ae) = ab81cc98fbf18a6e1bacc8de93e00fddd9fb834c
cvs diff -r1.19 -r1.20 pkgsrc/fonts/fontforge/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/patches/Attic/patch-ae 2009/01/03 19:45:29 1.19
+++ pkgsrc/fonts/fontforge/patches/Attic/patch-ae 2009/10/11 08:01:47 1.20
@@ -1,42 +1,49 @@ @@ -1,42 +1,49 @@
1$NetBSD: patch-ae,v 1.19 2009/01/03 19:45:29 adam Exp $ 1$NetBSD: patch-ae,v 1.20 2009/10/11 08:01:47 adam Exp $
2 2
3--- configure.orig 2008-12-15 20:38:07.000000000 +0100 3--- configure.orig 2009-09-24 01:55:22.000000000 +0200
4+++ configure 4+++ configure
5@@ -21815,8 +21815,8 @@ if test $ac_cv_file__usr_include_libxml2 5@@ -20246,14 +20246,14 @@ if test "x$ac_cv_file__usr_include_libxm
6 CFLAGS="$CFLAGS -I/usr/include/libxml2/" 6 CFLAGS="$CFLAGS -I/usr/include/libxml2/"
7 else 7 else
8  8
9- { echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5 9- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/local/include/libxml2/libxml" >&5
10-echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6; } 10-$as_echo_n "checking for /usr/local/include/libxml2/libxml... " >&6; }
11+ { echo "$as_me:$LINENO: checking for ${PREFIX}/include/libxml2/libxml" >&5 11+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PREFIX}/include/libxml2/libxml" >&5
12+echo $ECHO_N "checking for ${PREFIX}/include/libxml2/libxml... $ECHO_C" >&6; } 12+$as_echo_n "checking for ${PREFIX}/include/libxml2/libxml... " >&6; }
13 if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then 13 if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then :
14 echo $ECHO_N "(cached) $ECHO_C" >&6 14 $as_echo_n "(cached) " >&6
15 else 15 else
16@@ -21824,7 +21824,7 @@ else 16 test "$cross_compiling" = yes &&
17 { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 17 as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
18 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} 
19 { (exit 1); exit 1; }; } 
20-if test -r "/usr/local/include/libxml2/libxml"; then 18-if test -r "/usr/local/include/libxml2/libxml"; then
21+if test -r "${PREFIX}/include/libxml2/libxml"; then 19+if test -r "${PREFIX}/include/libxml2/libxml"; then
22 ac_cv_file__usr_local_include_libxml2_libxml=yes 20 ac_cv_file__usr_local_include_libxml2_libxml=yes
23 else 21 else
24 ac_cv_file__usr_local_include_libxml2_libxml=no 22 ac_cv_file__usr_local_include_libxml2_libxml=no
25@@ -21833,7 +21833,7 @@ fi 23@@ -20262,7 +20262,7 @@ fi
26 { echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5 24 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
27 echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6; } 25 $as_echo "$ac_cv_file__usr_local_include_libxml2_libxml" >&6; }
28 if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then 26 if test "x$ac_cv_file__usr_local_include_libxml2_libxml" = x""yes; then :
29- CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/" 27- CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
30+ CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/" 28+ CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/"
31 else 29 else
32 cat >>confdefs.h <<\_ACEOF 30 $as_echo "#define _NO_LIBXML 1" >>confdefs.h
33 #define _NO_LIBXML 1 31
34@@ -26606,7 +26606,7 @@ if test "$gww_has_gettext" = "yes" >/dev 32@@ -22761,7 +22761,7 @@ if test "$gww_has_gettext" = "yes" >/dev
35  33
36 cat </dev/null >$ac_confdir/po/Makefile.in 34 cat </dev/null >$ac_confdir/po/Makefile.in
37 echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in 35 echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
38- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in 36- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in
39+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in 37+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in
40 echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in 38 echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in
41 echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in 39 echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in
42 echo '' >> $ac_confdir/po/Makefile.in 40 echo '' >> $ac_confdir/po/Makefile.in
 41@@ -22843,7 +22843,7 @@ if test "$gww_archlist" != "" ; then
 42 LDFLAGS="$LDFLAGS $gww_archlist"
 43 fi
 44
 45-CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//`
 46+CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2//g | sed -e s/-O//g`
 47
 48 cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in
 49 cp $ac_confdir/Unicode/Makefile.dynamic.in $ac_confdir/Unicode/Makefile.in