[31258] trunk/dports/graphics/fontforge
takanori at macports.org
takanori at macports.org
Sun Nov 18 21:24:27 PST 2007
Revision: 31258
http://trac.macosforge.org/projects/macports/changeset/31258
Author: takanori at macports.org
Date: 2007-11-18 21:24:26 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
fontforge: Linted.
Modified Paths:
--------------
trunk/dports/graphics/fontforge/Portfile
Added Paths:
-----------
trunk/dports/graphics/fontforge/files/patch-fontforge.diff
Removed Paths:
-------------
trunk/dports/graphics/fontforge/files/fontforge.patch
Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile 2007-11-19 05:24:03 UTC (rev 31257)
+++ trunk/dports/graphics/fontforge/Portfile 2007-11-19 05:24:26 UTC (rev 31258)
@@ -1,6 +1,7 @@
# $Id$
PortSystem 1.0
+
name fontforge
version 20071110
set docversion 20071109
@@ -22,10 +23,10 @@
sourceforge:freetype:freetype
distname ${name}_full-${version}
use_bzip2 yes
-distfiles-append cidmaps.tgz:cidmaps \
- ${name}_htdocs-${docversion}.tar.bz2
-extract.only ${distname}${extract.suffix}
-
+distfiles-append \
+ cidmaps.tgz:cidmaps \
+ ${name}_htdocs-${docversion}.tar.bz2
+patchfiles patch-fontforge.diff
checksums ${distname}${extract.suffix} md5 79e0663867ed7a50ad901024ebd82a0f \
sha1 9675da83b9ccc0ef8591509bedf7071b8f303a43 \
rmd160 41260e5a0164689c14f20f52e500c8f64a371b5b \
@@ -39,7 +40,6 @@
sha1 45695d44c74be31944d807526a7e69a818e4afd2 \
rmd160 2a97cb1c3d93572c094d5d2890d12445ef2786d4
-worksrcdir ${name}-${version}
depends_lib lib:libX11:XFree86 \
port:freetype \
port:gettext \
@@ -51,9 +51,8 @@
port:tiff \
port:zlib
-patchfiles fontforge.patch
-patch.pre_args -p1
-
+extract.only ${distname}${extract.suffix}
+worksrcdir ${name}-${version}
post-extract {
file mkdir ${worksrcpath}/cidmap
system "cd ${worksrcpath}/cidmap && gzip -dc ${distpath}/cidmaps.tgz | tar --no-same-owner -xf -"
@@ -61,6 +60,7 @@
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
@@ -71,7 +71,7 @@
destroot.post_args prefix=${destroot}/${prefix}
post-destroot {
delete ${destroot}/${prefix}/share/man
- file rename ${destroot}/${prefix}/man ${destroot}/${prefix}/share/man
+ move ${destroot}/${prefix}/man ${destroot}/${prefix}/share/man
system "strip ${destroot}/${prefix}/bin/fontforge"
}
post-destroot {
@@ -79,12 +79,12 @@
xinstall -m 644 -W ${worksrcpath} AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html README-unix ${destroot}/${prefix}/share/doc/${name}
}
-variant without_multilayer {
+variant without_multilayer description {Enable support for multilayered type3/svg fonts} {
configure.args-delete --with-multilayer
configure.args-append --without-multilayer
}
-variant with_freetype_bytecode {
+variant with_freetype_bytecode description {Enable support for bytecode interpreter} {
distfiles-append freetype-${ftversion}${extract.suffix}:freetype
extract.only-append freetype-${ftversion}${extract.suffix}
configure.args-delete --without-freetype-bytecode
Deleted: trunk/dports/graphics/fontforge/files/fontforge.patch
===================================================================
--- trunk/dports/graphics/fontforge/files/fontforge.patch 2007-11-19 05:24:03 UTC (rev 31257)
+++ trunk/dports/graphics/fontforge/files/fontforge.patch 2007-11-19 05:24:26 UTC (rev 31258)
@@ -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);
Copied: trunk/dports/graphics/fontforge/files/patch-fontforge.diff (from rev 31169, trunk/dports/graphics/fontforge/files/fontforge.patch)
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-fontforge.diff (rev 0)
+++ trunk/dports/graphics/fontforge/files/patch-fontforge.diff 2007-11-19 05:24:26 UTC (rev 31258)
@@ -0,0 +1,128 @@
+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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/3c450359/attachment.html
More information about the macports-changes
mailing list