[112286] trunk/dports/graphics/netpbm

[ryandesign at macports.org]

Revision: 112286
          https://trac.macports.org/changeset/112286
Author:   ryandesign at macports.org
Date:     2013-10-16 17:14:25 -0700 (Wed, 16 Oct 2013)
Log Message:
-----------
netpbm: change the order of header includes in the jpeg2000 converter so that jasper's headers don't end up undefining true and false and causing the netpbm build to fail

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

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

Removed Paths:
-------------
    trunk/dports/graphics/netpbm/files/patch-lib-util-pm_c_util.h.diff

Modified: trunk/dports/graphics/netpbm/Portfile
===================================================================
--- trunk/dports/graphics/netpbm/Portfile	2013-10-16 23:40:37 UTC (rev 112285)
+++ trunk/dports/graphics/netpbm/Portfile	2013-10-17 00:14:25 UTC (rev 112286)
@@ -40,7 +40,7 @@
 patchfiles      patch-pm_config.in.h.diff \
                 patch-lib-Makefile.diff \
                 patch-converter-other-giftopnm.c-strcaseeq.diff \
-                patch-lib-util-pm_c_util.h.diff
+                patch-converter-other-jpeg2000.diff
 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/pm_config.in.h

Added: trunk/dports/graphics/netpbm/files/patch-converter-other-jpeg2000.diff
===================================================================
--- trunk/dports/graphics/netpbm/files/patch-converter-other-jpeg2000.diff	                        (rev 0)
+++ trunk/dports/graphics/netpbm/files/patch-converter-other-jpeg2000.diff	2013-10-17 00:14:25 UTC (rev 112286)
@@ -0,0 +1,36 @@
+--- 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"
+ 
+ 

Deleted: trunk/dports/graphics/netpbm/files/patch-lib-util-pm_c_util.h.diff
===================================================================
--- trunk/dports/graphics/netpbm/files/patch-lib-util-pm_c_util.h.diff	2013-10-16 23:40:37 UTC (rev 112285)
+++ trunk/dports/graphics/netpbm/files/patch-lib-util-pm_c_util.h.diff	2013-10-17 00:14:25 UTC (rev 112286)
@@ -1,17 +0,0 @@
-Index: lib/util/pm_c_util.h
-===================================================================
---- lib/util/pm_c_util.h	(revision 2009)
-+++ lib/util/pm_c_util.h	(working copy)
-@@ -80,10 +80,10 @@
- #endif
- 
- #ifndef TRUE
--  #define TRUE true
-+  #define TRUE 1
-   #endif
- #ifndef FALSE
--#define FALSE false
-+#define FALSE 0
-   #endif
- 
- #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131016/a7fd77c6/attachment.html>