[49151] trunk/dports/graphics/jbigkit

mcalhoun at macports.org mcalhoun at macports.org
Sat Apr 4 10:52:25 PDT 2009


Revision: 49151
          http://trac.macports.org/changeset/49151
Author:   mcalhoun at macports.org
Date:     2009-04-04 10:52:25 -0700 (Sat, 04 Apr 2009)
Log Message:
-----------
jbigkit: Update version 1.6 -> 2.0.

Modified Paths:
--------------
    trunk/dports/graphics/jbigkit/Portfile
    trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin

Removed Paths:
-------------
    trunk/dports/graphics/jbigkit/files/patch-Makefile_darwin

Modified: trunk/dports/graphics/jbigkit/Portfile
===================================================================
--- trunk/dports/graphics/jbigkit/Portfile	2009-04-04 17:46:17 UTC (rev 49150)
+++ trunk/dports/graphics/jbigkit/Portfile	2009-04-04 17:52:25 UTC (rev 49151)
@@ -4,7 +4,7 @@
 PortSystem			1.0
 
 name				jbigkit
-version				1.6
+version				2.0
 categories			graphics
 maintainers			nomaintainer
 description			Data compression algorithm for bi-level high-res images
@@ -20,51 +20,68 @@
 homepage			http://www.cl.cam.ac.uk/~mgk25/${name}
 master_sites			http://www.cl.cam.ac.uk/~mgk25/download/
 
-checksums			md5 ce196e45f293d40ba76af3dc981ccfd7
+checksums			md5 3dd87f605abb1a97a22dc79d8b3e8f6c \
+                    sha1 cfb7d3121f02a74bfb229217858a0d149b6589ef \
+                    rmd160 4b1b8358203c2bd86e034703d666c1453c60e572
 
 worksrcdir			${name}
 
-post-patch {
-	reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/libjbig/Makefile
+configure {
+    if { [variant_isset universal] } {
+        foreach arch ${universal_archs} {
+            configure.cc-append -arch ${arch}
+        }
+        configure.cc-append -isysroot ${configure.universal_sysroot}
+    }
+    reinplace "s|CC = gcc|CC = ${configure.cc}|" ${worksrcpath}/Makefile
 }
 
-use_configure		no
-
 test.run		yes
 test.target		test
 
 destroot {
-	xinstall -m 755 -d ${destroot}${prefix}/bin \
-		${destroot}${prefix}/include ${destroot}${prefix}/lib \
-		${destroot}${prefix}/share/man/man1 \
-		${destroot}${prefix}/share/doc/${name} \
-		${destroot}${prefix}/share/examples
+    xinstall -m 755 -d \
+        ${destroot}${prefix}/share/doc/${name} \
+        ${destroot}${prefix}/share/examples
 	xinstall -m 755 -W ${worksrcpath}/pbmtools jbgtopbm pbmtojbg \
 		${destroot}${prefix}/bin
 	xinstall -m 644 -W ${worksrcpath}/pbmtools jbgtopbm.1 pbmtojbg.1 \
 		${destroot}${prefix}/share/man/man1
-	xinstall -m 644 -W ${worksrcpath}/libjbig jbig.h \
+	xinstall -m 644 -W ${worksrcpath}/libjbig jbig.h jbig_ar.h \
 		${destroot}${prefix}/include
 	xinstall -m 644 -W ${worksrcpath}/libjbig libjbig.a \
 		${destroot}${prefix}/lib
-	system "ranlib ${destroot}${prefix}/lib/libjbig.a"
 	xinstall -m 644 -W ${worksrcpath} ANNOUNCE CHANGES COPYING INSTALL TODO \
 		${destroot}${prefix}/share/doc/${name}
-	xinstall -m 644 -W ${worksrcpath}/libjbig jbig.doc \
-		${destroot}${prefix}/share/doc/${name}
-	file copy ${worksrcpath}/examples \
+	copy ${worksrcpath}/examples \
 		${destroot}${prefix}/share/examples/${name}
 }
 
+set name_version     ${version}
+set install_version  [join [lrange [split ${version} .] 0 0] .]
+
 platform darwin {
-	patchfiles-append	patch-Makefile_darwin patch-libjbig_Makefile_darwin
+	patchfiles-append	patch-libjbig_Makefile_darwin
+
+    post-patch {
+        reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" \
+            ${worksrcpath}/libjbig/Makefile
+        reinplace "s|__MACPORTS_VERSION__|${name_version}|g" \
+            ${worksrcpath}/libjbig/Makefile
+        reinplace "s|__MACPORTS_INSTALL_VERSION__|${install_version}|g" \
+            ${worksrcpath}/libjbig/Makefile
+    }
+
 	post-destroot {
-		xinstall -m 644 -W ${worksrcpath}/libjbig libjbig.1.dylib \
+		xinstall -m 644 -W ${worksrcpath}/libjbig libjbig.${name_version}.dylib \
 			${destroot}${prefix}/lib
-		system "ln -s libjbig.1.dylib ${destroot}${prefix}/lib/libjbig.dylib"
+		ln -s libjbig.${name_version}.dylib ${destroot}${prefix}/lib/libjbig.${install_version}.dylib
+		ln -s libjbig.${name_version}.dylib ${destroot}${prefix}/lib/libjbig.dylib
 	}
 }
 
+variant universal {}
+
 livecheck.check regex
 livecheck.url   ${master_sites}
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Deleted: trunk/dports/graphics/jbigkit/files/patch-Makefile_darwin
===================================================================
--- trunk/dports/graphics/jbigkit/files/patch-Makefile_darwin	2009-04-04 17:46:17 UTC (rev 49150)
+++ trunk/dports/graphics/jbigkit/files/patch-Makefile_darwin	2009-04-04 17:52:25 UTC (rev 49151)
@@ -1,11 +0,0 @@
---- Makefile.orig	Fri Jun 11 12:05:26 2004
-+++ Makefile	Thu Oct 21 18:19:42 2004
-@@ -8,7 +8,7 @@
- CCFLAGS = -O2 -W
- #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG  # developer only
- 
--CFLAGS = $(CCFLAGS) -I../libjbig
-+CFLAGS = $(CCFLAGS) -I../libjbig -fPIC
- 
- VERSION=1.6
- 

Modified: trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin
===================================================================
--- trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin	2009-04-04 17:46:17 UTC (rev 49150)
+++ trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin	2009-04-04 17:52:25 UTC (rev 49151)
@@ -1,19 +1,22 @@
---- libjbig/Makefile.orig	Wed Jun 11 10:57:56 2003
-+++ libjbig/Makefile	Tue Mar  2 01:30:20 2004
-@@ -7,11 +7,15 @@
+--- libjbig/Makefile.orig	2008-08-30 13:20:52.000000000 -0400
++++ libjbig/Makefile	2009-03-31 15:41:07.000000000 -0400
+@@ -7,7 +7,7 @@
  # Options for the compiler: A high optimization level is suggested
- CFLAGS = -O -Wall -ansi -pedantic
+ CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
  
--all: libjbig.a tstcodec
-+all: libjbig.1.dylib libjbig.a tstcodec
+-all: libjbig.a tstcodec tstcodec85
++all: libjbig.a libjbig.__MACPORTS_VERSION__.dylib tstcodec tstcodec85
  
- tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
- 	$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
- 	jbig_tab.o
+ tstcodec: tstcodec.o jbig.o jbig_ar.o
+ 	$(CC) $(CFLAGS) -o tstcodec $+
+@@ -25,6 +25,10 @@
+ 	ar rc libjbig85.a jbig85.o jbig_ar.o
+ 	-ranlib libjbig85.a
+ 
++libjbig.__MACPORTS_VERSION__.dylib:  jbig.o jbig_ar.o
++	rm -f $@
++	$(CC) -dynamiclib -install_name __MACPORTS_PREFIX__/lib/libjbig.__MACPORTS_INSTALL_VERSION__.dylib -o $@ $^
 +
-+libjbig.1.dylib: jbig.o jbig_tab.o
-+	rm -f libjbig.1.dylib
-+	gcc -fPIC -dynamiclib -install_name @@PREFIX@@/lib/libjbig.1.dylib -o libjbig.1.dylib jbig.o jbig_tab.o
- 
- libjbig.a: jbig.o jbig_tab.o
- 	rm -f libjbig.a
+ jbig.o: jbig.c jbig.h jbig_ar.h
+ jbig85.o: jbig85.c jbig85.h jbig_ar.h
+ jbig_ar.o: jbig_ar.c jbig_ar.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090404/e2740d5d/attachment-0001.html>


More information about the macports-changes mailing list