Attachment 114282 Details for Bug 155926 – unzip-6.0.patch

[patch] unzip-6.0.patch

unzip-6.0.patch (text/plain), 1.81 KB, created by takefu on 2011-03-25 06:00:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2011-03-25 06:00:24 UTC

Size: 1.81 KB

patch

obsolete

>diff -ruN /usr/ports/archivers/unzip/Makefile archivers/unzip/Makefile
>--- /usr/ports/archivers/unzip/Makefile	2010-09-21 17:49:28.000000000 +0900
>+++ archivers/unzip/Makefile	2011-03-25 13:07:29.000000000 +0900
>@@ -9,13 +9,20 @@
> PORTVERSION=	6.0
> CATEGORIES?=	archivers
> MASTER_SITES=	SF/infozip/UnZip%206.x%20%28latest%29/UnZip%20${PORTVERSION}/:main \
>-	     	SF/infozip/UnZip%205.x%20and%20earlier/5.51/:unreduce
>+		SF/infozip/UnZip%205.x%20and%20earlier/5.51/:unreduce
> DISTNAME=	${PORTNAME}60
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
>
> MAINTAINER?=	ache@FreeBSD.org
> COMMENT?=	List, test and extract compressed files in a ZIP archive
>
>+LICENSE=	Info-ZIP
>+LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
>+LICENSE_NAME=	Info-ZIP license
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+CONFLICTS=	zh-unzip-[0-9]* ko-unzip-[0-9]* ru-unzip-[0-9]*
>+
> MAKEFILE=	unix/Makefile
> .if defined(INSTALL_AS_INFOUNZIP)
> UNZIP_NAME=	info-unzip
>@@ -32,15 +39,15 @@
>
> .if defined(WITH_UNZIP_UNREDUCE)
> DISTFILES+=	unreduce_full.zip:unreduce
>-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>+EXTRACT_ONLY+=	${DISTNAME}${EXTRACT_SUFX}
> LOCAL_UNZIP+=	-DUSE_SMITH_CODE
> .endif
>
> .if defined(WITH_ICONV)
>-PATCH_SITES=		${MASTER_SITE_LOCAL}
>+PATCH_SITES+=		${MASTER_SITE_LOCAL}
> PATCH_SITE_SUBDIR=	nork
>-PATCHFILES=		unzip60-alt-iconv-utf8.patch
>-PATCH_DIST_STRIP=	-p1
>+PATCHFILES+=		unzip60-alt-iconv-utf8.patch
>+PATCH_DIST_STRIP+=	-p1
> USE_ICONV=		yes
> CFLAGS+=		-I${LOCALBASE}/include -DNATIVE
> MAKE_ARGS+=		LFLAGS1="-L${LOCALBASE}/lib -liconv"
>@@ -70,7 +77,7 @@
>
> .if defined(WITH_UNZIP_UNREDUCE)
> pre-build:
>-	@(cd ${BUILD_WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} unzip)
>+	@(cd ${BUILD_WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} CFLAGS="${CFLAGS}" unzip)
> 	@(cd ${WRKSRC}; \
> 		./unzip -o ${_DISTDIR}unreduce_full.zip; \
> 		${MV} unreduce_full.c unreduce.c)

Actions: View | Diff

Attachments on bug 155926: 114282