Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21797
Modified Files:
fontforge.info fontforge.patch
Log Message:
New upstream version (20061014)
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fontforge.info 4 Sep 2006 02:38:53 -0000 1.8
+++ fontforge.info 18 Oct 2006 02:26:15 -0000 1.9
@@ -1,12 +1,12 @@
Package: fontforge
-Version: 20060822
+Version: 20061014
Revision: 1
License: BSD
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 872a8013be82e322677f7c254101544d
+Source-MD5: 6ab890d9440601b21fa5c7267a95233d
SourceDirectory: %n-%v
Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
-Source2-MD5: 40f374cf43d57d8e8f29e7fe25bf8f39
+Source2-MD5: c55c948e1475d2f772aba96704e4b779
Source2ExtractDir: %n-%v/htdocs
Depends: giflib-shlibs | libungif-shlibs, libpng3-shlibs, libtiff-shlibs,
libjpeg-shlibs, libxml2-shlibs, libiconv, libuninameslist1-shlibs, x11,
freetype219-shlibs, libgettext3-shlibs
BuildDepends: giflib, libpng3, libtiff, libjpeg, libxml2, libiconv-dev,
libuninameslist1, x11-dev, freetype219, libgettext3-dev, gettext-tools, fink
(>= 0.24.12)
@@ -32,7 +32,7 @@
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
PatchFile: %n.patch
-PatchFile-MD5: 9518fe8d59322791bf1aacbb180c666a
+PatchFile-MD5: 8780e09f3a98607418ab268e6d51abd6
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: True
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fontforge.patch 7 Aug 2006 01:07:12 -0000 1.5
+++ fontforge.patch 18 Oct 2006 02:26:15 -0000 1.6
@@ -1,7 +1,7 @@
-diff -ru fontforge-20060413.orig/Makefile.dynamic.in
fontforge-20060413/Makefile.dynamic.in
---- fontforge-20060413.orig/Makefile.dynamic.in 2006-04-08
15:24:14.000000000 -0400
-+++ fontforge-20060413/Makefile.dynamic.in 2006-06-21 21:17:19.000000000
-0400
-@@ -87,7 +87,7 @@
+diff -ru fontforge-20061014.orig/Makefile.dynamic.in
fontforge-20061014/Makefile.dynamic.in
+--- fontforge-20061014.orig/Makefile.dynamic.in 2006-08-28
17:55:13.000000000 -0400
++++ fontforge-20061014/Makefile.dynamic.in 2006-10-17 22:06:53.000000000
-0400
+@@ -86,7 +86,7 @@
$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(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"
@@ -10,10 +10,10 @@
uninstall:
-rm $(bindir)/fontforge
-diff -ru fontforge-20060413.orig/configure fontforge-20060413/configure
---- fontforge-20060413.orig/configure 2006-04-09 12:30:42.000000000 -0400
-+++ fontforge-20060413/configure 2006-06-21 20:20:21.000000000 -0400
-@@ -2653,9 +2653,7 @@
+diff -ru fontforge-20061014.orig/configure fontforge-20061014/configure
+--- fontforge-20061014.orig/configure 2006-10-12 14:19:31.000000000 -0400
++++ fontforge-20061014/configure 2006-10-17 22:08:45.000000000 -0400
+@@ -2682,9 +2682,7 @@
gww_define_caps_for_alt="1"
@@ -21,10 +21,10 @@
- LDFLAGS="$LDFLAGS -L/sw/lib"
- gww_rpath="-rpath /sw/lib"
+ gww_rpath=""
- LIBS="/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
+ LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices
$LIBS"
+
;;
- powerpc-*-*linux*)
-@@ -8283,7 +8281,7 @@
+@@ -18892,7 +18890,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
@@ -33,7 +33,7 @@
else
echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
-@@ -8304,7 +8302,7 @@
+@@ -18913,7 +18911,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
@@ -42,14 +42,13 @@
else
cat >>confdefs.h <<\_ACEOF
#define _NO_LIBXML 1
-Only in fontforge-20060413: configure.orig
-diff -ru fontforge-20060413.orig/fontforge/Makefile.dynamic.in
fontforge-20060413/fontforge/Makefile.dynamic.in
---- fontforge-20060413.orig/fontforge/Makefile.dynamic.in 2006-04-13
13:59:01.000000000 -0400
-+++ fontforge-20060413/fontforge/Makefile.dynamic.in 2006-06-21
21:21:48.000000000 -0400
-@@ -51,9 +51,9 @@
- CFLAGS = @CFLAGS@ $(_CFLAGS)
+diff -ru fontforge-20061014.orig/fontforge/Makefile.dynamic.in
fontforge-20061014/fontforge/Makefile.dynamic.in
+--- fontforge-20061014.orig/fontforge/Makefile.dynamic.in 2006-09-01
09:36:25.000000000 -0400
++++ fontforge-20061014/fontforge/Makefile.dynamic.in 2006-10-17
22:12:54.000000000 -0400
+@@ -52,9 +52,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
@@ -59,30 +58,30 @@
all: fontforge sfddiff
-diff -ru fontforge-20060413.orig/fontforge/start.c
fontforge-20060413/fontforge/start.c
---- fontforge-20060413.orig/fontforge/start.c 2006-01-16 10:10:22.000000000
-0500
-+++ fontforge-20060413/fontforge/start.c 2006-06-21 20:20:21.000000000
-0400
-@@ -202,7 +202,6 @@
- /* otherwise leave alone. On the mac people often use fink to */
- /* install image libs. For some reason fink installs in a place */
- /* the dynamic loader doesn't find */
-- setenv("DYLD_LIBRARY_PATH","/sw/lib",0);
- #endif
- }
-
-diff -uNr fontforge-20060703/fontforge/Makefile.in
fontforge-20060703-new/fontforge/Makefile.in
---- fontforge-20060703/fontforge/Makefile.in 2006-05-07 18:59:14.000000000
-0400
-+++ fontforge-20060703-new/fontforge/Makefile.in 2006-08-06
20:50:59.000000000 -0400
-@@ -75,10 +75,10 @@
+diff -ru fontforge-20061014.orig/fontforge/Makefile.in
fontforge-20061014/fontforge/Makefile.in
+--- fontforge-20061014.orig/fontforge/Makefile.in 2006-09-01
09:36:13.000000000 -0400
++++ fontforge-20061014/fontforge/Makefile.in 2006-10-17 22:15:19.000000000
-0400
+@@ -76,10 +76,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
+ 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
- splinerefigure.lo: $(srcdir)/splinerefigure.c
+ 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
- #%.o: %.c
- # $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
+ %.o: %.c
+
+diff -ru fontforge-20061014.orig/fontforge/start.c
fontforge-20061014/fontforge/start.c
+--- fontforge-20061014.orig/fontforge/start.c 2006-09-02 10:35:40.000000000
-0400
++++ fontforge-20061014/fontforge/start.c 2006-10-17 22:06:53.000000000
-0400
+@@ -203,7 +203,6 @@
+ /* otherwise leave alone. On the mac people often use fink to */
+ /* install image libs. For some reason fink installs in a place */
+ /* the dynamic loader doesn't find */
+- setenv("DYLD_LIBRARY_PATH","/sw/lib",0);
+ #endif
+ }
+
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
