[64243] trunk/dports/graphics/jbigkit

[jeremyhu at macports.org]

Revision: 64243
          http://trac.macports.org/changeset/64243
Author:   jeremyhu at macports.org
Date:     2010-02-26 14:35:02 -0800 (Fri, 26 Feb 2010)
Log Message:
-----------
jbigkit:  Fix universal build

Link bin/* against dynamic lib
Don't install static lib

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

Added Paths:
-----------
    trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile

Modified: trunk/dports/graphics/jbigkit/Portfile
===================================================================
--- trunk/dports/graphics/jbigkit/Portfile	2010-02-26 22:27:57 UTC (rev 64242)
+++ trunk/dports/graphics/jbigkit/Portfile	2010-02-26 22:35:02 UTC (rev 64243)
@@ -5,6 +5,7 @@
 
 name                    jbigkit
 version                 2.0
+revision                1
 categories              graphics
 platforms               darwin
 maintainers             nomaintainer
@@ -28,11 +29,15 @@
 
 worksrcdir              ${name}
 
-patchfiles              patch-Makefile
+patchfiles              patch-Makefile patch-pbmtools_Makefile
 
 configure {
     reinplace "s|__CC__|${configure.cc}|" ${worksrcpath}/Makefile
-    reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/Makefile
+    if {[variant_isset universal]} {
+        reinplace "s|__CFLAGS__|${configure.cppflags} ${configure.universal_cflags} ${configure.cflags}|" ${worksrcpath}/Makefile
+    } else {
+        reinplace "s|__CFLAGS__|${configure.cppflags} ${configure.cflags}|" ${worksrcpath}/Makefile
+    }
 }
 
 test.run                yes
@@ -48,8 +53,6 @@
         ${destroot}${prefix}/share/man/man1
     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
     xinstall -m 644 -W ${worksrcpath} ANNOUNCE CHANGES COPYING INSTALL TODO \
         ${destroot}${prefix}/share/doc/${name}
     copy ${worksrcpath}/examples \

Modified: trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin
===================================================================
--- trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin	2010-02-26 22:27:57 UTC (rev 64242)
+++ trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin	2010-02-26 22:35:02 UTC (rev 64243)
@@ -1,21 +1,24 @@
---- 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 @@
+--- libjbig/Makefile.orig	2010-02-26 14:31:06.000000000 -0800
++++ libjbig/Makefile	2010-02-26 14:31:31.000000000 -0800
+@@ -7,7 +7,7 @@ CC = gcc
  # Options for the compiler: A high optimization level is suggested
  CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
  
 -all: libjbig.a tstcodec tstcodec85
-+all: libjbig.a libjbig.__MACPORTS_VERSION__.dylib tstcodec tstcodec85
++all: libjbig.dylib
  
  tstcodec: tstcodec.o jbig.o jbig_ar.o
  	$(CC) $(CFLAGS) -o tstcodec $+
-@@ -25,6 +25,10 @@
+@@ -25,6 +25,13 @@ libjbig85.a: jbig85.o jbig_ar.o
  	ar rc libjbig85.a jbig85.o jbig_ar.o
  	-ranlib libjbig85.a
  
++libjbig.dylib: libjbig.__MACPORTS_VERSION__.dylib
++	ln -s $< $@
++
 +libjbig.__MACPORTS_VERSION__.dylib:  jbig.o jbig_ar.o
 +	rm -f $@
-+	$(CC) -dynamiclib -install_name __MACPORTS_PREFIX__/lib/libjbig.__MACPORTS_INSTALL_VERSION__.dylib -o $@ $^
++	$(CC) $(CFLAGS) -dynamiclib -install_name __MACPORTS_PREFIX__/lib/libjbig.__MACPORTS_INSTALL_VERSION__.dylib -o $@ $^
 +
  jbig.o: jbig.c jbig.h jbig_ar.h
  jbig85.o: jbig85.c jbig85.h jbig_ar.h

Added: trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile
===================================================================
--- trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile	                        (rev 0)
+++ trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile	2010-02-26 22:35:02 UTC (rev 64243)
@@ -0,0 +1,19 @@
+--- pbmtools/Makefile.orig	2010-02-26 14:26:44.000000000 -0800
++++ pbmtools/Makefile	2010-02-26 14:27:31.000000000 -0800
+@@ -9,13 +9,13 @@ CFLAGS = -g -Wall -ansi -pedantic -I../l
+ 
+ .SUFFIXES: .1 .5 .txt $(SUFFIXES)
+ 
+-all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \
++all: pbmtojbg jbgtopbm \
+ 	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
+ 
+-pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
++pbmtojbg: pbmtojbg.o
+ 	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
+ 
+-jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
++jbgtopbm: jbgtopbm.o
+ 	$(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
+ 
+ pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100226/69e9e8cd/attachment-0001.html>