pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/archivers/zziplib
Module Name: pkgsrc
Committed By: schmonz
Date: Fri Jan 15 07:15:12 UTC 2021
Modified Files:
pkgsrc/archivers/zziplib: Makefile PLIST distinfo
pkgsrc/archivers/zziplib/patches: patch-zzip_CMakeLists.txt
Log Message:
Notably missing on macOS, with magic PLIST handling hiding its absence:
libzzip.dylib. Pass -f along with ln -s in the APPLE cases, too, so none
of the bash install scripts exit early due to ln giving "File exists".
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/archivers/zziplib/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/archivers/zziplib/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/archivers/zziplib/distinfo
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/archivers/zziplib/patches/patch-zzip_CMakeLists.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/archivers/zziplib/Makefile
diff -u pkgsrc/archivers/zziplib/Makefile:1.28 pkgsrc/archivers/zziplib/Makefile:1.29
--- pkgsrc/archivers/zziplib/Makefile:1.28 Wed Jan 13 08:50:21 2021
+++ pkgsrc/archivers/zziplib/Makefile Fri Jan 15 07:15:12 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/01/13 08:50:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.29 2021/01/15 07:15:12 schmonz Exp $
DISTNAME= zziplib-0.13.72
+PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GITHUB:=gdraheim/}
GITHUB_TAG= v${PKGVERSION_NOREV}
Index: pkgsrc/archivers/zziplib/PLIST
diff -u pkgsrc/archivers/zziplib/PLIST:1.10 pkgsrc/archivers/zziplib/PLIST:1.11
--- pkgsrc/archivers/zziplib/PLIST:1.10 Wed Jan 13 08:50:21 2021
+++ pkgsrc/archivers/zziplib/PLIST Fri Jan 15 07:15:12 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2021/01/13 08:50:21 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.11 2021/01/15 07:15:12 schmonz Exp $
bin/unzip-mem
bin/unzzip
bin/unzzip-big
@@ -31,29 +31,29 @@ include/zzip/write.h
include/zzip/zzip.h
include/zzip/zzip32.h
include/zziplib.h
+${PLIST.dylib}lib/libzzip-0.13.0.72.dylib
lib/libzzip-0.so
lib/libzzip-0.${SOEXT}.10
lib/libzzip-0.${SOEXT}.11
lib/libzzip-0.${SOEXT}.12
lib/libzzip-0.so.13
lib/libzzip-0.${SOEXT}.13.0.72
-${PLIST.dylib}lib/libzzip-0.13.0.72.dylib
lib/libzzip.so
+${PLIST.dylib}lib/libzzipfseeko-0.13.0.72.dylib
lib/libzzipfseeko-0.so
lib/libzzipfseeko-0.${SOEXT}.10
lib/libzzipfseeko-0.${SOEXT}.11
lib/libzzipfseeko-0.${SOEXT}.12
lib/libzzipfseeko-0.so.13
lib/libzzipfseeko-0.${SOEXT}.13.0.72
-${PLIST.dylib}lib/libzzipfseeko-0.13.0.72.dylib
lib/libzzipfseeko.so
+${PLIST.dylib}lib/libzzipmmapped-0.13.0.72.dylib
lib/libzzipmmapped-0.so
lib/libzzipmmapped-0.${SOEXT}.10
lib/libzzipmmapped-0.${SOEXT}.11
lib/libzzipmmapped-0.${SOEXT}.12
lib/libzzipmmapped-0.so.13
lib/libzzipmmapped-0.${SOEXT}.13.0.72
-${PLIST.dylib}lib/libzzipmmapped-0.13.0.72.dylib
lib/libzzipmmapped.so
lib/libzzipwrap-0.so
lib/libzzipwrap-0.so.13
Index: pkgsrc/archivers/zziplib/distinfo
diff -u pkgsrc/archivers/zziplib/distinfo:1.20 pkgsrc/archivers/zziplib/distinfo:1.21
--- pkgsrc/archivers/zziplib/distinfo:1.20 Tue Jan 12 21:06:20 2021
+++ pkgsrc/archivers/zziplib/distinfo Fri Jan 15 07:15:12 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2021/01/12 21:06:20 otis Exp $
+$NetBSD: distinfo,v 1.21 2021/01/15 07:15:12 schmonz Exp $
SHA1 (zziplib-0.13.72.tar.gz) = 330cab1c477196d2d26d30d5f4cb031647fd4597
RMD160 (zziplib-0.13.72.tar.gz) = d1bcdbf0df1e1eb222c31b8d4c659bb1a45744f4
SHA512 (zziplib-0.13.72.tar.gz) = 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
Size (zziplib-0.13.72.tar.gz) = 1162175 bytes
-SHA1 (patch-zzip_CMakeLists.txt) = a296d43002028dea734b113432b22d4956bd1247
+SHA1 (patch-zzip_CMakeLists.txt) = 736f28d1617825d3c14a338ff3e022f53a746190
SHA1 (patch-zzipwrap_CMakeLists.txt) = 01df91186ccea06fec2a085f440e2151086700df
Index: pkgsrc/archivers/zziplib/patches/patch-zzip_CMakeLists.txt
diff -u pkgsrc/archivers/zziplib/patches/patch-zzip_CMakeLists.txt:1.1 pkgsrc/archivers/zziplib/patches/patch-zzip_CMakeLists.txt:1.2
--- pkgsrc/archivers/zziplib/patches/patch-zzip_CMakeLists.txt:1.1 Tue Jan 12 21:06:20 2021
+++ pkgsrc/archivers/zziplib/patches/patch-zzip_CMakeLists.txt Fri Jan 15 07:15:12 2021
@@ -1,10 +1,15 @@
-$NetBSD: patch-zzip_CMakeLists.txt,v 1.1 2021/01/12 21:06:20 otis Exp $
+$NetBSD: patch-zzip_CMakeLists.txt,v 1.2 2021/01/15 07:15:12 schmonz Exp $
Use portable ln switches
--- zzip/CMakeLists.txt.orig 2021-01-04 23:05:08.000000000 +0000
+++ zzip/CMakeLists.txt
-@@ -294,13 +294,13 @@ if(ZZIP_COMPAT)
+@@ -290,17 +290,17 @@ if(ZZIP_COMPAT)
+ cd $DESTDIR/${libdir}
+ if [ -f ${lib}${libname}${librelease}.${libversion}${dll} ]; then
+ # Fix for APPLE where dylib goes in the end
+- ln -s ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion}
++ ln -sf ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion}
fi
[ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0
echo -n .. Installing: `pwd`
@@ -22,7 +27,12 @@ Use portable ln switches
\")")
endif()
endif()
-@@ -321,13 +321,13 @@ if(ZZIP_LIBTOOL)
+@@ -317,17 +317,17 @@ if(ZZIP_LIBTOOL)
+ cd $DESTDIR/${libdir}
+ if [ -f ${lib}${libname}${librelease}.${libversion}${dll} ]; then
+ # Fix for APPLE where dylib goes in the end
+- ln -s ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion}
++ ln -sf ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion}
fi
[ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0
echo -n .. Installing: `pwd`
@@ -40,7 +50,12 @@ Use portable ln switches
\")")
if(ZZIPFSEEKO)
get_target_property(libname libzzipfseeko OUTPUT_NAME)
-@@ -341,13 +341,13 @@ if(ZZIP_LIBTOOL)
+@@ -337,17 +337,17 @@ if(ZZIP_LIBTOOL)
+ cd $DESTDIR/${libdir}
+ if [ -f ${lib}${libname}${librelease}.${libversion}${dll} ]; then
+ # Fix for APPLE where dylib goes in the end
+- ln -s ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion}
++ ln -sf ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion}
fi
[ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0
echo -n .. Installing: `pwd`
@@ -58,7 +73,12 @@ Use portable ln switches
\")")
endif(ZZIPFSEEKO)
if(ZZIPMMAPPED)
-@@ -362,13 +362,13 @@ if(ZZIP_LIBTOOL)
+@@ -358,17 +358,17 @@ if(ZZIP_LIBTOOL)
+ cd $DESTDIR/${libdir}
+ if [ -f ${lib}${libname}${librelease}.${libversion}${dll} ]; then
+ # Fix for APPLE where dylib goes in the end
+- ln -s ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion}
++ ln -sf ${lib}${libname}${librelease}.${libversion}${dll} ${lib}${libname}${librelease}${dll}.${libversion}
fi
[ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0
echo -n .. Installing: `pwd`
Home |
Main Index |
Thread Index |
Old Index