Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22758
Modified Files:
fontforge.info fontforge.patch
Log Message:
Moved to stable.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fontforge.info 4 Jul 2006 19:38:04 -0000 1.3
+++ fontforge.info 22 Dec 2006 01:40:10 -0000 1.4
@@ -1,12 +1,12 @@
Package: fontforge
-Version: 20060413
+Version: 20061025
Revision: 1
License: BSD
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 5058e33dbbd5c0ca344dc73c6ff7a428
+Source-MD5: 5fcfa3497d237bf68d1d388254f78448
SourceDirectory: %n-%v
-Source2: mirror:sourceforge:%n/%n_htdocs-20060406.tar.bz2
-Source2-MD5: 03ab55ad1298592e8e15137362dee99c
+Source2: mirror:sourceforge:%n/%n_htdocs-20061014.tar.bz2
+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,9 @@
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
PatchFile: %n.patch
-PatchFile-MD5: a189941f58b93d60bfe827d81ac953b6
+PatchFile-MD5: 470c06296e77a8fd29268e193ab78ca8
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
SetCFLAGS: -I%p/include/libxml2
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fontforge.patch 4 Jul 2006 19:38:04 -0000 1.3
+++ fontforge.patch 22 Dec 2006 01:40:10 -0000 1.4
@@ -1,8 +1,8 @@
-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 @@
- $(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
+diff -ru fontforge-20061025.orig/Makefile.dynamic.in
fontforge-20061025/Makefile.dynamic.in
+--- fontforge-20061025.orig/Makefile.dynamic.in 2006-10-26
10:21:01.000000000 -0400
++++ fontforge-20061025/Makefile.dynamic.in 2006-11-12 12:11:36.000000000
-0500
+@@ -88,7 +88,7 @@
+ $(INSTALL_DATA) $(srcdir)/fontforge/fontimage.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"
- sh < systemspecific
@@ -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-20061025.orig/configure fontforge-20061025/configure
+--- fontforge-20061025.orig/configure 2006-10-18 22:44:38.000000000 -0400
++++ fontforge-20061025/configure 2006-11-12 12:11:36.000000000 -0500
+@@ -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-20061025.orig/fontforge/Makefile.dynamic.in
fontforge-20061025/fontforge/Makefile.dynamic.in
+--- fontforge-20061025.orig/fontforge/Makefile.dynamic.in 2006-10-26
10:21:01.000000000 -0400
++++ fontforge-20061025/fontforge/Makefile.dynamic.in 2006-11-12
12:11:36.000000000 -0500
+@@ -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
@@ -57,12 +56,28 @@
+ $(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
+ all: fontforge sfddiff fontimage
-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 @@
+diff -ru fontforge-20061025.orig/fontforge/Makefile.in
fontforge-20061025/fontforge/Makefile.in
+--- fontforge-20061025.orig/fontforge/Makefile.in 2006-10-26
10:16:35.000000000 -0400
++++ fontforge-20061025/fontforge/Makefile.in 2006-11-12 12:11:36.000000000
-0500
+@@ -81,10 +81,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
+
+ 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
+
+diff -ru fontforge-20061025.orig/fontforge/start.c
fontforge-20061025/fontforge/start.c
+--- fontforge-20061025.orig/fontforge/start.c 2006-09-02 10:35:40.000000000
-0400
++++ fontforge-20061025/fontforge/start.c 2006-11-12 12:11:37.000000000
-0500
+@@ -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 */
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
