Attachment 222643 Details for Bug 244548 – [patch] fix gzip & zutils conflict [v2]

[patch] [patch] fix gzip & zutils conflict [v2]

pr-gzip-fix-zutils-conflict-v2.diff (text/plain), 1.44 KB, created by John Hein on 2021-02-19 16:42:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2021-02-19 16:42:20 UTC

Size: 1.44 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 566056)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gzip
> PORTVERSION=	1.10
>+PORTREVISION=	1
> CATEGORIES=	archivers
> MASTER_SITES=	GNU
> 
>@@ -20,8 +21,12 @@
> PORTDOCS=	AUTHORS COPYING ChangeLog ChangeLog-2007 INSTALL NEWS README \
> 		THANKS TODO
> 
>-OPTIONS_DEFINE=	DOCS
>+OPTIONS_DEFINE=	DOCS ZUTILS
>+OPTIONS_SUB=	yes
> 
>+ZUTILS_CONFLICTS_INSTALL=	zutils-*
>+ZUTILS_DESC=	Install zcat, et. al. (conflicts with archivers/zutils)
>+
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 566056)
>+++ pkg-plist	(working copy)
>@@ -2,13 +2,13 @@
> bin/gzexe
> bin/gzip
> bin/uncompress
>-bin/zcat
>-bin/zcmp
>-bin/zdiff
>-bin/zegrep
>-bin/zfgrep
>+%%ZUTILS%%bin/zcat
>+%%ZUTILS%%bin/zcmp
>+%%ZUTILS%%bin/zdiff
>+%%ZUTILS%%bin/zegrep
>+%%ZUTILS%%bin/zfgrep
> bin/zforce
>-bin/zgrep
>+%%ZUTILS%%bin/zgrep
> bin/zless
> bin/zmore
> bin/znew
>@@ -15,11 +15,11 @@
> man/man1/gunzip.1.gz
> man/man1/gzexe.1.gz
> man/man1/gzip.1.gz
>-man/man1/zcat.1.gz
>-man/man1/zcmp.1.gz
>-man/man1/zdiff.1.gz
>+%%ZUTILS%%man/man1/zcat.1.gz
>+%%ZUTILS%%man/man1/zcmp.1.gz
>+%%ZUTILS%%man/man1/zdiff.1.gz
> man/man1/zforce.1.gz
>-man/man1/zgrep.1.gz
>+%%ZUTILS%%man/man1/zgrep.1.gz
> man/man1/zless.1.gz
> man/man1/zmore.1.gz
> man/man1/znew.1.gz

Flags:

jcfyecrayz: maintainer-approval? (amdmi3)

Actions: View | Diff

Attachments on bug 244548: 212086 | 222643