From jhelfman@e-e.com  Thu Jul 15 18:09:49 2010
Return-Path: <jhelfman@e-e.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B5D21065675
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Jul 2010 18:09:49 +0000 (UTC)
	(envelope-from jhelfman@e-e.com)
Received: from mail.experts-exchange.com (mail.experts-exchange.com [64.156.132.251])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A1188FC1B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Jul 2010 18:09:48 +0000 (UTC)
Received: from eggman.experts-exchange.com (unknown [72.29.180.81])
	by mail.experts-exchange.com (Postfix) with ESMTP id 86EDA4A2E6B0;
	Thu, 15 Jul 2010 10:59:04 -0700 (PDT)
Received: by eggman.experts-exchange.com (sSMTP sendmail emulation); Thu, 15 Jul 2010 11:07:25 -0700
Message-Id: <20100715175904.86EDA4A2E6B0@mail.experts-exchange.com>
Date: Thu, 15 Jul 2010 11:07:25 -0700
From: Jason Helfman <jhelfman@e-e.com>
Reply-To: Jason Helfman <jhelfman@e-e.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tomasv@megalogika.lt
Subject: [patch] www/tomcat55 remove java hardcoding
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         148650
>Category:       ports
>Synopsis:       [patch] www/tomcat55 remove java hardcoding
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    linimon
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 15 18:10:02 UTC 2010
>Closed-Date:    Fri Aug 20 06:56:09 UTC 2010
>Last-Modified:  Fri Aug 20 07:00:04 UTC 2010
>Originator:     Jason Helfman
>Release:        FreeBSD 7.3-RELEASE-p1 i386
>Organization:
Experts-Exchange
>Environment:
System: FreeBSD eggman.experts-exchange.com 7.3-RELEASE-p1 FreeBSD 7.3-RELEASE-p1 #0: Wed May 26 04:29:05 UTC 2010 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


>Description:
www/tomcat55 port hardcodes to use specific version of java. This patch makes the version and vendor of java configurable. Default of java_vendor remains freebsd, and java_version 1.4+

>How-To-Repeat:
	
>Fix:

--- /usr/ports/www/tomcat55/Makefile	2010-06-29 03:39:30.000000000 -0700
+++ /usr/ports/www/tomcat55/Makefile	2010-07-15 10:22:36.000000000 -0700
@@ -17,7 +17,8 @@
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION?=	1.4+
+JAVA_VENDOR?=	freebsd
 NO_BUILD=	YES
 
 USE_RC_SUBR=	tomcat55.sh
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Jul 15 18:10:21 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: tomasv@megalogika.lt
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148650: [patch] www/tomcat55 remove java hardcoding
Date: Thu, 15 Jul 2010 18:10:19 UT

 Maintainer of www/tomcat55,
 
 Please note that PR ports/148650 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/148650
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu Jul 29 02:02:54 UTC 2010 
State-Changed-Why:  
Maintainer was reset. 

To submitter: you seem to have submitted updates for this port in the 
past.  Would you be interested in becoming the new maintainer? 

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

From: Jason <jhelfman@e-e.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148650: [patch] www/tomcat55 remove java hardcoding
Date: Thu, 19 Aug 2010 21:18:56 -0700

 --qMm9M+Fa2AknHoGS
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 I have graciously accepted the offer to maintain www/tomcat55, and also
 approve of this patch. Previous reply can be disposed of.
 
 Below is a test run with the patch in place:
 
 [jhelfman@walrus /usr/ports/www/tomcat55]$ sudo make package
 =3D=3D=3D>  Vulnerability check disabled, database not found
 =3D=3D=3D>  License check disabled, port has not defined LICENSE
 =3D=3D=3D>  Extracting for tomcat-5.5.28_1
 =3D> MD5 Checksum OK for apache-tomcat-5.5.28.tar.gz.
 =3D> SHA256 Checksum OK for apache-tomcat-5.5.28.tar.gz.
 =3D=3D=3D>  Patching for tomcat-5.5.28_1
 Installation settings:
     Destination directory:    /usr/local/tomcat5.5
     Location of JDK:          /usr/local/openjdk6
     Location of Java port:    java/openjdk6
     Running as (user/group/uid):  test/test/995
     HTTP port:                8180
     Shutdown listener port:   8005
     AJP 1.3 connector port:   8009
     Logfile stdout:           /usr/local/tomcat5.5/logs/stdout.log
     Logfile stderr:           /usr/local/tomcat5.5/logs/stderr.log
 =3D=3D=3D>  Applying FreeBSD patches for tomcat-5.5.28_1
 >> Removing unneeded files... [ DONE ]
 >> Customizing server.xml... [ DONE ]
 =3D=3D=3D>  Configuring for tomcat-5.5.28_1
 =3D=3D=3D>  Installing for tomcat-5.5.28_1
 =3D=3D=3D>   tomcat-5.5.28_1 depends on file: /usr/local/openjdk6/bin/java -
 found =3D=3D=3D>   Generating temporary packing list
 =3D=3D=3D>  Checking if www/tomcat55 already installed
 >> Creating destination directory... [ DONE ]
 >> Copying files to destination directory...
      Installing local configuration
 file: /usr/local/tomcat5.5/conf/Catalina/localhost/host-manager.xml
 Installing local configuration
 file: /usr/local/tomcat5.5/conf/Catalina/localhost/manager.xml
 Installing local configuration
 file: /usr/local/tomcat5.5/conf/catalina.policy Installing local
 configuration file: /usr/local/tomcat5.5/conf/catalina.properties
 Installing local configuration
 file: /usr/local/tomcat5.5/conf/context.xml Installing local
 configuration file: /usr/local/tomcat5.5/conf/logging.properties
 Installing local configuration
 file: /usr/local/tomcat5.5/conf/server-minimal.xml Installing local
 configuration file: /usr/local/tomcat5.5/conf/server.xml Installing
 local configuration file: /usr/local/tomcat5.5/conf/tomcat-users.xml
 Installing local configuration file: /usr/local/tomcat5.5/conf/web.xml
 [ DONE ]
 >> Creating log files... [ DONE ]
 >> Creating symlink to tools.jar... [ DONE ]
 >> Fixing ownership settings... [ DONE ]
 >> Fixing permissions... [ DONE ]
 Apache Tomcat 5.5.28 has been installed in /usr/local/tomcat5.5.
 =3D=3D=3D> Installing rc.d startup script(s)
 =3D=3D=3D>   Registering installation for tomcat-5.5.28_1
 =3D=3D=3D>  Building package for tomcat-5.5.28_1
 Creating package /usr/ports/packages/All/tomcat-5.5.28_1.tbz
 Registering depends: openjdk6-b20 open-motif-2.2.3_6 libXaw-1.0.7,1
 libXp-1.0.0,1 libXpm-3.5.7 libXmu-1.0.5,1 libXt-1.0.7 libXtst-1.1.0
 libXi-1.3,1 libXext-1.1.1,1 libX11-1.3.3,1 libxcb-1.6
 libpthread-stubs-0.3_3 dejavu-2.30_1 fontconfig-2.8.0,1
 freetype2-2.3.12 libSM-1.1.1_1,1 libICE-1.0.6,1 libXau-1.0.5
 libXdmcp-1.0.3 xproto-7.0.16 pkg-config-0.23_1 javavmwrapper-2.3.5
 expat-2.0.1_1 inputproto-2.0 kbproto-1.0.4 printproto-1.0.4
 recordproto-1.14 xbitmaps-1.1.0 xextproto-7.1.1. Creating bzip'd tar
 ball in '/usr/ports/packages/All/tomcat-5.5.28_1.tbz'
 
 My make.conf file included the following information:
 =2Eif ${.CURDIR:M*/www/tomcat55}
 TOMCAT_USER=3Dtest
 TOMCAT_GROUP=3Dtest
 TOMCAT_UID=3D995
 JAVA_VENDOR=3D openjdk
 JAVA_VERSION=3D 1.6
 =2Eendif
 
 --=20
 Jason Helfman
 
 --qMm9M+Fa2AknHoGS
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (FreeBSD)
 
 iF4EAREIAAYFAkxuAjAACgkQXpKtZoyM+6VIPAD7Bhbhqz1fEY8t0NE5a4kYkEg7
 R3s5M0nv5K2NvK6CqF8A/0xctBtMxs+Yv1lKMQbpgTZVA5YWUc/ntowljgxiGW8d
 =Gce0
 -----END PGP SIGNATURE-----
 
 --qMm9M+Fa2AknHoGS--
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Fri Aug 20 06:55:39 UTC 2010 
State-Changed-Why:  
Committed, thanks. 


Responsible-Changed-From-To: freebsd-ports-bugs->linimon 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Aug 20 06:55:39 UTC 2010 
Responsible-Changed-Why:  

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148650: commit references a PR
Date: Fri, 20 Aug 2010 06:56:11 +0000 (UTC)

 linimon     2010-08-20 06:55:57 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/tomcat55         Makefile 
   Log:
   Make the default java version and vendor overrideable.
   
   PR:             ports/148650
   Submitted by:   maintainer
   
   Revision  Changes    Path
   1.53      +2 -1      ports/www/tomcat55/Makefile
 _______________________________________________
 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:
