Index: branches/2018Q3/devel/zziplib/Makefile =================================================================== --- branches/2018Q3/devel/zziplib/Makefile (revision 474028) +++ branches/2018Q3/devel/zziplib/Makefile (revision 474029) @@ -1,33 +1,37 @@ # Created by: George Reid # $FreeBSD$ PORTNAME= zziplib -PORTVERSION= 0.13.62 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 0.13.69 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_COMB= dual +LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB +LICENSE_FILE_MPL11= ${WRKSRC}/docs/COPYING.MPL BUILD_DEPENDS= zip:archivers/zip -USES= libtool pathfix pkgconfig python:2.7,build tar:bzip2 -GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_XMLTO=":" +USES= libtool pathfix pkgconfig python:2.7,build shebangfix +USE_GITHUB= yes +GH_ACCOUNT= gdraheim +GH_PROJECT= zziplib USE_LDCONFIG= yes +SHEBANG_FILES= docs/*.py + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --srcdir=${WRKSRC} INSTALL_TARGET= install-strip TEST_TARGET= check - PORTSCOUT= limit:^0\. OPTIONS_DEFINE= SDL OPTIONS_SUB= yes - SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= sdl .include Index: branches/2018Q3/devel/zziplib/distinfo =================================================================== --- branches/2018Q3/devel/zziplib/distinfo (revision 474028) +++ branches/2018Q3/devel/zziplib/distinfo (revision 474029) @@ -1,2 +1,3 @@ -SHA256 (zziplib-0.13.62.tar.bz2) = a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b -SIZE (zziplib-0.13.62.tar.bz2) = 685770 +TIMESTAMP = 1521293451 +SHA256 (gdraheim-zziplib-v0.13.69_GH0.tar.gz) = 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 +SIZE (gdraheim-zziplib-v0.13.69_GH0.tar.gz) = 1132204 Index: branches/2018Q3/devel/zziplib/files/patch-docs_Makefile.in =================================================================== --- branches/2018Q3/devel/zziplib/files/patch-docs_Makefile.in (revision 474028) +++ branches/2018Q3/devel/zziplib/files/patch-docs_Makefile.in (nonexistent) @@ -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) Property changes on: branches/2018Q3/devel/zziplib/files/patch-docs_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q3/devel/zziplib/files/patch-configure =================================================================== --- branches/2018Q3/devel/zziplib/files/patch-configure (revision 474028) +++ branches/2018Q3/devel/zziplib/files/patch-configure (revision 474029) @@ -1,26 +1,26 @@ ---- 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 2018-03-15 22:54:37 UTC ++++ configure +@@ -13077,7 +13077,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].*//'` - RELEASE_INFO="-release $MAJOR_VERSION" + RELEASE_INFO="" 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 @@ +@@ -15430,12 +15430,12 @@ case "$host_os" in mingw*) ;; *) if test ".$can_build_shared" != ".no" ; then ZZIPLIB_LDFLAGS="-export-dynamic" - if test ".$lt_cv_prog_gnu_ld" == ".yes" ; then + if test ".$lt_cv_prog_gnu_ld" = ".yes" ; then ZZIPLIB_LDFLAGS="${wl}--export-dynamic" # TODO: that is for backward compatibility only fi fi - RESOLVES=" # " + RESOLVES=' ' ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZZIPLIB_LDFLAGS $RESOLVES" >&5 $as_echo "$ZZIPLIB_LDFLAGS $RESOLVES" >&6; } Index: branches/2018Q3/devel/zziplib/files/patch-docs_dbk2man.py =================================================================== --- branches/2018Q3/devel/zziplib/files/patch-docs_dbk2man.py (nonexistent) +++ branches/2018Q3/devel/zziplib/files/patch-docs_dbk2man.py (revision 474029) @@ -0,0 +1,47 @@ +--- docs/dbk2man.py.orig 2018-03-16 11:55:55 UTC ++++ docs/dbk2man.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python2.7 ++#! /usr/bin/python + """ Converts an xml-file with docbook elements into troff manual pages. + The conversion uses etree expecting elements in the input. + The output goes to a multiple files in manX/* subdirectories. +@@ -223,22 +223,23 @@ def refentry2man(refentry, subdirectory + if found is not None: manvolnum = found.text + written = 0 + section = refentry.find("refnamediv") +- for refname in section.findall("refname"): +- if not refentrytitle: +- refentrytitle = refname.text +- manpage = refname.text +- filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum) +- if manpage != refentrytitle: +- manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum) +- writefile(filename, manpagetext) +- else: +- manpagetext = text ++ if section is not None: ++ for refname in section.findall("refname"): ++ if not refentrytitle: ++ refentrytitle = refname.text ++ manpage = refname.text ++ filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum) ++ if manpage != refentrytitle: ++ manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum) ++ writefile(filename, manpagetext) ++ else: ++ manpagetext = text ++ writefile(filename, manpagetext) ++ written += 1 ++ if not written: ++ manpage = refentrytitle ++ filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum) + writefile(filename, manpagetext) +- written += 1 +- if not written: +- manpage = refentrytitle +- filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum) +- writefile(filename, manpagetext) + + def writefile(filename, manpagetext): + dirname = os.path.dirname(filename) Property changes on: branches/2018Q3/devel/zziplib/files/patch-docs_dbk2man.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q3/devel/zziplib/files/patch-zzip_Makefile.in =================================================================== --- branches/2018Q3/devel/zziplib/files/patch-zzip_Makefile.in (revision 474028) +++ branches/2018Q3/devel/zziplib/files/patch-zzip_Makefile.in (revision 474029) @@ -1,10 +1,10 @@ ---- 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-16 11:43:07 UTC ++++ zzip/Makefile.in +@@ -826,7 +826,6 @@ install-dvi-am: install-exec-am: install-libLTLIBRARIES @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-am install-html-am: Index: branches/2018Q3/devel/zziplib/pkg-descr =================================================================== --- branches/2018Q3/devel/zziplib/pkg-descr (revision 474028) +++ branches/2018Q3/devel/zziplib/pkg-descr (revision 474029) @@ -1,6 +1,6 @@ The zzip library provides read access to zipped file in a zip-archive. It is based solely on free algorithms provided by zlib and can 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 Index: branches/2018Q3/devel/zziplib/pkg-plist =================================================================== --- branches/2018Q3/devel/zziplib/pkg-plist (revision 474028) +++ branches/2018Q3/devel/zziplib/pkg-plist (revision 474029) @@ -1,148 +1,146 @@ 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 bin/zzxorcopy bin/zzxordir %%SDL%%include/SDL_rwops_zzip/SDL_rwops_zzip.c %%SDL%%include/SDL_rwops_zzip/SDL_rwops_zzip.h include/zzip-io.h include/zzip.h include/zzip/_config.h include/zzip/_msvc.h include/zzip/autoconf.h include/zzip/conf.h include/zzip/fetch.h include/zzip/file.h include/zzip/format.h include/zzip/fseeko.h include/zzip/info.h include/zzip/lib.h include/zzip/memdisk.h include/zzip/mmapped.h include/zzip/plugin.h include/zzip/stdint.h include/zzip/types.h include/zzip/wrap.h include/zzip/write.h include/zzip/zzip.h include/zzip/zzip32.h include/zziplib.h lib/libzzip.a lib/libzzip.so lib/libzzip.so.13 -lib/libzzip.so.13.0.62 +lib/libzzip.so.13.0.69 lib/libzzipfseeko.a lib/libzzipfseeko.so lib/libzzipfseeko.so.13 -lib/libzzipfseeko.so.13.0.62 +lib/libzzipfseeko.so.13.0.69 lib/libzzipmmapped.a lib/libzzipmmapped.so lib/libzzipmmapped.so.13 -lib/libzzipmmapped.so.13.0.62 +lib/libzzipmmapped.so.13.0.69 lib/libzzipwrap.a lib/libzzipwrap.so lib/libzzipwrap.so.13 -lib/libzzipwrap.so.13.0.62 +lib/libzzipwrap.so.13.0.69 %%SDL%%libdata/pkgconfig/SDL_rwops_zzip.pc libdata/pkgconfig/zzip-zlib-config.pc libdata/pkgconfig/zzipfseeko.pc libdata/pkgconfig/zziplib.pc libdata/pkgconfig/zzipmmapped.pc libdata/pkgconfig/zzipwrap.pc man/man3/__zzip_fetch_disk_trailer.3.gz man/man3/__zzip_parse_root_directory.3.gz man/man3/__zzip_try_open.3.gz man/man3/zzip_close.3.gz man/man3/zzip_closedir.3.gz man/man3/zzip_compr_str.3.gz man/man3/zzip_dir_alloc.3.gz man/man3/zzip_dir_alloc_ext_io.3.gz -man/man3/zzip_dir_close.3.gz man/man3/zzip_dir_fdopen.3.gz man/man3/zzip_dir_fdopen_ext_io.3.gz man/man3/zzip_dir_free.3.gz man/man3/zzip_dir_open.3.gz man/man3/zzip_dir_open_ext_io.3.gz man/man3/zzip_dir_read.3.gz man/man3/zzip_dir_real.3.gz man/man3/zzip_dir_stat.3.gz man/man3/zzip_dirfd.3.gz man/man3/zzip_dirhandle.3.gz man/man3/zzip_disk_buffer.3.gz man/man3/zzip_disk_close.3.gz man/man3/zzip_disk_entry_fopen.3.gz man/man3/zzip_disk_entry_strdup_comment.3.gz man/man3/zzip_disk_entry_strdup_name.3.gz man/man3/zzip_disk_entry_to_data.3.gz man/man3/zzip_disk_entry_to_file_header.3.gz man/man3/zzip_disk_fclose.3.gz man/man3/zzip_disk_feof.3.gz man/man3/zzip_disk_findfile.3.gz man/man3/zzip_disk_findfirst.3.gz man/man3/zzip_disk_findmatch.3.gz man/man3/zzip_disk_findnext.3.gz man/man3/zzip_disk_fopen.3.gz man/man3/zzip_disk_fread.3.gz man/man3/zzip_disk_init.3.gz man/man3/zzip_disk_mmap.3.gz man/man3/zzip_disk_munmap.3.gz man/man3/zzip_disk_new.3.gz man/man3/zzip_disk_open.3.gz man/man3/zzip_entry_data_offset.3.gz man/man3/zzip_entry_fclose.3.gz man/man3/zzip_entry_feof.3.gz man/man3/zzip_entry_ffile.3.gz man/man3/zzip_entry_findfile.3.gz man/man3/zzip_entry_findfirst.3.gz man/man3/zzip_entry_findmatch.3.gz man/man3/zzip_entry_findnext.3.gz man/man3/zzip_entry_fopen.3.gz man/man3/zzip_entry_fread.3.gz man/man3/zzip_entry_fread_file_header.3.gz man/man3/zzip_entry_free.3.gz man/man3/zzip_entry_strdup_name.3.gz man/man3/zzip_errno.3.gz man/man3/zzip_error.3.gz man/man3/zzip_fclose.3.gz man/man3/zzip_file_close.3.gz man/man3/zzip_file_open.3.gz man/man3/zzip_file_read.3.gz man/man3/zzip_file_real.3.gz man/man3/zzip_file_stat.3.gz +man/man3/zzip_filesize.3.gz man/man3/zzip_fopen.3.gz man/man3/zzip_fread.3.gz man/man3/zzip_freopen.3.gz man/man3/zzip_fstat.3.gz man/man3/zzip_get_default_io.3.gz man/man3/zzip_inflate_init.3.gz man/man3/zzip_init_io.3.gz man/man3/zzip_open.3.gz man/man3/zzip_open_ext_io.3.gz man/man3/zzip_open_shared_io.3.gz man/man3/zzip_opendir.3.gz man/man3/zzip_opendir_ext_io.3.gz man/man3/zzip_read.3.gz man/man3/zzip_readdir.3.gz man/man3/zzip_realdir.3.gz man/man3/zzip_realfd.3.gz man/man3/zzip_rewind.3.gz man/man3/zzip_rewinddir.3.gz man/man3/zzip_seek.3.gz man/man3/zzip_seek32.3.gz man/man3/zzip_seekdir.3.gz man/man3/zzip_seekdir32.3.gz man/man3/zzip_seterror.3.gz man/man3/zzip_strerror.3.gz man/man3/zzip_strerror_of.3.gz man/man3/zzip_tell.3.gz man/man3/zzip_tell32.3.gz man/man3/zzip_telldir.3.gz man/man3/zzip_telldir32.3.gz share/aclocal/zziplib.m4 Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 474028) +++ branches/2018Q3 (revision 474029) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r474027-474028