Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17:/tmp/cvs-serv25713
Modified Files:
fontforge.info fontforge.patch
Log Message:
Removed useless -I and cleaned up patch.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- fontforge.info 3 Sep 2007 01:45:45 -0000 1.20
+++ fontforge.info 7 Sep 2007 14:44:47 -0000 1.21
@@ -17,6 +17,7 @@
Had to remove setting of DYLD_LIBRARY_PATH in start.c.
Caused ImageIO problems. Yuck.
Enabled python scripting. Uses system python.
+ Patched Makefile.in's to remove useless -I
<<
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
@@ -61,7 +62,7 @@
DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
PatchFile: %n.patch
-PatchFile-MD5: 768898b527efa4810cbe413d7ea12e5c
+PatchFile-MD5: 71f91549f3784ec19d6f02c95f2959b3
PatchScript: <<
patch -p1 <%{PatchFile}
perl -pi -e 's,python -c,/usr/bin/python -c,g' configure
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fontforge.patch 3 Sep 2007 01:45:45 -0000 1.10
+++ fontforge.patch 7 Sep 2007 14:44:47 -0000 1.11
@@ -1,6 +1,6 @@
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-01 17:49:07.000000000
-0400
++++ fontforge-20070831/Makefile.dynamic.in 2007-09-07 10:14:49.000000000
-0400
@@ -94,7 +94,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
@@ -10,9 +10,45 @@
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-07
10:36:20.000000000 -0400
+@@ -18,7 +18,7 @@
+ 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
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
+
+ ../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-07 10:36:06.000000000
-0400
+@@ -18,7 +18,7 @@
+ 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
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
+
+ ../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-07
10:35:53.000000000 -0400
+@@ -12,7 +12,7 @@
+ 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
+
+-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
++Incs = -I$(top_srcdir)/inc
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
+
+ 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-01 17:49:07.000000000 -0400
++++ fontforge-20070831/configure 2007-09-07 10:14:49.000000000 -0400
@@ -2686,9 +2686,7 @@
gww_define_caps_for_alt="1"
@@ -44,7 +80,7 @@
#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-01
17:49:07.000000000 -0400
++++ fontforge-20070831/fontforge/Makefile.dynamic.in 2007-09-07
10:14:49.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
@@ -60,23 +96,23 @@
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-01 17:49:07.000000000
-0400
-@@ -87,10 +87,10 @@
- # disasterous effects. This file may not be compiled with the optimizer.
- # On the other hand we do need CPPFLAGS to get the right includes...
- splinerefigure.o: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h
-- $(CC) -g -c -o splinerefigure.o $(_CFLAGS) $(srcdir)/splinerefigure.c
-+ $(CC) -g -c -o splinerefigure.o $(CFLAGS) $(srcdir)/splinerefigure.c
++++ fontforge-20070831/fontforge/Makefile.in 2007-09-07 10:27:37.000000000
-0400
+@@ -53,9 +53,9 @@
- splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h
-- $(LIBTOOL) --mode=compile $(CC) -g -c -o splinerefigure.lo $(_CFLAGS)
$(srcdir)/splinerefigure.c
-+ $(LIBTOOL) --mode=compile $(CC) -g -c -o splinerefigure.lo $(CFLAGS)
$(srcdir)/splinerefigure.c
+ #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
- %.o: %.c
+ all: fontforge 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-01 17:49:07.000000000
-0400
++++ fontforge-20070831/fontforge/start.c 2007-09-07 10:14:49.000000000
-0400
@@ -361,7 +361,6 @@
/* install image libs. For some reason fink installs in a place */
/* the dynamic loader doesn't find */
@@ -85,3 +121,39 @@
#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-07
10:15:26.000000000 -0400
+@@ -38,7 +38,7 @@
+ 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
++Incs = -I$(top_srcdir)/inc
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
+
+ ../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-07 10:22:18.000000000
-0400
+@@ -38,7 +38,7 @@
+ 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
++Incs = -I$(top_srcdir)/inc
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
+
+ ../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-07
10:33:13.000000000 -0400
+@@ -28,7 +28,7 @@
+ gtextfield.o gtextinfo.o gwidgets.o gxdraw.o dynamic.o \
+ ghvbox.o gmatrixedit.o gdrawable.o gspacer.o
+
+-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
++Incs = -I$(top_srcdir)/inc
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
+
+ all: ../libs/libgdraw.a
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
