[25078] trunk/dports/graphics/fontforge

source_changes at macosforge.org source_changes at macosforge.org
Sun May 13 06:22:56 PDT 2007 

Revision: 25078
          http://trac.macosforge.org/projects/macports/changeset/25078
Author:   takanori at macports.org
Date:     2007-05-13 06:22:56 -0700 (Sun, 13 May 2007)

Log Message:
-----------
* Version bump to 20070511.
* Enable support for multilayer (Type3) by default.
* Add variants +without_multilayer and +with_freetype_bytecode.

Modified Paths:
--------------
    trunk/dports/graphics/fontforge/Portfile
    trunk/dports/graphics/fontforge/files/fontforge.patch

Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile	2007-05-13 13:06:15 UTC (rev 25077)
+++ trunk/dports/graphics/fontforge/Portfile	2007-05-13 13:22:56 UTC (rev 25078)
@@ -2,7 +2,9 @@
 
 PortSystem			1.0
 name				fontforge
-version				20070312
+version				20070511
+set docversion			20070501
+set ftversion			2.3.4
 categories			graphics fonts
 maintainers			nomaintainer at macports.org
 description			Outline and bitmap font editor/converter for many formats
@@ -17,22 +19,27 @@
 
 homepage			http://fontforge.sourceforge.net/
 master_sites			sourceforge:fontforge \
-				${homepage}:cidmaps
+				${homepage}:cidmaps \
+				http://download.savannah.gnu.org/releases/freetype/:freetype \
+				sourceforge:freetype:freetype
 distname			${name}_full-${version}
 use_bzip2			yes
-distfiles-append		cidmaps.tgz:cidmaps
-#				${name}_htdocs-${version}.tar.bz2
+distfiles-append		cidmaps.tgz:cidmaps \
+				${name}_htdocs-${docversion}.tar.bz2
 extract.only			${distname}${extract.suffix}
 
-checksums			${distname}${extract.suffix} md5 f1b211fad5088764582f7b0e9d5113fc \
-					sha1 310c29b1905893c9dd48a7d78bd0b8c9067fafd8 \
-					rmd160 8acfaeecb31d1bf2644427e27b540fefddecb27c \
+checksums			${distname}${extract.suffix} md5 8762f5c6e1b25940fe964da2f45892fa \
+					sha1 55ab2a451b9d24e895717e7cf2d1336ec6914106 \
+					rmd160 10a15cfb1a20ebc6ab005cc30e58a0da6de4a53f \
 				cidmaps.tgz md5 5f00607e4bbe014cdfd5b23bb0943666 \
 					sha1 d111db1f6d9a05cf6cb1387c2fb2eeb21ba0279a \
-					rmd160 c25b1a4f0d8ed0634402d2ce2b36ba47e0c2ef1b
-#				${name}_htdocs-${version}.tar.bz2 md5 0f7b90adb0faf4b2e353ad5df9200b88 \
-#					sha1 56163a2ef952ca1c4b8feb25b72a50d2af09287a \
-#					rmd160 5afaa49f6fb22634e273ceecb9aaeece628badf9
+					rmd160 c25b1a4f0d8ed0634402d2ce2b36ba47e0c2ef1b \
+				${name}_htdocs-${docversion}.tar.bz2 md5 3ed692ba5ad1c7b8e0cff8a5db6dc340 \
+					sha1 593bd08b412812d58bb29aa137cf8a500e0a8a81 \
+					rmd160 9e3f6333a7dcd87650c9db9367dae363fadd61ab \
+				freetype-${ftversion}${extract.suffix} md5 1a6c59a7723d637c78672e7784da865d \
+					sha1 09b8f5ecbb3e06a14cc1c2f2dc7c04fe34c48eca \
+					rmd160 23b641c0b6e6102449e6f2512a131743d8836321
 
 worksrcdir			${name}-${version}
 
@@ -46,8 +53,8 @@
 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-${version}.tar.bz2 | 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 -"
 }
 
 post-patch {
@@ -55,6 +62,8 @@
 	reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gdraw/dynamic.c
 }
 
+configure.args		--without-python --with-multilayer --without-freetype-bytecode --without-freetype-src
+
 destroot.post_args	prefix=${destroot}/${prefix}
 post-destroot {
 	delete ${destroot}/${prefix}/share/man
@@ -68,6 +77,15 @@
 		README-Unix.html README-unix ${destroot}/${prefix}/share/doc/${name}
 }
 
-variant svg {
-	configure.args-append	--with-multilayer
+variant without_multilayer {
+	configure.args-delete	--with-multilayer
+	configure.args-append	--without-multilayer
 }
+
+variant with_freetype_bytecode {
+	distfiles-append	freetype-${ftversion}${extract.suffix}
+	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}
+}

Modified: trunk/dports/graphics/fontforge/files/fontforge.patch
===================================================================
--- trunk/dports/graphics/fontforge/files/fontforge.patch	2007-05-13 13:06:15 UTC (rev 25077)
+++ trunk/dports/graphics/fontforge/files/fontforge.patch	2007-05-13 13:22:56 UTC (rev 25078)
@@ -1,6 +1,6 @@
-diff -Naur fontforge-20061220.orig/Makefile.dynamic.in fontforge-20061220/Makefile.dynamic.in
---- fontforge-20061220.orig/Makefile.dynamic.in	2006-11-21 05:09:56.000000000 +0900
-+++ fontforge-20061220/Makefile.dynamic.in	2007-01-05 14:39:32.000000000 +0900
+diff -Naur fontforge-20070511.orig/Makefile.dynamic.in fontforge-20070511/Makefile.dynamic.in
+--- fontforge-20070511.orig/Makefile.dynamic.in	2006-11-21 05:09:56.000000000 +0900
++++ fontforge-20070511/Makefile.dynamic.in	2007-05-13 15:35:31.000000000 +0900
 @@ -92,7 +92,6 @@
  	$(INSTALL_DATA) $(srcdir)/fontforge/fontimage.1 $(mandir)/man1
  #explicit use of sh to make sure we don't invoke csh with different "if" syntax
@@ -9,10 +9,10 @@
  
  uninstall:
  	-rm $(bindir)/fontforge
-diff -Naur fontforge-20061220.orig/configure fontforge-20061220/configure
---- fontforge-20061220.orig/configure	2006-12-03 11:02:45.000000000 +0900
-+++ fontforge-20061220/configure	2007-01-05 15:34:03.000000000 +0900
-@@ -2662,7 +2662,7 @@
+diff -Naur fontforge-20070511.orig/configure fontforge-20070511/configure
+--- fontforge-20070511.orig/configure	2007-04-30 10:53:16.000000000 +0900
++++ fontforge-20070511/configure	2007-05-13 15:35:31.000000000 +0900
+@@ -2664,7 +2664,7 @@
  
  fi;
  
@@ -21,7 +21,7 @@
  
  case "$host" in
  *-apple-darwin*)
-@@ -2682,9 +2682,9 @@
+@@ -2684,9 +2684,9 @@
   gww_define_caps_for_alt="1"
  
  
@@ -34,7 +34,7 @@
   LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
  
   ;;
-@@ -18874,46 +18874,25 @@
+@@ -19075,46 +19075,25 @@
  
  fi
  
@@ -91,7 +91,7 @@
  else
    cat >>confdefs.h <<\_ACEOF
  #define _NO_LIBXML 1
-@@ -18921,9 +18900,6 @@
+@@ -19122,9 +19101,6 @@
  
  fi
  
@@ -101,20 +101,20 @@
  
  echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5
  echo $ECHO_N "checking for DGifOpenFileName in -lgif... $ECHO_C" >&6
-diff -Naur fontforge-20061220.orig/fontforge/start.c fontforge-20061220/fontforge/start.c
---- fontforge-20061220.orig/fontforge/start.c	2006-11-21 07:53:47.000000000 +0900
-+++ fontforge-20061220/fontforge/start.c	2007-01-05 14:50:55.000000000 +0900
-@@ -203,7 +203,6 @@
-     /*  otherwise leave alone. On the mac people often use fink to */
+diff -Naur fontforge-20070511.orig/fontforge/start.c fontforge-20070511/fontforge/start.c
+--- fontforge-20070511.orig/fontforge/start.c	2007-05-08 05:33:23.000000000 +0900
++++ fontforge-20070511/fontforge/start.c	2007-05-13 15:39:46.000000000 +0900
+@@ -207,7 +207,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-20061220.orig/gdraw/dynamic.c fontforge-20061220/gdraw/dynamic.c
---- fontforge-20061220.orig/gdraw/dynamic.c	2006-10-20 03:32:40.000000000 +0900
-+++ fontforge-20061220/gdraw/dynamic.c	2007-01-05 14:53:20.000000000 +0900
+diff -Naur fontforge-20070511.orig/gdraw/dynamic.c fontforge-20070511/gdraw/dynamic.c
+--- fontforge-20070511.orig/gdraw/dynamic.c	2007-01-05 00:49:03.000000000 +0900
++++ fontforge-20070511/gdraw/dynamic.c	2007-05-13 15:35:31.000000000 +0900
 @@ -140,8 +140,8 @@
      if (( lib!=NULL && lib!=(void *) -1) || name==NULL || *name=='/' )
  return( lib );

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070513/52740f71/attachment.html

More information about the macports-changes mailing list