Index: head/archivers/unalz/Makefile =================================================================== --- head/archivers/unalz/Makefile (revision 464969) +++ head/archivers/unalz/Makefile (revision 464970) @@ -1,40 +1,39 @@ # Created by: Hye-Shik Chang # $FreeBSD$ PORTNAME= unalz -PORTVERSION= 0.65 -PORTREVISION= 2 +DISTVERSION= 0.66 CATEGORIES= archivers -MASTER_SITES= http://BSDforge.com/projects/source/archivers/unalz/ +MASTER_SITES= https://BSDforge.com/projects/source/archivers/unalz/ MAINTAINER= portmaster@BSDforge.com COMMENT= Extracts AlZip archives LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/readme.txt WRKSRC= ${WRKDIR}/${PORTNAME} -USES= dos2unix iconv tar:tgz +USES= iconv tar:xz MAKE_ARGS+= CPP="${CXX}" CC="${CC}" OBJ="${UNALZ_OBJS}" \ LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" ALL_TARGET= posix-utf8 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lz -lbz2 PLIST_FILES= bin/${PORTNAME} UNALZ_OBJS= main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o \ UnAlzBzip2.o UnAlzbzlib.o post-patch: ${REINPLACE_CMD} -e \ 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e \ '//d' ${WRKSRC}/main.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include Index: head/archivers/unalz/distinfo =================================================================== --- head/archivers/unalz/distinfo (revision 464969) +++ head/archivers/unalz/distinfo (revision 464970) @@ -1,2 +1,3 @@ -SHA256 (unalz-0.65.tgz) = 4c26699eb7545072de2ef7de79b4fff1f01c4db09cebff2d8d50ec03d5d74db0 -SIZE (unalz-0.65.tgz) = 137985 +TIMESTAMP = 1521416109 +SHA256 (unalz-0.66.tar.xz) = 90f449be70a9ea4d2421ae43eadaaf12a76f0eaaeb3ba62644837387d91a94b7 +SIZE (unalz-0.66.tar.xz) = 102140 Index: head/archivers/unalz/files/patch-UnAlz.cpp =================================================================== --- head/archivers/unalz/files/patch-UnAlz.cpp (revision 464969) +++ head/archivers/unalz/files/patch-UnAlz.cpp (revision 464970) @@ -1,32 +1,50 @@ ---- UnAlz.cpp.orig 2016-07-26 12:39:47 UTC +--- UnAlz.cpp.orig 2018-02-26 21:09:31 UTC +++ UnAlz.cpp @@ -37,7 +37,7 @@ # include #endif -#if defined(__NetBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) # include // __NetBSD_Version__ - # include // iconv.h ¶§¹®¿¡ ÇÊ¿ä + # include // iconv.h #endif -@@ -455,7 +455,7 @@ BOOL CUnAlz::ReadLocalFileheader() +@@ -432,7 +432,7 @@ BOOL CUnAlz::ReadLocalFileheader() + FRead(zipHeader.fileName, zipHeader.head.fileNameLength); + if(zipHeader.head.fileNameLength > MAX_PATH - 5) + zipHeader.head.fileNameLength = MAX_PATH - 5; +- zipHeader.fileName[zipHeader.head.fileNameLength] = (CHAR)NULL; ++ zipHeader.fileName[zipHeader.head.fileNameLength] = (CHAR)0; + + + #ifdef _UNALZ_ICONV // codepage convert +@@ -447,7 +447,7 @@ BOOL CUnAlz::ReadLocalFileheader() size_t size; char inbuf[ICONV_BUF_SIZE]; char outbuf[ICONV_BUF_SIZE]; -#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__NetBSD__) +#if defined(__CYGWIN__) || defined(__NetBSD__) const char *inptr = inbuf; #else char *inptr = inbuf; -@@ -1907,7 +1907,11 @@ void CUnAlz::DecryptingData(int nSize, B +@@ -937,7 +937,7 @@ BOOL CUnAlz::DigPath(const char* szPathN + { + if(*last=='/' || *last=='\\') + { +- *last = (char)NULL; ++ *last = (char)0; + break; + } + last --; +@@ -1870,7 +1870,11 @@ void CUnAlz::DecryptingData(int nSize, B //////////////////////////////////////////////////////////////////////////////////////////////////// UINT32 CUnAlz::CRC32(UINT32 l, BYTE c) { +#ifndef Z_U4 const unsigned long *CRC_TABLE = get_crc_table(); +#else + const Z_U4 *CRC_TABLE = get_crc_table(); +#endif return CRC_TABLE[(l ^ c) & 0xff] ^ (l >> 8); } Index: head/archivers/unalz/pkg-descr =================================================================== --- head/archivers/unalz/pkg-descr (revision 464969) +++ head/archivers/unalz/pkg-descr (revision 464970) @@ -1,4 +1,4 @@ Unalz is a ZLIB-licensed unarchiver for AlZip format which requires proprietary and Win32-only software but widely used in Korea. -WWW: http://BSDforge.com/projects/archivers/unalz/ +WWW: https://bsdforge.com/projects/archivers/unalz/