Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6195
Modified Files:
fontforge.info fontforge.patch
Log Message:
Move to stable.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fontforge.info 16 Sep 2007 19:46:03 -0000 1.8
+++ fontforge.info 17 Nov 2007 23:04:31 -0000 1.9
@@ -1,6 +1,6 @@
Package: fontforge
-Version: 20070831
-Revision: 2
+Version: 20071002
+Revision: 1
License: BSD
Description: Outline font editor
DescDetail: <<
@@ -23,10 +23,10 @@
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: bc19690af836940ff822c9e0a5680b20
+Source-MD5: 0f4090b9035e50befee39d1b8c16cff2
SourceDirectory: %n-%v
Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
-Source2-MD5: 508c6c8679757a73505d21bd59c2ad47
+Source2-MD5: bc0be7d21cf039e6a24c81b65b3f30d9
Source2ExtractDir: %n-%v/htdocs
Depends: <<
@@ -62,7 +62,7 @@
DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
PatchFile: %n.patch
-PatchFile-MD5: 1e5b18fbdb5b5c35dfd35b495aa93512
+PatchFile-MD5: 45662f7899565421e5bda7cb67eaa776
PatchScript: <<
patch -p1 <%{PatchFile}
perl -pi -e 's,python -c,/usr/bin/python -c,g' configure
@@ -82,6 +82,7 @@
--with-python\
--enable-shared=no\
--enable-static=yes\
+ --disable-pyextension\
--without-freetype-src
<<
CompileScript: <<
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fontforge.patch 16 Sep 2007 19:46:03 -0000 1.6
+++ fontforge.patch 17 Nov 2007 23:04:31 -0000 1.7
@@ -1,32 +1,18 @@
-diff -ru fontforge-20070831.orig/Makefile.dynamic.in
fontforge-20070831/Makefile.dynamic.in
---- fontforge-20070831.orig/Makefile.dynamic.in 2007-08-17
22:06:04.000000000 -0400
-+++ fontforge-20070831/Makefile.dynamic.in 2007-09-15 18:08:25.000000000
-0400
-@@ -94,7 +94,7 @@
+diff -ru fontforge-20071002.orig/Makefile.dynamic.in
fontforge-20071002/Makefile.dynamic.in
+--- fontforge-20071002.orig/Makefile.dynamic.in 2007-10-02
14:08:48.000000000 -0400
++++ fontforge-20071002/Makefile.dynamic.in 2007-10-07 15:20:08.000000000
-0400
+@@ -96,7 +96,7 @@
$(INSTALL_DATA) $(srcdir)/fontforge/fontlint.1 $(DESTDIR)$(mandir)/man1
#explicit use of sh to make sure we don't invoke csh with different "if"
syntax
sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE)
install_docs ; fi"
- sh < systemspecific
+# sh < systemspecific
+ #we don't always create a setup.py
+ -(cd pyhook ; python setup.py install )
- uninstall:
- -rm $(DESTDIR)$(bindir)/fontforge
-diff -ru fontforge-20070831.orig/Unicode/Makefile.dynamic.in
fontforge-20070831/Unicode/Makefile.dynamic.in
---- fontforge-20070831.orig/Unicode/Makefile.dynamic.in 2007-05-28
10:20:55.000000000 -0400
-+++ fontforge-20070831/Unicode/Makefile.dynamic.in 2007-09-15
18:11:35.000000000 -0400
-@@ -18,8 +18,8 @@
- 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
--CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
-+Incs = -I$(top_srcdir)/inc
-+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ @DEFS@
-
- ../libgunicode.la: $(libgunicode_OBJECTS)
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o
../libgunicode.la $(libgunicode_OBJECTS) \
-diff -ru fontforge-20070831.orig/Unicode/Makefile.in
fontforge-20070831/Unicode/Makefile.in
---- fontforge-20070831.orig/Unicode/Makefile.in 2007-05-28
10:20:55.000000000 -0400
-+++ fontforge-20070831/Unicode/Makefile.in 2007-09-15 18:11:22.000000000
-0400
+diff -ru fontforge-20071002.orig/Unicode/Makefile.dynamic.in
fontforge-20071002/Unicode/Makefile.dynamic.in
+--- fontforge-20071002.orig/Unicode/Makefile.dynamic.in 2007-05-28
10:20:55.000000000 -0400
++++ fontforge-20071002/Unicode/Makefile.dynamic.in 2007-10-07
15:19:13.000000000 -0400
@@ -18,8 +18,8 @@
cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \
usprintf.lo gwwiconv.lo
@@ -38,9 +24,9 @@
../libgunicode.la: $(libgunicode_OBJECTS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o
../libgunicode.la $(libgunicode_OBJECTS) \
-diff -ru fontforge-20070831.orig/Unicode/Makefile.static.in
fontforge-20070831/Unicode/Makefile.static.in
---- fontforge-20070831.orig/Unicode/Makefile.static.in 2006-10-30
10:38:03.000000000 -0500
-+++ fontforge-20070831/Unicode/Makefile.static.in 2007-09-15
18:11:09.000000000 -0400
+diff -ru fontforge-20071002.orig/Unicode/Makefile.static.in
fontforge-20071002/Unicode/Makefile.static.in
+--- fontforge-20071002.orig/Unicode/Makefile.static.in 2006-10-30
10:38:03.000000000 -0500
++++ fontforge-20071002/Unicode/Makefile.static.in 2007-10-07
15:19:13.000000000 -0400
@@ -12,8 +12,8 @@
libgunicode_OBJECTS = ArabicForms.o alphabet.o backtrns.o char.o \
cjk.o memory.o ucharmap.o unialt.o ustring.o utype.o usprintf.o gwwiconv.o
@@ -52,10 +38,10 @@
all: ../libs/libgunicode.a
-diff -ru fontforge-20070831.orig/configure fontforge-20070831/configure
---- fontforge-20070831.orig/configure 2007-08-30 18:13:19.000000000 -0400
-+++ fontforge-20070831/configure 2007-09-15 18:08:26.000000000 -0400
-@@ -2686,9 +2686,7 @@
+diff -ru fontforge-20071002.orig/configure fontforge-20071002/configure
+--- fontforge-20071002.orig/configure 2007-10-03 11:46:41.000000000 -0400
++++ fontforge-20071002/configure 2007-10-07 15:19:13.000000000 -0400
+@@ -2690,9 +2690,7 @@
gww_define_caps_for_alt="1"
@@ -66,7 +52,7 @@
LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices
$LIBS"
;;
-@@ -19100,7 +19098,7 @@
+@@ -19142,7 +19140,7 @@
echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_libxml2_libxml" >&5
echo "${ECHO_T}$ac_cv_file__usr_include_libxml2_libxml" >&6
if test $ac_cv_file__usr_include_libxml2_libxml = yes; then
@@ -75,7 +61,7 @@
else
echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
-@@ -19121,7 +19119,7 @@
+@@ -19163,7 +19161,7 @@
echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml"
>&5
echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6
if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
@@ -84,26 +70,10 @@
else
cat >>confdefs.h <<\_ACEOF
#define _NO_LIBXML 1
-diff -ru fontforge-20070831.orig/fontforge/Makefile.dynamic.in
fontforge-20070831/fontforge/Makefile.dynamic.in
---- fontforge-20070831.orig/fontforge/Makefile.dynamic.in 2007-08-27
22:18:49.000000000 -0400
-+++ fontforge-20070831/fontforge/Makefile.dynamic.in 2007-09-15
18:08:26.000000000 -0400
-@@ -53,9 +53,9 @@
-
- #I used to include -L/usr/lib explicitly after static_libs. Not sure why.
Should be implied & breaks 64bit compiles
- LDFLAGS = @LDFLAGS@
--LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
-- $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
--DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
-+LIBS = -rpath $(libdir) $(STATIC_LIBS) $(X_LIBS) ../libgdraw.la
../libgunicode.la \
-+ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ -lm
-+DLIBS = -rpath $(libdir) -L$(libdir) -liconv ../libgunicode.la @LIBS@
$(STATIC_LIBS) -lm
-
- all: fontforge sfddiff fontimage fontlint
-
-diff -ru fontforge-20070831.orig/fontforge/Makefile.in
fontforge-20070831/fontforge/Makefile.in
---- fontforge-20070831.orig/fontforge/Makefile.in 2007-08-27
22:18:49.000000000 -0400
-+++ fontforge-20070831/fontforge/Makefile.in 2007-09-15 18:08:26.000000000
-0400
-@@ -53,9 +53,9 @@
+diff -ru fontforge-20071002.orig/fontforge/Makefile.dynamic.in
fontforge-20071002/fontforge/Makefile.dynamic.in
+--- fontforge-20071002.orig/fontforge/Makefile.dynamic.in 2007-10-01
16:00:33.000000000 -0400
++++ fontforge-20071002/fontforge/Makefile.dynamic.in 2007-10-07
15:19:13.000000000 -0400
+@@ -58,9 +58,9 @@
#I used to include -L/usr/lib explicitly after static_libs. Not sure why.
Should be implied & breaks 64bit compiles
LDFLAGS = @LDFLAGS@
@@ -114,11 +84,11 @@
+ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ -lm
+DLIBS = -rpath $(libdir) -L$(libdir) -liconv ../libgunicode.la @LIBS@
$(STATIC_LIBS) -lm
- all: fontforge sfddiff fontimage fontlint
+ all: @FINAL_TARGET@ sfddiff fontimage fontlint
-diff -ru fontforge-20070831.orig/fontforge/start.c
fontforge-20070831/fontforge/start.c
---- fontforge-20070831.orig/fontforge/start.c 2007-08-17 15:27:06.000000000
-0400
-+++ fontforge-20070831/fontforge/start.c 2007-09-15 18:08:26.000000000
-0400
+diff -ru fontforge-20071002.orig/fontforge/start.c
fontforge-20071002/fontforge/start.c
+--- fontforge-20071002.orig/fontforge/start.c 2007-10-02 15:19:30.000000000
-0400
++++ fontforge-20071002/fontforge/start.c 2007-10-07 15:19:13.000000000
-0400
@@ -361,7 +361,6 @@
/* install image libs. For some reason fink installs in a place */
/* the dynamic loader doesn't find */
@@ -127,23 +97,9 @@
#endif
}
-diff -ru fontforge-20070831.orig/gdraw/Makefile.dynamic.in
fontforge-20070831/gdraw/Makefile.dynamic.in
---- fontforge-20070831.orig/gdraw/Makefile.dynamic.in 2007-08-17
20:58:23.000000000 -0400
-+++ fontforge-20070831/gdraw/Makefile.dynamic.in 2007-09-15
18:10:49.000000000 -0400
-@@ -38,8 +38,8 @@
- gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo dynamic.lo \
- ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo
-
--Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
--CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
-+Incs = -I$(top_srcdir)/inc
-+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
-
- ../libgdraw.la: $(libgdraw_OBJECTS)
- $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) @LDFLAGS@ -o
../libgdraw.la $(libgdraw_OBJECTS) \
-diff -ru fontforge-20070831.orig/gdraw/Makefile.in
fontforge-20070831/gdraw/Makefile.in
---- fontforge-20070831.orig/gdraw/Makefile.in 2007-08-17 20:58:23.000000000
-0400
-+++ fontforge-20070831/gdraw/Makefile.in 2007-09-15 18:10:33.000000000
-0400
+diff -ru fontforge-20071002.orig/gdraw/Makefile.dynamic.in
fontforge-20071002/gdraw/Makefile.dynamic.in
+--- fontforge-20071002.orig/gdraw/Makefile.dynamic.in 2007-09-05
14:56:41.000000000 -0400
++++ fontforge-20071002/gdraw/Makefile.dynamic.in 2007-10-07
15:19:13.000000000 -0400
@@ -38,8 +38,8 @@
gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo dynamic.lo \
ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo
@@ -155,9 +111,9 @@
../libgdraw.la: $(libgdraw_OBJECTS)
$(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) @LDFLAGS@ -o
../libgdraw.la $(libgdraw_OBJECTS) \
-diff -ru fontforge-20070831.orig/gdraw/Makefile.static.in
fontforge-20070831/gdraw/Makefile.static.in
---- fontforge-20070831.orig/gdraw/Makefile.static.in 2007-02-01
08:43:21.000000000 -0500
-+++ fontforge-20070831/gdraw/Makefile.static.in 2007-09-15
18:10:18.000000000 -0400
+diff -ru fontforge-20071002.orig/gdraw/Makefile.static.in
fontforge-20071002/gdraw/Makefile.static.in
+--- fontforge-20071002.orig/gdraw/Makefile.static.in 2007-02-01
08:43:21.000000000 -0500
++++ fontforge-20071002/gdraw/Makefile.static.in 2007-10-07
15:19:13.000000000 -0400
@@ -28,8 +28,8 @@
gtextfield.o gtextinfo.o gwidgets.o gxdraw.o dynamic.o \
ghvbox.o gmatrixedit.o gdrawable.o gspacer.o
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
