From owner-freebsd-ports Sun Aug 20 13:49:33 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8EE7537B424; Sun, 20 Aug 2000 13:49:30 -0700 (PDT) Received: from localhost (kris@localhost) by freefall.freebsd.org (8.9.3/8.9.2) with ESMTP id NAA37307; Sun, 20 Aug 2000 13:49:30 -0700 (PDT) (envelope-from kris@FreeBSD.org) X-Authentication-Warning: freefall.freebsd.org: kris owned process doing -bs Date: Sun, 20 Aug 2000 13:49:29 -0700 (PDT) From: Kris Kennaway To: Will Andrews Cc: Satoshi Asami , ports@FreeBSD.ORG Subject: Re: Proposal: PORTREVISION and PORTEPOCH In-Reply-To: <20000820064317.J8055@argon.gryphonsoft.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org On Sun, 20 Aug 2000, Will Andrews wrote: > On Sun, Aug 20, 2000 at 04:35:50AM -0700, Kris Kennaway wrote: > > PROPOSAL FOR PACKAGE NAMING CONVENTIONS > > I'm all for this -- great job thinking this out, Kris! :) > > Satoshi? Please implement this in bsd.port.mk. Here's the patch (I didnt look at pkg_version yet, but as noted in the proposal it should continue to work as well as before until it can be taught about the new structure): Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.346 diff -u -r1.346 bsd.port.mk --- bsd.port.mk 2000/08/15 22:39:00 1.346 +++ bsd.port.mk 2000/08/20 20:47:18 @@ -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 +541,17 @@ @${ECHO} " your bsd.port.mk.)" @${FALSE} .endif +.if defined(PORTREVISION) && ${PORTREVISION} > 0 +.if defined(PORTEPOCH) && ${PORTEPOCH} > 0 +PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}_${PORTREVISION}:${PORTEPOCH} +.else +PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}_${PORTREVISION} +.endif +.elif defined(PORTEPOCH) && ${PORTEPOCH} > 0 +PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}:${PORTEPOCH} +.else PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} +.endif DISTNAME?= ${PORTNAME}-${PORTVERSION} # These need to be absolute since we don't know how deep in the ports -- In God we Trust -- all others must submit an X.509 certificate. -- Charles Forsythe To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message