Date: Fri, 31 Jan 2014 09:22:20 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: joemann@beefree.free.de Subject: ports/186292: [PATCH] ports-mgmt/porttools: Add template to cmd_submit.in Message-ID: <1389977000.enqueue@mx12.chaot.net> Resent-Message-ID: <201401310730.s0V7U0sT097767@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186292 >Category: ports >Synopsis: [PATCH] ports-mgmt/porttools: Add template to cmd_submit.in >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 31 07:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Johannes Jost Meixner >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Goldener Grund OUe >Environment: System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #0: Wed Jan 15 11:44:09 EET 2014 >Description: - Add pretty template to committer-mode to provide proof of port build and cleanliness Example can be seen below - Specify BSD license (2-clause) Port maintainer (joemann@beefree.free.de) is cc'd. portlint: looks fine. testport: ok redports: https://redports.org/buildarchive/20140131065900-30915/ Generated with FreeBSD Port Tools 0.99_12 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- porttools-0.99_12.patch begins here --- diff -ruN /usr/ports/ports-mgmt/porttools/Makefile ./Makefile --- /usr/ports/ports-mgmt/porttools/Makefile 2014-01-22 19:00:46.000000000 +0200 +++ ./Makefile 2014-01-31 08:19:51.000000000 +0200 @@ -1,16 +1,16 @@ # Created by: Sergei Kolobov <sergei@kolobov.com> -# $FreeBSD: ports-mgmt/porttools/Makefile 340722 2014-01-22 17:00:46Z mat $ +# $FreeBSD: head/ports-mgmt/porttools/Makefile 340722 2014-01-22 17:00:46Z mat $ PORTNAME= porttools PORTVERSION= 0.99 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= ports-mgmt MASTER_SITES= SF MAINTAINER= joemann@beefree.free.de COMMENT= Tools for testing and submitting port updates and new ports -LICENSE= BSD +LICENSE= BSD2CLAUSE RUN_DEPENDS= portlint:${PORTSDIR}/ports-mgmt/portlint \ cdiff:${PORTSDIR}/textproc/cdiff \ diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-Makefile ./files/patch-Makefile --- /usr/ports/ports-mgmt/porttools/files/patch-Makefile 2013-11-06 14:25:51.000000000 +0200 +++ ./files/patch-Makefile 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2009-09-09 21:59:59.000000000 +0200 -+++ ./Makefile 2013-10-22 10:41:23.000000000 +0200 +--- ./Makefile.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./Makefile 2014-01-31 08:56:56.000000000 +0200 @@ -9,6 +9,15 @@ PORTNAME?= porttools PORTVERSION?= 0.99 diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-README ./files/patch-README --- /usr/ports/ports-mgmt/porttools/files/patch-README 2013-03-02 02:40:53.000000000 +0200 +++ ./files/patch-README 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- README.orig 2009-09-10 04:59:59.000000000 +0900 -+++ README 2012-12-27 19:22:20.000000000 +0900 +--- ./README.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./README 2014-01-31 08:56:56.000000000 +0200 @@ -7,7 +7,7 @@ FreeBSD Port Tools consist of the several small scripts run from diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-cmd_commit.in ./files/patch-cmd_commit.in --- /usr/ports/ports-mgmt/porttools/files/patch-cmd_commit.in 2013-06-22 14:14:34.000000000 +0300 +++ ./files/patch-cmd_commit.in 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- cmd_commit.in.orig 2009-09-10 04:59:59.000000000 +0900 -+++ cmd_commit.in 2013-04-27 07:26:46.000000000 +0900 +--- ./cmd_commit.in.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./cmd_commit.in 2014-01-31 08:56:56.000000000 +0200 @@ -1,6 +1,6 @@ # cmd_commit # Module for port(1) @@ -44,12 +44,12 @@ - # Initialize CVS environment - PCVS="cvs -d ${FREEFALL_USERNAME}@pcvs.FreeBSD.org:/home/pcvs" + PORTSDIR="`make -V PORTSDIR`" - ++ + if [ -e ${MSG} ] + then + FLAGS="-c ${MSG}" + fi -+ + + ${PORTSDIR}/Tools/scripts/addport -d `pwd` -u ${FREEFALL_USERNAME} ${FLAGS} +else # Make sure we are working with up-to-date version diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-cmd_diff.in ./files/patch-cmd_diff.in --- /usr/ports/ports-mgmt/porttools/files/patch-cmd_diff.in 2013-11-06 14:25:51.000000000 +0200 +++ ./files/patch-cmd_diff.in 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- cmd_diff.in.orig 2009-09-09 21:59:59.000000000 +0200 -+++ cmd_diff.in 2013-10-22 10:37:13.000000000 +0200 +--- ./cmd_diff.in.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./cmd_diff.in 2014-01-31 08:56:56.000000000 +0200 @@ -20,7 +20,7 @@ Usage: port diff [-h] [-d <diff mode>] -h - Display this usage summary diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-cmd_submit.in ./files/patch-cmd_submit.in --- /usr/ports/ports-mgmt/porttools/files/patch-cmd_submit.in 2013-11-15 16:06:13.000000000 +0200 +++ ./files/patch-cmd_submit.in 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ --- ./cmd_submit.in.orig 2009-09-09 22:59:59.000000000 +0300 -+++ ./cmd_submit.in 2013-10-30 11:02:11.324453150 +0200 ++++ ./cmd_submit.in 2014-01-31 08:57:17.000000000 +0200 @@ -25,11 +25,12 @@ change - changing a port update - updating a port to newer version @@ -183,8 +183,19 @@ if [ -n "${FILES_ADD}" ] then -@@ -326,14 +356,14 @@ +@@ -324,16 +354,25 @@ + fi + fi ++if [ "${COMMITTER}" = "yes" ] ++then ++ echo "" >> ${PR_FORM} ++ echo "SEND-PR: <Handy template to provide proof of cleanliness>" >> ${PR_FORM} ++ echo "portlint: " >> ${PR_FORM} ++ echo "testport: " >> ${PR_FORM} ++ echo "redports: " >> ${PR_FORM} ++fi ++ cat >> ${PR_FORM} <<- EOF - Generated with FreeBSD Port Tools __VERSION__ diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-cmd_test.in ./files/patch-cmd_test.in --- /usr/ports/ports-mgmt/porttools/files/patch-cmd_test.in 2013-03-02 02:40:53.000000000 +0200 +++ ./files/patch-cmd_test.in 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- cmd_test.in 2009-09-09 23:59:59.000000000 +0400 -+++ cmd_test.in 2010-11-10 13:57:10.000000000 +0300 +--- ./cmd_test.in.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./cmd_test.in 2014-01-31 08:56:56.000000000 +0200 @@ -189,7 +189,7 @@ sed -e "s,^${PREFIX}/,," sudo find ${LOCALBASE}/ -type d | sed "s,^${LOCALBASE}/,," | sort > ${PREFIX}.PLIST_DIRS.before diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-port.1 ./files/patch-port.1 --- /usr/ports/ports-mgmt/porttools/files/patch-port.1 2013-03-02 02:40:53.000000000 +0200 +++ ./files/patch-port.1 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- port.1.orig 2009-09-10 04:59:59.000000000 +0900 -+++ port.1 2012-12-27 19:26:53.000000000 +0900 +--- ./port.1.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./port.1 2014-01-31 08:56:56.000000000 +0200 @@ -123,8 +123,8 @@ .It Fl d Ar mode select diff generation mode: diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-port.in ./files/patch-port.in --- /usr/ports/ports-mgmt/porttools/files/patch-port.in 2013-11-12 15:30:22.000000000 +0200 +++ ./files/patch-port.in 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- port.in.orig 2009-09-10 04:59:59.000000000 +0900 -+++ port.in 2013-10-28 17:50:13.000000000 +0100 +--- ./port.in.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./port.in 2014-01-31 08:56:56.000000000 +0200 @@ -19,12 +19,15 @@ ORGANIZATION="" BUILDROOT="/tmp" diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-porttools.5 ./files/patch-porttools.5 --- /usr/ports/ports-mgmt/porttools/files/patch-porttools.5 2013-03-02 02:40:53.000000000 +0200 +++ ./files/patch-porttools.5 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- porttools.5.orig 2009-09-10 04:59:59.000000000 +0900 -+++ porttools.5 2012-12-27 19:46:53.000000000 +0900 +--- ./porttools.5.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./porttools.5 2014-01-31 08:56:56.000000000 +0200 @@ -51,7 +51,7 @@ Default to .Pa /tmp . diff -ruN /usr/ports/ports-mgmt/porttools/files/patch-util_diff.in ./files/patch-util_diff.in --- /usr/ports/ports-mgmt/porttools/files/patch-util_diff.in 2013-11-12 15:30:22.000000000 +0200 +++ ./files/patch-util_diff.in 2014-01-31 08:57:21.000000000 +0200 @@ -1,5 +1,5 @@ ---- util_diff.in.orig 2009-09-10 04:59:59.000000000 +0900 -+++ util_diff.in 2013-10-28 17:48:33.000000000 +0100 +--- ./util_diff.in.orig 2009-09-09 22:59:59.000000000 +0300 ++++ ./util_diff.in 2014-01-31 08:56:56.000000000 +0200 @@ -14,7 +14,8 @@ # Determine if this is a new port if [ "${MODE}" = "" ] --- porttools-0.99_12.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1389977000.enqueue>