diff --git a/archivers/zopfli/Makefile b/archivers/zopfli/Makefile index 4b327611437..8ac392ca84f 100644 --- a/archivers/zopfli/Makefile +++ b/archivers/zopfli/Makefile @@ -1,10 +1,13 @@ -# $OpenBSD: Makefile,v 1.6 2019/07/12 20:43:30 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2019/11/28 14:36:32 sthen Exp $ + +SHARED_LIBS += zopfli 0.0 +SHARED_LIBS += zopflipng 0.0 COMMENT = deflate-compatible compression format GH_ACCOUNT = google GH_PROJECT = zopfli -GH_TAGNAME = zopfli-1.0.2 +GH_TAGNAME = zopfli-1.0.3 DISTNAME = ${GH_TAGNAME} CATEGORIES = archivers @@ -12,15 +15,11 @@ CATEGORIES = archivers # Apache 2.0 PERMIT_PACKAGE = Yes -WANTLIB += c m - -MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \ - COPTFLAGS="${CFLAGS}" CXXOPTFLAGS="${CXXFLAGS}" +WANTLIB += ${COMPILER_LIBCXX} c m +MODULES = devel/cmake +COMPILER = base-clang ports-gcc base-gcc +CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=yes NO_TEST = Yes -ALL_TARGET = - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/zopfli ${PREFIX}/bin .include diff --git a/archivers/zopfli/distinfo b/archivers/zopfli/distinfo index 30d16eb4424..ad7b1f9b5c8 100644 --- a/archivers/zopfli/distinfo +++ b/archivers/zopfli/distinfo @@ -1,2 +1,2 @@ -SHA256 (zopfli-1.0.2.tar.gz) = SlcDB8NxctiU7E75O26OOqzEAeeMvMUc+FshLbw3mlU= -SIZE (zopfli-1.0.2.tar.gz) = 136035 +SHA256 (zopfli-1.0.3.tar.gz) = 6VWnc59xrzfvM0nE+hQcZI6HdbzrIZW+B+hvjmOIFL0= +SIZE (zopfli-1.0.3.tar.gz) = 195227 diff --git a/archivers/zopfli/patches/patch-Makefile b/archivers/zopfli/patches/patch-Makefile deleted file mode 100644 index 7e12193785e..00000000000 --- a/archivers/zopfli/patches/patch-Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.2 2018/06/09 18:38:18 bket Exp $ -Index: Makefile ---- Makefile.orig -+++ Makefile -@@ -1,8 +1,8 @@ - CC = gcc - CXX = g++ - --CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function --CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2 -+CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm $(COPTFLAGS) -Wno-unused-function -+CXXFLAGS = -W -Wall -Wextra -ansi -pedantic $(COPTFLAGS) - - ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\ - src/zopfli/deflate.c src/zopfli/gzip_container.c\ diff --git a/archivers/zopfli/pkg/PLIST b/archivers/zopfli/pkg/PLIST index 71aa83aec2b..e2d53ffa8c7 100644 --- a/archivers/zopfli/pkg/PLIST +++ b/archivers/zopfli/pkg/PLIST @@ -1,2 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2013/07/07 17:57:44 bentley Exp $ +@comment $OpenBSD: PLIST,v 1.2 2019/11/28 14:36:32 sthen Exp $ @bin bin/zopfli +@bin bin/zopflipng +include/zopfli.h +include/zopflipng_lib.h +lib/cmake/ +lib/cmake/Zopfli/ +lib/cmake/Zopfli/ZopfliConfig${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Zopfli/ZopfliConfig.cmake +lib/cmake/Zopfli/ZopfliConfigVersion.cmake +@lib lib/libzopfli.so.${LIBzopfli_VERSION} +@lib lib/libzopflipng.so.${LIBzopflipng_VERSION}