diff -ruN zziplib.orig/Makefile zziplib/Makefile --- zziplib.orig/Makefile 2018-02-19 12:10:43.000000000 +0100 +++ zziplib/Makefile 2018-03-10 00:16:27.874207000 +0100 @@ -2,25 +2,31 @@ # $FreeBSD: head/devel/zziplib/Makefile 462307 2018-02-19 11:10:43Z antoine $ PORTNAME= zziplib -PORTVERSION= 0.13.62 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 0.13.68 CATEGORIES= devel -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}13/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Library to provide transparent read access to zipped files -LICENSE= LGPL21 MPL11 +LICENSE= LGPL20 MPL11 LICENSE_COMB= dual +LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB +LICENSE_FILE_MPL11= ${WRKSRC}/docs/COPYING.MPL -BUILD_DEPENDS= zip:archivers/zip +BUILD_DEPENDS= zip:archivers/zip \ + xmlto:textproc/xmlto -USES= libtool pathfix pkgconfig python:2.7,build tar:bzip2 +USES= libtool pathfix pkgconfig python:2.7,build GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_XMLTO=":" +CONFIGURE_ARGS= --srcdir=${WRKSRC} + USE_LDCONFIG= yes INSTALL_TARGET= install-strip +USE_GITHUB= yes +GH_ACCOUNT= gdraheim + PORTSCOUT= limit:^0\. OPTIONS_DEFINE= SDL diff -ruN zziplib.orig/distinfo zziplib/distinfo --- zziplib.orig/distinfo 2014-01-22 16:30:13.000000000 +0100 +++ zziplib/distinfo 2018-03-09 22:24:23.739533000 +0100 @@ -1,2 +1,3 @@ -SHA256 (zziplib-0.13.62.tar.bz2) = a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b -SIZE (zziplib-0.13.62.tar.bz2) = 685770 +TIMESTAMP = 1520630663 +SHA256 (gdraheim-zziplib-v0.13.68_GH0.tar.gz) = 9460919b46592a225217cff067b1c0eb86002b32c54b4898f9c21401aaa11032 +SIZE (gdraheim-zziplib-v0.13.68_GH0.tar.gz) = 1077386 diff -ruN zziplib.orig/files/patch-configure zziplib/files/patch-configure --- zziplib.orig/files/patch-configure 2014-06-22 12:44:29.000000000 +0200 +++ zziplib/files/patch-configure 2018-03-09 22:06:28.678550000 +0100 @@ -1,6 +1,6 @@ ---- configure.orig 2012-03-11 23:21:53.000000000 +0900 -+++ configure 2012-03-12 17:46:25.000000000 +0900 -@@ -11452,7 +11452,7 @@ +--- configure.orig 2012-03-11 23:50:30 UTC ++++ configure +@@ -11452,7 +11452,7 @@ $as_echo_n "checking out linker version if test "_$MICRO_VERSION" = "_" ; then MICRO_VERSION="0" ; fi if test "_$MINOR_VERSION" = "_" ; then MINOR_VERSION="$MAJOR_VERSION" ; MAJOR_VERSION="0" ; fi MINOR_VERSION=`echo "$MINOR_VERSION" | sed -e 's/[^0-9].*//'` @@ -9,7 +9,7 @@ VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION" { $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5 $as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; } -@@ -13733,12 +13733,12 @@ +@@ -13733,12 +13733,12 @@ case "$host_os" in mingw*) ;; *) if test ".$can_build_shared" != ".no" ; then ZZIPLIB_LDFLAGS="-export-dynamic" diff -ruN zziplib.orig/files/patch-docs_Makefile.in zziplib/files/patch-docs_Makefile.in --- zziplib.orig/files/patch-docs_Makefile.in 2014-01-22 18:40:44.000000000 +0100 +++ zziplib/files/patch-docs_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- docs/Makefile.in.orig 2009-08-27 16:33:21.000000000 +0200 -+++ docs/Makefile.in 2009-08-27 16:33:21.000000000 +0200 -@@ -451,7 +451,7 @@ uninstall-am: - - - all : all-am default --default : doc @MAINTAINER_MODE_FALSE@ mans -+default : @MAINTAINER_MODE_FALSE@ mans - clean-doc clean-docs : clean-unpack - - rm $(DISTCLEANFILES) - - rm $(MAINTAINERCLEANFILES) diff -ruN zziplib.orig/files/patch-zzip_Makefile.in zziplib/files/patch-zzip_Makefile.in --- zziplib.orig/files/patch-zzip_Makefile.in 2014-01-22 18:40:44.000000000 +0100 +++ zziplib/files/patch-zzip_Makefile.in 2018-03-09 22:06:28.680405000 +0100 @@ -1,6 +1,6 @@ ---- zzip/Makefile.in.orig 2010-05-20 16:46:22.000000000 +0200 -+++ zzip/Makefile.in 2010-05-20 16:47:02.000000000 +0200 -@@ -694,7 +694,6 @@ +--- zzip/Makefile.in.orig 2018-03-09 21:06:18 UTC ++++ zzip/Makefile.in +@@ -696,7 +696,6 @@ install-dvi-am: install-exec-am: install-libLTLIBRARIES @$(NORMAL_INSTALL) diff -ruN zziplib.orig/pkg-descr zziplib/pkg-descr --- zziplib.orig/pkg-descr 2014-01-22 16:44:51.000000000 +0100 +++ zziplib/pkg-descr 2018-03-10 00:48:07.532353000 +0100 @@ -3,4 +3,4 @@ transparently access files being either real files or zipped files with the same file path argument. -WWW: http://zziplib.sourceforge.net/ +WWW: https://github.com/gdraheim/zziplib diff -ruN zziplib.orig/pkg-plist zziplib/pkg-plist --- zziplib.orig/pkg-plist 2014-10-14 13:30:29.000000000 +0200 +++ zziplib/pkg-plist 2018-03-09 23:22:22.675119000 +0100 @@ -1,10 +1,8 @@ bin/unzip-mem bin/unzzip -bin/unzzipcat -bin/unzzipcat-mem -bin/unzzipcat-seeko -bin/unzzipdir -bin/unzzipdir-mem +bin/unzzip-big +bin/unzzip-mem +bin/unzzip-mix bin/zzcat bin/zzdir bin/zzxorcat @@ -37,19 +35,19 @@ lib/libzzip.a lib/libzzip.so lib/libzzip.so.13 -lib/libzzip.so.13.0.62 +lib/libzzip.so.13.0.68 lib/libzzipfseeko.a lib/libzzipfseeko.so lib/libzzipfseeko.so.13 -lib/libzzipfseeko.so.13.0.62 +lib/libzzipfseeko.so.13.0.68 lib/libzzipmmapped.a lib/libzzipmmapped.so lib/libzzipmmapped.so.13 -lib/libzzipmmapped.so.13.0.62 +lib/libzzipmmapped.so.13.0.68 lib/libzzipwrap.a lib/libzzipwrap.so lib/libzzipwrap.so.13 -lib/libzzipwrap.so.13.0.62 +lib/libzzipwrap.so.13.0.68 %%SDL%%libdata/pkgconfig/SDL_rwops_zzip.pc libdata/pkgconfig/zzip-zlib-config.pc libdata/pkgconfig/zzipfseeko.pc