summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/unalz/Makefile17
-rw-r--r--archivers/unalz/distinfo3
-rw-r--r--archivers/unalz/patches/patch-UnAlz.cpp15
3 files changed, 22 insertions, 13 deletions
diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile
index 6b3133dd4e8..c188dd6be62 100644
--- a/archivers/unalz/Makefile
+++ b/archivers/unalz/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/01/24 04:32:54 zafer Exp $
-#
+# $NetBSD: Makefile,v 1.19 2017/06/26 09:48:34 adam Exp $
DISTNAME= unalz-0.65
CATEGORIES= archivers
@@ -9,6 +8,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://kippler.com/win/unalz/
COMMENT= Alzip archive (.alz) extractor
+LICENSE= zlib
BUILD_TARGET= posix-utf8
USE_LANGUAGES= c c++
@@ -16,17 +16,10 @@ WRKSRC= ${WRKDIR}/unalz
INSTALLATION_DIRS= bin
-SUBST_CLASSES+= d2u
-SUBST_STAGE.d2u= pre-configure
-SUBST_FILES.d2u= bzip2/*.[ch] zlib/*.[ch]
-SUBST_FILTER_CMD.d2u= ${TR} -d '\r'
-USE_TOOLS+= tr
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/unalz ${DESTDIR}${PREFIX}/bin
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unalz/distinfo b/archivers/unalz/distinfo
index 7c30ac19e30..48c56c6c365 100644
--- a/archivers/unalz/distinfo
+++ b/archivers/unalz/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.26 2016/01/24 04:32:54 zafer Exp $
+$NetBSD: distinfo,v 1.27 2017/06/26 09:48:34 adam Exp $
SHA1 (unalz-0.65.tgz) = 98a64f799892f7adfffd4635bd19826fe8f18b26
RMD160 (unalz-0.65.tgz) = bb55aee26e12c8bf0e4422b11feffa5c88844771
SHA512 (unalz-0.65.tgz) = 6e22d1e28c956ced5c9dbfd4d7b5c03f36a8bd3e076801984cc4539e579cefbb1a6001d1086b33e14843e9d5be37a6cf811acffb52bb5dfb5d4a65518b735600
Size (unalz-0.65.tgz) = 137985 bytes
+SHA1 (patch-UnAlz.cpp) = 81017389e58fc1900903c0d26697ca49467efa54
SHA1 (patch-aa) = 327fd080040946fe7a0707698f90d7709a2d3c5b
SHA1 (patch-ac) = 00c6255437f4ebdf3676787ed63cc838a16476d4
SHA1 (patch-main.cpp) = 6a805a82b6bb762afd0b026f3f8b39e7c200163d
diff --git a/archivers/unalz/patches/patch-UnAlz.cpp b/archivers/unalz/patches/patch-UnAlz.cpp
new file mode 100644
index 00000000000..8b438d41cd5
--- /dev/null
+++ b/archivers/unalz/patches/patch-UnAlz.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-UnAlz.cpp,v 1.1 2017/06/26 09:48:34 adam Exp $
+
+Fix for newer zlib.
+
+--- UnAlz.cpp.orig 2017-06-26 09:30:31.000000000 +0000
++++ UnAlz.cpp
+@@ -1907,7 +1907,7 @@ void CUnAlz::DecryptingData(int nSize, B
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ UINT32 CUnAlz::CRC32(UINT32 l, BYTE c)
+ {
+- const unsigned long *CRC_TABLE = get_crc_table();
++ const unsigned int *CRC_TABLE = (unsigned int *)get_crc_table();
+ return CRC_TABLE[(l ^ c) & 0xff] ^ (l >> 8);
+ }
+