Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10548
Modified Files:
fontforge.info fontforge.patch
Log Message:
Moved to stable.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fontforge.info 8 Dec 2005 14:40:22 -0000 1.13
+++ fontforge.info 22 Jun 2006 00:14:09 -0000 1.14
@@ -1,15 +1,15 @@
Package: fontforge
-Version: 20051028
+Version: 20060406
Revision: 1
License: BSD
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 3d385a58cb37c544cfef9a0434072dd6
+Source-MD5: 33aabad96a007b90679c392807e6eb7d
SourceDirectory: %n-%v
-Source2: mirror:sourceforge:%n/%n_htdocs-%v.tgz
-Source2-MD5: 1a4f98489bcbb7aa91e38a8cade6f2f5
+Source2: mirror:sourceforge:%n/%n_htdocs-%v.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
-BuildDepends: giflib, libpng3, libtiff, libjpeg, libxml2, libiconv-dev,
libuninameslist1, x11-dev, freetype219
+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
@@ -24,19 +24,28 @@
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.
+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]>
-Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: 2cc40728f1a0134bc8b2562de71f56e0
+PatchScript: <<
+ patch -p1 < %{PatchFile}
+ perl -pi -e's/ungif/gif/g' configure
+<<
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"
+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: <<
- mkdir cidmap
+ /bin/mkdir cidmap
tar -xz -C cidmap -f htdocs/cidmaps.tgz
make install prefix=%i
- rm -R %i/lib
+ /bin/rm -R %i/lib
<<
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fontforge.patch 17 Jan 2006 16:34:25 -0000 1.5
+++ fontforge.patch 22 Jun 2006 00:14:09 -0000 1.6
@@ -1,18 +1,31 @@
-diff -ru fontforge-20051028.orig/Makefile.dynamic.in
fontforge-20051028/Makefile.dynamic.in
---- fontforge-20051028.orig/Makefile.dynamic.in 2005-10-28
23:05:40.000000000 -0400
-+++ fontforge-20051028/Makefile.dynamic.in 2005-11-18 08:49:04.000000000
-0500
-@@ -78,7 +78,7 @@
- cp $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
+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
#explicit use of sh to make sure we don't invoke csh with different "if"
syntax
- sh -c "if test -d htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
+ 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-20051028.orig/configure fontforge-20051028/configure
---- fontforge-20051028.orig/configure 2005-10-28 23:05:40.000000000 -0400
-+++ fontforge-20051028/configure 2005-11-18 08:48:28.000000000 -0500
+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 @@
gww_define_caps_for_alt="1"
@@ -24,7 +37,7 @@
LIBS="/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
;;
powerpc-*-*linux*)
-@@ -8163,7 +8163,7 @@
+@@ -8267,7 +8265,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 +46,7 @@
else
echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
-@@ -8184,7 +8184,7 @@
+@@ -8288,7 +8286,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,94 +55,33 @@
else
cat >>confdefs.h <<\_ACEOF
#define _NO_LIBXML 1
-@@ -8196,13 +8196,13 @@
-
-
-
--echo "$as_me:$LINENO: checking for DGifOpenFileName in -lungif" >&5
--echo $ECHO_N "checking for DGifOpenFileName in -lungif... $ECHO_C" >&6
--if test "${ac_cv_lib_ungif_DGifOpenFileName+set}" = set; then
-+echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5
-+echo $ECHO_N "checking for DGifOpenFileName in -lgif... $ECHO_C" >&6
-+if test "${ac_cv_lib_gif_DGifOpenFileName+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lungif $LIBS"
-+LIBS="-lgif $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8247,20 +8247,20 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_lib_ungif_DGifOpenFileName=yes
-+ ac_cv_lib_gif_DGifOpenFileName=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ungif_DGifOpenFileName=no
-+ac_cv_lib_gif_DGifOpenFileName=no
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_DGifOpenFileName" >&5
--echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpenFileName" >&6
--if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_gif_DGifOpenFileName" >&5
-+echo "${ECHO_T}$ac_cv_lib_gif_DGifOpenFileName" >&6
-+if test $ac_cv_lib_gif_DGifOpenFileName = yes; then
-
- echo -n checking for ExtensionBlock.Function in gif_lib.h...
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8306,7 +8306,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- echo " " no
-- ac_cv_lib_ungif_DGifOpenFileName=no
-+ ac_cv_lib_gif_DGifOpenFileName=no
- cat >>confdefs.h <<\_ACEOF
- #define _NO_LIBUNGIF 1
- _ACEOF
-@@ -11793,8 +11793,8 @@
- if test "$gww_needsstatic" = "yes"; then
- STATIC_LIBS="$STATIC_LIBS -static"
- fi
-- if test "$ac_cv_lib_ungif_DGifOpenFileName" = "yes"; then
-- STATIC_LIBS="$STATIC_LIBS -lungif"
-+ if test "$ac_cv_lib_gif_DGifOpenFileName" = "yes"; then
-+ STATIC_LIBS="$STATIC_LIBS -lgif"
- fi
- if test "$ac_cv_lib_png_png_create_read_struct" = "yes"; then
- STATIC_LIBS="$STATIC_LIBS -lpng -lz"
-@@ -11900,8 +11900,8 @@
- if test "$gww_needsstatic" = "yes"; then
- STATIC_LIBS="$STATIC_LIBS -static"
- fi
-- if test "$ac_cv_lib_ungif_DGifOpenFileName" = "yes"; then
-- STATIC_LIBS="$STATIC_LIBS -lungif"
-+ if test "$ac_cv_lib_gif_DGifOpenFileName" = "yes"; then
-+ STATIC_LIBS="$STATIC_LIBS -lgif"
- cat >>confdefs.h <<\_ACEOF
- #define _STATIC_LIBUNGIF 1
- _ACEOF
-diff -ru fontforge-20051028.orig/fontforge/Makefile.dynamic.in
fontforge-20051028/fontforge/Makefile.dynamic.in
---- fontforge-20051028.orig/fontforge/Makefile.dynamic.in 2005-10-28
23:06:34.000000000 -0400
-+++ fontforge-20051028/fontforge/Makefile.dynamic.in 2005-11-18
08:48:28.000000000 -0500
-@@ -47,9 +47,9 @@
- @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"'
- CFLAGS = @CFLAGS@ @CPPFLAGS@ $(_CFLAGS)
+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 @@
+ 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) -L/usr/lib
-lm
--DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ -lm
+- $(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@ -L/usr/lib -lm
-+DLIBS = -rpath $(libdir) -L$(libdir) -liconv ../libgunicode.la @LIBS@ -lm
++ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ -lm
++DLIBS = -rpath $(libdir) -L$(libdir) -liconv ../libgunicode.la @LIBS@
$(STATIC_LIBS) -lm
- all: pfaedit-en.ui fontforge sfddiff
+-all: fontforge
++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
+@@ -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
+ }
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
