Date: Sat, 24 Apr 2004 07:33:45 +0200 From: Kirill Ponomarew <krion@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65926: Allow to use only numbers in PORTREVISION/PORTEPOCH Message-ID: <E1BHFnN-000OgN-Cb@voodoo.oberon.net> Resent-Message-ID: <200404240540.i3O5eD64001039@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65926
>Category: ports
>Synopsis: Allow to use only numbers in PORTREVISION/PORTEPOCH
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 23 22:40:13 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kirill Ponomarew
>Release: FreeBSD 5.2.1-RELEASE-p4 i386
>Organization:
Oberon.net
>Environment:
System: FreeBSD voodoo.oberon.net 5.2.1-RELEASE-p4 FreeBSD 5.2.1-RELEASE-p4 #0: Fri Apr 9 10:45:36 CEST 2004 krion@voodoo.oberon.net:/usr/obj/usr/src/sys/FREAK i386
>Description:
We have at the moment the scenario that any characters are
allowed in PORTREVISION/PORTEPOCH
"Porters Handbook" doesn't also tell about this behaviour.
Since using numbers in PORTREVISION/PORTEPOCH is a common way
in ports, I'd suggest this patch.
>How-To-Repeat:
>Fix:
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.488
diff -u -r1.488 bsd.port.mk
--- bsd.port.mk 19 Apr 2004 23:39:52 -0000 1.488
+++ bsd.port.mk 20 Apr 2004 10:50:25 -0000
@@ -972,14 +972,24 @@
.endif
.endif
-PORTREVISION?= 0
+.if defined(PORTREVISION)
.if ${PORTREVISION} != 0
+.if ${PORTREVISION:M*[0-9]*}x !=x
_SUF1= _${PORTREVISION}
+.else
+BROKEN= "PORTREVISION should contain only numbers."
+.endif
+.endif
.endif
-PORTEPOCH?= 0
+.if defined(PORTEPOCH)
.if ${PORTEPOCH} != 0
+.if ${PORTEPOCH:M*[0-9]*}x !=x
_SUF2= ,${PORTEPOCH}
+.else
+BROKEN= "PORTEPOCH should contain only numbers."
+.endif
+.endif
.endif
# check for old, crufty, makefile types, part 2. The "else" case
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BHFnN-000OgN-Cb>