From jhelfman@experts-exchange.com  Thu Aug 11 16:19:41 2011
Return-Path: <jhelfman@experts-exchange.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4C4F71065677
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Aug 2011 16:19:41 +0000 (UTC)
	(envelope-from jhelfman@experts-exchange.com)
Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C89E8FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Aug 2011 16:19:40 +0000 (UTC)
Received: from mail.experts-exchange.com (localhost [127.0.0.1])
	by mail.experts-exchange.com (Postfix) with ESMTP id CE4906FD29F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Aug 2011 09:19:40 -0700 (PDT)
Received: from mail.experts-exchange.com ([127.0.0.1])
	by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id kiNKJLfqAOpe for <FreeBSD-gnats-submit@freebsd.org>;
	Thu, 11 Aug 2011 09:19:40 -0700 (PDT)
Received: from experts-exchange.com (unknown [192.168.103.122])
	by mail.experts-exchange.com (Postfix) with SMTP id A9EA06F25A0
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Aug 2011 09:19:40 -0700 (PDT)
Received: (nullmailer pid 74564 invoked by uid 1001);
	Thu, 11 Aug 2011 16:18:56 -0000
Message-Id: <1313079536.897510.74563.nullmailer@experts-exchange.com>
Date: Thu, 11 Aug 2011 09:18:56 -0700
From: Jason Helfman <jhelfman@experts-exchange.com>
Reply-To: Jason Helfman <jhelfman@experts-exchange.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] www/axis: deprecation of www/tomcat41, cleanup deps.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         159691
>Category:       ports
>Synopsis:       [patch] www/axis: deprecation of www/tomcat41, cleanup deps.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hq
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 11 16:20:07 UTC 2011
>Closed-Date:    Sat Aug 13 23:16:19 UTC 2011
>Last-Modified:  Sat Aug 13 23:20:07 UTC 2011
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD eggman.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
www/tomcat41 is set for deprecation
update port dependencies against tomcat55 and tomcat6
>How-To-Repeat:
	
>Fix:

Index: www/axis/Makefile
===================================================================
RCS file: /home/jhelfman/ncvs/ports/www/axis/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- www/axis/Makefile	21 Jul 2011 05:02:59 -0000	1.21
+++ www/axis/Makefile	11 Aug 2011 04:39:15 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=		axis
 PORTVERSION=		1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=		www java
 MASTER_SITES=		${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	ws/axis/${PORTVERSION:S,.,_,g}
@@ -20,16 +20,16 @@
 #
 .if exists(${LOCALBASE}/tomcat5.5/webapps)
 WEBAPPDIR=	${PREFIX}/tomcat5.5/webapps
-BUILD_DEPENDS+=	${LOCALBASE}/tomcat5.5:${PORTSDIR}/www/tomcat55
-RUN_DEPENDS+=	${LOCALBASE}/tomcat5.5:${PORTSDIR}/www/tomcat55
-.elif exists(${LOCALBASE}/jakarta-tomcat4.1/webapps)
-WEBAPPDIR=	${PREFIX}/jakarta-tomcat4.1/webapps
-BUILD_DEPENDS+=	${LOCALBASE}/jakarta-tomcat4.1:${PORTSDIR}/www/tomcat41
-RUN_DEPENDS+=	${LOCALBASE}/jakarta-tomcat4.1:${PORTSDIR}/www/tomcat41
+BUILD_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
+RUN_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
+.elif exists(${LOCALBASE}/apache-tomcat-6.0/webapps)
+WEBAPPDIR=	${PREFIX}/apache-tomcat-6.0/webapps
+BUILD_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
 .else
 WEBAPPDIR=	${PREFIX}/tomcat5.5/webapps
-BUILD_DEPENDS+=	${LOCALBASE}/tomcat5.5:${PORTSDIR}/www/tomcat55
-RUN_DEPENDS+=	${LOCALBASE}/tomcat5.5:${PORTSDIR}/www/tomcat55
+BUILD_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
+RUN_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
 .endif
 
 NO_BUILD=	YES
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->hq 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Aug 11 16:20:18 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159691 
State-Changed-From-To: open->closed 
State-Changed-By: hq 
State-Changed-When: Sat Aug 13 23:15:35 UTC 2011 
State-Changed-Why:  
Patch committed. Thanks for your contribution. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159691 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/159691: commit references a PR
Date: Sat, 13 Aug 2011 23:15:26 +0000 (UTC)

 hq          2011-08-13 23:15:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/axis             Makefile pkg-plist 
   Log:
   - Handle deprecation of www/tomcat41 and cleanup dependencies [1]
   - Fix Tomcat dependency lookup mechanism
   - Honor NOPORTEXAMPLES
   - Use PORTDOCS and PORTEXAMPLES
   
   PR:             159691 [1]
   Submitted by:   Jason Helfman <jhelfman@experts-exchange.com> [1]
   
   Revision  Changes    Path
   1.22      +19 -11    ports/www/axis/Makefile
   1.7       +1 -2316   ports/www/axis/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
