Attachment 138200 Details for Bug 184093 – file.diff

[patch] file.diff

file.diff (text/plain), 2.08 KB, created by mike jakubik on 2013-11-19 18:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mike jakubik

Created: 2013-11-19 18:30:00 UTC

Size: 2.08 KB

patch

obsolete

>diff -Nru javaservicewrapper.orig/Makefile javaservicewrapper/Makefile
>--- javaservicewrapper.orig/Makefile	2013-11-18 20:55:01.000000000 -0500
>+++ javaservicewrapper/Makefile	2013-11-19 13:11:53.000000000 -0500
>@@ -2,7 +2,7 @@
> # $FreeBSD: sysutils/javaservicewrapper/Makefile 327772 2013-09-20 23:05:58Z bapt $
> 
> PORTNAME=	javaservicewrapper
>-PORTVERSION=	3.5.7
>+PORTVERSION=	3.5.21
> CATEGORIES=	sysutils java
> MASTER_SITES=	http://wrapper.tanukisoftware.com/download/${PORTVERSION}/
> DISTNAME=	wrapper_${PORTVERSION}_src
>@@ -14,7 +14,8 @@
> 
> USE_JAVA=	1.4+
> USE_ANT=	yes
>-USE_GMAKE=	yes
>+
>+USES=		gmake iconv
> 
> DATADIR=	${PREFIX}/lib/${PORTNAME}
> 
>@@ -28,16 +29,23 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS} -fPIC|' \
>+
>+.if empty(ICONV_LIB)
>+	@${REINPLACE_CMD} -e 's|gcc -Wall -pedantic -DFREEBSD -DJSW64 -fPIC -I/usr/local/include -L/usr/local/lib -liconv -DUNICODE -D_UNICODE|${CC} ${CFLAGS} -Wall -pedantic -DFREEBSD -DJSW64 -fPIC -I/usr/local/include -L/usr/local/lib -DUNICODE -D_UNICODE|' \
>+		${WRKSRC}/src/c/Makefile-freebsd-x86-32.gmake \
>+		${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake
>+.else
>+	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS} |' \
> 		${WRKSRC}/src/c/Makefile-freebsd-x86-32.gmake \
> 		${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake
>+.endif
> 
> do-install:
> 	${MKDIR} ${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)
>+.if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
> 	${CP} -r ${WRKSRC}/doc/* ${DOCSDIR}
> .endif
>diff -Nru javaservicewrapper.orig/distinfo javaservicewrapper/distinfo
>--- javaservicewrapper.orig/distinfo	2013-11-18 20:55:01.000000000 -0500
>+++ javaservicewrapper/distinfo	2013-11-19 13:07:38.000000000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (wrapper_3.5.7_src.tar.gz) = 1090d4314d9ef5544013f14488b983a18b8612f9d12490d2a45fa9c61fb44d5a
>-SIZE (wrapper_3.5.7_src.tar.gz) = 465189
>+SHA256 (wrapper_3.5.21_src.tar.gz) = 4b7cf9b280cba7c8161d03af3e8fdf003ce6622092e7d50eaf32ffce13c5b43a
>+SIZE (wrapper_3.5.21_src.tar.gz) = 538978

Actions: View | Diff

Attachments on bug 184093: 138200