View | Details | Raw Unified | Return to bug 226491 | Differences between
and this patch

Collapse All | Expand All

(-)zziplib/Makefile (-7 / +14 lines)
Lines 2-31 Link Here
2
# $FreeBSD: head/devel/zziplib/Makefile 462307 2018-02-19 11:10:43Z antoine $
2
# $FreeBSD: head/devel/zziplib/Makefile 462307 2018-02-19 11:10:43Z antoine $
3
3
4
PORTNAME=	zziplib
4
PORTNAME=	zziplib
5
PORTVERSION=	0.13.62
5
DISTVERSIONPREFIX=	v
6
PORTREVISION=	2
6
DISTVERSION=	0.13.69
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}13/${PORTVERSION}
9
8
10
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	ports@FreeBSD.org
11
COMMENT=	Library to provide transparent read access to zipped files
10
COMMENT=	Library to provide transparent read access to zipped files
12
11
13
LICENSE=	LGPL21 MPL11
12
LICENSE=	LGPL20 MPL11
14
LICENSE_COMB=	dual
13
LICENSE_COMB=	dual
14
LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LIB
15
LICENSE_FILE_MPL11=	${WRKSRC}/docs/COPYING.MPL
15
16
16
BUILD_DEPENDS=	zip:archivers/zip
17
BUILD_DEPENDS=	zip:archivers/zip
17
18
18
USES=		libtool pathfix pkgconfig python:2.7,build tar:bzip2
19
USES=		libtool pathfix pkgconfig python:2.7,build shebangfix
19
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
20
CONFIGURE_ENV=	ac_cv_path_XMLTO=":"
21
CONFIGURE_ARGS=	--srcdir=${WRKSRC}
22
21
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
22
INSTALL_TARGET=	install-strip
24
INSTALL_TARGET=	install-strip
23
25
26
SHEBANG_FILES=	docs/*.py
27
28
USE_GITHUB=	yes
29
GH_ACCOUNT=	gdraheim
30
GH_PROJECT=	zziplib
31
24
PORTSCOUT=	limit:^0\.
32
PORTSCOUT=	limit:^0\.
25
33
26
OPTIONS_DEFINE=	SDL
34
OPTIONS_DEFINE=	SDL
27
OPTIONS_SUB=	yes
35
OPTIONS_SUB=	yes
28
29
SDL_USE=		SDL=sdl
36
SDL_USE=		SDL=sdl
30
SDL_CONFIGURE_ENABLE=	sdl
37
SDL_CONFIGURE_ENABLE=	sdl
31
38
(-)zziplib/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (zziplib-0.13.62.tar.bz2) = a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b
1
TIMESTAMP = 1521293451
2
SIZE (zziplib-0.13.62.tar.bz2) = 685770
2
SHA256 (gdraheim-zziplib-v0.13.69_GH0.tar.gz) = 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544
3
SIZE (gdraheim-zziplib-v0.13.69_GH0.tar.gz) = 1132204
(-)zziplib/files/patch-configure (-4 / +4 lines)
Lines 1-6 Link Here
1
--- configure.orig	2012-03-11 23:21:53.000000000 +0900
1
--- configure.orig	2018-03-15 22:54:37 UTC
2
+++ configure	2012-03-12 17:46:25.000000000 +0900
2
+++ configure
3
@@ -11452,7 +11452,7 @@
3
@@ -13077,7 +13077,7 @@ $as_echo_n "checking out linker version 
4
   if test "_$MICRO_VERSION" = "_" ; then MICRO_VERSION="0" ; fi
4
   if test "_$MICRO_VERSION" = "_" ; then MICRO_VERSION="0" ; fi
5
   if test "_$MINOR_VERSION" = "_" ; then MINOR_VERSION="$MAJOR_VERSION" ; MAJOR_VERSION="0" ; fi
5
   if test "_$MINOR_VERSION" = "_" ; then MINOR_VERSION="$MAJOR_VERSION" ; MAJOR_VERSION="0" ; fi
6
   MINOR_VERSION=`echo "$MINOR_VERSION" | sed -e 's/[^0-9].*//'`
6
   MINOR_VERSION=`echo "$MINOR_VERSION" | sed -e 's/[^0-9].*//'`
Lines 9-15 Link Here
9
   VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION"
9
   VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION"
10
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
10
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
11
 $as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; }
11
 $as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; }
12
@@ -13733,12 +13733,12 @@
12
@@ -15430,12 +15430,12 @@ case "$host_os" in mingw*)
13
 ;; *)
13
 ;; *)
14
     if test ".$can_build_shared" != ".no" ; then
14
     if test ".$can_build_shared" != ".no" ; then
15
       ZZIPLIB_LDFLAGS="-export-dynamic"
15
       ZZIPLIB_LDFLAGS="-export-dynamic"
(-)zziplib/files/patch-docs_Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- docs/Makefile.in.orig	2009-08-27 16:33:21.000000000 +0200
2
+++ docs/Makefile.in	2009-08-27 16:33:21.000000000 +0200
3
@@ -451,7 +451,7 @@ uninstall-am:
4
 
5
 
6
 all : all-am default
7
-default : doc @MAINTAINER_MODE_FALSE@ mans
8
+default : @MAINTAINER_MODE_FALSE@ mans
9
 clean-doc clean-docs : clean-unpack
10
 	- rm $(DISTCLEANFILES) 
11
 	- rm $(MAINTAINERCLEANFILES)
(-)zziplib/files/patch-docs_dbk2man.py (+47 lines)
Line 0 Link Here
1
--- docs/dbk2man.py.orig	2018-03-16 11:55:55 UTC
2
+++ docs/dbk2man.py
3
@@ -1,4 +1,4 @@
4
-#!/usr/local/bin/python2.7
5
+#! /usr/bin/python
6
 """ Converts an xml-file with docbook elements into troff manual pages.
7
     The conversion uses etree expecting <refentry> elements in the input.
8
     The output goes to a multiple files in manX/* subdirectories.
9
@@ -223,22 +223,23 @@ def refentry2man(refentry, subdirectory 
10
         if found is not None: manvolnum = found.text
11
     written = 0
12
     section = refentry.find("refnamediv")
13
-    for refname in section.findall("refname"):
14
-        if not refentrytitle:
15
-            refentrytitle = refname.text
16
-        manpage = refname.text
17
-        filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
18
-        if manpage != refentrytitle:
19
-            manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
20
-            writefile(filename, manpagetext)
21
-        else:
22
-            manpagetext = text
23
+    if section is not None:
24
+        for refname in section.findall("refname"):
25
+            if not refentrytitle:
26
+                refentrytitle = refname.text
27
+            manpage = refname.text
28
+            filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
29
+            if manpage != refentrytitle:
30
+                manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
31
+                writefile(filename, manpagetext)
32
+            else:
33
+                manpagetext = text
34
+                writefile(filename, manpagetext)
35
+                written += 1
36
+        if not written:
37
+            manpage = refentrytitle
38
+            filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
39
             writefile(filename, manpagetext)
40
-            written += 1
41
-    if not written:
42
-        manpage = refentrytitle
43
-        filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
44
-        writefile(filename, manpagetext)
45
 
46
 def writefile(filename, manpagetext):
47
     dirname = os.path.dirname(filename)
(-)zziplib/files/patch-zzip_Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- zzip/Makefile.in.orig	2010-05-20 16:46:22.000000000 +0200
1
--- zzip/Makefile.in.orig	2018-03-16 11:43:07 UTC
2
+++ zzip/Makefile.in	2010-05-20 16:47:02.000000000 +0200
2
+++ zzip/Makefile.in
3
@@ -694,7 +694,6 @@
3
@@ -826,7 +826,6 @@ install-dvi-am:
4
 
4
 
5
 install-exec-am: install-libLTLIBRARIES
5
 install-exec-am: install-libLTLIBRARIES
6
 	@$(NORMAL_INSTALL)
6
 	@$(NORMAL_INSTALL)
(-)zziplib/pkg-descr (-1 / +1 lines)
Lines 3-6 Link Here
3
transparently access files being either real files or zipped files
3
transparently access files being either real files or zipped files
4
with the same file path argument.
4
with the same file path argument.
5
5
6
WWW: http://zziplib.sourceforge.net/
6
WWW: https://github.com/gdraheim/zziplib
(-)zziplib/pkg-plist (-10 / +8 lines)
Lines 1-10 Link Here
1
bin/unzip-mem
1
bin/unzip-mem
2
bin/unzzip
2
bin/unzzip
3
bin/unzzipcat
3
bin/unzzip-big
4
bin/unzzipcat-mem
4
bin/unzzip-mem
5
bin/unzzipcat-seeko
5
bin/unzzip-mix
6
bin/unzzipdir
7
bin/unzzipdir-mem
8
bin/zzcat
6
bin/zzcat
9
bin/zzdir
7
bin/zzdir
10
bin/zzxorcat
8
bin/zzxorcat
Lines 37-55 Link Here
37
lib/libzzip.a
35
lib/libzzip.a
38
lib/libzzip.so
36
lib/libzzip.so
39
lib/libzzip.so.13
37
lib/libzzip.so.13
40
lib/libzzip.so.13.0.62
38
lib/libzzip.so.13.0.69
41
lib/libzzipfseeko.a
39
lib/libzzipfseeko.a
42
lib/libzzipfseeko.so
40
lib/libzzipfseeko.so
43
lib/libzzipfseeko.so.13
41
lib/libzzipfseeko.so.13
44
lib/libzzipfseeko.so.13.0.62
42
lib/libzzipfseeko.so.13.0.69
45
lib/libzzipmmapped.a
43
lib/libzzipmmapped.a
46
lib/libzzipmmapped.so
44
lib/libzzipmmapped.so
47
lib/libzzipmmapped.so.13
45
lib/libzzipmmapped.so.13
48
lib/libzzipmmapped.so.13.0.62
46
lib/libzzipmmapped.so.13.0.69
49
lib/libzzipwrap.a
47
lib/libzzipwrap.a
50
lib/libzzipwrap.so
48
lib/libzzipwrap.so
51
lib/libzzipwrap.so.13
49
lib/libzzipwrap.so.13
52
lib/libzzipwrap.so.13.0.62
50
lib/libzzipwrap.so.13.0.69
53
%%SDL%%libdata/pkgconfig/SDL_rwops_zzip.pc
51
%%SDL%%libdata/pkgconfig/SDL_rwops_zzip.pc
54
libdata/pkgconfig/zzip-zlib-config.pc
52
libdata/pkgconfig/zzip-zlib-config.pc
55
libdata/pkgconfig/zzipfseeko.pc
53
libdata/pkgconfig/zzipfseeko.pc
Lines 64-70 Link Here
64
man/man3/zzip_compr_str.3.gz
62
man/man3/zzip_compr_str.3.gz
65
man/man3/zzip_dir_alloc.3.gz
63
man/man3/zzip_dir_alloc.3.gz
66
man/man3/zzip_dir_alloc_ext_io.3.gz
64
man/man3/zzip_dir_alloc_ext_io.3.gz
67
man/man3/zzip_dir_close.3.gz
68
man/man3/zzip_dir_fdopen.3.gz
65
man/man3/zzip_dir_fdopen.3.gz
69
man/man3/zzip_dir_fdopen_ext_io.3.gz
66
man/man3/zzip_dir_fdopen_ext_io.3.gz
70
man/man3/zzip_dir_free.3.gz
67
man/man3/zzip_dir_free.3.gz
Lines 116-121 Link Here
116
man/man3/zzip_file_read.3.gz
113
man/man3/zzip_file_read.3.gz
117
man/man3/zzip_file_real.3.gz
114
man/man3/zzip_file_real.3.gz
118
man/man3/zzip_file_stat.3.gz
115
man/man3/zzip_file_stat.3.gz
116
man/man3/zzip_filesize.3.gz
119
man/man3/zzip_fopen.3.gz
117
man/man3/zzip_fopen.3.gz
120
man/man3/zzip_fread.3.gz
118
man/man3/zzip_fread.3.gz
121
man/man3/zzip_freopen.3.gz
119
man/man3/zzip_freopen.3.gz

Return to bug 226491