Date: Fri, 14 Feb 2014 06:30:01 GMT From: Johannes Meixner <xmj@chaot.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/186372: [UPDATE] ports-mgmt/porttools: update to 1.00.2014.02.02, take maintainership Message-ID: <201402140630.s1E6U1BL055318@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/186372; it has been noted by GNATS. From: Johannes Meixner <xmj@chaot.net> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/186372: [UPDATE] ports-mgmt/porttools: update to 1.00.2014.02.02, take maintainership Date: Fri, 14 Feb 2014 08:28:07 +0200 --EuxKj2iCbKjpUGkD Content-Type: multipart/mixed; boundary="vtzGhvizbBRQ85DL" Content-Disposition: inline --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Update to 1.00.2014.02.11 attached below, which is GH_COMMIT e84626d on github. Fixes a few bugs in-between (see commit-log for details). On Sun, Feb 02, 2014 at 02:30:01PM +0000, FreeBSD-gnats-submit@FreeBSD.org = wrote: > Thank you very much for your problem report. > It has the internal identification `ports/186372'. > The individual assigned to look at your > report is: freebsd-ports-bugs.=20 >=20 > You can access the state of your problem report at any time > via this link: >=20 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D186372 >=20 > >Category: ports > >Responsible: freebsd-ports-bugs > >Synopsis: [UPDATE] ports-mgmt/porttools: update to 1.00.2014.02.02= , take maintainership > >Arrival-Date: Sun Feb 02 14:30:01 UTC 2014 --=20 xmj@chaot.net http://xmj.me --vtzGhvizbBRQ85DL Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="porttools.diff" Content-Transfer-Encoding: quoted-printable =3D=3D=3D> Updating from SVN Updating '.': At revision 343326. =3D=3D=3D> Generating patch =3D=3D=3D> Viewing diff with less -iRM Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile (revision 343326) +++ Makefile (working copy) @@ -2,15 +2,13 @@ # $FreeBSD$ =20 PORTNAME=3D porttools -PORTVERSION=3D 0.99 -PORTREVISION=3D 11 +PORTVERSION=3D 1.00.2014.02.03 CATEGORIES=3D ports-mgmt -MASTER_SITES=3D SF =20 -MAINTAINER=3D joemann@beefree.free.de +MAINTAINER=3D xmj@chaot.net COMMENT=3D Tools for testing and submitting port updates and new ports =20 -LICENSE=3D BSD +LICENSE=3D BSD2CLAUSE =20 RUN_DEPENDS=3D portlint:${PORTSDIR}/ports-mgmt/portlint \ cdiff:${PORTSDIR}/textproc/cdiff \ @@ -17,23 +15,26 @@ sudo:${PORTSDIR}/security/sudo \ svn:${PORTSDIR}/devel/subversion =20 -MAKE_ENV=3D DATADIR=3D"${DATADIR}" DOCSDIR=3D"${DOCSDIR}" +USE_GITHUB=3D yes +GH_ACCOUNT=3D xmj +GH_COMMIT=3D 1012d17 +GH_TAGNAME=3D ${GH_COMMIT} + # Make the version information of porttools itself # available for inclusion in the PRs generated by it. -MAKE_ENV+=3D PORTVERSION=3D"${PORTVERSION}" -.if defined(PORTREVISION) -MAKE_ENV+=3D PORTREVISION=3D"${PORTREVISION}" -.endif -.if defined(PORTEPOCH) -MAKE_ENV+=3D PORTEPOCH=3D"${PORTEPOCH}" -.endif +MAKE_ENV=3D DATADIR=3D"${DATADIR}" DOCSDIR=3D"${DOCSDIR}" PORTVERSION=3D"$= {PORTVERSION}" =20 OPTIONS_DEFINE=3D DOCS NEWFILE OPTIONS_DEFAULT=3D NEWFILE =20 +.include <bsd.port.options.mk> + NEWFILE_DESC=3D Enable newfile support =20 NEWFILE_RUN_DEPENDS=3D newfile:${PORTSDIR}/devel/newfile -DOCS_INSTALL_TARGET=3D install install-docs =20 +.if ${PORT_OPTIONS:MDOCS} +INSTALL_TARGET=3D install install-docs +.endif + .include <bsd.port.mk> Index: distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- distinfo (revision 343326) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (porttools-0.99.tar.gz) =3D b59f5acee9ae3c3494ffb9c588b1ea2d95abbfa= 82162107a84c9c42455b252a2 -SIZE (porttools-0.99.tar.gz) =3D 17357 +SHA256 (porttools-1.00.2014.02.03.tar.gz) =3D 8c04d8fe10966f3d0de32e5870ec= 9f484407af18a262457e2dcce045164383e8 +SIZE (porttools-1.00.2014.02.03.tar.gz) =3D 18609 Index: files/patch-Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-Makefile (revision 343326) +++ files/patch-Makefile (working copy) @@ -1,53 +0,0 @@ ---- ./Makefile.orig 2009-09-09 21:59:59.000000000 +0200 -+++ ./Makefile 2013-10-22 10:41:23.000000000 +0200 -@@ -9,6 +9,15 @@ - PORTNAME?=3D porttools - PORTVERSION?=3D 0.99 - DISTNAME?=3D ${PORTNAME}-${PORTVERSION} -+.if defined(PORTREVISION) && defined(PORTEPOCH) -+VERSIONSTRING=3D ${PORTVERSION}_${PORTREVISION},${PORTEPOCH} -+.elif defined(PORTREVISION) -+VERSIONSTRING=3D ${PORTVERSION}_${PORTREVISION} -+.elif defined(PORTEPOCH) -+VERSIONSTRING=3D ${PORTVERSION},${PORTEPOCH} -+.else -+VERSIONSTRING=3D ${PORTVERSION} -+.endif -=20 - PROGRAMS=3D port - SCRIPTS=3D cmd_commit cmd_create cmd_diff cmd_fetch cmd_getpr cmd_help \ -@@ -31,23 +40,23 @@ -=20 - .SUFFIXES: .in -=20 --.in:=20 -- sed -e 's,__VERSION__,${PORTVERSION},;s,__PREFIX__,${PREFIX},' \ -+.in: -+ sed -e 's%__VERSION__%${VERSIONSTRING}%;s,__PREFIX__,${PREFIX},' \ - inc_header.in ${.IMPSRC} > ${.TARGET} - chmod a+x ${.TARGET} -=20 - install: ${PROGRAMS} ${SCRIPTS} -- ${BSD_INSTALL_SCRIPT} ${PROGRAMS} ${PREFIX}/bin -- mkdir -p ${DATADIR} -- ${BSD_INSTALL_SCRIPT} ${SCRIPTS} ${DATADIR} -- mkdir -p ${MANPREFIX}/man/man1 -- ${BSD_INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1 -- mkdir -p ${MANPREFIX}/man/man5 -- ${BSD_INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5 -+ ${BSD_INSTALL_SCRIPT} ${PROGRAMS} ${DESTDIR}${PREFIX}/bin -+ mkdir -p ${DESTDIR}${DATADIR} -+ ${BSD_INSTALL_SCRIPT} ${SCRIPTS} ${DESTDIR}${DATADIR} -+ mkdir -p ${DESTDIR}${MANPREFIX}/man/man1 -+ ${BSD_INSTALL_MAN} ${MAN1} ${DESTDIR}${MANPREFIX}/man/man1 -+ mkdir -p ${DESTDIR}${MANPREFIX}/man/man5 -+ ${BSD_INSTALL_MAN} ${MAN5} ${DESTDIR}${MANPREFIX}/man/man5 -=20 - install-docs: -- mkdir -p ${DOCSDIR} -- ${BSD_INSTALL_DATA} ${DOCS} ${DOCSDIR} -+ mkdir -p ${DESTDIR}${DOCSDIR} -+ ${BSD_INSTALL_DATA} ${DOCS} ${DESTDIR}${DOCSDIR} -=20 - clean: - rm -rf ${PROGRAMS} ${SCRIPTS} ${DISTNAME}* Index: files/patch-README =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-README (revision 343326) +++ files/patch-README (working copy) @@ -1,61 +0,0 @@ ---- README.orig 2009-09-10 04:59:59.000000000 +0900 -+++ README 2012-12-27 19:22:20.000000000 +0900 -@@ -7,7 +7,7 @@ -=20 - FreeBSD Port Tools consist of the several small scripts run from - port(1) front-end: --- port commit: commit a port into the FreeBSD Ports CVS Repository -+- port commit: commit a port into the FreeBSD Ports SVN Repository - - port create: create a new port from a template - - port diff: generate a diff against a previous version of the port - - port fetch: fetch distfile(s) of a new version of the port -@@ -43,42 +43,35 @@ - Let us assume you are interested in helping out with one of the ports. - The most convenient way of doing that with the Port Tools is the followin= g. - Even though the Port Tools have 3 most of diff generation, the recommende= d is=20 --CVS (default). Do not be scared away at this point - it is very simple. -+SVN (default). Do not be scared away at this point - it is very simple. - Let me give a quick overview: -=20 --1. Set up CVSROOT environment variable -- -- sgk@elf% export CVSROOT=3D":pserver:anoncvs@anoncvs.FreeBSD.org:/home/= ncvs" -- -- NOTE: you may want to check the Handbook for a list of anonymous CVS s= ervers -- (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/anoncvs.htm= l). -- --2. Check out a working copy of the port. I usually do it in ~/ports direc= tory: -+1. Check out a working copy of the port. I usually do it in ~/ports direc= tory: - (NOTE: my ~/ports directory contains only those ports I am interested = in, - i.e. either maitain or send changes/updates to. Thus, it does not have - to contain the whole FreeBSD Ports tree) -=20 - sgk@elf:~% cd ~/ports -- sgk@elf:~/ports% cvs co ipsvd -+ sgk@elf:~/ports% svn co ipsvd -=20 - ipsvd is the sample port name. -=20 --3. Now, make your changes - e.g. change PORTVERSION from 0.6.0 to 0.6.1. -+2. Now, make your changes - e.g. change PORTVERSION from 0.6.0 to 0.6.1. -=20 - sgk@elf:~/ports/ipsvd% cd ipsvd - sgk@elf:~/ports/ipsvd% vim Makefile -=20 --4. At this moment we need to fetch the new distfile and run "make makesum= "=20 -+3. At this moment we need to fetch the new distfile and run "make makesum= "=20 - to update the distinfo file. There is even simpler way to accomplish t= his=20 - with the Port Tools version 0.50 or later: -=20 - sgk@elf:~/ports/ipsvd% port fetch -=20 --5. Now we want to make sure that the port compiles, installs and works fi= ne: -+4. Now we want to make sure that the port compiles, installs and works fi= ne: -=20 - sgk@elf:~/ports/ipsvd% port test -=20 --6. Once I am satisfied with the results, let us submit a PR=20 -+5. Once I am satisfied with the results, let us submit a PR=20 - with the port update: -=20 - sgk@elf:~/ports/ipsvd% port submit Index: files/patch-cmd_commit.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-cmd_commit.in (revision 343326) +++ files/patch-cmd_commit.in (working copy) @@ -1,89 +0,0 @@ ---- cmd_commit.in.orig 2009-09-10 04:59:59.000000000 +0900 -+++ cmd_commit.in 2013-04-27 07:26:46.000000000 +0900 -@@ -1,6 +1,6 @@ - # cmd_commit - # Module for port(1) --# SUMMARY: commit a port into the FreeBSD Ports CVS Repository -+# SUMMARY: commit a port into the FreeBSD Ports SVN Repository - # - # $Id: cmd_commit.in,v 1.2 2009/09/09 19:58:30 skolobov Exp $ - # -@@ -59,13 +59,17 @@ -=20 - # Determine if this is a new port - MODE=3D"update" --[ "`grep '\$FreeBSD: ' Makefile`" ] || MODE=3D"new" -+svn status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:' -+if [ $? -eq 0 ] -+then -+ MODE=3D"new" -+fi -=20 - # Run portlint(1) to validate port's sanity - echo "=3D=3D=3D> Pre-commit portlint check" - FLAGS=3D"-C" - [ "${MODE}" =3D "new" ] && FLAGS=3D"${FLAGS} -N" --PL_CVS_IGNORE=3D'^\d+$|^pr-patch$|^cvs-msg$' \ -+PL_SVN_IGNORE=3D'^\d+$|^pr-patch$|^svn-msg$' \ - portlint ${FLAGS} - if [ $? -ne 0 ] - then -@@ -74,21 +78,25 @@ - fi -=20 -=20 --PORTSDIR=3D"`make -V PORTSDIR`" -+# See if SVN message already exists, and use that for commit log -+MSG=3D"svn-msg" -+FLAGS=3D"" -+ - if [ "${MODE}" =3D "new" ] - then -- ${PORTSDIR}/Tools/scripts/addport -d `pwd` -u ${FREEFALL_USERNAME} --else -- # Initialize CVS environment -- PCVS=3D"cvs -d ${FREEFALL_USERNAME}@pcvs.FreeBSD.org:/home/pcvs" -+ PORTSDIR=3D"`make -V PORTSDIR`" -=20 -+ if [ -e ${MSG} ] -+ then -+ FLAGS=3D"-c ${MSG}" -+ fi -+ -+ ${PORTSDIR}/Tools/scripts/addport -d `pwd` -u ${FREEFALL_USERNAME} ${FLA= GS} -+else - # Make sure we are working with up-to-date version -- echo "=3D=3D=3D> Pre-commit CVS update" -- ${PCVS} update -+ echo "=3D=3D=3D> Pre-commit SVN update" -+ svn update -=20 -- # See if CVS message already exists, and use that for commit log -- MSG=3D"cvs-msg" -- FLAGS=3D"" - if [ -e ${MSG} ] - then - FLAGS=3D"-F ${MSG}" -@@ -99,18 +107,18 @@ - echo '=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D' - cat ${MSG} - echo '=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D' -- read -p "Is the CVS message above correct? (y/n)" ANSWER -+ read -p "Is the SVN message above correct? (y/n)" ANSWER - [ "${ANSWER}" =3D "y" ] && break - ${VISUAL:-vi} ${MSG} - done - fi=20 - # Commit the port update - echo "=3D=3D=3D> Committing port update" -- ${PCVS} commit ${FLAGS} -+ svn commit ${FLAGS} - =09 -- # Remove CVS message file only if commit was successful -- [ $? -eq 0 -a -e ${MSG} ] && rm ${MSG} - fi -+# Remove SVN message file only if commit was successful -+[ $? -eq 0 -a -e ${MSG} ] && rm ${MSG} -=20 - echo "=3D=3D=3D> Done" - exit 0 Index: files/patch-cmd_diff.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-cmd_diff.in (revision 343326) +++ files/patch-cmd_diff.in (working copy) @@ -1,20 +0,0 @@ ---- cmd_diff.in.orig 2009-09-09 21:59:59.000000000 +0200 -+++ cmd_diff.in 2013-10-22 10:37:13.000000000 +0200 -@@ -20,7 +20,7 @@ - Usage: port diff [-h] [-d <diff mode>] - -h - Display this usage summary - -d <diff mode> - Select diff generation mode: -- CVS - against CVS -+ SVN - against SVN - <dir> - against Ports tree in <dir> - <pattern> - against original port in <pwd><pattern> - EOF -@@ -65,7 +65,7 @@ - [ -n "${DIFF_VIEWER}" ] || DIFF_VIEWER=3D"more" - fi - echo "=3D=3D=3D> Viewing diff with ${DIFF_VIEWER}" --${DIFF_VIEWER} ${PATCH} -+${DIFF_VIEWER} < ${PATCH} -=20 - # Cleanup - rm -rf ${TEMPROOT} Index: files/patch-cmd_submit.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-cmd_submit.in (revision 343326) +++ files/patch-cmd_submit.in (working copy) @@ -1,202 +0,0 @@ ---- ./cmd_submit.in.orig 2009-09-09 22:59:59.000000000 +0300 -+++ ./cmd_submit.in 2013-10-30 11:02:11.324453150 +0200 -@@ -25,11 +25,12 @@ - change - changing a port=20 - update - updating a port to newer version - -d <diff mode> - Select diff generation mode: -- CVS - against CVS -+ SVN - against SVN - <dir> - against Ports tree in <dir> - <pattern> - against original port in <pwd><pattern> - -s <severity> - Set PR's severity to <severity> - -p <priority> - Set PR's priority to <priority> -+ -P - Don't send the PR; print to stdout (see -P in send-pr(1)) - -c - committer mode: more portlint(1) checks - -L - Skip running portlint(1) - EOF -@@ -41,9 +42,10 @@ - PRIORITY=3D"low" - COMMITTER=3D"no" - RUN_PORTLINT=3D"yes" -+SENDPR_ARGS=3D -=20 - # Parse command line arguments --ARGS=3D`/usr/bin/getopt hm:d:s:p:cL $*` -+ARGS=3D`/usr/bin/getopt hm:d:s:p:cLP $*` - if [ $? !=3D 0 ] - then - echo "Error: invalid arguments" -@@ -116,6 +118,10 @@ - -L) - RUN_PORTLINT=3D"no" - ;; -+ # print to stdout instead of sending -+ -P) -+ SENDPR_ARGS=3D"${SENDPR_ARGS} -P" -+ ;; - esac - shift - done -@@ -123,9 +129,19 @@ - # Determine if this is a new port - if [ "${MODE}" =3D "" ] - then -- [ "`grep '\$FreeBSD: ' Makefile`" ] || MODE=3D"new" -+ svn status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:' -+ [ $? -eq 0 ] || [ "`grep '\$FreeBSD: ' Makefile`" ] || MODE=3D"new" - fi -=20 -+# util_diff will set -+# - PORTBASENAME if PORTNAME !=3D port's directory name -+# - DIFF_TYPE to SVN, ports, or suffix -+PORTBASENAME=3D"" -+DIFF_TYPE=3D"" -+ -+# Generate diff or shar, depending on the mode, and create TEMPROOT -+. ${SCRIPT_DIR}/util_diff -+ - # Run portlint(1) to validate port's sanity - if [ "${RUN_PORTLINT}" =3D "yes" ] - then -@@ -133,10 +149,13 @@ - FLAGS=3D"-${PORTLINT_FLAGS:-abt}" - [ "${COMMITTER}" =3D "yes" ] && FLAGS=3D"${FLAGS} -c" - [ "${MODE}" =3D "new" ] && FLAGS=3D"${FLAGS} -N" -- portlint ${FLAGS} -- if [ $? -ne 0 ] -+ if portlint ${FLAGS} > ${TEMPROOT}/.portlint.out - then -+ cat ${TEMPROOT}/.portlint.out -+ else -+ cat ${TEMPROOT}/.portlint.out - echo "Error validating port" -+ rm -rf ${TEMPROOT} - exit 1 - fi - else -@@ -144,8 +163,26 @@ - fi -=20 - # Collect information about the port --PORTNAME=3D"`make -V PKGNAMEPREFIX``make -V PORTNAME``make -V PKGNAMESUFF= IX`" -+ -+# The following section comes from util_diff.=20 -+# For port submit to work with python/ruby ports and GNATS auto-assign, v= ersion -+# numbers need to be sed'ed out before adding to synopsis. -+ -+PYTHON_SUFFIX=3D"`make -V PYTHON_SUFFIX`" -+RUBY_SUFFIX=3D"`make -V RUBY_SUFFIX`" -+PKGNAMEPREFIX=3D"`make -V PKGNAMEPREFIX | sed -E "s,py${PYTHON_SUFFIX}-,p= y-," | sed -E "s,ruby${RUBY_SUFFIX}-,ruby-,"`" -+PKGNAMESUFFIX=3D"`make -V PKGNAMESUFFIX`" -+PORTNAME=3D"${PKGNAMEPREFIX}`make -V PORTNAME`${PKGNAMESUFFIX}" -+ -+# Rest as normal -+ - PORTVERSION=3D"`make -V PORTVERSION`" -+PORTREVISION=3D"`make -V PORTREVISION`" -+PORTEPOCH=3D"`make -V PORTEPOCH`" -+VERSIONSTRING=3D"${PORTVERSION}" -+[ "$PORTREVISION" !=3D "0" ] && VERSIONSTRING=3D"${VERSIONSTRING}_${PORTR= EVISION}" -+[ "$PORTEPOCH" !=3D "0" ] && VERSIONSTRING=3D"${VERSIONSTRING},${PORTEPOC= H}" -+ - PKGNAME=3D"`make -V PKGNAME`" - CATEGORY=3D"`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`" - MAINTAINER=3D"`make -V MAINTAINER`" -@@ -155,9 +192,6 @@ - RELEASE=3D"`uname -srp`" - SYSTEM=3D"`uname -a | cut -d ' ' -f 1-12`" -=20 --# Generate diff or shar, depending on the mode --. ${SCRIPT_DIR}/util_diff -- - CC=3D"" - if [ "${MODE}" =3D "new" ] - then -@@ -194,10 +228,10 @@ - # Override some parameters if submitting an update to a newer - # version of an existing port - CLASS=3D"update" -- SUFFIX=3D"update to ${PORTVERSION}" -- DESCRIPTION=3D"- Update to ${PORTVERSION}" -+ SUFFIX=3D"update to ${VERSIONSTRING}" -+ DESCRIPTION=3D"- Update to ${VERSIONSTRING}" - fi --=09 -+ - # Check to see if maintainership was requested - MAINT_CHANGE=3D"`grep '^[+-]MAINTAINER' ${PATCH} | wc -l`" - if [ ${MAINT_CHANGE} -eq 2 ] -@@ -242,7 +276,12 @@ - fi -=20 - # Generate Synopsis line --SYNOPSIS=3D"[${PREFIX}] ${CATEGORY}/${PORTNAME}: ${SUFFIX}" -+if [ -z "${PORTBASENAME}" ] -+then -+ SYNOPSIS=3D"[${PREFIX}] ${CATEGORY}/${PORTNAME}: ${SUFFIX}" -+else -+ SYNOPSIS=3D"[${PREFIX}] ${CATEGORY}/${PORTBASENAME}: ${SUFFIX}" -+fi -=20 - echo "=3D=3D=3D> Generating PR form" - PR_FORM=3D"${TEMPROOT}/PR" -@@ -266,9 +305,10 @@ - SEND-PR: [ low | medium | high ] - >Category: ports=20 - SEND-PR: <choose from the list of categories below (one line)> -- SEND-PR: advocacy alpha bin conf docs gnu =20 -- SEND-PR: i386 ia64 java kern misc ports =20 -- SEND-PR: powerpc sparc64 standards www =20 -+ SEND-PR: advocacy alpha amd64 arm bin conf -+ SEND-PR: docs gnu i386 ia64 java kern -+ SEND-PR: misc ports powerpc sparc64 standards sun4v -+ SEND-PR: threads usb www - >Class: ${CLASS} - SEND-PR: [ sw-bug | doc-bug | change-request | update | maintainer-updat= e ] - >Release: ${RELEASE} -@@ -277,25 +317,15 @@ - >Description: - EOF -=20 -+MODESTRING=3D"mode: ${MODE}" -+ - if [ "${MODE}" =3D "new" ] - then - cat pkg-descr >> ${PR_FORM} - else - echo -e ${DESCRIPTION} >> ${PR_FORM} -=20 -- # Get list of added/removed files -- if [ "${DIFF_MODE}" =3D "CVS" ] -- then -- FILES_ADD=3D`grep --after-context=3D1 "^--- /dev/null" ${PATCH} | grep = "^+++ " | awk '{print $2;}'` -- FILES_DEL=3D`grep --before-context=3D1 "^+++ /dev/null" ${PATCH} | grep= "^--- " | awk '{print $2;}'` -- else -- TEMP=3D`mktemp -t porttools` || exit 1 -- find -s ${ORIG_DIR} -type f | sed -e "s#${ORIG_DIR}/##" > ${TEMP} -- CURR_DIR=3D`pwd` -- FILES_ADD=3D`find -s ${CURR_DIR} -type f | sed -e "s#${CURR_DIR}/##" | = comm -23 - ${TEMP}` -- FILES_DEL=3D`find -s ${CURR_DIR} -type f | sed -e "s#${CURR_DIR}/##" | = comm -13 - ${TEMP}` -- rm -f ${TEMP} -- fi -+ MODESTRING=3D"${MODESTRING}, diff: ${DIFF_TYPE}" -=20 - if [ -n "${FILES_ADD}" ] - then -@@ -326,14 +356,14 @@ -=20 - cat >> ${PR_FORM} <<- EOF -=20 -- Generated with FreeBSD Port Tools __VERSION__ -+ Generated with FreeBSD Port Tools __VERSION__ (${MODESTRING}) - >How-To-Repeat: - >Fix: - EOF -=20 - # Invoke send-pr(1) - echo "=3D=3D=3D> Invoking send-pr(1) to submit a PR" --PR_FORM=3D"${PR_FORM}" /usr/bin/send-pr -a ${PATCH} -+PR_FORM=3D"${PR_FORM}" /usr/bin/send-pr -a ${PATCH} ${SENDPR_ARGS} - if [ $? -ne 0 ] - then - echo "Error submitting PR" Index: files/patch-cmd_test.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-cmd_test.in (revision 343326) +++ files/patch-cmd_test.in (working copy) @@ -1,11 +0,0 @@ ---- cmd_test.in 2009-09-09 23:59:59.000000000 +0400 -+++ cmd_test.in 2010-11-10 13:57:10.000000000 +0300 -@@ -189,7 +189,7 @@ - sed -e "s,^${PREFIX}/,," - sudo find ${LOCALBASE}/ -type d | sed "s,^${LOCALBASE}/,," | sort > ${PR= EFIX}.PLIST_DIRS.before - sudo find ${PREFIX}/ -type d | sed "s,^${PREFIX}/,," | sort > ${PREFIX}.= PLIST_DIRS.after -- comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -= r | awk '{print "@dirrmtry "$1}' -+ comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -= r | awk '{print "@dirrmtry "$0}' - fi -=20 - # Finish with a clean workspace Index: files/patch-port.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-port.1 (revision 343326) +++ files/patch-port.1 (working copy) @@ -1,55 +0,0 @@ ---- port.1.orig 2009-09-10 04:59:59.000000000 +0900 -+++ port.1 2012-12-27 19:26:53.000000000 +0900 -@@ -123,8 +123,8 @@ - .It Fl d Ar mode - select diff generation mode: - .Bl -tag -width ".Pa suffix" --.It CVS --diff against CVS repository (default). -+.It SVN -+diff against SVN repository (default). - .It Pa dir - diff against original version of the port in the Ports tree with root at - .Pa dir -@@ -141,10 +141,10 @@ - .Pp - Example: - .Pp --.Dl % port diff -d CVS -+.Dl % port diff -d SVN - .Pp - This would generate unified diff of modified checked-out working copy=20 --of the port against local or remote CVS repo. -+of the port against SVN repo. - .It Ar fetch - Fetch one or more distfiles of new or updated port version=20 - and updates checksums. -@@ -215,6 +215,8 @@ - .Bl -tag -width ".Fl s Ar severity" - .It Fl h - display usage summary for this command. -+.It Fl d Ar mode -+select diff generation mode - see the port diff command above for details. - .It Fl m Ar mode - Overrides automatic detection of operation mode: - .Bl -tag -width update -@@ -245,6 +247,10 @@ - Skips running - .Xr portlint 1 . - Using this option will generate a warning and it strongly discouraged. -+.It Fl P -+Don't send the PR. -+Just print to stdout (see -P in -+.Xr send-pr 1) . - .El - .It Ar test - Automates the process of testing a new port (or a port update)=20 -@@ -347,7 +353,7 @@ - for detailed description of the format. - .El - .Sh SEE ALSO --.Xr cvs 1 , -+.Xr svn 1 , - .Xr cdiff 1 , - .Xr diff 1 , - .Xr more 1 , Index: files/patch-port.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-port.in (revision 343326) +++ files/patch-port.in (working copy) @@ -1,19 +0,0 @@ ---- port.in.orig 2009-09-10 04:59:59.000000000 +0900 -+++ port.in 2013-10-28 17:50:13.000000000 +0100 -@@ -19,12 +19,15 @@ - ORGANIZATION=3D"" - BUILDROOT=3D"/tmp" - ARCHIVE_DIR=3D"" -- DIFF_MODE=3D"CVS" -+ DIFF_MODE=3D"SVN" - DIFF_VIEWER=3D"more" - PORTLINT_FLAGS=3D"abct" -+ PORTSDIR=3D"/usr/ports" - EOF - fi -=20 -+PORTSDIR=3D"/usr/ports" -+ - # Reading configuration file - . ${PORTTOOLS} -=20 Index: files/patch-porttools.5 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-porttools.5 (revision 343326) +++ files/patch-porttools.5 (working copy) @@ -1,11 +0,0 @@ ---- porttools.5.orig 2009-09-10 04:59:59.000000000 +0900 -+++ porttools.5 2012-12-27 19:46:53.000000000 +0900 -@@ -51,7 +51,7 @@ - Default to - .Pa /tmp . - .It Ev DIFF_MODE --Selects diff generation mode. Valid values are: CVS, directory -+Selects diff generation mode. Valid values are: SVN, directory - .Pq e.g. Pa /usr/ports , - or suffix - .Pq e.g. Pa .orig . Index: files/patch-util_diff.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-util_diff.in (revision 343326) +++ files/patch-util_diff.in (working copy) @@ -1,142 +0,0 @@ ---- util_diff.in.orig 2009-09-10 04:59:59.000000000 +0900 -+++ util_diff.in 2013-10-28 17:48:33.000000000 +0100 -@@ -14,7 +14,8 @@ - # Determine if this is a new port - if [ "${MODE}" =3D "" ] - then -- [ "`grep '\$FreeBSD: ' Makefile`" ] || MODE=3D"new" -+ svn status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:' -+ [ $? -eq 0 ] || [ "`grep '\$FreeBSD: ' Makefile`" ] || MODE=3D"new" - fi -=20 - # Create a temporary dir for generated files (patch/shar, PR form) -@@ -37,49 +38,96 @@ - fi - cd ${SAVE_CWD} - else -- # Default to CVS diff mode -- [ "${DIFF_MODE}" =3D "" ] && DIFF_MODE=3D"CVS" -- -- # If there is no CVS subdirectory then -- # fallback to diffing against /usr/ports tree=20 -- if [ "${DIFF_MODE}" =3D "CVS" -a ! -d CVS ] -+ # Determine the default diff mode -+ if [ "${DIFF_MODE}" =3D "" ] - then -- DIFF_MODE=3D"/usr/ports" -+ if [ -d ${PORTSDIR}/.svn ] -+ then -+ DIFF_MODE=3D"SVN" -+ else -+ DIFF_MODE=3D"${PORTSDIR}" -+ fi -+ echo "Default diff mode is ${DIFF_MODE}" -+ elif [ "${DIFF_MODE}" =3D "SVN" ] -+ then -+ # If there is no .svn directory then -+ # fallback to diffing against ${PORTSDIR} tree -+ if [ ! -d ${PORTSDIR}/.svn ] -+ then -+ echo "Diff mode was set to ${DIFF_MODE}, but there's no .svn directory" -+ echo -n "Trying ${PORTSDIR} ... " -+ if [ -d ${PORTSDIR} ] -+ then -+ DIFF_MODE=3D"${PORTSDIR}" -+ echo "found" -+ else -+ echo "not found - please choose an approriate diff mode" -+ rm -rf ${TEMPROOT} -+ exit 1 -+ fi -+ fi - fi -=20 -- if [ "${DIFF_MODE}" =3D "CVS" ] -+ if [ "${DIFF_MODE}" =3D "SVN" ] - then -- # Test for ~/.cvspass and create if necessary -- test -f ${HOME}/.cvspass || touch ${HOME}/.cvspass -+ DIFF_TYPE=3D${DIFF_MODE} -=20 -- # Run 'cvs update' first -- echo "=3D=3D=3D> Updating from CVS" -- cvs -R update -Pd -- if [ $? -ne 0 ] -+ # Run 'svn update' first -+ echo "=3D=3D=3D> Updating from SVN" -+ svn update -+ status=3D$? -+ if [ $status -ne 0 ] - then -- echo "Error updating CVS" -+ echo "Error updating SVN" - rm -rf ${TEMPROOT} - exit 1 - fi -- -- DIFF_CMD=3D"cvs -R diff -uN" -+ DIFF_CMD=3D"svn diff" - else=20 -- # Non-CVS modes -+ # Non-SVN modes -+ DIRBASENAME=3D`basename \`pwd\`` -+ PORTBASENAME_HEADER=3D`sed -n -E -e '1,/^($|[^#].*$)|\\$FreeBSD\:/s%^#.= *\\$FreeBSD\:[[:space:]]*([^/]+/)*([^/]+)/Makefile.*\\$%\2%p' Makefile` -+ if [ "${DIRBASENAME}" !=3D "${PORTBASENAME_HEADER}" ] -+ then -+ echo "Warning: current directory name differs from Makefile header:" -+ echo " ${DIRBASENAME}" !=3D "${PORTBASENAME_HEADER}" -+ fi -+ PYTHON_SUFFIX=3D"`make -V PYTHON_SUFFIX`" -+ RUBY_SUFFIX=3D"`make -V RUBY_SUFFIX`" -+ PKGNAMEPREFIX=3D"`make -V PKGNAMEPREFIX | sed -E "s,py${PYTHON_SUFFIX}-= ,py-," | sed -E "s,ruby${RUBY_SUFFIX}-,ruby-,"`" -+ PKGNAMESUFFIX=3D"`make -V PKGNAMESUFFIX`" -+ PORTNAME=3D"${PKGNAMEPREFIX}`make -V PORTNAME`${PKGNAMESUFFIX}" - if [ -d ${DIFF_MODE} ] - then - # -d <dir> have been specified - # it should be Ports tree location -+ DIFF_TYPE=3D"ports" - CATEGORY=3D"`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`" -- PYTHON_SUFFIX=3D"`make -V PYTHON_SUFFIX`" -- RUBY_SUFFIX=3D"`make -V RUBY_SUFFIX`" -- PKGNAMEPREFIX=3D"`make -V PKGNAMEPREFIX | sed -E "s,py${PYTHON_SUFFIX}= -,py-," | sed -E "s,ruby${RUBY_SUFFIX}-,ruby-,"`" -- PKGNAMESUFFIX=3D"`make -V PKGNAMESUFFIX`" -- PORTNAME=3D"${PKGNAMEPREFIX}`make -V PORTNAME`${PKGNAMESUFFIX}" - ORIG_DIR=3D"${DIFF_MODE}/${CATEGORY}/${PORTNAME}" -+ if [ ! -d ${ORIG_DIR} ] -+ then -+ echo "Original version does not exist at ${ORIG_DIR}" -+ if [ -d "${DIFF_MODE}/${CATEGORY}/${DIRBASENAME}" ] -+ then -+ PORTBASENAME=3D${DIRBASENAME} -+ ORIG_DIR=3D"${DIFF_MODE}/${CATEGORY}/${PORTBASENAME}" -+ elif [ -d "${DIFF_MODE}/${CATEGORY}/${PORTBASENAME_HEADER}" ] -+ then -+ PORTBASENAME=3D${PORTBASENAME_HEADER} -+ ORIG_DIR=3D"${DIFF_MODE}/${CATEGORY}/${PORTBASENAME}" -+ fi -+ [ -d ${ORIG_DIR} ] && echo "Using ${ORIG_DIR} instead" -+ fi - else=20 - # -d <pattern> have been specified - # <pattern> is used to determine original port location -- ORIG_DIR=3D"`pwd`${DIFF_MODE}" -+ DIFF_TYPE=3D"suffix" -+ ORIG_DIR=3D"../${DIRBASENAME}${DIFF_MODE}" -+ if [ "${DIRBASENAME}" !=3D "${PORTNAME}" -a "${DIRBASENAME}" =3D "${PO= RTBASENAME_HEADER}" ] -+ then -+ PORTBASENAME=3D${DIRBASENAME} -+ echo "Using ${PORTBASENAME} instead of ${PORTNAME} as the port's dire= ctory name" -+ fi - fi -=20 - # Check to see if the original version of port exist=20 -@@ -90,7 +138,7 @@ - exit 1 - fi - =09 -- DIFF_CMD=3D"diff -ruN --exclude=3DCVS ${ORIG_DIR} `pwd`" -+ DIFF_CMD=3D"diff -ruN ${ORIG_DIR} ." - fi -=20 - # Generate patch Index: pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- pkg-descr (revision 343326) +++ pkg-descr (working copy) @@ -6,4 +6,4 @@ - port submit: submit a PR with new port, or port change/update - port test: automate testing a new port or a port update =20 -WWW: http://sourceforge.net/projects/porttools/ +WWW: http://github.com/xmj/porttools/ Index: pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- pkg-plist (revision 343326) +++ pkg-plist (working copy) @@ -16,6 +16,5 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%% =3D=3D=3D> Done --vtzGhvizbBRQ85DL-- --EuxKj2iCbKjpUGkD Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBAgAGBQJS/bd2AAoJEElqnXBiUNQCTBUP/iGfpL/8149RjNhz1tfBnyTS 5O4CI996GICiHYMDBEFsf/9yjZcSFT5RI0E82XZ8EoeStHRh/VkH2pIerrAm+2KY osTKYWROZNZxAYGv5f1P2B3P+QRtm5onqjP9gmXGminR9NENw4G/TIiF8Rf2qfv7 NwBm6b7aZFyHBX23tORHfT0mbZwo7RDzNbe9MJM1qqUOy7alNZXCdQg9zAzyiykp STyDOAsqDH7LL7VQfwhqtErjfhUciGKeFql/npRX8ZKmnrOuw+SvJjR/Aar9/Ls1 aSzL0JFxIuIiVYkbX9DiJjjGhUOZJqXRl2WCFKuJnw5hddt8Lw2w3QooZmN5IQJC y7jgHb3Plvi9QSDkp+A6ProaITOD8xFNDZXF22g0hB59qp5NASB40SfoAA9Vth7I 899YXOTyQy9cqn1gRypHrhk2H7Gz6/dU8Jup1xmwMkFhrydSt3meHFHIEjD+WcvW /tsbxVxC1TGg/Lyzmz5jG5wSsWHc17tFToEzAfBemKeMnTe/ymUIHxyJqw6XSswe nebfTu18AYodZJEFr8D3cDQLRRoN2ELiO2wmOAO4pNbXVNZgJQHT0TJUNkvDO/rN eOLF17+cP6uskrD6gy8WI7HT86pmCc2J9aDBEOqFPTSgb/8Ku4AjbkguOUR0Wrch wPo5+EUM8KRT9Xm26l23 =reax -----END PGP SIGNATURE----- --EuxKj2iCbKjpUGkD--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402140630.s1E6U1BL055318>