Attachment #107072 for bug #147771

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

Lines 6-12 Link Here

(-)graphics/apngasm/Makefile (-6 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= apngasm	8	PORTNAME= apngasm
9	PORTVERSION= 2.0	9	PORTVERSION= 2.1
10	DISTVERSIONSUFFIX=-src	10	DISTVERSIONSUFFIX=-src
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}	12	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
Lines 14-32 MASTER_SITES= SF/${PORTNAME}/${PORTVERSI Link Here
14	MAINTAINER= swell.k@gmail.com	14	MAINTAINER= swell.k@gmail.com
15	COMMENT= Create Animated PNG from a sequence of files	15	COMMENT= Create Animated PNG from a sequence of files
16		16
17	LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
18
19	USE_ZIP= yes	17	USE_ZIP= yes
20	USE_DOS2UNIX= yes	18	USE_DOS2UNIX= yes
21	NO_WRKSUBDIR= yes	19	NO_WRKSUBDIR= yes
22		20
		21	LICENSE= LGPL21 LGPL3
		22	LICENSE_COMB= dual
		23
23	ALL_TARGET= ${PORTNAME}	24	ALL_TARGET= ${PORTNAME}
24	MAKEFILE= /dev/null	25	MAKEFILE= /dev/null
25	CFLAGS+= -I${LOCALBASE}/include -lpng -lz -L${LOCALBASE}/lib	26	MAKE_ENV+= LDFLAGS="${LDFLAGS}" LDLIBS="${LDLIBS}"
		27	CFLAGS+= -I${LOCALBASE}/include
		28	LDFLAGS+= -L${LOCALBASE}/lib
		29	LDLIBS+= -lpng -lm -lz
26		30
27	PLIST_FILES= bin/${PORTNAME}	31	PLIST_FILES= bin/${PORTNAME}
28		32
		33	.include <bsd.port.pre.mk>
		34
		35	.if !defined(NO_SHARED)
		36	LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
		37	.else
		38	BUILD_DEPENDS= ${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
		39	LDFLAGS+= -static
		40	.endif
		41
29	do-install:	42	do-install:
30	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/	43	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
31		44
32	.include <bsd.port.mk>	45	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)graphics/apngasm/distinfo (-3 / +3 lines)
1	MD5 (apngasm-2.0-src.zip) = eacbeb064219c6e7fe490abe788ab385	1	MD5 (apngasm-2.1-src.zip) = df7c65ff207ab9d9cf0e236a01b723f6
2	SHA256 (apngasm-2.0-src.zip) = cc8c33c42115273dc63b7763f8c0b3ab5ec891420fb3ad794b44ade104118c19	2	SHA256 (apngasm-2.1-src.zip) = ddfba3d932526bc58c84de8a27f9130609891ddf1e73be079c31952b6ed3c122
3	SIZE (apngasm-2.0-src.zip) = 6807	3	SIZE (apngasm-2.1-src.zip) = 8363




--- apngasm.c~
+++ apngasm.c
@@ -39,6 +39,10 @@ inline unsigned int swap32(unsigned int 
 #include <byteswap.h>
 inline unsigned short swap16(unsigned short data) {return(bswap_16(data));}
 inline unsigned int swap32(unsigned int data) {return(bswap_32(data));}
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+inline unsigned short swap16(unsigned short data) {return(bswap16(data));}
+inline unsigned int swap32(unsigned int data) {return(bswap32(data));}
 #else
 inline unsigned short swap16(unsigned short data) {return((data >> 8) | (data << 8));}
 inline unsigned int swap32(unsigned int data) {return((swap16(data) << 16) | swap16(data >> 16));}

Return to bug 147771

Removed Link Here

(-)graphics/apngasm/files/patch-bswap (-13 lines)
1	--- apngasm.c~
2	+++ apngasm.c
3	@@ -39,6 +39,10 @@ inline unsigned int swap32(unsigned int
4	#include <byteswap.h>
5	inline unsigned short swap16(unsigned short data) {return(bswap_16(data));}
6	inline unsigned int swap32(unsigned int data) {return(bswap_32(data));}
7	+#elif defined(__FreeBSD__)
8	+#include <sys/endian.h>
9	+inline unsigned short swap16(unsigned short data) {return(bswap16(data));}
10	+inline unsigned int swap32(unsigned int data) {return(bswap32(data));}
11	#else
12	inline unsigned short swap16(unsigned short data) {return((data >> 8) \| (data << 8));}
13	inline unsigned int swap32(unsigned int data) {return((swap16(data) << 16) \| swap16(data >> 16));}