Attachment 133657 Details for Bug 178154 – archivers_unalz.diff

[patch] archivers_unalz.diff

archivers_unalz.diff (text/x-diff), 3.19 KB, created by tkato432 on 2013-04-26 18:54:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-04-26 18:54:45 UTC

Size: 3.19 KB

patch

obsolete

>diff -urN /usr/ports/archivers/unalz/Makefile archivers/unalz/Makefile
>--- /usr/ports/archivers/unalz/Makefile	2013-04-23 14:57:22.000000000 +0900
>+++ archivers/unalz/Makefile	2013-04-27 00:00:00.000000000 +0900
>@@ -4,8 +4,7 @@
> PORTNAME=	unalz
> PORTVERSION=	0.65
> CATEGORIES=	archivers
>-MASTER_SITES=	http://www.kipple.pe.kr/win/unalz/ \
>-		http://www.c-s.li/ports/
>+MASTER_SITES=	http://www.kipple.pe.kr/win/unalz/
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -13,24 +12,28 @@
> 
> LICENSE_FILE=	${WRKSRC}/readme.txt
> 
>-BROKEN=		fails to build
>+WRKSRC=		${WRKDIR}/${PORTNAME}
>+
>+USE_DOS2UNIX=	yes
> USE_ICONV=	yes
>-PLIST_FILES=	bin/unalz
>-MAKEFILE=	Makefile.freebsd
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-WRKSRC=		${WRKDIR}/unalz
>-
>-pre-patch:
>-	cd ${WRKSRC} && for f in `find . -name '*.c' -o -name '*.h'`; do \
>-		${TR} -d '\015' < ${WRKSRC}/$$f > ${WRKSRC}/$$f.tmp && \
>-		${MV} -f ${WRKSRC}/$$f.tmp ${WRKSRC}/$$f; \
>-	done
>-	${REINPLACE_CMD} -e 's|CPP = g++|CPP = ${CXX}|' \
>-			-e "s|CC  =|CC  ?=|" \
>-			${WRKSRC}/Makefile
>+MAKE_ARGS=	CPP="${CXX}" CC="${CC}" OBJ="${UNALZ_OBJS}" \
>+		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
>+ALL_TARGET=	posix-utf8
>+MAKE_JOBS_SAFE=	yes
>+
>+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 \
>+		'/<sys\/timeb.h>/d' ${WRKSRC}/main.cpp
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/unalz ${PREFIX}/bin
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/archivers/unalz/distinfo archivers/unalz/distinfo
>--- /usr/ports/archivers/unalz/distinfo	2012-11-08 04:19:40.000000000 +0900
>+++ archivers/unalz/distinfo	2013-04-27 00:00:00.000000000 +0900
>@@ -1,2 +1,3 @@
>+MD5 (unalz-0.65.tgz) = e4db2c4e3c8f6f5ee414b68bc55288e5
> SHA256 (unalz-0.65.tgz) = 4c26699eb7545072de2ef7de79b4fff1f01c4db09cebff2d8d50ec03d5d74db0
> SIZE (unalz-0.65.tgz) = 137985
>diff -urN /usr/ports/archivers/unalz/files/patch-UnAlz.cpp archivers/unalz/files/patch-UnAlz.cpp
>--- /usr/ports/archivers/unalz/files/patch-UnAlz.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ archivers/unalz/files/patch-UnAlz.cpp	2013-04-27 00:00:00.000000000 +0900
>@@ -0,0 +1,14 @@
>+--- UnAlz.cpp.orig
>++++ UnAlz.cpp
>+@@ -1907,7 +1907,11 @@
>+ ////////////////////////////////////////////////////////////////////////////////////////////////////
>+ UINT32 CUnAlz::CRC32(UINT32 l, BYTE c)
>+ {
>++#ifdef Z_U4
>++	const Z_U4 *CRC_TABLE = get_crc_table();
>++#else
>+ 	const unsigned long *CRC_TABLE = get_crc_table();
>++#endif
>+ 	return CRC_TABLE[(l ^ c) & 0xff] ^ (l >> 8);
>+ }
>+ 
>diff -urN /usr/ports/archivers/unalz/pkg-descr archivers/unalz/pkg-descr
>--- /usr/ports/archivers/unalz/pkg-descr	2012-11-08 04:19:40.000000000 +0900
>+++ archivers/unalz/pkg-descr	2013-04-27 00:00:00.000000000 +0900
>@@ -1,4 +1,4 @@
>-Unalz is a BSD-licensed unarchiver for AlZip format which requires proprietary
>-and win32-only software but widely used in Korea.
>+Unalz is a BSD-licensed unarchiver for AlZip format which requires
>+proprietary and win32-only software but widely used in Korea.
> 
> WWW: http://www.kipple.pe.kr/win/unalz/

Actions: View | Diff

Attachments on bug 178154: 133656 | 133657 | 133658 | 133659