4 files changed, 26 insertions, 20 deletions

diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 15262bbb36dc..f672aff0c4b1 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zziplib
-PORTVERSION=	0.13.45
+PORTVERSION=	0.13.47
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,8 +17,7 @@ COMMENT=	A library to provide transparent read access to zipped files
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-builddir
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/zziplib/distinfo b/devel/zziplib/distinfo
index 43a509079cbe..9fcd18bdf66b 100644
--- a/devel/zziplib/distinfo
+++ b/devel/zziplib/distinfo
@@ -1,3 +1,3 @@
-MD5 (zziplib-0.13.45.tar.bz2) = 687e6e487795680dd1e8ea9c1670e0ab
-SHA256 (zziplib-0.13.45.tar.bz2) = c458f22f05cbbb925e777491b29a1621be242da6e5b1bca89bfd25a2edefb592
-SIZE (zziplib-0.13.45.tar.bz2) = 647307
+MD5 (zziplib-0.13.47.tar.bz2) = ac3bc8da2db2aa6e7751243c1dade296
+SHA256 (zziplib-0.13.47.tar.bz2) = dd3e5167e8e2bad893444b008ba6b5ad3e0eb1e4b19cf2f3bc0ac6be951bfb6a
+SIZE (zziplib-0.13.47.tar.bz2) = 625563
diff --git a/devel/zziplib/files/patch-configure b/devel/zziplib/files/patch-configure
index 9d83f8d10e6f..f78bf7f74fe4 100644
--- a/devel/zziplib/files/patch-configure
+++ b/devel/zziplib/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	Wed Apr 26 09:44:09 2006
-+++ configure	Wed Apr 26 09:44:09 2006
-@@ -20525,7 +20525,7 @@
+--- configure.orig	Thu Sep  7 08:18:30 2006
++++ configure	Thu Sep  7 08:19:44 2006
+@@ -1651,7 +1651,7 @@
+   else
+     test ".$ax_enable_builddir" = "."  && ax_enable_builddir="."
+     test ".$ax_enable_builddir" = ".no"  && ax_enable_builddir="."
+-    test ".$BUILD" = "." && BUILD=`uname -msr | tr " /" "__"`.d
++    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
+       { if $as_mkdir_p; then
+@@ -19477,7 +19477,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].*//'`
@@ -9,3 +18,12 @@
    VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION"
  echo "$as_me:$LINENO: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
  echo "${ECHO_T}/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6
+@@ -25249,7 +25249,7 @@
+ _EOF
+     test ".$USE_MAINTAINER_MODE" = ".no" || \
+   	cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefile.sed~"            ## DEBUGGING
+-    echo 'BUILD=`uname -msr | tr " /" "__"`.d' >$ac_top_srcdir/Makefile
++    echo 'BUILD=./build' >$ac_top_srcdir/Makefile
+     echo 'ISNOTSRCDIR=test ! -f configure' >>$ac_top_srcdir/Makefile
+     $ax_enable_builddir_sed -f $tmp/conftemp.sed Makefile >>$ac_top_srcdir/Makefile
+     echo 'done: ;@ if grep "$(RULE)-done .*:" Makefile > /dev/null; then     echo $(MAKE) $(RULE)-done ; $(MAKE) $(RULE)-done ; else true ; fi'     >> $ac_top_srcdir/Makefile
diff --git a/devel/zziplib/files/patch-zzip_conf.h b/devel/zziplib/files/patch-zzip_conf.h
deleted file mode 100644
index fa96998f61d3..000000000000
--- a/devel/zziplib/files/patch-zzip_conf.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- zzip/conf.h.orig	Wed Apr 26 08:24:22 2006
-+++ zzip/conf.h	Wed Apr 26 08:24:54 2006
-@@ -21,6 +21,8 @@
- #ifndef _ZZIP_CONF_H

- #define _ZZIP_CONF_H 1

- 

-+#include <sys/types.h>

-+

- #if !defined ZZIP_OMIT_CONFIG_H

- # if defined _MSC_VER || defined __BORLANDC__ || defined __WATCOMC__

- # include <zzip/_msvc.h>