From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 30 15:20:12 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69CF51065673 for ; Thu, 30 Jul 2009 15:20:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 44DEF8FC16 for ; Thu, 30 Jul 2009 15:20:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6UFKCPr048577 for ; Thu, 30 Jul 2009 15:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6UFKCen048571; Thu, 30 Jul 2009 15:20:12 GMT (envelope-from gnats) Resent-Date: Thu, 30 Jul 2009 15:20:12 GMT Resent-Message-Id: <200907301520.n6UFKCen048571@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, Mike Jakubik Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18ED3106566C for ; Thu, 30 Jul 2009 15:19:25 +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 0781B8FC17 for ; Thu, 30 Jul 2009 15:19:25 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n6UFJOAD034250 for ; Thu, 30 Jul 2009 15:19:24 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n6UFJOjg034249; Thu, 30 Jul 2009 15:19:24 GMT (envelope-from nobody) Message-Id: <200907301519.n6UFJOjg034249@www.freebsd.org> Date: Thu, 30 Jul 2009 15:19:24 GMT From: Mike Jakubik To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/137267: [patch] Update sysutils/javaservicewrapper 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: Thu, 30 Jul 2009 15:20:12 -0000 >Number: 137267 >Category: ports >Synopsis: [patch] Update sysutils/javaservicewrapper >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 30 15:20:11 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Mike Jakubik >Release: 7.2-STABLE >Organization: >Environment: FreeBSD illidan.local 7.2-STABLE FreeBSD 7.2-STABLE #0: Mon May 11 13:09:29 EDT 2009 root@illidan.local:/usr/obj/usr/src/sys/ILLIDAN amd64 >Description: - Change port to properly pass 32/64bit options based on current ARCH to the ant build process. - Remove javaservicewrapper/files/patch-build.xml, this patch should no longer be necessary due to the update above. - Remove unnecessary USE_GMAKE. - Strip resulting binary. - Take over maintainership, Alejandro no longer uses this port. --- On 7/9/2009 2:08 PM, Mike Jakubik wrote: > Hi, > > Is there any chance of updating this port? The version in the ports tree > is 3.2.3 while 3.3.5 is already available. > > Thanks > Hello, I've just updated it, thanks (and sorry for the delay). BTW I'm not using it now, if you want to maintain it you can have it. Regards, Ale >How-To-Repeat: >Fix: diff -urN javaservicewrapper.orig/Makefile javaservicewrapper/Makefile --- javaservicewrapper.orig/Makefile 2009-07-30 10:52:20.000000000 -0400 +++ javaservicewrapper/Makefile 2009-07-30 11:01:36.000000000 -0400 @@ -7,33 +7,40 @@ PORTNAME= javaservicewrapper PORTVERSION= 3.3.5 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= http://wrapper.tanukisoftware.org/download/${PORTVERSION}/ DISTNAME= wrapper_${PORTVERSION}_src -MAINTAINER= alepulver@FreeBSD.org +MAINTAINER= mikej@rogers.com COMMENT= Application to solve problems common to many Java applications -USE_GMAKE= yes USE_JAVA= 1.3+ USE_ANT= yes DATADIR= ${PREFIX}/lib/${PORTNAME} +ONLY_FOR_ARCHS= i386 amd64 + +.include + +.if (${ARCH} == amd64) +MAKE_ARGS+=-Dbits=64 +.else +MAKE_ARGS+=-Dbits=32 +.endif + post-patch: @${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS} -fPIC|' \ - ${WRKSRC}/src/c/Makefile-freebsd-x86-32.gmake - -do-build: - @cd ${WRKSRC} && ${SETENV} ANT_HOME="${LOCALBASE}" ${SH} build32.sh + ${WRKSRC}/src/c/Makefile-freebsd-x86-32.gmake ${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake do-install: ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${CP} -rp bin conf lib test ${DATADIR} + cd ${WRKSRC} && ${CP} -rp bin conf lib test ${DATADIR} && ${STRIP_CMD} ${DATADIR}/bin/wrapper ${LN} -sf ${DATADIR}/bin/wrapper ${PREFIX}/bin/${PORTNAME} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${CP} -r ${WRKSRC}/doc/* ${DOCSDIR} .endif -.include +.include diff -urN javaservicewrapper.orig/files/patch-build.xml javaservicewrapper/files/patch-build.xml --- javaservicewrapper.orig/files/patch-build.xml 2007-09-27 18:10:05.000000000 -0400 +++ javaservicewrapper/files/patch-build.xml 1969-12-31 19:00:00.000000000 -0500 @@ -1,10 +0,0 @@ ---- ./build.xml.orig Tue Oct 17 11:21:20 2006 -+++ ./build.xml Thu Sep 27 19:07:48 2007 -@@ -304,7 +304,6 @@ - - - -- - - - >Release-Note: >Audit-Trail: >Unformatted: