Attachment #99230 for bug #138277

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




#

PORTNAME=	icoutils
PORTVERSION=	0.28.0
CATEGORIES=	graphics
MASTER_SITES=	SAVANNAH


LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
RUN_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww

USE_GETTEXT=	yes
USE_PERL5_RUN=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-nls
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"


Lines 1-3 Link Here

(-)graphics/icoutils/distinfo (-3 / +3 lines)
1	MD5 (icoutils-0.27.0.tar.gz) = e0ec22c83290317a04110a3d05d1c7ac	1	MD5 (icoutils-0.28.0.tar.gz) = 8b28053a5b6c2fd900d73a7aeed0cdb3
2	SHA256 (icoutils-0.27.0.tar.gz) = 848456fdfddfdefde30946ff60658b3af544623dcde2118c75aa583a0bdf46a9	2	SHA256 (icoutils-0.28.0.tar.gz) = c02f0249ed937f108ae337a86a8c3564ea6c8c2282d61665109f206e757b5f69
3	SIZE (icoutils-0.27.0.tar.gz) = 489729	3	SIZE (icoutils-0.28.0.tar.gz) = 500481

Lines 1-15 Link Here

(-)graphics/icoutils/files/patch-icotool__Makefile.in (-15 lines)
1	--- icotool/Makefile.in.orig 2009-06-30 03:14:01.000000000 +0900
2	+++ icotool/Makefile.in 2009-07-07 01:32:50.000000000 +0900
3	@@ -559,9 +559,10 @@
4	win32.h
5
6	icotool_LDADD = \
7	- @PNG_LIBS@ \
8	../common/libcommon.a \
9	- ../lib/libgnu.a
10	+ ../lib/libgnu.a \
11	+ @PNG_LIBS@ \
12	+ @LIBINTL@
13
14	man_MANS = \
15	icotool.1




--- icotool/win32-endian.c.orig	Sun Nov 27 18:43:33 2005
+++ icotool/win32-endian.c	Sun Nov 27 21:05:48 2005
@@ -17,6 +17,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+
 #include <config.h>
 #include "win32-endian.h"
 
@@ -27,6 +31,27 @@
 #define bswap_16(x) NXSwapShort(x)
 #define bswap_32(x) NXSwapInt(x)
 #define bswap_64(x) NXSwapLongLong(x)
+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 470000)
+# include <sys/endian.h>
+# if (__FreeBSD_version >= 500000)
+#  define bswap_16(x) bswap16(x)
+#  define bswap_32(x) bswap32(x)
+#  define bswap_64(x) bswap64(x)
+# else
+#  define bswap_16(x) be16toh(x)
+#  define bswap_32(x) be32toh(x)
+#  define bswap_64(x) \
+    x = ((((x) & 0xff00000000000000) >> 56) | \
+        (((x) & 0x00ff000000000000) >> 40) | \
+        (((x) & 0x0000ff0000000000) >> 24) | \
+        (((x) & 0x000000ff00000000) >>  8) | \
+        (((x) & 0x00000000ff000000) <<  8) | \
+        (((x) & 0x0000000000ff0000) << 24) | \
+        (((x) & 0x000000000000ff00) << 40) | \
+        (((x) & 0x00000000000000ff) << 56))
+# endif /* >= 4.7-R || >= 5.0-CURRENT */
+#else
+# include "common/byteswap.h"
 #endif
 
 #define BSWAP16(x)  	((x) = bswap_16(x))

Lines 1-12 Link Here

(-)graphics/icoutils/files/patch-wrestool__Makefile.in (-12 lines)
1	--- wrestool/Makefile.in.orig 2009-06-30 03:14:01.000000000 +0900
2	+++ wrestool/Makefile.in 2009-07-07 01:33:24.000000000 +0900
3	@@ -558,7 +558,8 @@
4
5	wrestool_LDADD = \
6	../common/libcommon.a \
7	- ../lib/libgnu.a
8	+ ../lib/libgnu.a \
9	+ @LIBINTL@
10
11	man_MANS = \
12	wrestool.1

Return to bug 138277

Lines 6-12 Link Here

(-)graphics/icoutils/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= icoutils	8	PORTNAME= icoutils
9	PORTVERSION= 0.27.0	9	PORTVERSION= 0.28.0
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= SAVANNAH	11	MASTER_SITES= SAVANNAH
12		12
Lines 16-24 Link Here
16	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png	16	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
17	RUN_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww	17	RUN_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
18		18
19	USE_GETTEXT= yes
20	USE_PERL5_RUN= yes	19	USE_PERL5_RUN= yes
21	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
		21	CONFIGURE_ARGS= --disable-nls
22	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	22	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
23	LDFLAGS="-L${LOCALBASE}/lib"	23	LDFLAGS="-L${LOCALBASE}/lib"
24		24

Lines 1-41 Link Here

(-)graphics/icoutils/files/patch-icotool__win32-endian.c (-41 lines)
1	--- icotool/win32-endian.c.orig Sun Nov 27 18:43:33 2005
2	+++ icotool/win32-endian.c Sun Nov 27 21:05:48 2005
3	@@ -17,6 +17,10 @@
4	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
5	*/
6
7	+#if (defined(__unix__) \|\| defined(unix)) && !defined(USG)
8	+#include <sys/param.h>
9	+#endif
10	+
11	#include <config.h>
12	#include "win32-endian.h"
13
14	@@ -27,6 +31,27 @@
15	#define bswap_16(x) NXSwapShort(x)
16	#define bswap_32(x) NXSwapInt(x)
17	#define bswap_64(x) NXSwapLongLong(x)
18	+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 470000)
19	+# include <sys/endian.h>
20	+# if (__FreeBSD_version >= 500000)
21	+# define bswap_16(x) bswap16(x)
22	+# define bswap_32(x) bswap32(x)
23	+# define bswap_64(x) bswap64(x)
24	+# else
25	+# define bswap_16(x) be16toh(x)
26	+# define bswap_32(x) be32toh(x)
27	+# define bswap_64(x) \
28	+ x = ((((x) & 0xff00000000000000) >> 56) \| \
29	+ (((x) & 0x00ff000000000000) >> 40) \| \
30	+ (((x) & 0x0000ff0000000000) >> 24) \| \
31	+ (((x) & 0x000000ff00000000) >> 8) \| \
32	+ (((x) & 0x00000000ff000000) << 8) \| \
33	+ (((x) & 0x0000000000ff0000) << 24) \| \
34	+ (((x) & 0x000000000000ff00) << 40) \| \
35	+ (((x) & 0x00000000000000ff) << 56))
36	+# endif /* >= 4.7-R \|\| >= 5.0-CURRENT */
37	+#else
38	+# include "common/byteswap.h"
39	#endif
40
41	#define BSWAP16(x) ((x) = bswap_16(x))