diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2013-11-15 14:06:13 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2013-11-15 14:06:13 +0000 |
| commit | f6a45b75f93d0ff971031c02b153c1a9b293e433 (patch) | |
| tree | 19ee3043fbb5802dc63a7e7d49920af5f1c534cc /ports-mgmt | |
| parent | 807440e5e0df4339581a6a3a7e78eca2730f81c1 (diff) | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/porttools/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/porttools/files/patch-cmd_submit.in | 35 |
2 files changed, 26 insertions, 11 deletions
diff --git a/ports-mgmt/porttools/Makefile b/ports-mgmt/porttools/Makefile index 547ffff57ec9..fceba214a6d4 100644 --- a/ports-mgmt/porttools/Makefile +++ b/ports-mgmt/porttools/Makefile @@ -3,7 +3,7 @@ PORTNAME= porttools PORTVERSION= 0.99 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= ports-mgmt MASTER_SITES= SF diff --git a/ports-mgmt/porttools/files/patch-cmd_submit.in b/ports-mgmt/porttools/files/patch-cmd_submit.in index 3b6bcb5a2eec..c1e581967d7b 100644 --- a/ports-mgmt/porttools/files/patch-cmd_submit.in +++ b/ports-mgmt/porttools/files/patch-cmd_submit.in @@ -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 |