From xmj@chaot.net  Wed Oct 30 09:12:06 2013
Return-Path: <xmj@chaot.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 79220EEB
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Oct 2013 09:12:06 +0000 (UTC)
	(envelope-from xmj@chaot.net)
Received: from dd16522.kasserver.com (dd16522.kasserver.com [85.13.137.124])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 1FA692F7D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Oct 2013 09:12:05 +0000 (UTC)
Received: from mx12.chaot.net (62.65.222.235.cable.starman.ee [62.65.222.235])
	by dd16522.kasserver.com (Postfix) with ESMTPSA id 2FCE84565D9;
	Wed, 30 Oct 2013 10:11:58 +0100 (CET)
Received: from localhost (1003@localhost [local]);
	by mx12.chaot.net (OpenSMTPD) with ESMTPA id 547226eb;
	Wed, 30 Oct 2013 11:11:57 +0200 (EET)
Message-Id: <2027873197.enqueue@mx12.chaot.net>
Date: Wed, 30 Oct 2013 11:11:57 +0200 (EET)
From: Johannes Jost Meixner <xmj@chaot.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: joemann@beefree.free.de
Subject: [PATCH] ports-mgmt/porttools: Remove python/ruby version numbers in port submit
X-Send-Pr-Version: 3.113
X-GNATS-Notify: joemann@beefree.free.de

>Number:         183468
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/porttools: Remove python/ruby version numbers in port submit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 30 09:20:00 UTC 2013
>Closed-Date:    Fri Nov 15 14:07:35 UTC 2013
>Last-Modified:  Fri Nov 15 14:10:00 UTC 2013
>Originator:     Johannes Jost Meixner
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #8: Sun Oct 13 11:56:41 EEST 2013
>Description:

Currently, when using port submit to send changes to python/ruby ports,
one needs to manually remove the corresponding version number.
While util_diff.in contains a helper sed script to remove them, cmd_submit.in did not.

This led to GNATS auto-assign issues and manual work.

Patch below copies util_diff.in's solution to the problem to cmd_submit.in.

Port maintainer (joemann@beefree.free.de) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
Submit any patch for a python port.
>Fix:
Apply the following patch to ports-mgmt/porttools:

--- porttools-0.99_8.patch begins here ---
diff -ruN /usr/ports/ports-mgmt/porttools/Makefile ./Makefile
--- /usr/ports/ports-mgmt/porttools/Makefile	2013-09-21 01:36:49.000000000 +0300
+++ ./Makefile	2013-09-23 04:59:59.288993194 +0300
@@ -1,5 +1,5 @@
 # Created by: Sergei Kolobov <sergei@kolobov.com>
-# $FreeBSD: ports-mgmt/porttools/Makefile 327762 2013-09-20 22:36:49Z bapt $
+# $FreeBSD: head/ports-mgmt/porttools/Makefile 327762 2013-09-20 22:36:49Z bapt $
 
 PORTNAME=	porttools
 PORTVERSION=	0.99
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-03-02 02:40:53.000000000 +0200
+++ ./files/patch-cmd_submit.in	2013-10-30 11:02:16.953825809 +0200
@@ -1,5 +1,5 @@
---- cmd_submit.in.orig	2009-09-10 04:59:59.000000000 +0900
-+++ cmd_submit.in	2012-12-31 23:10:59.000000000 +0900
+--- ./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 
  		update - updating a port to newer version
@@ -74,9 +74,24 @@
  		exit 1
  	fi
  else
-@@ -146,6 +165,12 @@
+@@ -144,8 +163,26 @@
+ fi
+ 
  # Collect information about the port
- PORTNAME="`make -V PKGNAMEPREFIX``make -V PORTNAME``make -V PKGNAMESUFFIX`"
+-PORTNAME="`make -V PKGNAMEPREFIX``make -V PORTNAME``make -V PKGNAMESUFFIX`"
++
++# The following section comes from util_diff. 
++# For port submit to work with python/ruby ports and GNATS auto-assign, version
++# numbers need to be sed'ed out before adding to synopsis.
++
++PYTHON_SUFFIX="`make -V PYTHON_SUFFIX`"
++RUBY_SUFFIX="`make -V RUBY_SUFFIX`"
++PKGNAMEPREFIX="`make -V PKGNAMEPREFIX | sed -E "s,py${PYTHON_SUFFIX}-,py-," | sed -E "s,ruby${RUBY_SUFFIX}-,ruby-,"`"
++PKGNAMESUFFIX="`make -V PKGNAMESUFFIX`"
++PORTNAME="${PKGNAMEPREFIX}`make -V PORTNAME`${PKGNAMESUFFIX}"
++
++# Rest as normal
++
  PORTVERSION="`make -V PORTVERSION`"
 +PORTREVISION="`make -V PORTREVISION`"
 +PORTEPOCH="`make -V PORTEPOCH`"
@@ -87,7 +102,7 @@
  PKGNAME="`make -V PKGNAME`"
  CATEGORY="`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`"
  MAINTAINER="`make -V MAINTAINER`"
-@@ -155,9 +180,6 @@
+@@ -155,9 +192,6 @@
  RELEASE="`uname -srp`"
  SYSTEM="`uname -a | cut -d ' ' -f 1-12`"
  
@@ -97,7 +112,7 @@
  CC=""
  if [ "${MODE}" = "new" ]
  then
-@@ -194,10 +216,10 @@
+@@ -194,10 +228,10 @@
  		# Override some parameters if submitting an update to a newer
  		# version of an existing port
  		CLASS="update"
@@ -111,7 +126,7 @@
  	# Check to see if maintainership was requested
  	MAINT_CHANGE="`grep '^[+-]MAINTAINER' ${PATCH} | wc -l`"
  	if [ ${MAINT_CHANGE} -eq 2 ]
-@@ -242,7 +264,12 @@
+@@ -242,7 +276,12 @@
  fi
  
  # Generate Synopsis line
@@ -125,7 +140,7 @@
  
  echo "===> Generating PR form"
  PR_FORM="${TEMPROOT}/PR"
-@@ -266,9 +293,10 @@
+@@ -266,9 +305,10 @@
  	SEND-PR: 	[ low | medium | high ]
  	>Category:	ports 
  	SEND-PR: <choose from the list of categories below (one line)>
@@ -139,7 +154,7 @@
  	>Class:		${CLASS}
  	SEND-PR: [ sw-bug | doc-bug | change-request | update | maintainer-update ]
  	>Release:	${RELEASE}
-@@ -277,25 +305,15 @@
+@@ -277,25 +317,15 @@
  	>Description:
  EOF
  
@@ -168,7 +183,7 @@
  
  	if [ -n "${FILES_ADD}" ]
  	then
-@@ -326,14 +344,14 @@
+@@ -326,14 +356,14 @@
  
  cat >> ${PR_FORM} <<- EOF
  
diff -ruN /usr/ports/ports-mgmt/porttools/pkg-plist ./pkg-plist
--- /usr/ports/ports-mgmt/porttools/pkg-plist	2012-07-14 17:29:18.000000000 +0300
+++ ./pkg-plist	2013-06-22 15:02:02.789400838 +0300
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports-mgmt/porttools/pkg-plist 300897 2012-07-14 14:29:18Z beat $
+@comment $FreeBSD: head/ports-mgmt/porttools/pkg-plist 300897 2012-07-14 14:29:18Z beat $
 bin/port
 %%DATADIR%%/cmd_commit
 %%DATADIR%%/cmd_create
--- porttools-0.99_8.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Oct 30 09:20:09 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183468 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: joemann@beefree.free.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/183468: [PATCH] ports-mgmt/porttools: Remove python/ruby version numbers in port submit
Date: Wed, 30 Oct 2013 09:20:08 UT

 Maintainer of ports-mgmt/porttools,
 
 Please note that PR ports/183468 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183468
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Fri Nov 15 13:49:37 UTC 2013 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183468 
State-Changed-From-To: feedback->closed 
State-Changed-By: mat 
State-Changed-When: Fri Nov 15 14:07:33 UTC 2013 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183468 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183468: commit references a PR
Date: Fri, 15 Nov 2013 14:06:21 +0000 (UTC)

 Author: mat
 Date: Fri Nov 15 14:06:13 2013
 New Revision: 333865
 URL: http://svnweb.freebsd.org/changeset/ports/333865
 
 Log:
   Fixup submit when port is ruby or python based.
   
   maintainer timeout.
   PR:		ports/183468
   Submitted by:	Johannes Jost Meixner
 
 Modified:
   head/ports-mgmt/porttools/Makefile
   head/ports-mgmt/porttools/files/patch-cmd_submit.in
 
 Modified: head/ports-mgmt/porttools/Makefile
 ==============================================================================
 --- head/ports-mgmt/porttools/Makefile	Fri Nov 15 13:48:38 2013	(r333864)
 +++ head/ports-mgmt/porttools/Makefile	Fri Nov 15 14:06:13 2013	(r333865)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	porttools
  PORTVERSION=	0.99
 -PORTREVISION=	10
 +PORTREVISION=	11
  CATEGORIES=	ports-mgmt
  MASTER_SITES=	SF
  
 
 Modified: head/ports-mgmt/porttools/files/patch-cmd_submit.in
 ==============================================================================
 --- head/ports-mgmt/porttools/files/patch-cmd_submit.in	Fri Nov 15 13:48:38 2013	(r333864)
 +++ head/ports-mgmt/porttools/files/patch-cmd_submit.in	Fri Nov 15 14:06:13 2013	(r333865)
 @@ -1,5 +1,5 @@
 ---- cmd_submit.in.orig	2009-09-10 04:59:59.000000000 +0900
 -+++ cmd_submit.in	2012-12-31 23:10:59.000000000 +0900
 +--- ./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 
   		update - updating a port to newer version
 @@ -74,9 +74,24 @@
   		exit 1
   	fi
   else
 -@@ -146,6 +165,12 @@
 +@@ -144,8 +163,26 @@
 + fi
 + 
   # Collect information about the port
 - PORTNAME="`make -V PKGNAMEPREFIX``make -V PORTNAME``make -V PKGNAMESUFFIX`"
 +-PORTNAME="`make -V PKGNAMEPREFIX``make -V PORTNAME``make -V PKGNAMESUFFIX`"
 ++
 ++# The following section comes from util_diff. 
 ++# For port submit to work with python/ruby ports and GNATS auto-assign, version
 ++# numbers need to be sed'ed out before adding to synopsis.
 ++
 ++PYTHON_SUFFIX="`make -V PYTHON_SUFFIX`"
 ++RUBY_SUFFIX="`make -V RUBY_SUFFIX`"
 ++PKGNAMEPREFIX="`make -V PKGNAMEPREFIX | sed -E "s,py${PYTHON_SUFFIX}-,py-," | sed -E "s,ruby${RUBY_SUFFIX}-,ruby-,"`"
 ++PKGNAMESUFFIX="`make -V PKGNAMESUFFIX`"
 ++PORTNAME="${PKGNAMEPREFIX}`make -V PORTNAME`${PKGNAMESUFFIX}"
 ++
 ++# Rest as normal
 ++
   PORTVERSION="`make -V PORTVERSION`"
  +PORTREVISION="`make -V PORTREVISION`"
  +PORTEPOCH="`make -V PORTEPOCH`"
 @@ -87,7 +102,7 @@
   PKGNAME="`make -V PKGNAME`"
   CATEGORY="`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`"
   MAINTAINER="`make -V MAINTAINER`"
 -@@ -155,9 +180,6 @@
 +@@ -155,9 +192,6 @@
   RELEASE="`uname -srp`"
   SYSTEM="`uname -a | cut -d ' ' -f 1-12`"
   
 @@ -97,7 +112,7 @@
   CC=""
   if [ "${MODE}" = "new" ]
   then
 -@@ -194,10 +216,10 @@
 +@@ -194,10 +228,10 @@
   		# Override some parameters if submitting an update to a newer
   		# version of an existing port
   		CLASS="update"
 @@ -111,7 +126,7 @@
   	# Check to see if maintainership was requested
   	MAINT_CHANGE="`grep '^[+-]MAINTAINER' ${PATCH} | wc -l`"
   	if [ ${MAINT_CHANGE} -eq 2 ]
 -@@ -242,7 +264,12 @@
 +@@ -242,7 +276,12 @@
   fi
   
   # Generate Synopsis line
 @@ -125,7 +140,7 @@
   
   echo "===> Generating PR form"
   PR_FORM="${TEMPROOT}/PR"
 -@@ -266,9 +293,10 @@
 +@@ -266,9 +305,10 @@
   	SEND-PR: 	[ low | medium | high ]
   	>Category:	ports 
   	SEND-PR: <choose from the list of categories below (one line)>
 @@ -139,7 +154,7 @@
   	>Class:		${CLASS}
   	SEND-PR: [ sw-bug | doc-bug | change-request | update | maintainer-update ]
   	>Release:	${RELEASE}
 -@@ -277,25 +305,15 @@
 +@@ -277,25 +317,15 @@
   	>Description:
   EOF
   
 @@ -168,7 +183,7 @@
   
   	if [ -n "${FILES_ADD}" ]
   	then
 -@@ -326,14 +344,14 @@
 +@@ -326,14 +356,14 @@
   
   cat >> ${PR_FORM} <<- EOF
   
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
