From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 6 01:01:33 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E859916AA3E for ; Tue, 6 Jun 2006 00:10:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90CE343D4C for ; Tue, 6 Jun 2006 00:10:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k560AFgR071666 for ; Tue, 6 Jun 2006 00:10:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k560AF8u071665; Tue, 6 Jun 2006 00:10:15 GMT (envelope-from gnats) Resent-Date: Tue, 6 Jun 2006 00:10:15 GMT Resent-Message-Id: <200606060010.k560AF8u071665@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, michael johnson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29DDE16B697 for ; Mon, 5 Jun 2006 23:08:39 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAB8843D5C for ; Mon, 5 Jun 2006 23:08:38 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k55N8c15004870 for ; Mon, 5 Jun 2006 23:08:38 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k55N8c5W004868; Mon, 5 Jun 2006 23:08:38 GMT (envelope-from nobody) Message-Id: <200606052308.k55N8c5W004868@www.freebsd.org> Date: Mon, 5 Jun 2006 23:08:38 GMT From: michael johnson To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/98565: [PATCH] Add PKGVERSION to bsd.port.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jun 2006 01:01:43 -0000 >Number: 98565 >Category: ports >Synopsis: [PATCH] Add PKGVERSION to bsd.port.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 06 00:10:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: michael johnson >Release: >Organization: >Environment: FreeBSD sparkey.ahze.net 7.0-CURRENT FreeBSD 7.0-CURRENT #6: Sun Jun 4 22:04:11 EDT 2006 ahze@sparkey.ahze.net:/usr/obj/usr/src/sys/Sparkey sparc64 >Description: This splists up PKGNAME in to PKGVERSION, I plan to use PKGVERSION in bsd.gstreamer.mk and in all the gstreamer ports. >How-To-Repeat: >Fix: Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.533 diff -u -r1.533 bsd.port.mk --- bsd.port.mk 23 May 2006 21:53:18 -0000 1.533 +++ bsd.port.mk 5 Jun 2006 23:00:53 -0000 @@ -72,6 +72,9 @@ # PKGNAMEPREFIX - Prefix to specify that port is language-specific, etc. # Optional. # PKGNAMESUFFIX - Suffix to specify compilation options. Optional. +# PKGVERSION - Always defined as +# ${PORTVERSION}. +# Do not define this in your Makefile. # UNIQUENAME - A name for your port that is globally unique. By default, # this is set to ${LATEST_LINK} when LATEST_LINK is set, # and to ${PKGNAMEPREFIX}${PORTNAME} otherwise. @@ -1212,8 +1215,11 @@ # check for old, crufty, makefile types, part 2. The "else" case # should have been handled in part 1, above. +.if !defined(PKGVERSION) +PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} +.endif .if !defined(PKGNAME) -PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} +PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} .endif DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} >Release-Note: >Audit-Trail: >Unformatted: