Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Mar 2012 02:20:54 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/166026: Update port: devel/zziplib to 0.13.62
Message-ID:  <20120314022054.e6048b1c.tkato432@yahoo.com>
Resent-Message-ID: <201203131810.q2DIA5sk054704@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         166026
>Category:       ports
>Synopsis:       Update port: devel/zziplib to 0.13.62
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 13 18:10:05 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 0.13.62

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/devel/zziplib/Makefile devel/zziplib/Makefile
--- /usr/ports/devel/zziplib/Makefile	2011-04-12 08:44:27.000000000 +0900
+++ devel/zziplib/Makefile	2012-03-13 05:40:52.000000000 +0900
@@ -6,22 +6,27 @@
 #
 
 PORTNAME=	zziplib
-PORTVERSION=	0.13.60
+PORTVERSION=	0.13.62
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}13/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library to provide transparent read access to zipped files
 
+LICENSE=	LGPL21 MPL
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
+OPTIONS=	SDL "Enable SDL support" off
+
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_PYTHON_BUILD=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	ac_cv_path_XMLTO=":"
-CONFIGURE_ARGS=	--disable-sdl
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
 MAN3=		__zzip_fetch_disk_trailer.3 __zzip_parse_root_directory.3 __zzip_try_open.3 \
 		zzip_close.3 zzip_closedir.3 zzip_compr_str.3 zzip_dir_alloc.3 \
@@ -51,6 +56,16 @@
 
 PORTSCOUT=	limit:^0\.
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_SDL)
+USE_SDL=	sdl
+CONFIGURE_ARGS+=--enable-sdl
+PLIST_SUB+=	SDL=""
+.else
+PLIST_SUB+=	SDL="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800000 && ${ARCH} == "amd64"
diff -urN /usr/ports/devel/zziplib/distinfo devel/zziplib/distinfo
--- /usr/ports/devel/zziplib/distinfo	2011-03-24 11:12:10.000000000 +0900
+++ devel/zziplib/distinfo	2012-03-13 04:55:59.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (zziplib-0.13.60.tar.bz2) = 4bc3ca7c5f249280bd6c8d1e96be8a03413dad9063a49c19601bd29ff4910155
-SIZE (zziplib-0.13.60.tar.bz2) = 685418
+SHA256 (zziplib-0.13.62.tar.bz2) = a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b
+SIZE (zziplib-0.13.62.tar.bz2) = 685770
diff -urN /usr/ports/devel/zziplib/files/patch-configure devel/zziplib/files/patch-configure
--- /usr/ports/devel/zziplib/files/patch-configure	2011-12-04 22:23:25.000000000 +0900
+++ devel/zziplib/files/patch-configure	2012-03-12 17:46:49.000000000 +0900
@@ -1,6 +1,6 @@
---- configure.orig	2009-08-27 16:33:21.000000000 +0200
-+++ configure	2009-08-27 16:33:21.000000000 +0200
-@@ -2271,7 +2271,7 @@ $as_echo "$as_me: toplevel srcdir alread
+--- configure.orig	2012-03-11 23:21:53.000000000 +0900
++++ configure	2012-03-12 17:46:25.000000000 +0900
+@@ -2608,7 +2608,7 @@
    else
      test ".$ax_enable_builddir" = "."  && ax_enable_builddir="."
      test ".$ax_enable_builddir" = ".no"  && ax_enable_builddir="."
@@ -8,26 +8,26 @@
 +    test ".$BUILD" = "." && BUILD=./build
      test ".$ax_enable_builddir" = ".yes" && ax_enable_builddir="$BUILD"
      if test ".$ax_enable_builddir" != ".." ; then    # we know where to go and
-       { as_dir=$ax_enable_builddir
-@@ -12133,7 +12133,7 @@ $as_echo_n "checking out linker version 
+       as_dir=$ax_enable_builddir; as_fn_mkdir_p
+@@ -11452,7 +11452,7 @@
    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:$LINENO: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
+ { $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; }
-@@ -13713,7 +13713,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking link options" >&5
- $as_echo_n "checking link options... " >&6; }
- ZZIPLIB_LDFLAGS=""
--test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
-+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="${wl}--export-dynamic"
- RESOLVES=" # "
- case "$host_os" in mingw*)
-     ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
-@@ -19280,7 +19280,7 @@ s/:.*/:/
+@@ -13733,7 +13733,7 @@
+ ;; *)
+     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
+@@ -16590,7 +16590,7 @@
  _EOF
      test ".$USE_MAINTAINER_MODE" = ".no" || \
    	cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefile.sed~"            ## DEBUGGING
diff -urN /usr/ports/devel/zziplib/pkg-plist devel/zziplib/pkg-plist
--- /usr/ports/devel/zziplib/pkg-plist	2010-05-21 16:30:50.000000000 +0900
+++ devel/zziplib/pkg-plist	2012-03-13 05:17:20.000000000 +0900
@@ -10,6 +10,8 @@
 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/zziplib.h
@@ -48,6 +50,7 @@
 lib/libzzipwrap.la
 lib/libzzipwrap.so
 lib/libzzipwrap.so.13
+%%SDL%%libdata/pkgconfig/SDL_rwops_zzip.pc
 libdata/pkgconfig/zzip-zlib-config.pc
 libdata/pkgconfig/zzipfseeko.pc
 libdata/pkgconfig/zziplib.pc
@@ -55,3 +58,4 @@
 libdata/pkgconfig/zzipwrap.pc
 share/aclocal/zziplib.m4
 @dirrm include/zzip
+%%SDL%%@dirrm include/SDL_rwops_zzip
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120314022054.e6048b1c.tkato432>