Attachment 221442 Details for Bug 252561 – Patch against /usr/ports/sysutils/javaservicewrapper

[patch] Patch against /usr/ports/sysutils/javaservicewrapper

javaservicewrapper-3.5.45.patch (text/plain), 6.96 KB, created by Michael Osipov on 2021-01-10 17:44:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2021-01-10 17:44:23 UTC

Size: 6.96 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(Revision 560560)
>+++ Makefile	(Arbeitskopie)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	javaservicewrapper
>-PORTVERSION=	3.5.43
>+PORTVERSION=	3.5.45
> CATEGORIES=	sysutils java
> MASTER_SITES=	https://wrapper.tanukisoftware.com/download/${PORTVERSION}/
> DISTNAME=	wrapper_${PORTVERSION}_src
>@@ -35,6 +35,14 @@
> CFLAGS+=	-fPIC
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${JAVA_PORT_VERSION} >= 15
>+PLIST_SUB+=	JS_ENGINE="@comment "
>+.else
>+PLIST_SUB+=	JS_ENGINE=""
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}| ; \
> 			s|/usr/local|${ICONV_PREFIX}|g ; \
>@@ -58,4 +66,4 @@
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(Revision 560560)
>+++ distinfo	(Arbeitskopie)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1592680865
>-SHA256 (wrapper_3.5.43_src.tar.gz) = 4b802ee036541eed97f0fab3a36579ba464d9cedfba26f0a10ebcc4c0a1a9da5
>-SIZE (wrapper_3.5.43_src.tar.gz) = 736950
>+TIMESTAMP = 1610005557
>+SHA256 (wrapper_3.5.45_src.tar.gz) = ae7965a1ad0389c593d5194fdaccc3bc120dbd3e7f459d7b18e6ab533bd7d402
>+SIZE (wrapper_3.5.45_src.tar.gz) = 748917
>Index: files/patch-build-tests.xml
>===================================================================
>--- files/patch-build-tests.xml	(Revision 560560)
>+++ files/patch-build-tests.xml	(nicht existent)
>@@ -1,14 +0,0 @@
>---- build-tests.xml.orig	2019-10-30 07:02:29 UTC
>-+++ build-tests.xml
>-@@ -31,10 +31,7 @@
>-  
>-     
>-     <condition property="java-includes-jsEngine">
>--        <and>
>--            <isfalse value="${is.java 1.5 or lower}"/>
>--            <istrue  value="${is.JavaSunOracleApple}"/>
>--        </and>
>-+        <javaversion atleast="1.8"/>
>-     </condition>
>-  
>-     
>
>Property changes on: files/patch-build-tests.xml
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-build.xml
>===================================================================
>--- files/patch-build.xml	(Revision 560560)
>+++ files/patch-build.xml	(nicht existent)
>@@ -1,59 +0,0 @@
>---- build.xml.orig	2020-03-13 16:37:05 UTC
>-+++ build.xml
>-@@ -515,7 +515,7 @@
>-         <mkdir dir="${lib.dir}"/>
>-         
>-         
>--        <javac srcdir="${src.dir}/java" destdir="${build.classes}"
>-+        <javac srcdir="${src.dir}/java" destdir="${build.classes}" nativeheaderdir="${src.dir}/c"
>-                deprecation="on"
>-                debug="on"
>-                optimize="on"
>-@@ -524,6 +524,7 @@
>-                target="${javac.target.version}">
>-             <classpath refid="project.class.path"/>
>-         </javac>
>-+        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_*.h" eol="lf" />
>- 
>-         
>-         <copy todir="${build.classes}" > 
>-@@ -545,39 +546,6 @@
>-             </fileset> 
>-         </copy>
>-         
>--        
>--        <javah
>--            destdir="${src.dir}/c"
>--            classpath="${build.classes}">
>--            <class name="org.tanukisoftware.wrapper.WrapperManager"/>
>--        </javah>
>--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperManager.h" eol="lf" />
>--        <javah
>--            destdir="${src.dir}/c"
>--            classpath="${build.classes}">
>--            <class name="org.tanukisoftware.wrapper.WrapperProcessInputStream"/>
>--        </javah>
>--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessInputStream.h" eol="lf" />
>--        <javah
>--            destdir="${src.dir}/c"
>--            classpath="${build.classes}">
>--            <class name="org.tanukisoftware.wrapper.WrapperProcessOutputStream"/>
>--        </javah>
>--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessOutputStream.h" eol="lf" />
>--        <javah
>--            destdir="${src.dir}/c"
>--            classpath="${build.classes}">
>--            <class name="org.tanukisoftware.wrapper.WrapperProcessConfig"/>
>--        </javah>
>--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessConfig.h" eol="lf" />
>--        <javah
>--            destdir="${src.dir}/c"
>--            classpath="${build.classes}">
>--            <class name="org.tanukisoftware.wrapper.WrapperResources"/>
>--        </javah>
>--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperResources.h" eol="lf" />
>--
>-         <available property="junit.present"
>-             classname="junit.framework.TestCase">
>-             <classpath refid="project.class.path"/>
>
>Property changes on: files/patch-build.xml
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(Revision 560560)
>+++ pkg-plist	(Arbeitskopie)
>@@ -59,12 +59,12 @@
> %%DATADIR%%/test/filter.conf
> %%DATADIR%%/test/growinglogoutput
> %%DATADIR%%/test/growinglogoutput.conf
>-%%DATADIR%%/test/hugeclasspathenvmaxsize
>-%%DATADIR%%/test/hugeclasspathenvmaxsize-path.conf
>-%%DATADIR%%/test/hugeclasspathenvmaxsize.conf
>-%%DATADIR%%/test/hugeclasspathenvoversize
>-%%DATADIR%%/test/hugeclasspathenvoversize-path.conf
>-%%DATADIR%%/test/hugeclasspathenvoversize.conf
>+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize
>+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize-path.conf
>+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize.conf
>+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvoversize
>+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvoversize-path.conf
>+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvoversize.conf
> %%DATADIR%%/test/hugeclasspathmaxsize
> %%DATADIR%%/test/hugeclasspathmaxsize.conf
> %%DATADIR%%/test/hugeclasspathoversize
>@@ -149,6 +149,10 @@
> %%DATADIR%%/test/simplewrapperlistener.conf
> %%DATADIR%%/test/slowstop
> %%DATADIR%%/test/slowstop.conf
>+%%DATADIR%%/test/startstopstopandreturnwhilestarting
>+%%DATADIR%%/test/startstopstopandreturnwhilestarting.conf
>+%%DATADIR%%/test/startstopstopwhilestarting
>+%%DATADIR%%/test/startstopstopwhilestarting.conf
> %%DATADIR%%/test/stopwhilestarting
> %%DATADIR%%/test/stopwhilestarting.conf
> %%DATADIR%%/test/stopwhilestartingforcestop

Flags:

michael.osipov: maintainer-approval+

Actions: View | Diff

Attachments on bug 252561: 221442