[118745] trunk/dports/graphics/jbigkit
ryandesign at macports.org
ryandesign at macports.org
Thu Apr 10 05:16:56 PDT 2014
Revision: 118745
https://trac.macports.org/changeset/118745
Author: ryandesign at macports.org
Date: 2014-04-10 05:16:56 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
jbigkit: update to 2.1 (#43308); update master_sites to avoid redirects and to fix the livecheck; use the right compiler and flags in all parts of the build, not just the main Makefile
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
trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile
Modified: trunk/dports/graphics/jbigkit/Portfile
===================================================================
--- trunk/dports/graphics/jbigkit/Portfile 2014-04-10 11:50:51 UTC (rev 118744)
+++ trunk/dports/graphics/jbigkit/Portfile 2014-04-10 12:16:56 UTC (rev 118745)
@@ -4,8 +4,7 @@
PortSystem 1.0
name jbigkit
-version 2.0
-revision 2
+version 2.1
categories graphics
license GPL-2+
platforms darwin
@@ -21,21 +20,17 @@
decompression programs with a simple command line \
interface (similar to the converters found in netpbm).
-homepage http://www.cl.cam.ac.uk/~mgk25/${name}
-master_sites http://www.cl.cam.ac.uk/~mgk25/download/
+homepage http://www.cl.cam.ac.uk/~mgk25/${name}/
+master_sites ${homepage}download/
-checksums md5 3dd87f605abb1a97a22dc79d8b3e8f6c \
- sha1 cfb7d3121f02a74bfb229217858a0d149b6589ef \
- rmd160 4b1b8358203c2bd86e034703d666c1453c60e572
+checksums rmd160 71cc51fce3f65d8d9abf9ff52c29edf5469eb52f \
+ sha256 de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932
-worksrcdir ${name}
+use_configure no
-patchfiles patch-Makefile patch-pbmtools_Makefile
+variant universal {}
-configure {
- reinplace "s|__CC__|${configure.cc}|" ${worksrcpath}/Makefile
- reinplace "s|__CFLAGS__|${configure.cppflags} [get_canonical_archflags] ${configure.cflags}|" ${worksrcpath}/Makefile
-}
+build.args CC="${configure.cc} ${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]"
test.run yes
test.target test
Deleted: trunk/dports/graphics/jbigkit/files/patch-Makefile
===================================================================
--- trunk/dports/graphics/jbigkit/files/patch-Makefile 2014-04-10 11:50:51 UTC (rev 118744)
+++ trunk/dports/graphics/jbigkit/files/patch-Makefile 2014-04-10 12:16:56 UTC (rev 118745)
@@ -1,15 +0,0 @@
---- Makefile.orig 2009-06-06 01:49:36.000000000 -0700
-+++ Makefile 2009-06-06 01:49:55.000000000 -0700
-@@ -2,10 +2,10 @@
- # $Id: Makefile 1303 2008-08-30 20:16:20Z mgk25 $
-
- # Select an ANSI/ISO C compiler here, GNU gcc is recommended
--CC = gcc
-+CC = __CC__
-
- # Options for the compiler: A high optimization level is suggested
--CCFLAGS = -O2 -W
-+CCFLAGS = -W __CFLAGS__
- #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only
-
- CFLAGS = $(CCFLAGS) -I../libjbig
Modified: trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin
===================================================================
--- trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin 2014-04-10 11:50:51 UTC (rev 118744)
+++ trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin 2014-04-10 12:16:56 UTC (rev 118745)
@@ -1,15 +1,15 @@
---- 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
+--- libjbig/Makefile.orig 2014-03-27 13:47:15.000000000 -0500
++++ libjbig/Makefile 2014-04-09 15:24:57.000000000 -0500
+@@ -6,7 +6,7 @@
# Options for the compiler: A high optimization level is suggested
- CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
+ CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
--all: libjbig.a tstcodec tstcodec85
+-all: libjbig.a libjbig85.a tstcodec tstcodec85
+all: libjbig.dylib
tstcodec: tstcodec.o jbig.o jbig_ar.o
- $(CC) $(CFLAGS) -o tstcodec $+
-@@ -25,6 +25,13 @@ libjbig85.a: jbig85.o jbig_ar.o
+ $(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
+@@ -24,6 +24,13 @@
ar rc libjbig85.a jbig85.o jbig_ar.o
-ranlib libjbig85.a
Deleted: trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile
===================================================================
--- trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile 2014-04-10 11:50:51 UTC (rev 118744)
+++ trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile 2014-04-10 12:16:56 UTC (rev 118745)
@@ -1,19 +0,0 @@
---- 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: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140410/3f1ef56a/attachment.html>
More information about the macports-changes
mailing list