--- graphics/apngasm/Makefile (revision 393038) +++ graphics/apngasm/Makefile (working copy) @@ -3,8 +3,8 @@ PORTNAME= apngasm PORTVERSION= 2.9 -PORTREVISION= 1 DISTVERSIONSUFFIX=-src +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} @@ -28,6 +28,11 @@ STATIC_BUILD_DEPENDS= ${LOCALBASE}/lib/libpng.a:${ 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: --- graphics/apngasm/files/patch-Makefile (revision 393038) +++ graphics/apngasm/files/patch-Makefile (working copy) @@ -1,15 +1,16 @@ --- ./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) @@ -17,6 +18,7 @@ +ifeq ($(strip $(STATIC)),) +LIBS = $(shell libpng-config --ldflags) +else ++SRC_DIRS += zopfli +LIBS = $(shell libpng-config --static --ldflags) +LDFLAGS += -static +endif