Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv14774
Modified Files:
fontforge.info fontforge.patch
Log Message:
New upstream version (20060413).
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- fontforge.info 9 Apr 2006 20:52:30 -0000 1.41
+++ fontforge.info 22 Jun 2006 01:38:19 -0000 1.42
@@ -1,11 +1,11 @@
Package: fontforge
-Version: 20060406
+Version: 20060413
Revision: 1
License: BSD
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 33aabad96a007b90679c392807e6eb7d
+Source-MD5: 5058e33dbbd5c0ca344dc73c6ff7a428
SourceDirectory: %n-%v
-Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
+Source2: mirror:sourceforge:%n/%n_htdocs-20060406.tar.bz2
Source2-MD5: 03ab55ad1298592e8e15137362dee99c
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
@@ -32,11 +32,7 @@
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
PatchFile: %n.patch
-PatchFile-MD5: 2cc40728f1a0134bc8b2562de71f56e0
-PatchScript: <<
- patch -p1 < %{PatchFile}
- perl -pi -e's/ungif/gif/g' configure
-<<
+PatchFile-MD5: a189941f58b93d60bfe827d81ac953b6
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
SetCFLAGS: -I%p/include/libxml2
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fontforge.patch 9 Apr 2006 20:52:30 -0000 1.10
+++ fontforge.patch 22 Jun 2006 01:38:19 -0000 1.11
@@ -1,21 +1,8 @@
-diff -ru fontforge-20060406.orig/Makefile.dynamic.in
fontforge-20060406/Makefile.dynamic.in
---- fontforge-20060406.orig/Makefile.dynamic.in 2006-04-07
16:22:55.000000000 -0400
-+++ fontforge-20060406/Makefile.dynamic.in 2006-04-09 16:21:23.000000000
-0400
-@@ -75,7 +75,7 @@
- mkdir -p $(mandir)/man1
- mkdir -p $(sharedir)
- $(LIBTOOL) --mode=install $(INSTALL) -c fontforge/fontforge $(bindir)
--# -$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
-+ -$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
- # -rm -f $(bindir)/pfaedit
- # (cd $(bindir) ; ln -s fontforge pfaedit)
- # $(INSTALL_DATA) fontforge/pfaedit-*.ui $(sharedir)
-@@ -84,10 +84,10 @@
- # if you are editing CID keyed files (and even then you can live without them
- -$(INSTALL_DATA) $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
- $(INSTALL_DATA) $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
--# -$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
-+ -$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
+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
#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
@@ -23,10 +10,10 @@
uninstall:
-rm $(bindir)/fontforge
-diff -ru fontforge-20060406.orig/configure fontforge-20060406/configure
---- fontforge-20060406.orig/configure 2006-04-04 01:11:59.000000000 -0400
-+++ fontforge-20060406/configure 2006-04-09 16:14:34.000000000 -0400
-@@ -2652,9 +2652,7 @@
+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 @@
gww_define_caps_for_alt="1"
@@ -37,7 +24,7 @@
LIBS="/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
;;
powerpc-*-*linux*)
-@@ -8267,7 +8265,7 @@
+@@ -8283,7 +8281,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
@@ -46,7 +33,7 @@
else
echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
-@@ -8288,7 +8286,7 @@
+@@ -8304,7 +8302,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
@@ -55,10 +42,11 @@
else
cat >>confdefs.h <<\_ACEOF
#define _NO_LIBXML 1
-diff -ru fontforge-20060406.orig/fontforge/Makefile.dynamic.in
fontforge-20060406/fontforge/Makefile.dynamic.in
---- fontforge-20060406.orig/fontforge/Makefile.dynamic.in 2006-04-05
14:20:21.000000000 -0400
-+++ fontforge-20060406/fontforge/Makefile.dynamic.in 2006-04-09
16:18:18.000000000 -0400
-@@ -51,11 +51,11 @@
+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)
#I used to include -L/usr/lib explicitly after static_libs. Not sure why.
Should be implied & breaks 64bit compiles
@@ -69,14 +57,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
-+all: fontforge sfddiff
+ all: fontforge sfddiff
- fontforge: main.o $(fontforge_LIBOBJECTS)
- $(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o
$(fontforge_LIBOBJECTS) $(LIBS)
-diff -ru fontforge-20060406.orig/fontforge/start.c
fontforge-20060406/fontforge/start.c
---- fontforge-20060406.orig/fontforge/start.c 2006-01-16 10:10:22.000000000
-0500
-+++ fontforge-20060406/fontforge/start.c 2006-04-09 16:18:59.000000000
-0400
+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 */
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
