Attachment 121782 Details for Bug 164847 – file.shar

file.shar

file.shar (text/plain), 2.16 KB, created by Konstantin Kukushkin on 2012-02-07 12:40:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Kukushkin

Created: 2012-02-07 12:40:13 UTC

Size: 2.16 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	diablo.patch.txt
>#	unzip.patch.txt
>#
>echo x - diablo.patch.txt
>sed 's/^X//' >diablo.patch.txt << '4213a63692e5c4cfd8b498217e856ea8'
>X--- java/diablo-jdk16/Makefile.orig	2012-01-03 06:43:38.000000000 +0400
>X+++ java/diablo-jdk16/Makefile	2012-02-07 16:09:11.000000000 +0400
>X@@ -69,7 +69,9 @@ PLIST_SUB+=	CLIENTVM="@comment "
>X .endif
>X 
>X .if defined(WITH_POLICY) || !defined(WITHOUT_TZUPDATE)
>X-EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
>X+.if !exists($UNZIP_CMD)
>X+EXTRACT_DEPENDS+=	$UNZIP_CMD:${PORTSDIR}/archivers/unzip
>X+.endif
>X .endif
>X 
>X POLICYFILE=	jce_policy-6.zip
>4213a63692e5c4cfd8b498217e856ea8
>echo x - unzip.patch.txt
>sed 's/^X//' >unzip.patch.txt << 'e29434339a312ddc20076b427eba545e'
>X--- Mk/bsd.port.mk.orig	2012-02-07 15:41:34.000000000 +0400
>X+++ Mk/bsd.port.mk	2012-02-07 15:47:32.000000000 +0400
>X@@ -1629,7 +1629,7 @@ MANCOMPRESSED?=	no
>X .endif
>X 
>X .if defined(PATCHFILES)
>X-.if ${PATCHFILES:M*.zip}x != x
>X+.if ${PATCHFILES:M*.zip}x != x && !exists(/usr/bin/unzip)
>X PATCH_DEPENDS+=		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
>X .endif
>X .endif
>X@@ -1668,7 +1668,7 @@ PKG_DEPENDS+=		${LOCALBASE}/sbin/pkg:${P
>X .endif
>X .endif
>X 
>X-.if defined(USE_ZIP)
>X+.if defined(USE_ZIP) && !exists(/usr/bin/unzip)
>X EXTRACT_DEPENDS+=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
>X .endif
>X .if defined(USE_XZ) && ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 )
>X--- Mk/bsd.commands.mk.orig	2012-02-07 15:39:55.000000000 +0400
>X+++ Mk/bsd.commands.mk	2012-02-07 15:46:16.000000000 +0400
>X@@ -89,7 +89,11 @@ TRUE?=		true				# Shell builtin
>X UMOUNT?=	/sbin/umount
>X UNAME?=		/usr/bin/uname
>X UNMAKESELF_CMD?=	${LOCALBASE}/bin/unmakeself
>X+.if exists(/usr/bin/unzip)
>X+UNZIP_CMD?=	/usr/bin/unzip
>X+.else
>X UNZIP_CMD?=	${LOCALBASE}/bin/unzip
>X+.endif
>X WHICH?=		/usr/bin/which
>X XARGS?=		/usr/bin/xargs
>X XMKMF?=		${LOCALBASE}/bin/xmkmf -a
>e29434339a312ddc20076b427eba545e
>exit

Actions: View

Attachments on bug 164847: 121782