Date: Sun, 16 Aug 2015 15:48:17 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394412 - in head/graphics/apngasm: . files Message-ID: <201508161548.t7GFmHkQ032290@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Sun Aug 16 15:48:16 2015 New Revision: 394412 URL: https://svnweb.freebsd.org/changeset/ports/394412 Log: - Convert to system libzopfli PR: 201934 Submitted by: jbeich Modified: head/graphics/apngasm/Makefile head/graphics/apngasm/files/patch-Makefile Modified: head/graphics/apngasm/Makefile ============================================================================== --- head/graphics/apngasm/Makefile Sun Aug 16 14:41:34 2015 (r394411) +++ head/graphics/apngasm/Makefile Sun Aug 16 15:48:16 2015 (r394412) @@ -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/l 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: Modified: head/graphics/apngasm/files/patch-Makefile ============================================================================== --- head/graphics/apngasm/files/patch-Makefile Sun Aug 16 14:41:34 2015 (r394411) +++ head/graphics/apngasm/files/patch-Makefile Sun Aug 16 15:48:16 2015 (r394412) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508161548.t7GFmHkQ032290>