Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14873
Modified Files:
fontforge.info
Added Files:
fontforge.patch
Log Message:
Updated version to match 10.4 now that freetype219 is available.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fontforge.info 2 Jun 2005 02:29:35 -0000 1.11
+++ fontforge.info 15 Sep 2005 18:44:20 -0000 1.12
@@ -1,15 +1,15 @@
Package: fontforge
-Version: 20050117
+Version: 20050809
Revision: 1
License: BSD
-Source: mirror:sourceforge:%n/%n_full-%v.tgz
-Source-MD5: eb1b17de78b8a211a60f08a3e2a7a548
+Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
+Source-MD5: c9517e9c49c2f6d9bc68f556fcc5fcd1
SourceDirectory: %n-%v
Source2: mirror:sourceforge:%n/%n_htdocs-%v.tgz
-Source2-MD5: 0c4c17ba0389654707322888577f4434
+Source2-MD5: 2051870401876cc1ea7c7a68309baf87
Source2ExtractDir: %n-%v/%n_htdocs
-Depends: giflib-shlibs | libungif-shlibs, libpng3-shlibs, libtiff-shlibs,
libjpeg-shlibs, libxml2-shlibs, libiconv, libuninameslist1-shlibs, x11
-BuildDepends: giflib, libpng3, libtiff, libjpeg, libxml2, libiconv-dev,
libuninameslist1, x11-dev
+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
Recommends: autotrace-bin | potrace
Conflicts: pfaedit
Replaces: pfaedit
@@ -27,13 +27,13 @@
DescPort: Makefile ignores CPPFLAGS and LDFLAGS so we use CFLAGS instead.
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
-PatchScript: perl -pi.bak -e 's,ungif,gif,g' configure
+PatchScript: sed 's|@PREFIX@|%p|g ' <%a/%{ni}.patch | patch -p1
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
SetCFLAGS: -I%p/include/libxml2
-SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
+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/include; ./configure %c; make
STATIC_LIBS="-lgif -lpng -lz -ltiff -ljpeg -lfreetype -L%p/lib -lxml2
-luninameslist"
+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"
InstallScript: <<
mkdir cidmap
tar -xz -C cidmap -f %n_htdocs/cidmaps.tgz
--- NEW FILE: fontforge.patch ---
diff -ru fontforge-20050624.orig/configure fontforge-20050624/configure
--- fontforge-20050624.orig/configure 2005-06-13 13:31:59.000000000 -0400
+++ fontforge-20050624/configure 2005-07-04 16:56:14.000000000 -0400
@@ -7521,9 +7521,9 @@
- CPPFLAGS="$CPPFLAGS -I/sw/include"
- LDFLAGS="$LDFLAGS -L/sw/lib"
- gww_rpath="-rpath /sw/lib"
+# CPPFLAGS="$CPPFLAGS -I/sw/include"
+# LDFLAGS="$LDFLAGS -L/sw/lib"
+ gww_rpath=""
LIBS="/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
;;
powerpc-*-*linux*)
@@ -8087,7 +8087,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
@@ -8108,7 +8108,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
@@ -8120,13 +8120,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
@@ -8171,20 +8171,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
@@ -8230,7 +8230,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
@@ -11622,8 +11622,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"
@@ -11726,8 +11726,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-20050624.orig/fontforge/Makefile.dynamic.in
fontforge-20050624/fontforge/Makefile.dynamic.in
--- fontforge-20050624.orig/fontforge/Makefile.dynamic.in 2005-03-28
14:33:47.000000000 -0500
+++ fontforge-20050624/fontforge/Makefile.dynamic.in 2005-07-04
16:54:55.000000000 -0400
@@ -47,9 +47,9 @@
@DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"'
CFLAGS = @CFLAGS@ @CPPFLAGS@ $(_CFLAGS)
-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
+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) [EMAIL PROTECTED]@/lib -liconv ../libgunicode.la
@LIBS@ -lm
all: pfaedit-en.ui fontforge sfddiff
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
