Index: head/graphics/apngasm/Makefile
===================================================================
--- head/graphics/apngasm/Makefile	(revision 394411)
+++ head/graphics/apngasm/Makefile	(revision 394412)
@@ -1,40 +1,45 @@
 # Created by: Anonymous <swell.k@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	apngasm
 PORTVERSION=	2.9
-PORTREVISION=	1
 DISTVERSIONSUFFIX=-src
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Create Animated PNG from a sequence of files
 
 LICENSE=	ZLIB
 
 OPTIONS_DEFINE=	DOCS STATIC
 
 NO_WRKSUBDIR=	yes
 
 USES=		dos2unix gmake zip
 
 LDFLAGS+=	-lz
 
 PORTDOCS=	readme.txt
 PLIST_FILES=	bin/${PORTNAME}
 
 STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
 STATIC_MAKE_ENV=	STATIC=1
 STATIC_LIB_DEPENDS_OFF=	libpng.so:${PORTSDIR}/graphics/png
+
+# libzopfli.a is N/A
+STATIC_LIB_DEPENDS_OFF+=libzopfli.so:${PORTSDIR}/archivers/zopfli
+STATIC_CPPFLAGS_OFF+=	-I${LOCALBASE}/include/zopfli
+STATIC_LDFLAGS_OFF+=	-lzopfli
 
 MAKE_JOBS_UNSAFE=	yes
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
 		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/graphics/apngasm/files/patch-Makefile
===================================================================
--- head/graphics/apngasm/files/patch-Makefile	(revision 394411)
+++ head/graphics/apngasm/files/patch-Makefile	(revision 394412)
@@ -1,49 +1,51 @@
 --- ./Makefile.orig	2013-12-18 15:23:41.000000000 -0200
 +++ ./Makefile	2013-12-18 15:23:54.000000000 -0200
-@@ -1,10 +1,17 @@
+@@ -1,10 +1,18 @@
  PACKAGE    = apngasm
 -CC         = gcc
-+CC        ?= cc
-+CXX       ?= c++
- SRC_DIRS   = . 7z zopfli
+-SRC_DIRS   = . 7z zopfli
 -CFLAGS     = -Wall -pedantic
 -CFLAGS_OPT = -O2
 -CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
 -LIBS       = -lstdc++ -lm -lpng -lz
++CC        ?= cc
++CXX       ?= c++
++SRC_DIRS   = . 7z
 +CFLAGS    += -Wall -pedantic
 +CXXFLAGS  += -Wall -pedantic
 +CPPFLAGS  += $(shell libpng-config --cflags)
 +CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-parentheses
 +ifeq ($(strip $(STATIC)),)
 +LIBS       = $(shell libpng-config --ldflags)
 +else
++SRC_DIRS  += zopfli
 +LIBS       = $(shell libpng-config --static --ldflags)
 +LDFLAGS   += -static
 +endif
  
  INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
  OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS))
 @@ -16,19 +23,19 @@
  all : $(PACKAGE)
  
  $(PACKAGE) : objdirs $(OBJECTS)
 -	$(CC) -o $@ $(OBJECTS) -s $(LIBS)
 +	$(CXX) -o $@ $(OBJECTS) $(LIBS) $(LDFLAGS)
  
  objdirs :
  	mkdir -p $(OBJ_DIRS)
  
  obj/%.o : %.cpp
 -	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
 +	$(CXX) -o $@ -c $< $(INCUDE_DIRS) $(CXXFLAGS) $(CPPFLAGS)
  
  obj/%.o : %.c
 -	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
 +	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CPPFLAGS)
  
  obj/%.o : %.cc
 -	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT) $(CFLAGS_7Z)
 +	$(CXX) -o $@ -c $< $(INCUDE_DIRS) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS_7Z)
  
  .PHONY : clean