[41786] trunk/dports/graphics/fontforge
nox at macports.org
nox at macports.org
Mon Nov 10 06:07:29 PST 2008
Revision: 41786
http://trac.macports.org/changeset/41786
Author: nox at macports.org
Date: 2008-11-10 06:07:24 -0800 (Mon, 10 Nov 2008)
Log Message:
-----------
fontforge:
* Updated to 20080927.
* Updated freetype bytecode interpreter to 2.3.7.
* dlopen() now uses only absolute paths to ensure libraries are taken from $prefix.
* Added libuninameslist dependency.
* Documentation is now installed into a versioned directory.
* Multilayered type3/svg fonts support is now always enabled.
* Aqua application is now correctly installed in /Application/MacPorts.
Modified Paths:
--------------
trunk/dports/graphics/fontforge/Portfile
trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff
trunk/dports/graphics/fontforge/files/patch-configure.diff
trunk/dports/graphics/fontforge/files/patch-gutils_dynamic.c.diff
Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile 2008-11-10 10:35:39 UTC (rev 41785)
+++ trunk/dports/graphics/fontforge/Portfile 2008-11-10 14:07:24 UTC (rev 41786)
@@ -4,10 +4,8 @@
PortSystem 1.0
name fontforge
-version 20080110
-revision 1
-set docversion 20080109
-set ftversion 2.3.5
+version 20080927
+set ftversion 2.3.7
categories graphics fonts
platforms darwin
maintainers nomaintainer
@@ -21,7 +19,7 @@
pfaedit.
homepage http://fontforge.sourceforge.net/
-master_sites sourceforge:fontforge \
+master_sites sourceforge \
${homepage}:cidmaps \
http://download.savannah.gnu.org/releases/freetype/:freetype \
sourceforge:freetype:freetype
@@ -29,87 +27,87 @@
dist_subdir ${name}/${version}_${revision}
use_bzip2 yes
+set docdistname ${name}_htdocs-$version
+
distfiles-append \
cidmaps.tgz:cidmaps \
- ${name}_htdocs-${docversion}.tar.bz2
+ [suffix $docdistname]
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 \
+checksums [suffix $distname] \
+ md5 8866595d4dac77c0c093ed1e104515d3 \
+ sha1 bf80dd035d0ff26da1f5cc4aa55dcd9b6ff9e748 \
+ rmd160 8f8fb0026b967602184bfefd83d5234fc684f340 \
cidmaps.tgz \
md5 063691163e592515b31514515bb3ce8c \
sha1 efbc7c9d3e95159f5600dc71f9cccb370e46bb94 \
rmd160 d194355e61813d31fe4813bdf10a62d66a9f6d04 \
- ${name}_htdocs-${docversion}.tar.bz2 \
- md5 63054ea6035ffbf8f7824e720d308fca \
- sha1 e79f0cd1de592e4cbb4f86a8b63f661daea9df37 \
- rmd160 8de4f14f88ce1f070e73af62ca055bd61f397ff3 \
- freetype-${ftversion}${extract.suffix} \
- md5 65234327c5ac46ee00ebda15995d4c1c \
- sha1 45695d44c74be31944d807526a7e69a818e4afd2 \
- rmd160 2a97cb1c3d93572c094d5d2890d12445ef2786d4
+ [suffix $docdistname] \
+ md5 cc3e292e75250e8318cb098c1552c98e \
+ sha1 a8cab59612cf8dc04ec371de752e5f4dc9ab8437 \
+ rmd160 c890fb375a5388632e46ea15bc2594ae60e1a9f7 \
+ [suffix freetype-$ftversion] \
+ md5 83306194817ebdea554133b4232a34aa \
+ sha1 f16f849d6e739ce8842008586af36371a32ac064 \
+ rmd160 7333507c5f42d451bf0541f007fe44165f090418
-extract.only ${distname}${extract.suffix}
+worksrcdir $name-$version
+extract.only [suffix $distname]
+
post-extract {
- file mkdir ${worksrcpath}/cidmap
- system "cd ${worksrcpath}/cidmap && gzip -dc ${distpath}/cidmaps.tgz | tar --no-same-owner -xf -"
- file mkdir ${worksrcpath}/htdocs
- system "cd ${worksrcpath}/htdocs && bzip2 -dc ${distpath}/${name}_htdocs-${docversion}.tar.bz2 | tar --no-same-owner -xf -"
+ xinstall -d \
+ $worksrcpath/cidmap \
+ $worksrcpath/htdocs
+
+ system "tar xf $distpath/cidmaps.tgz -C $worksrcpath/cidmap"
+ system "tar xf $distpath/[suffix $docdistname] -C $worksrcpath/htdocs"
}
-worksrcdir ${name}-${version}
-
post-patch {
- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gutils/dynamic.c
+ reinplace "s|@PREFIX@|${prefix}|g" \
+ $worksrcpath/configure \
+ $worksrcpath/gutils/dynamic.c
}
-depends_lib lib:libX11:XFree86 \
+depends_lib lib:libX11:xorg \
port:freetype \
port:gettext \
port:giflib \
port:jpeg \
port:libiconv \
port:libpng \
+ port:libuninameslist \
port:libxml2 \
port:tiff \
port:zlib
-configure.args --without-python --with-multilayer --without-freetype-bytecode --without-freetype-src
+configure.args --mandir=$prefix/share/man \
+ --without-python \
+ --without-freetype-bytecode
use_parallel_build yes
-destroot.destdir prefix=${destroot}${prefix}
+set docdir $prefix/share/doc/$name-$version
-post-destroot {
- delete ${destroot}${prefix}/share/man
- move ${destroot}${prefix}/man ${destroot}${prefix}/share/man
- system "strip ${destroot}${prefix}/bin/fontforge"
-}
+destroot.args docdir=$docdir
post-destroot {
- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
- xinstall -m 644 -W ${worksrcpath} AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html README-unix ${destroot}${prefix}/share/doc/${name}
+ xinstall -d $destroot$docdir
+ xinstall -m 644 -W $worksrcpath \
+ AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html README-unix \
+ $destroot$docdir
}
-variant without_multilayer description {Disable support for multilayered type3/svg fonts} {
- configure.args-delete --with-multilayer
- configure.args-append --without-multilayer
-}
-
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
- configure.args-delete --without-freetype-src
- configure.args-append --with-freetype-bytecode --with-freetype-src=${workpath}/freetype-${ftversion}
+ configure.args-append --with-freetype-src=$workpath/freetype-$ftversion
}
livecheck.distname $name-source
Modified: trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff 2008-11-10 10:35:39 UTC (rev 41785)
+++ trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff 2008-11-10 14:07:24 UTC (rev 41786)
@@ -1,10 +1,12 @@
---- 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 @@
+--- Makefile.dynamic.in.orig 2008-11-10 13:43:37.000000000 +0100
++++ Makefile.dynamic.in 2008-11-10 14:06:41.000000000 +0100
+@@ -127,8 +127,7 @@
# 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 -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
- sh < systemspecific
++ sh -c "if test -d fontforge/FontForge.app >/dev/null ; then mkdir -p $(DESTDIR)/Applications/MacPorts ; mv fontforge/FontForge.app $(DESTDIR)/Applications/MacPorts ; ln -sf $(bindir)/fontforge $(DESTDIR)/Applications/MacPorts/FontForge.app/Contents/MacOS/FontForge ; fi"
#we don't always create a setup.py
- -(cd pyhook ; if test -r setup.py ; then python setup.py install ; fi )
+ -(cd pyhook ; if test -r setup.py ; then python setup.py install --prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir ; then rm -rf $$dir ; fi; done ; fi )
Modified: trunk/dports/graphics/fontforge/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-configure.diff 2008-11-10 10:35:39 UTC (rev 41785)
+++ trunk/dports/graphics/fontforge/files/patch-configure.diff 2008-11-10 14:07:24 UTC (rev 41786)
@@ -1,51 +1,50 @@
---- configure.orig 2008-01-05 10:58:52.000000000 -0700
-+++ configure 2008-01-12 18:05:47.000000000 -0700
-@@ -2675,7 +2675,6 @@
+--- configure.orig 2008-11-10 09:16:23.000000000 +0100
++++ configure 2008-11-10 09:21:43.000000000 +0100
+@@ -2684,8 +2684,6 @@
fi;
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
-
+-
case "$host" in
*-apple-darwin*)
-@@ -2695,9 +2694,9 @@
+ gww_ismac="yes"
+@@ -2705,13 +2703,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"
+- if test -d /sw/include >/dev/null ; then
+- CPPFLAGS="$CPPFLAGS -I/sw/include"
+- fi
+- if test -d /sw/lib >/dev/null ; then
+- LDFLAGS="$LDFLAGS -L/sw/lib"
+- gww_rpath="-rpath /sw/lib"
+- fi
++ CPPFLAGS="$CPPFLAGS -I at PREFIX@/include"
++ LDFLAGS="$LDFLAGS -L at PREFIX@/lib"
++ gww_rpath="-rpath @PREFIX@/lib"
+ LIBS="-Wl,/System/Library/Frameworks/Carbon.framework/Carbon $LIBS"
LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
- ;;
-@@ -19171,55 +19170,26 @@
+@@ -19738,55 +19732,8 @@
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; }; }
+- 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
+-else
- ac_cv_file__usr_include_libxml2_libxml=no
-+ ac_cv_file__opt_local_include_libxml2_libxml=no
- fi
- fi
+-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
@@ -66,11 +65,7 @@
-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
+-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
@@ -83,7 +78,8 @@
-fi
-
-fi
--
++CFLAGS="$CFLAGS -I at PREFIX@/include -I at PREFIX@/include/libxml2"
+
echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5
Modified: trunk/dports/graphics/fontforge/files/patch-gutils_dynamic.c.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-gutils_dynamic.c.diff 2008-11-10 10:35:39 UTC (rev 41785)
+++ trunk/dports/graphics/fontforge/files/patch-gutils_dynamic.c.diff 2008-11-10 14:07:24 UTC (rev 41786)
@@ -1,13 +1,38 @@
---- 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 );
+--- gutils/dynamic.c.orig 2008-11-10 09:33:19.000000000 +0100
++++ gutils/dynamic.c 2008-11-10 09:36:01.000000000 +0100
+@@ -137,14 +137,11 @@
+ void *gwwv_dlopen(char *name,int flags) {
+ #undef dlopen
+- void *lib = dlopen(name,flags);
++ void *lib;
+ char *temp;
+
+- 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/");
++ temp = galloc( strlen("@PREFIX@/lib/") + strlen(name) +1 );
++ strcpy(temp,"@PREFIX@/lib/");
strcat(temp,name);
lib = dlopen(temp,flags);
free(temp);
+@@ -157,14 +154,11 @@
+ # include <string.h>
+
+ const void *gwwv_NSAddImage(char *name,uint32_t options) {
+- const void *lib = NSAddImage(name,options);
++ const void *lib;
+ char *temp;
+
+- 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/20081110/32a23c01/attachment-0001.html>
More information about the macports-changes
mailing list