diff options
| author | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2015-08-16 15:48:16 +0000 |
|---|---|---|
| committer | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2015-08-16 15:48:16 +0000 |
| commit | 4067a4a639d5de248f7f28cda54286fe500c424a (patch) | |
| tree | d8a256853d5a00287a5e723410bd2b75e901c5c1 /graphics/apngasm | |
| parent | eb6685c5b27089c0db950c833d099b059c4b9702 (diff) | |
Notes
Diffstat (limited to 'graphics/apngasm')
| -rw-r--r-- | graphics/apngasm/Makefile | 7 | ||||
| -rw-r--r-- | graphics/apngasm/files/patch-Makefile | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/graphics/apngasm/Makefile b/graphics/apngasm/Makefile index d027ebe18cf1..f2a3789ff2da 100644 --- a/graphics/apngasm/Makefile +++ b/graphics/apngasm/Makefile @@ -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:${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: diff --git a/graphics/apngasm/files/patch-Makefile b/graphics/apngasm/files/patch-Makefile index ef82e7f03b42..1f3b392c9788 100644 --- a/graphics/apngasm/files/patch-Makefile +++ b/graphics/apngasm/files/patch-Makefile @@ -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 |