Author: ranger Date: Mon Aug 7 02:52:59 2006 New Revision: 286 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=286&repname=user%3a+ranger> Log: trying to get this to build on my x86 box
Added: trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.info trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.patch Added: trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.info URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.info&rev=286&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.info (added) +++ trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.info Mon Aug 7 02:52:59 2006 @@ -1,0 +1,49 @@ +Package: fontforge +Version: 20060703 +Revision: 1 +License: BSD +Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2 +Source-MD5: 087601ff6b05507f9846df030953b4e8 +SourceDirectory: %n-%v +Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2 +Source2-MD5: 0f85e93652a8ae6c7b836776541d5d34 +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) +Recommends: autotrace-bin | potrace +Conflicts: pfaedit +Replaces: pfaedit +DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION +Description: Outline font editor +DescDetail: << + An outline font editor that lets you create your own postscript, + truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap (bdf) + fonts, or edit existing ones. Also lets you convert one format to + another. FontForge has support for many Macintosh font formats. + + This program was formerly called PfaEdit. +<< +DescUsage: Will use autotrace or potrace to trace bitmaps if available. +DescPort: << + Makefile ignores CPPFLAGS and LDFLAGS so we use CFLAGS instead. + Had to remove setting of DYLD_LIBRARY_PATH in start.c. + Caused ImageIO problems. Yuck. +<< +Homepage: http://fontforge.sourceforge.net/ +Maintainer: Daniel Johnson <[EMAIL PROTECTED]> +PatchFile: %n.patch +PatchFile-MD5: 9518fe8d59322791bf1aacbb180c666a +NoSetMAKEFLAGS: true +SetMAKEFLAGS: -j1 +NoSetCPPFLAGS: True +NoSetLDFLAGS: True +SetCFLAGS: -I%p/include/libxml2 +SetLIBRARY_PATH: %p/lib/freetype219/lib:/usr/X11R6/lib:%p/lib +ConfigureParams: --mandir='${prefix}/share/man' --with-x --with-regular-link --enable-shared=no --enable-static=yes +CompileScript: export CPATH="%p/lib/freetype219/include:%p/include"; export PATH="%p/lib/freetype219/bin:$PATH"; ./configure %c; make STATIC_LIBS="-L%p/lib -L%p/lib/freetype219/lib -lgif -lpng -lz -ltiff -ljpeg -lxml2 -luninameslist -lfreetype -lintl" +InstallScript: << + /bin/mkdir cidmap + tar -xz -C cidmap -f htdocs/cidmaps.tgz + make install prefix=%i + /bin/rm -R %i/lib +<< Added: trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.patch&rev=286&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.patch (added) +++ trunk/experimental/3rdparty/common/main/finkinfo/graphics/fontforge.patch Mon Aug 7 02:52:59 2006 @@ -1,0 +1,88 @@ +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 ++# sh < systemspecific + + 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 @@ + gww_define_caps_for_alt="1" + + +- CPPFLAGS="$CPPFLAGS -I/sw/include" +- LDFLAGS="$LDFLAGS -L/sw/lib" +- gww_rpath="-rpath /sw/lib" ++ gww_rpath="" + LIBS="/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS" + ;; + powerpc-*-*linux*) +@@ -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 +- CFLAGS="$CFLAGS -I/usr/include/libxml2/" ++ true + else + + echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5 +@@ -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 +- CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/" ++ true + 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) + + #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles +-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 + +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 @@ + # 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 +- $(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 +- $(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 $< ------------------------------------------------------------------------- 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