[123653] trunk/dports/graphics/netpbm

[ryandesign at macports.org]

Revision: 123653
          https://trac.macports.org/changeset/123653
Author:   ryandesign at macports.org
Date:     2014-08-11 20:54:42 -0700 (Mon, 11 Aug 2014)
Log Message:
-----------
netpbm: update to 10.67.01; actually use MacPorts jbigkit instead of built-in copy; re-enable parallel building

Modified Paths:
--------------
    trunk/dports/graphics/netpbm/Portfile

Removed Paths:
-------------
    trunk/dports/graphics/netpbm/files/patch-converter-other-jpeg2000.diff

Modified: trunk/dports/graphics/netpbm/Portfile
===================================================================
--- trunk/dports/graphics/netpbm/Portfile	2014-08-12 03:47:27 UTC (rev 123652)
+++ trunk/dports/graphics/netpbm/Portfile	2014-08-12 03:54:42 UTC (rev 123653)
@@ -3,8 +3,8 @@
 PortSystem 1.0
 
 name            netpbm
-version         10.66.04
-svn.revision    2214
+version             10.67.01
+svn.revision        2242
 categories      graphics
 license         {BSD GPL-2 IJG Permissive}
 maintainers     ryandesign openmaintainer
@@ -19,12 +19,6 @@
 homepage        http://netpbm.sourceforge.net/
 platforms       darwin freebsd linux
 
-# Parallel building is not reliable in netpbm 10.64.01.
-# See http://trac.macports.org/ticket/17516#comment:7 .
-# If you're thinking about enabling parallel build in the Portfile,
-# please make sure to test it on OS X 10.4 as well!  Thanks!
-use_parallel_build  no
-
 depends_build   path:bin/perl:perl5
 
 depends_lib     port:jasper \
@@ -42,8 +36,7 @@
 
 patchfiles      patch-pm_config.in.h.diff \
                 patch-lib-Makefile.diff \
-                patch-converter-other-giftopnm.c-strcaseeq.diff \
-                patch-converter-other-jpeg2000.diff
+                    patch-converter-other-giftopnm.c-strcaseeq.diff
 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/pm_config.in.h
@@ -72,6 +65,8 @@
 CFLAGS_CONFIG = \$(CFLAGS)
 JASPERHDR_DIR = ${prefix}/include
 JASPERLIB = ${jasperlib}
+JBIGHDR_DIR = ${prefix}/include
+JBIGLIB = -ljbig
 JPEGLIB = -ljpeg
 LDFLAGS = ${configure.ldflags} [get_canonical_archflags ld]
 LDRELOC = ${ldreloc}
@@ -107,8 +102,8 @@
     set ldshlib "${prefix}/lib/glibtool --mode=link gcc"
 }
 
-build.args    "messages=yes"
-build.target  ""
+build.args          messages=yes
+build.target
 build.type    gnu
 
 destroot.target   package

Deleted: trunk/dports/graphics/netpbm/files/patch-converter-other-jpeg2000.diff
===================================================================
--- trunk/dports/graphics/netpbm/files/patch-converter-other-jpeg2000.diff	2014-08-12 03:47:27 UTC (rev 123652)
+++ trunk/dports/graphics/netpbm/files/patch-converter-other-jpeg2000.diff	2014-08-12 03:54:42 UTC (rev 123653)
@@ -1,36 +0,0 @@
---- converter/other/jpeg2000/jpeg2ktopam.c.orig	2012-12-30 20:15:55.000000000 -0600
-+++ converter/other/jpeg2000/jpeg2ktopam.c	2013-10-16 19:05:54.000000000 -0500
-@@ -12,14 +12,13 @@
- /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */
- #define _XOPEN_SOURCE 600
- #include <string.h>
-+#include <jasper/jasper.h>
- 
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
--
--#include <jasper/jasper.h>
- #include "libjasper_compat.h"
- 
- enum compmode {COMPMODE_INTEGER, COMPMODE_REAL};
---- converter/other/jpeg2000/pamtojpeg2k.c.orig	2012-10-21 16:33:33.000000000 -0500
-+++ converter/other/jpeg2000/pamtojpeg2k.c	2013-10-16 19:06:48.000000000 -0500
-@@ -12,14 +12,13 @@
- /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */
- #define _XOPEN_SOURCE 600
- #include <string.h>
-+#include <jasper/jasper.h>
- 
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
--
--#include <jasper/jasper.h>
- #include "libjasper_compat.h"
- 
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140811/b46ea56e/attachment.html>