Attachment #23539 for bug #40500

View | Details | Raw Unified | Return to bug 40500
Collapse All | Expand All

Lines 6-12 Link Here

(-)graphics/netpbm/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= netpbm	8	PORTNAME= netpbm
9	PORTVERSION= 10.3	9	PORTVERSION= 10.4
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}

Line 1 Link Here

(-)graphics/netpbm/distinfo (-1 / +1 lines)
1	MD5 (netpbm-10.3.tgz) = 73ffe1962788d585e041684260dfadae	1	MD5 (netpbm-10.4.tgz) = d8bd16fa1e9f955846d9f8d88972fa84




--- converter/other/pnmtotiffcmyk.c.orig	Sat May 13 09:29:45 2000
+++ converter/other/pnmtotiffcmyk.c	Tue Jun 18 00:00:00 2002
@@ -71,8 +71,12 @@
 #define VERSION 1.01
 
 /* beware - these evaluate more than once */
+#ifndef MAX
 #define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) )
+#endif
+#ifndef MIN
 #define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) )
+#endif
 
 /* only support 8 bit values */
 #define MAXTIFFBITS 8

Return to bug 40500

Lines 1-15 Link Here

(-)graphics/netpbm/files/patch-converter::other::pnmtotiffcmyk.c (-15 lines)
1	--- converter/other/pnmtotiffcmyk.c.orig Sat May 13 09:29:45 2000
2	+++ converter/other/pnmtotiffcmyk.c Tue Jun 18 00:00:00 2002
3	@@ -71,8 +71,12 @@
4	#define VERSION 1.01
5
6	/* beware - these evaluate more than once */
7	+#ifndef MAX
8	#define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) )
9	+#endif
10	+#ifndef MIN
11	#define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) )
12	+#endif
13
14	/* only support 8 bit values */
15	#define MAXTIFFBITS 8