[32886] trunk/dports/graphics/fontforge
ryandesign at macports.org
ryandesign at macports.org
Mon Jan 14 04:05:16 PST 2008
Revision: 32886
http://trac.macosforge.org/projects/macports/changeset/32886
Author: ryandesign at macports.org
Date: 2008-01-14 04:05:09 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
fontforge: update to 20080110; closes #13901
Modified Paths:
--------------
trunk/dports/graphics/fontforge/Portfile
Added Paths:
-----------
trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff
trunk/dports/graphics/fontforge/files/patch-configure.diff
trunk/dports/graphics/fontforge/files/patch-fontforge_start.c.diff
trunk/dports/graphics/fontforge/files/patch-gutils_dynamic.c.diff
Removed Paths:
-------------
trunk/dports/graphics/fontforge/files/patch-fontforge.diff
Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile 2008-01-14 12:02:56 UTC (rev 32885)
+++ trunk/dports/graphics/fontforge/Portfile 2008-01-14 12:05:09 UTC (rev 32886)
@@ -3,8 +3,8 @@
PortSystem 1.0
name fontforge
-version 20071110
-set docversion 20071109
+version 20080110
+set docversion 20080109
set ftversion 2.3.5
categories graphics fonts
maintainers nomaintainer
@@ -26,16 +26,19 @@
distfiles-append \
cidmaps.tgz:cidmaps \
${name}_htdocs-${docversion}.tar.bz2
-patchfiles patch-fontforge.diff
-checksums ${distname}${extract.suffix} md5 79e0663867ed7a50ad901024ebd82a0f \
- sha1 9675da83b9ccc0ef8591509bedf7071b8f303a43 \
- rmd160 41260e5a0164689c14f20f52e500c8f64a371b5b \
+patchfiles patch-Makefile.dynamic.in.diff \
+ patch-configure.diff \
+ patch-fontforge_start.c.diff \
+ patch-gutils_dynamic.c.diff
+checksums ${distname}${extract.suffix} md5 31de565d2288280e316ee6bd5b9db790 \
+ sha1 cce8a3618d51b5e82bfafe3e931530d1965e9b6c \
+ rmd160 4dff978337fc30e75ad5f2133c5d119a1445a841 \
cidmaps.tgz md5 5f00607e4bbe014cdfd5b23bb0943666 \
sha1 d111db1f6d9a05cf6cb1387c2fb2eeb21ba0279a \
rmd160 c25b1a4f0d8ed0634402d2ce2b36ba47e0c2ef1b \
- ${name}_htdocs-${docversion}.tar.bz2 md5 ef2746373eacf71a0f13467a0e8c3856 \
- sha1 a2b32eb2398f6670f1041f054ff6e0edd5caabbd \
- rmd160 759152c03bf7d2c88d117224b672f054bd0ac305 \
+ ${name}_htdocs-${docversion}.tar.bz2 md5 63054ea6035ffbf8f7824e720d308fca \
+ sha1 e79f0cd1de592e4cbb4f86a8b63f661daea9df37 \
+ rmd160 8de4f14f88ce1f070e73af62ca055bd61f397ff3 \
freetype-${ftversion}${extract.suffix} md5 65234327c5ac46ee00ebda15995d4c1c \
sha1 45695d44c74be31944d807526a7e69a818e4afd2 \
rmd160 2a97cb1c3d93572c094d5d2890d12445ef2786d4
@@ -60,10 +63,9 @@
system "cd ${worksrcpath}/htdocs && bzip2 -dc ${distpath}/${name}_htdocs-${docversion}.tar.bz2 | tar --no-same-owner -xf -"
}
-patch.pre_args -p1
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gdraw/dynamic.c
+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gutils/dynamic.c
}
configure.args --without-python --with-multilayer --without-freetype-bytecode --without-freetype-src
Added: trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff (rev 0)
+++ trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff 2008-01-14 12:05:09 UTC (rev 32886)
@@ -0,0 +1,10 @@
+--- Makefile.dynamic.in.orig 2008-01-08 21:52:23.000000000 -0700
++++ Makefile.dynamic.in 2008-01-12 17:59:01.000000000 -0700
+@@ -118,7 +118,6 @@
+ # You may need to be root to do the install
+ #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
+ #we don't always create a setup.py
+ -(cd pyhook ; if test -r setup.py ; then python setup.py install ; fi )
+
Copied: trunk/dports/graphics/fontforge/files/patch-configure.diff (from rev 32740, trunk/dports/graphics/fontforge/files/patch-fontforge.diff)
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-configure.diff (rev 0)
+++ trunk/dports/graphics/fontforge/files/patch-configure.diff 2008-01-14 12:05:09 UTC (rev 32886)
@@ -0,0 +1,89 @@
+--- configure.orig 2008-01-05 10:58:52.000000000 -0700
++++ configure 2008-01-12 18:05:47.000000000 -0700
+@@ -2675,7 +2675,6 @@
+
+ fi;
+
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
+ case "$host" in
+ *-apple-darwin*)
+@@ -2695,9 +2694,9 @@
+ gww_define_caps_for_alt="1"
+
+
+- CPPFLAGS="$CPPFLAGS -I/sw/include"
+- LDFLAGS="$LDFLAGS -L/sw/lib"
+- gww_rpath="-rpath /sw/lib"
++ CPPFLAGS="$CPPFLAGS -I@@PREFIX@@/include"
++ LDFLAGS="$LDFLAGS -L@@PREFIX@@/lib"
++ gww_rpath="-rpath @@PREFIX@@/lib"
+ LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
+
+ ;;
+@@ -19171,55 +19170,26 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for /usr/include/libxml2/libxml" >&5
+-echo $ECHO_N "checking for /usr/include/libxml2/libxml... $ECHO_C" >&6
+-if test "${ac_cv_file__usr_include_libxml2_libxml+set}" = set; then
++echo "$as_me:$LINENO: checking for @@PREFIX@@/include/libxml2/libxml" >&5
++echo $ECHO_N "checking for @@PREFIX@@/include/libxml2/libxml... $ECHO_C" >&6
++if test "${ac_cv_file__opt_local_include_libxml2_libxml+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+-if test -r "/usr/include/libxml2/libxml"; then
+- ac_cv_file__usr_include_libxml2_libxml=yes
++if test -r "@@PREFIX@@/include/libxml2/libxml"; then
++ ac_cv_file__opt_local_include_libxml2_libxml=yes
+ else
+- ac_cv_file__usr_include_libxml2_libxml=no
++ ac_cv_file__opt_local_include_libxml2_libxml=no
+ fi
+ fi
+-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/"
+-else
+-
+- echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
+-echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6
+-if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- test "$cross_compiling" = yes &&
+- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+- { (exit 1); exit 1; }; }
+-if test -r "/usr/local/include/libxml2/libxml"; then
+- ac_cv_file__usr_local_include_libxml2_libxml=yes
+-else
+- ac_cv_file__usr_local_include_libxml2_libxml=no
+-fi
++echo "$as_me:$LINENO: result: $ac_cv_file__opt_local_include_libxml2_libxml" >&5
++echo "${ECHO_T}$ac_cv_file__opt_local_include_libxml2_libxml" >&6
++if test $ac_cv_file__opt_local_include_libxml2_libxml = yes; then
++ CFLAGS="$CFLAGS -I@@PREFIX@@/include -I@@PREFIX@@/include/libxml2/"
+ fi
+-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/"
+-else
+- cat >>confdefs.h <<\_ACEOF
+-#define _NO_LIBXML 1
+-_ACEOF
+-
+-fi
+-
+-fi
+-
+
+
+ echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5
Deleted: trunk/dports/graphics/fontforge/files/patch-fontforge.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-fontforge.diff 2008-01-14 12:02:56 UTC (rev 32885)
+++ trunk/dports/graphics/fontforge/files/patch-fontforge.diff 2008-01-14 12:05:09 UTC (rev 32886)
@@ -1,128 +0,0 @@
-diff -Naur fontforge-20071002.orig/Makefile.dynamic.in fontforge-20071002/Makefile.dynamic.in
---- fontforge-20071002.orig/Makefile.dynamic.in 2007-10-03 03:08:48.000000000 +0900
-+++ fontforge-20071002/Makefile.dynamic.in 2007-10-08 01:22:48.000000000 +0900
-@@ -96,7 +96,6 @@
- $(INSTALL_DATA) $(srcdir)/fontforge/fontlint.1 $(DESTDIR)$(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
- #we don't always create a setup.py
- -(cd pyhook ; python setup.py install )
-
-diff -Naur fontforge-20071002.orig/configure fontforge-20071002/configure
---- fontforge-20071002.orig/configure 2007-10-04 00:46:41.000000000 +0900
-+++ fontforge-20071002/configure 2007-10-08 01:20:31.000000000 +0900
-@@ -2670,7 +2670,7 @@
-
- fi;
-
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+LDFLAGS="$LDFLAGS"
-
- case "$host" in
- *-apple-darwin*)
-@@ -2690,9 +2690,9 @@
- gww_define_caps_for_alt="1"
-
-
-- CPPFLAGS="$CPPFLAGS -I/sw/include"
-- LDFLAGS="$LDFLAGS -L/sw/lib"
-- gww_rpath="-rpath /sw/lib"
-+ CPPFLAGS="$CPPFLAGS -I@@PREFIX@@/include"
-+ LDFLAGS="$LDFLAGS -L@@PREFIX@@/lib"
-+ gww_rpath="-rpath @@PREFIX@@/lib"
- LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
-
- ;;
-@@ -19124,46 +19124,25 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for /usr/include/libxml2/libxml" >&5
--echo $ECHO_N "checking for /usr/include/libxml2/libxml... $ECHO_C" >&6
--if test "${ac_cv_file__usr_include_libxml2_libxml+set}" = set; then
-+ echo "$as_me:$LINENO: checking for @@PREFIX@@/include/libxml2/libxml" >&5
-+echo $ECHO_N "checking for @@PREFIX@@/include/libxml2/libxml... $ECHO_C" >&6
-+if test "${ac_cv_file__opt_local_include_libxml2_libxml+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
--if test -r "/usr/include/libxml2/libxml"; then
-- ac_cv_file__usr_include_libxml2_libxml=yes
-+if test -r "@@PREFIX@@/include/libxml2/libxml"; then
-+ ac_cv_file__opt_local_include_libxml2_libxml=yes
- else
-- ac_cv_file__usr_include_libxml2_libxml=no
-+ ac_cv_file__opt_local_include_libxml2_libxml=no
- fi
- fi
--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/"
--else
--
-- echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
--echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6
--if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- test "$cross_compiling" = yes &&
-- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-- { (exit 1); exit 1; }; }
--if test -r "/usr/local/include/libxml2/libxml"; then
-- ac_cv_file__usr_local_include_libxml2_libxml=yes
--else
-- ac_cv_file__usr_local_include_libxml2_libxml=no
--fi
--fi
--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/"
-+echo "$as_me:$LINENO: result: $ac_cv_file__opt_local_include_libxml2_libxml" >&5
-+echo "${ECHO_T}$ac_cv_file__opt_local_include_libxml2_libxml" >&6
-+if test $ac_cv_file__opt_local_include_libxml2_libxml = yes; then
-+ CFLAGS="$CFLAGS -I@@PREFIX@@/include -I@@PREFIX@@/include/libxml2/"
- else
- cat >>confdefs.h <<\_ACEOF
- #define _NO_LIBXML 1
-@@ -19171,9 +19150,6 @@
-
- fi
-
--fi
--
--
-
- echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5
- echo $ECHO_N "checking for DGifOpenFileName in -lgif... $ECHO_C" >&6
-diff -Naur fontforge-20071002.orig/fontforge/start.c fontforge-20071002/fontforge/start.c
---- fontforge-20071002.orig/fontforge/start.c 2007-10-03 04:19:30.000000000 +0900
-+++ fontforge-20071002/fontforge/start.c 2007-10-08 01:20:31.000000000 +0900
-@@ -361,7 +361,6 @@
- /* install image libs. For some reason fink installs in a place */
- /* the dynamic loader doesn't find */
- /* (And fink's attempts to set the PATH variables generally don't work */
-- setenv("DYLD_LIBRARY_PATH","/sw/lib",0);
- #endif
- }
-
-diff -Naur fontforge-20071002.orig/gdraw/dynamic.c fontforge-20071002/gdraw/dynamic.c
---- fontforge-20071002.orig/gdraw/dynamic.c 2007-01-05 00:49:03.000000000 +0900
-+++ fontforge-20071002/gdraw/dynamic.c 2007-10-08 01:20:31.000000000 +0900
-@@ -140,8 +140,8 @@
- if (( lib!=NULL && lib!=(void *) -1) || name==NULL || *name=='/' )
- return( lib );
-
-- temp = galloc( strlen("/sw/lib/") + strlen(name) +1 );
-- strcpy(temp,"/sw/lib/");
-+ temp = galloc( strlen("@@PREFIX@@/lib/") + strlen(name) +1 );
-+ strcpy(temp,"@@PREFIX@@/lib/");
- strcat(temp,name);
- lib = NSAddImage(temp,options);
- free(temp);
Added: trunk/dports/graphics/fontforge/files/patch-fontforge_start.c.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-fontforge_start.c.diff (rev 0)
+++ trunk/dports/graphics/fontforge/files/patch-fontforge_start.c.diff 2008-01-14 12:05:09 UTC (rev 32886)
@@ -0,0 +1,10 @@
+--- fontforge/start.c.orig 2008-01-01 06:48:44.000000000 -0700
++++ fontforge/start.c 2008-01-12 18:06:46.000000000 -0700
+@@ -125,7 +125,6 @@
+ /* install image libs. For some reason fink installs in a place */
+ /* the dynamic loader doesn't find */
+ /* (And fink's attempts to set the PATH variables generally don't work */
+- setenv("DYLD_LIBRARY_PATH","/sw/lib",0);
+ #endif
+ }
+
Added: trunk/dports/graphics/fontforge/files/patch-gutils_dynamic.c.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-gutils_dynamic.c.diff (rev 0)
+++ trunk/dports/graphics/fontforge/files/patch-gutils_dynamic.c.diff 2008-01-14 12:05:09 UTC (rev 32886)
@@ -0,0 +1,13 @@
+--- gutils/dynamic.c.orig 2008-01-01 06:36:39.000000000 -0700
++++ gutils/dynamic.c 2008-01-12 18:08:45.000000000 -0700
+@@ -143,8 +143,8 @@
+ if (( lib!=NULL && lib!=(void *) -1) || name==NULL || *name=='/' )
+ return( lib );
+
+- temp = galloc( strlen("/sw/lib/") + strlen(name) +1 );
+- strcpy(temp,"/sw/lib/");
++ temp = galloc( strlen("@@PREFIX@@/lib/") + strlen(name) +1 );
++ strcpy(temp,"@@PREFIX@@/lib/");
+ strcat(temp,name);
+ lib = dlopen(temp,flags);
+ free(temp);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080114/ab70bb44/attachment-0001.html
More information about the macports-changes
mailing list