Date: 01 Sep 2000 18:45:11 -0700 From: asami@FreeBSD.ORG (Satoshi - Ports Wraith - Asami) To: Will Andrews <andrews@technologist.com> Cc: Kris Kennaway <kris@FreeBSD.ORG>, ports@FreeBSD.ORG Subject: Re: Proposal: PORTREVISION and PORTEPOCH Message-ID: <vqcr973y3bs.fsf@silvia.hip.berkeley.edu> In-Reply-To: Will Andrews's message of "Mon, 28 Aug 2000 20:52:53 -0500" References: <Pine.BSF.4.21.0008200434470.24448-100000@freefall.freebsd.org> <vqc4s44oocq.fsf@bubble.hip.berkeley.edu> <20000828202407.N73638@radon.gryphonsoft.com> <vqcn1hwn8gw.fsf@bubble.hip.berkeley.edu> <20000828205253.Q73638@radon.gryphonsoft.com>
next in thread | previous in thread | raw e-mail | index | archive | help
* Date: Mon, 28 Aug 2000 20:52:53 -0500
* In the meantime, please implement PORTEPOCH/PORTREVISION. I don't think
* the bash thing is a big deal, since we're using sh in make(1).
I'm not sure if bash is a big deal but : is a special character in
some places (like in the earlier field of URLs) so it's probably
better to avoid it.
How about this one? I reimplemented Kris' patch to not use nested
.if's.
Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.348
diff -u -r1.348 bsd.port.mk
--- bsd.port.mk 2000/08/25 19:50:45 1.348
+++ bsd.port.mk 2000/09/02 01:38:44
@@ -43,10 +43,16 @@
#
# PORTNAME - Name of software.
# PORTVERSION - Version of software.
+# PORTREVISION - Revision level of FreeBSD port, incremented each time a
+# significant change is made to the port, and reset to 0
+# with each increase of PORTVERSION.
+# PORTEPOCH - Number of times the PORTVERSION has gone backwards:
+# each time a new version of the software has a lower
+# PORTVERSION, PORTEPOCH is increased. It is never reset.
# PKGNAMEPREFIX - Prefix to specify that port is language-specific, etc.
# PKGNAMESUFFIX - Suffix to specify compilation options.
# PKGNAME - Always defined as
-# ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}.
+# ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}[_${PORTREVISION}][,${PORTEPOCH}].
# Do not define this in your Makefile.
# DISTNAME - Name of port or distribution used in generating
# WRKSRC and DISTFILES below (default:
@@ -535,7 +543,18 @@
@${ECHO} " your bsd.port.mk.)"
@${FALSE}
.endif
-PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
+PORTREVISION?= 0
+.if ${PORTREVISION} != 0
+_SUF1= _${PORTREVISION}
+.endif
+
+PORTEPOCH?= 0
+.if ${PORTEPOCH} != 0
+_SUF2= ,${PORTEPOCH}
+.endif
+
+PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}${_SUF1}${_SUF2}
DISTNAME?= ${PORTNAME}-${PORTVERSION}
# These need to be absolute since we don't know how deep in the ports
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?vqcr973y3bs.fsf>