Date: Mon, 19 Feb 2018 14:01:42 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462320 - in head: devel/py-tconfpy mail/mailfmt mail/nohtml misc/hb misc/hb/files security/tsshbatch sysutils/abck sysutils/abck/files sysutils/tbku sysutils/tdir sysutils/tdir/files s... Message-ID: <201802191401.w1JE1grl015897@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Feb 19 14:01:41 2018 New Revision: 462320 URL: https://svnweb.freebsd.org/changeset/ports/462320 Log: Fix bunch of ports by TundraWare, which share a common set of problems - Add LICENSE It explicitly requires user agreement (thus no-auto-accept) and forbids distribution for a fee `beyond reasonable duplication charges` which is too vague I don't think can be guaranteed in any case (thus no-*-sell) tdir port uses another variant of license, which also forbids modification, and since the port requires shebangfix and Makefile patching, also mark it no-pkg-mirror and BROKEN. - Don't install licenses with documentation, since our license framework already handles this - Fix python shebangs - Limit python version to 2.7, as no port is compatible with python3 - Add NO_ARCH - User options targets helpers - Simplify installation in a few cases Approved by: portmgr blanket Added: head/sysutils/tdir/files/ head/sysutils/tdir/files/patch-Makefile (contents, props changed) Modified: head/devel/py-tconfpy/Makefile head/mail/mailfmt/Makefile head/mail/mailfmt/pkg-plist head/mail/nohtml/Makefile head/mail/nohtml/pkg-plist head/misc/hb/Makefile head/misc/hb/files/patch-Makefile head/misc/hb/pkg-plist head/security/tsshbatch/Makefile head/sysutils/abck/Makefile head/sysutils/abck/files/patch-Makefile head/sysutils/abck/pkg-plist head/sysutils/tbku/Makefile head/sysutils/tdir/Makefile head/sysutils/tren/Makefile head/www/mkapachepw/Makefile head/www/mkapachepw/pkg-plist head/www/waccess/Makefile head/www/waccess/pkg-plist head/x11-fm/twander/Makefile head/x11-fm/twander/files/patch-Makefile head/x11-fm/twander/pkg-plist Modified: head/devel/py-tconfpy/Makefile ============================================================================== --- head/devel/py-tconfpy/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/devel/py-tconfpy/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,6 +3,7 @@ PORTNAME= tconfpy PORTVERSION= 2.112 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= http://www.tundraware.com/Software/tconfpy/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,12 +12,18 @@ DISTNAME= py-${PORTNAME}-${PORTVERSION} MAINTAINER= tconfpy@tundraware.com COMMENT= Python Configuration File Parser -USES= python +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/tconfpy-license.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept + +USES= python:2.7,run USE_PYTHON= distutils autoplist +NO_ARCH= yes OPTIONS_DEFINE= DOCS -PORTDOCS= READ-1ST.txt WHATSNEW.txt tconfpy-license.txt tconfpy.html tconfpy.pdf tconfpy.ps tconfpy.txt test-tc.html test-tc.pdf test-tc.ps test-tc.txt +PORTDOCS= READ-1ST.txt WHATSNEW.txt tconfpy.html tconfpy.pdf tconfpy.ps tconfpy.txt test-tc.html test-tc.pdf test-tc.ps test-tc.txt post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/mail/mailfmt/Makefile ============================================================================== --- head/mail/mailfmt/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/mail/mailfmt/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,26 +3,24 @@ PORTNAME= mailfmt PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.tundraware.com/Software/mailfmt/ MAINTAINER= ports@FreeBSD.org COMMENT= Remove leading quotations from mail/news and wrap lines to fixed width -USES= python shebangfix +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/mailfmt-license.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept + +USES= python:2.7,run shebangfix SHEBANG_FILES= mailfmt NO_ARCH= yes -NO_BUILD= yes -OPTIONS_DEFINE= DOCS - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/mailfmt-license.txt ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/mail/mailfmt/pkg-plist ============================================================================== --- head/mail/mailfmt/pkg-plist Mon Feb 19 13:40:22 2018 (r462319) +++ head/mail/mailfmt/pkg-plist Mon Feb 19 14:01:41 2018 (r462320) @@ -1,3 +1,2 @@ bin/mailfmt man/man1/mailfmt.1.gz -%%PORTDOCS%%%%DOCSDIR%%/mailfmt-license.txt Modified: head/mail/nohtml/Makefile ============================================================================== --- head/mail/nohtml/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/mail/nohtml/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,19 +3,27 @@ PORTNAME= nohtml PORTVERSION= 1.11 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.tundraware.com/Software/nohtml/ MAINTAINER= nohtml@tundraware.com COMMENT= Strip HTML attachments from email -USES= python +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/nohtml-license.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept +USES= python:2.7,run shebangfix +SHEBANG_FILES= nohtml.py +NO_ARCH= yes + OPTIONS_DEFINE= DOCS -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in nohtml-license.txt nohtml.html nohtml.pdf nohtml.ps nohtml.txt +.for f in nohtml.html nohtml.pdf nohtml.ps nohtml.txt ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor Modified: head/mail/nohtml/pkg-plist ============================================================================== --- head/mail/nohtml/pkg-plist Mon Feb 19 13:40:22 2018 (r462319) +++ head/mail/nohtml/pkg-plist Mon Feb 19 14:01:41 2018 (r462320) @@ -1,7 +1,6 @@ bin/nohtml.py man/man1/nohtml.1.gz -%%PORTDOCS%%share/doc/nohtml/nohtml-license.txt -%%PORTDOCS%%share/doc/nohtml/nohtml.html -%%PORTDOCS%%share/doc/nohtml/nohtml.pdf -%%PORTDOCS%%share/doc/nohtml/nohtml.ps -%%PORTDOCS%%share/doc/nohtml/nohtml.txt +%%PORTDOCS%%%%DOCSDIR%%/nohtml.html +%%PORTDOCS%%%%DOCSDIR%%/nohtml.pdf +%%PORTDOCS%%%%DOCSDIR%%/nohtml.ps +%%PORTDOCS%%%%DOCSDIR%%/nohtml.txt Modified: head/misc/hb/Makefile ============================================================================== --- head/misc/hb/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/misc/hb/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,18 +3,22 @@ PORTNAME= hb PORTVERSION= 1.88 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc python MASTER_SITES= http://www.tundraware.com/Software/hb/ MAINTAINER= tundra@tundraware.com COMMENT= Simple, but complete budget management in Python -USES= python shebangfix +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/1-HB-License.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \ - ${WRKSRC}/hb.py - @${FIND} ${WRKSRC} -name "*.bak" -delete +USES= python:2.7,run shebangfix +SHEBANG_FILES= hb.py +NO_ARCH= yes + +OPTIONS_DEFINE= DOCS .include <bsd.port.mk> Modified: head/misc/hb/files/patch-Makefile ============================================================================== --- head/misc/hb/files/patch-Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/misc/hb/files/patch-Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -1,6 +1,6 @@ ---- Makefile.orig 2014-07-15 21:44:10.713832840 +0800 -+++ Makefile 2014-07-15 21:43:38.083846847 +0800 -@@ -4,13 +4,13 @@ +--- Makefile.orig 2002-09-04 23:41:00 UTC ++++ Makefile +@@ -4,13 +4,12 @@ all: # Do nothing - this is a python script that needs no build install: @@ -18,7 +18,6 @@ + $(BSD_INSTALL_MAN) ./hb.1.gz $(DESTDIR)${PREFIX}/man/man1 + $(BSD_INSTALL_DATA) ./hb.txt $(DESTDIR)${PREFIX}/share/doc/hb + $(BSD_INSTALL_DATA) ./0-StartHere.txt $(DESTDIR)${PREFIX}/share/doc/hb -+ $(BSD_INSTALL_DATA) ./1-HB-License.txt $(DESTDIR)${PREFIX}/share/doc/hb + $(BSD_INSTALL_DATA) ./2-HowToUse.txt $(DESTDIR)${PREFIX}/share/doc/hb + $(BSD_INSTALL_DATA) ./3-UnderTheHood.txt $(DESTDIR)${PREFIX}/share/doc/hb + $(BSD_INSTALL_DATA) ./4-Limitations-Enhancements.txt $(DESTDIR)${PREFIX}/share/doc/hb Modified: head/misc/hb/pkg-plist ============================================================================== --- head/misc/hb/pkg-plist Mon Feb 19 13:40:22 2018 (r462319) +++ head/misc/hb/pkg-plist Mon Feb 19 14:01:41 2018 (r462320) @@ -1,8 +1,7 @@ bin/hb.py man/man1/hb.1.gz -share/doc/hb/hb.txt -share/doc/hb/0-StartHere.txt -share/doc/hb/1-HB-License.txt -share/doc/hb/2-HowToUse.txt -share/doc/hb/3-UnderTheHood.txt -share/doc/hb/4-Limitations-Enhancements.txt +%%PORTDOCS%%%%DOCSDIR%%/hb.txt +%%PORTDOCS%%%%DOCSDIR%%/0-StartHere.txt +%%PORTDOCS%%%%DOCSDIR%%/2-HowToUse.txt +%%PORTDOCS%%%%DOCSDIR%%/3-UnderTheHood.txt +%%PORTDOCS%%%%DOCSDIR%%/4-Limitations-Enhancements.txt Modified: head/security/tsshbatch/Makefile ============================================================================== --- head/security/tsshbatch/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/security/tsshbatch/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,20 +3,22 @@ PORTNAME= tsshbatch PORTVERSION= 1.317 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= http://www.tundraware.com/Software/tsshbatch/ MAINTAINER= tsshbatch@tundraware.com COMMENT= Batch SSH operations -LICENSE= tsshbatch -LICENSE_NAME= tsshbatch +LICENSE= TundraWare +LICENSE_NAME= TundraWare license LICENSE_FILE= ${WRKSRC}/tsshbatch-license.txt -LICENSE_PERMS= auto-accept +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko@${PY_FLAVOR} -USES= python:run +USES= python:2.7,run shebangfix +SHEBANG_FILES= tsshbatch.py NO_ARCH= yes PLIST_FILES= bin/tsshbatch.py \ @@ -33,6 +35,8 @@ do-install: cp -p ${WRKSRC}/Docs/* ${WRKSRC}/ ${INSTALL_SCRIPT} ${WRKSRC}/tsshbatch.py ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/tsshbatch.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Modified: head/sysutils/abck/Makefile ============================================================================== --- head/sysutils/abck/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/sysutils/abck/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,15 +3,20 @@ PORTNAME= abck PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.tundraware.com/Software/abck/ MAINTAINER= tundra@tundraware.com COMMENT= Manage intrusion attempts recorded in the system log -USES= python shebangfix +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/abck-License.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept + +USES= python:2.7,run shebangfix SHEBANG_FILES= abck -python_OLD_CMD= /usr/local/bin/python +NO_ARCH= yes .include <bsd.port.mk> Modified: head/sysutils/abck/files/patch-Makefile ============================================================================== --- head/sysutils/abck/files/patch-Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/sysutils/abck/files/patch-Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -1,6 +1,6 @@ --- Makefile.orig 2002-09-04 21:55:45 UTC +++ Makefile -@@ -4,7 +4,7 @@ +@@ -4,7 +4,5 @@ all: # Do nothing - this is a python script that needs no build install: @@ -9,6 +9,4 @@ - install -c -o root -g wheel -m 644 ./abck.1.gz ${PREFIX}/man/man1 - install -c -o root -g wheel -m 644 ./abck-License.txt ${PREFIX}/share/doc/abck + ${BSD_INSTALL_SCRIPT} ./abck ${DESTDIR}${PREFIX}/bin -+ mkdir ${DESTDIR}${PREFIX}/share/doc/abck + ${BSD_INSTALL_MAN} ./abck.1.gz ${DESTDIR}${PREFIX}/man/man1 -+ ${BSD_INSTALL_DATA} ./abck-License.txt ${DESTDIR}${PREFIX}/share/doc/abck Modified: head/sysutils/abck/pkg-plist ============================================================================== --- head/sysutils/abck/pkg-plist Mon Feb 19 13:40:22 2018 (r462319) +++ head/sysutils/abck/pkg-plist Mon Feb 19 14:01:41 2018 (r462320) @@ -1,3 +1,2 @@ bin/abck man/man1/abck.1.gz -%%DOCSDIR%%/abck-License.txt Modified: head/sysutils/tbku/Makefile ============================================================================== --- head/sysutils/tbku/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/sysutils/tbku/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,11 +3,17 @@ PORTNAME= tbku PORTVERSION= 1.120 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.tundraware.com/Software/tbku/ MAINTAINER= tbku@tundraware.com COMMENT= Tool For Incremental And Imaging Backups + +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/tbku-license.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept NO_ARCH= yes Modified: head/sysutils/tdir/Makefile ============================================================================== --- head/sysutils/tdir/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/sysutils/tdir/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,24 +3,26 @@ PORTNAME= tdir PORTVERSION= 1.71 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.tundraware.com/Software/tdir/ MAINTAINER= tdir@tundraware.com COMMENT= Advanced file directory display utility -USES= python shebangfix +BROKEN= license forbids modification, but the port cannot be used without it + +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/tdir-license.txt +LICENSE_PERMS= dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept + +USES= python:2.7,run shebangfix SHEBANG_FILES= tdir python_OLD_CMD= "/usr//bin/env python" +NO_ARCH= yes -MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} - PLIST_FILES= bin/tdir \ man/man1/tdir.1.gz -PORTDOCS= tdir-license.txt - -post-patch: - @${REINPLACE_CMD} 's,-o root -g wheel,,' ${WRKSRC}/Makefile .include <bsd.port.mk> Added: head/sysutils/tdir/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/tdir/files/patch-Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -0,0 +1,13 @@ +--- Makefile.orig 2014-02-12 18:24:13 UTC ++++ Makefile +@@ -3,8 +3,5 @@ + all: # Do nothing - this is a python script that needs no build + + install: +- install -c -o root -g wheel -m 755 ./tdir ${PREFIX}/bin +- install -c -o root -g wheel -m 644 ./tdir.1.gz ${PREFIX}/man/man1 +- mkdir ${PREFIX}/share/doc/tdir +- install -c -o root -g wheel -m 644 ./tdir-license.txt ${PREFIX}/share/doc/tdir +- ++ ${BSD_INSTALL_SCRIPT} ./tdir ${DESTDIR}${PREFIX}/bin ++ ${BSD_INSTALL_MAN} ./tdir.1.gz ${DESTDIR}${PREFIX}/man/man1 Modified: head/sysutils/tren/Makefile ============================================================================== --- head/sysutils/tren/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/sysutils/tren/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,15 +3,15 @@ PORTNAME= tren PORTVERSION= 1.242 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils python MASTER_SITES= http://www.tundraware.com/Software/tren/ MAINTAINER= tren@tundraware.com COMMENT= Powerful File And Directory Batch Renaming Tool -LICENSE= TREN -LICENSE_NAME= Tren license +LICENSE= TundraWare +LICENSE_NAME= TundraWare license LICENSE_FILE= ${WRKSRC}/tren-license.txt LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept @@ -19,7 +19,6 @@ USES= python:2.7,run shebangfix SHEBANG_FILES= tren.py PLIST_FILES= bin/tren.py man/man1/tren.1.gz PORTDOCS= WHATSNEW.txt tren-license.txt tren.html tren.pdf tren.ps tren.rst -NO_BUILD= yes NO_ARCH= yes OPTIONS_DEFINE= DOCS Modified: head/www/mkapachepw/Makefile ============================================================================== --- head/www/mkapachepw/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/www/mkapachepw/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,23 +3,27 @@ PORTNAME= mkapachepw PORTVERSION= 1.121 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.tundraware.com/Software/mkapachepw/ MAINTAINER= mkapachepw@tundraware.com COMMENT= Group & Password Management Tool For Apache +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/mkapachepw-license.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept + USES= python:2.7,run shebangfix SHEBANG_FILES= mkapachepw.py -NO_BUILD= yes NO_ARCH= yes OPTIONS_DEFINE= DOCS post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in WHATSNEW.txt mkapachepw-license.txt mkapachepw.html mkapachepw.pdf mkapachepw.ps mkapachepw.txt +.for f in WHATSNEW.txt mkapachepw.html mkapachepw.pdf mkapachepw.ps mkapachepw.txt ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor Modified: head/www/mkapachepw/pkg-plist ============================================================================== --- head/www/mkapachepw/pkg-plist Mon Feb 19 13:40:22 2018 (r462319) +++ head/www/mkapachepw/pkg-plist Mon Feb 19 14:01:41 2018 (r462320) @@ -1,7 +1,6 @@ bin/mkapachepw.py man/man1/mkapachepw.1.gz %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt -%%PORTDOCS%%%%DOCSDIR%%/mkapachepw-license.txt %%PORTDOCS%%%%DOCSDIR%%/mkapachepw.html %%PORTDOCS%%%%DOCSDIR%%/mkapachepw.pdf %%PORTDOCS%%%%DOCSDIR%%/mkapachepw.ps Modified: head/www/waccess/Makefile ============================================================================== --- head/www/waccess/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/www/waccess/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,20 +3,24 @@ PORTNAME= waccess PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= www textproc MASTER_SITES= http://www.tundraware.com/Software/waccess/ MAINTAINER= tundra@tundraware.com COMMENT= Quick-N-Dirty Web Access Log Analyzer -USES= python +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/waccess-license.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept -OPTIONS_DEFINE= DOCS +USES= python:2.7,run shebangfix +SHEBANG_FILES= waccess +NO_ARCH= yes do-install: ${INSTALL_SCRIPT} ${WRKSRC}/waccess ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/waccess.1.gz ${STAGEDIR}${PREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/waccess-license.txt ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/www/waccess/pkg-plist ============================================================================== --- head/www/waccess/pkg-plist Mon Feb 19 13:40:22 2018 (r462319) +++ head/www/waccess/pkg-plist Mon Feb 19 14:01:41 2018 (r462320) @@ -1,3 +1,2 @@ bin/waccess man/man1/waccess.1.gz -%%PORTDOCS%%%%DOCSDIR%%/waccess-license.txt Modified: head/x11-fm/twander/Makefile ============================================================================== --- head/x11-fm/twander/Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/x11-fm/twander/Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -3,32 +3,31 @@ PORTNAME= twander PORTVERSION= 3.231 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm MASTER_SITES= http://www.tundraware.com/Software/twander/ MAINTAINER= twander@tundraware.com COMMENT= Better Filesystem Browser +LICENSE= TundraWare +LICENSE_NAME= TundraWare license +LICENSE_FILE= ${WRKSRC}/twander-license.txt +LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} -USES= python:2.7 +USES= python:2.7 shebangfix +SHEBANG_FILES= twander.py +MAKE_ENV= PYTHON_CMD="${PYTHON_CMD}" NO_ARCH= yes OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} \ - -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ - ${WRKSRC}/twander.py - @${REINPLACE_CMD} \ - -e 's|python |${PYTHON_CMD} |' \ - ${WRKSRC}/Makefile - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in READ-1ST.txt WHATSNEW.txt .twander twander-license.txt twander.html twander.pdf twander.ps twander.txt +.for f in READ-1ST.txt WHATSNEW.txt .twander twander.html twander.pdf twander.ps twander.txt ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor Modified: head/x11-fm/twander/files/patch-Makefile ============================================================================== --- head/x11-fm/twander/files/patch-Makefile Mon Feb 19 13:40:22 2018 (r462319) +++ head/x11-fm/twander/files/patch-Makefile Mon Feb 19 14:01:41 2018 (r462320) @@ -1,13 +1,17 @@ ---- Makefile.orig 2014-07-01 21:05:14.490108757 +0800 -+++ Makefile 2014-07-01 21:05:33.578108694 +0800 -@@ -6,7 +6,7 @@ all: # Just need to create the compiled - @python -OOOO -c"import py_compile;py_compile.compile('twander.py')" +--- Makefile.orig 2009-07-14 17:12:38 UTC ++++ Makefile +@@ -3,10 +3,10 @@ + + all: # Just need to create the compiled image +- @python -OOOO -c"import py_compile;py_compile.compile('twander.py')" ++ @${PYTHON_CMD} -OOOO -c"import py_compile;py_compile.compile('twander.py')" + install: - ${BSD_INSTALL_SCRIPT} ./twander.py ${PREFIX}/bin - ${BSD_INSTALL_SCRIPT} ./twander.pyo ${PREFIX}/bin - ${BSD_INSTALL_MAN} ./twander.1.gz ${PREFIX}/man/man1 + ${BSD_INSTALL_SCRIPT} ./twander.py $(DESTDIR)${PREFIX}/bin -+ ${BSD_INSTALL_SCRIPT} ./twander.pyo $(DESTDIR)${PREFIX}/bin ++ ${BSD_INSTALL_DATA} ./twander.pyo $(DESTDIR)${PREFIX}/bin + ${BSD_INSTALL_MAN} ./twander.1.gz $(DESTDIR)${PREFIX}/man/man1 Modified: head/x11-fm/twander/pkg-plist ============================================================================== --- head/x11-fm/twander/pkg-plist Mon Feb 19 13:40:22 2018 (r462319) +++ head/x11-fm/twander/pkg-plist Mon Feb 19 14:01:41 2018 (r462320) @@ -3,7 +3,6 @@ bin/twander.pyo man/man1/twander.1.gz %%PORTDOCS%%%%DOCSDIR%%/READ-1ST.txt %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt -%%PORTDOCS%%%%DOCSDIR%%/twander-license.txt %%PORTDOCS%%%%DOCSDIR%%/.twander %%PORTDOCS%%%%DOCSDIR%%/twander.html %%PORTDOCS%%%%DOCSDIR%%/twander.pdf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802191401.w1JE1grl015897>