3 files changed, 32 insertions, 29 deletions

diff --git a/archivers/zopfli/Makefile b/archivers/zopfli/Makefile
index 6acb699842ad..2df75f137210 100644
--- a/archivers/zopfli/Makefile
+++ b/archivers/zopfli/Makefile
@@ -2,11 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	zopfli
-DISTVERSIONPREFIX=	${PORTNAME}-
-DISTVERSION=	1.0.3
+PORTVERSION=	1.0.3
+DISTVERSIONPREFIX=	zopfli-
+PORTREVISION=	1
 CATEGORIES=	archivers
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Zopfli Compression Algorithm
 
 LICENSE=	APACHE20
@@ -17,29 +18,23 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
-ALL_TARGET=	${PORTNAME} ${PORTNAME}png \
-		lib${PORTNAME} lib${PORTNAME}png
-MAKE_ARGS=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}"
-CFLAGS+=	-fPIC # XXX Convert into an implicit rule
-LDFLAGS+=	-lm
-USE_LDCONFIG=	yes
-
+ALL_TARGET=	libzopfli libzopfli.a libzopflipng libzopflipng.a zopfli zopflipng
 MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
 
-PLIST_SUB=	VERSION=${DISTVERSION}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 do-install:
-.for f in ${PORTNAME} ${PORTNAME}png
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
-.endfor
-.for f in lib${PORTNAME}.so.${DISTVERSION} lib${PORTNAME}png.so.${DISTVERSION}
-	${INSTALL_LIB} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/lib
-	${LN} -fs ${f} ${STAGEDIR}${PREFIX}/lib/${f:R:R}
-	${LN} -fs ${f:R:R} ${STAGEDIR}${PREFIX}/lib/${f:R:R:R}
-.endfor
-	(cd ${WRKSRC}/src && ${COPYTREE_SHARE} \
-		"zopfli zopflipng" ${STAGEDIR}${PREFIX}/include \
-		"-name *.h")
+	${INSTALL_PROGRAM} ${WRKSRC}/zopfli ${WRKSRC}/zopflipng ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/zopfli ${STAGEDIR}${PREFIX}/include/zopflipng/lodepng
+	${INSTALL_DATA} ${WRKSRC}/src/zopfli/*.h ${STAGEDIR}${PREFIX}/include/zopfli
+	${INSTALL_DATA} ${WRKSRC}/src/zopflipng/*.h ${STAGEDIR}${PREFIX}/include/zopflipng
+	${INSTALL_DATA} ${WRKSRC}/src/zopflipng/lodepng/*.h ${STAGEDIR}${PREFIX}/include/zopflipng/lodepng
+	${INSTALL_DATA} ${WRKSRC}/libzopfli.a ${WRKSRC}/libzopflipng.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libzopfli.so.${PORTVERSION} ${WRKSRC}/libzopflipng.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
+	${LN} -s libzopfli.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzopfli.so
+	${LN} -s libzopfli.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzopfli.so.${PORTVERSION:R:R}
+	${LN} -s libzopflipng.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzopflipng.so
+	${LN} -s libzopflipng.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzopflipng.so.${PORTVERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/archivers/zopfli/pkg-descr b/archivers/zopfli/pkg-descr
index 793b763c4f64..d91199ace3e0 100644
--- a/archivers/zopfli/pkg-descr
+++ b/archivers/zopfli/pkg-descr
@@ -1,6 +1,12 @@
-Zopfli is a new zlib (gzip, deflate) compatible compressor.
-This compressor takes more time (~100x slower), but compresses
-around 5% better than zlib and better than any other zlib-compatible
-compressor we have found.
+Zopfli is a compression library that achieves higher compression density while
+taking longer to compress. The smaller compressed size allows for better space
+utilization, faster data transmission, and lower web page load latencies.
+Furthermore, the smaller compressed size has additional benefits in mobile use,
+such as lower data transfer fees and reduced battery use. The higher data
+density is achieved by using more exhaustive compression techniques, which make
+the compression a lot slower, but do not affect the decompression speed.
+
+Zopfli is bit-stream compatible with compression used in gzip, Zip, PNG, HTTP
+requests, and others.
 
 WWW: https://github.com/google/zopfli
diff --git a/archivers/zopfli/pkg-plist b/archivers/zopfli/pkg-plist
index 374b35213694..09b0b955f9ab 100644
--- a/archivers/zopfli/pkg-plist
+++ b/archivers/zopfli/pkg-plist
@@ -16,9 +16,11 @@ include/zopfli/zopfli.h
 include/zopflipng/lodepng/lodepng.h
 include/zopflipng/lodepng/lodepng_util.h
 include/zopflipng/zopflipng_lib.h
+lib/libzopfli.a
 lib/libzopfli.so
 lib/libzopfli.so.1
-lib/libzopfli.so.%%VERSION%%
+lib/libzopfli.so.%%PORTVERSION%%
+lib/libzopflipng.a
 lib/libzopflipng.so
 lib/libzopflipng.so.1
-lib/libzopflipng.so.%%VERSION%%
+lib/libzopflipng.so.%%PORTVERSION%%