Attachment 224496 Details for Bug 255442 – patch with corrections and more

[patch] patch with corrections and more

patch-sysutils_discus_v2.diff (text/plain), 2.45 KB, created by Rainer Hurling on 2021-04-28 13:02:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2021-04-28 13:02:33 UTC

Size: 2.45 KB

patch

obsolete

>diff -urN discus.orig/Makefile discus/Makefile
>--- discus.orig/Makefile	2021-04-28 13:20:04.800409000 +0200
>+++ discus/Makefile	2021-04-28 14:52:29.355239000 +0200
>@@ -1,40 +1,35 @@
>-# $FreeBSD$
>+# Created by: Chris Moerz <freebsd@ny-central.org>
> 
> PORTNAME=	discus
>-DISTVERSION=	0.4
>-PORTREVISION=	1
>+DISTVERSION=	0.4.0
> CATEGORIES=	sysutils
> 
> MAINTAINER=	freebsd@ny-central.org
> COMMENT=	Discus is a program to display hard drive space usage
> 
> LICENSE=	GPLv2
>-LICENSE_FILE=   ${WRKSRC}/COPYING
> 
>-USES=		python:3.3+
>-USES_PYTHON=	allflavors
>-
>+USES=		python:3.6+ shebangfix
> USE_GITHUB=	yes
> GH_ACCOUNT=	ncarrier
>-GH_PROJECT=	discus
>-GH_TAGNAME=	4d5bbb8
> 
>-PORTDOCS=	""
>-DOCSDIR=        ${PREFIX}/share/doc/discus
>+SHEBANG_FILES=	discus.py
> 
>-NO_BUILD=yes
>+DOCSDIR=	${PREFIX}/share/doc/discus
>+NO_BUILD=	yes
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's@/usr/bin/python3@${PYTHON_CMD}@g' ${WRKSRC}/discus.py
>+OPTIONS_DEFINE=	DOCS
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}/${ETCDIR}/
> 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
> 	${MKDIR} ${STAGEDIR}/${PREFIX}/sbin
> 	${INSTALL_DATA} ${WRKSRC}/discusrc ${STAGEDIR}/${ETCDIR}/discusrc.sample
>-	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
>-	${INSTALL_MAN} ${WRKSRC}/AUTHORS ${STAGEDIR}/${DOCSDIR}
> 	${INSTALL_MAN} ${WRKSRC}/discus.1 ${STAGEDIR}/${MANPREFIX}/man/man1
> 	${INSTALL_SCRIPT} ${WRKSRC}/discus.py ${STAGEDIR}/${PREFIX}/sbin/discus
>+
>+do-install-DOCS-on:
>+	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
>+	${INSTALL_MAN} ${WRKSRC}/AUTHORS ${STAGEDIR}/${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff -urN discus.orig/distinfo discus/distinfo
>--- discus.orig/distinfo	2021-04-28 13:20:04.799212000 +0200
>+++ discus/distinfo	2021-04-28 13:19:15.712365000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1619445893
>-SHA256 (ncarrier-discus-0.4-4d5bbb8_GH0.tar.gz) = 57c2da56f3f131bc78b91f0b7286c34e3a57ed1f4da050951e8892f43f7efb7e
>-SIZE (ncarrier-discus-0.4-4d5bbb8_GH0.tar.gz) = 16395
>+TIMESTAMP = 1619608755
>+SHA256 (ncarrier-discus-0.4.0_GH0.tar.gz) = bf9b9e94da6751a9b9f849b44d65cd7809e5d4814ac24f67353c70f09f743485
>+SIZE (ncarrier-discus-0.4.0_GH0.tar.gz) = 16392
>diff -urN discus.orig/pkg-plist discus/pkg-plist
>--- discus.orig/pkg-plist	2021-04-28 13:20:04.801453000 +0200
>+++ discus/pkg-plist	2021-04-28 13:30:03.474188000 +0200
>@@ -1,5 +1,5 @@
> @sample %%ETCDIR%%/discusrc.sample
> man/man1/discus.1.gz
>-@(root,wheel,2755) sbin/discus
>-%%DOCSDIR%%/AUTHORS
>-%%DOCSDIR%%/README.md
>+sbin/discus
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>+%%PORTDOCS%%%%DOCSDIR%%/README.md

Flags:

rhurlin: maintainer-approval? (freebsd)

Actions: View | Diff

Attachments on bug 255442: 224474 | 224496 | 224507