From nobody@FreeBSD.org  Mon Jan 28 10:49:07 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E47A16A420
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 28 Jan 2008 10:49:07 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id F1C6F13C448
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 28 Jan 2008 10:49:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m0SAlNsi095821
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 28 Jan 2008 10:47:23 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m0SAlNuk095820;
	Mon, 28 Jan 2008 10:47:23 GMT
	(envelope-from nobody)
Message-Id: <200801281047.m0SAlNuk095820@www.freebsd.org>
Date: Mon, 28 Jan 2008 10:47:23 GMT
From: Massimo Fusaro <mfusaro@neobe.it>
To: freebsd-gnats-submit@FreeBSD.org
Subject: "bad substitution" in www/geronimo start script
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         120078
>Category:       ports
>Synopsis:       "bad substitution" in www/geronimo start script
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    nemoliu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 28 10:50:12 UTC 2008
>Closed-Date:    Wed Feb 13 10:00:06 UTC 2008
>Last-Modified:  Wed Feb 13 10:00:06 UTC 2008
>Originator:     Massimo Fusaro
>Release:        7.0-PRERELEASE
>Organization:
>Environment:
FreeBSD plane.lan 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #2: Thu Jan 10 11:20:11 CET 2008     root@plane.lan:/usr/obj/usr/src/sys/PLANE  i386


>Description:
In the latest version of the "www/geronimo" port Makefile, PORTVERSION is 2.0.2, but other variables
such as MAJOR_VER refer the previous version: 2.0.M5.

The result is a broken start script (version number is not removed, so the shell variables contain some dot).
For example
	geronimo2_enable
becomes
	geronimo2.0.2_enable
which is not a correct name for a shell variable.
>How-To-Repeat:
/usr/local/etc/rc.d/geronimo2 start
>Fix:


Patch attached with submission follows:

--- Makefile.orig	2008-01-28 11:34:29.000000000 +0100
+++ Makefile	2008-01-28 11:39:57.000000000 +0100
@@ -9,8 +9,8 @@
 PORTVERSION=	2.0.2
 CATEGORIES=	www devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	geronimo/${PORTVERSION:C/\.M/-M/}
-DISTNAME=	${PORTNAME}-${WEBSERVER}-jee5-${PORTVERSION:C/\.M/-M/}-bin
+MASTER_SITE_SUBDIR=	geronimo/${PORTVERSION}
+DISTNAME=	${PORTNAME}-${WEBSERVER}-jee5-${PORTVERSION}-bin
 
 MAINTAINER=	nemoliu@FreeBSD.org
 COMMENT=	Open-source Java EE 5 application server
@@ -40,17 +40,17 @@
 WEBSERVER=	tomcat6
 .endif
 
-MAJOR_VER=	${PORTVERSION:S/.0.M5//}
-APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:S/.0.M5//}
+MAJOR_VER=	${PORTVERSION:S/.0.2//}
+APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:S/.0.2//}
 LOG_DIR=	${APP_HOME}/var/log
 APP_TITLE=	Geronimo
-APP_SHORTNAME=	geronimo${MAJOR_VER:S/.0.M5//}
+APP_SHORTNAME=	geronimo${MAJOR_VER:S/.0.2//}
 GERONIMO_USER?=	www
 GERONIMO_GROUP?=www
 GERONIMO_OUT=	${LOG_DIR}/geronimo.out
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/${PORTNAME}-${WEBSERVER}-jee5-${PORTVERSION:C/\.M/-M/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${WEBSERVER}-jee5-${PORTVERSION}
 JAR_FILE=	bin/server.jar
 WEBPATHV=	${WEBSERVER}
 WEBPATHNV=	jetty
@@ -67,7 +67,7 @@
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} \
 		WWWOWN=${TOMCAT_USER} \
 		WWWGRP=${TOMCAT_GROUP} \
-		PVER=${PORTVERSION:C/\.M/-M/} \
+		PVER=${PORTVERSION} \
 		WEBPATHV=${WEBPATHV} \
 		WEBPATHNV=${WEBPATHNV} \
 		WEBPATHV=${WEBPATHV} \


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nemoliu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jan 28 10:50:23 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120078 
State-Changed-From-To: open->closed  
State-Changed-By: nemoliu 
State-Changed-When: Wed Feb 13 09:58:22 UTC 2008 
State-Changed-Why:  
commited.thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120078 
>Unformatted:
