Index: graphics/apngasm/Makefile
===================================================================
RCS file: /a/.cvsup/ports/graphics/apngasm/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- graphics/apngasm/Makefile	13 May 2010 14:47:58 -0000	1.1
+++ graphics/apngasm/Makefile	10 Jun 2010 17:54:43 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	apngasm
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 DISTVERSIONSUFFIX=-src
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
@@ -14,19 +14,32 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTVERSI
 MAINTAINER=	swell.k@gmail.com
 COMMENT=	Create Animated PNG from a sequence of files
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
-
 USE_ZIP=	yes
 USE_DOS2UNIX=	yes
 NO_WRKSUBDIR=	yes
 
+LICENSE=	LGPL21 LGPL3
+LICENSE_COMB=	dual
+
 ALL_TARGET=	${PORTNAME}
 MAKEFILE=	/dev/null
-CFLAGS+=	-I${LOCALBASE}/include -lpng -lz -L${LOCALBASE}/lib
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}" LDLIBS="${LDLIBS}"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+LDLIBS+=	-lpng -lm -lz
 
 PLIST_FILES=	bin/${PORTNAME}
 
+.include <bsd.port.pre.mk>
+
+.if !defined(NO_SHARED)
+LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+.else
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
+LDFLAGS+=	-static
+.endif
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: graphics/apngasm/distinfo
===================================================================
RCS file: /a/.cvsup/ports/graphics/apngasm/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- graphics/apngasm/distinfo	13 May 2010 14:47:58 -0000	1.1
+++ graphics/apngasm/distinfo	10 Jun 2010 17:46:31 -0000
@@ -1,3 +1,3 @@
-MD5 (apngasm-2.0-src.zip) = eacbeb064219c6e7fe490abe788ab385
-SHA256 (apngasm-2.0-src.zip) = cc8c33c42115273dc63b7763f8c0b3ab5ec891420fb3ad794b44ade104118c19
-SIZE (apngasm-2.0-src.zip) = 6807
+MD5 (apngasm-2.1-src.zip) = df7c65ff207ab9d9cf0e236a01b723f6
+SHA256 (apngasm-2.1-src.zip) = ddfba3d932526bc58c84de8a27f9130609891ddf1e73be079c31952b6ed3c122
+SIZE (apngasm-2.1-src.zip) = 8363
Index: graphics/apngasm/files/patch-bswap
===================================================================
RCS file: graphics/apngasm/files/patch-bswap
diff -N graphics/apngasm/files/patch-bswap
--- graphics/apngasm/files/patch-bswap	13 May 2010 14:47:58 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
---- 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));}