Attachment 98375 Details for Bug 137267 – file.diff

[patch] file.diff

file.diff (text/plain), 2.50 KB, created by Mike Jakubik on 2009-07-30 16:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Jakubik

Created: 2009-07-30 16:20:11 UTC

Size: 2.50 KB

patch

obsolete

>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 <bsd.port.pre.mk>
>+
>+.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 <bsd.port.mk>
>+.include <bsd.port.post.mk>
>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 @@
>-         <echo message="**********************************************************************"/>
>-         <echo message="A ${bits}-bit build was requested, but this is a ${sun.arch.data.model}-bit JVM."/>
>-         <echo message="**********************************************************************"/>
>--        <fail message="The &quot;bits&quot; system property does not match that of the JVM."/>
>-     </target>
>-     
>-

Actions: View | Diff

Attachments on bug 137267: 98375