Attachment 212424 Details for Bug 244776 – Patch against /usr/ports

[patch] Patch against /usr/ports

jsw-java11.patch (text/plain), 4.00 KB, created by Michael Osipov on 2020-03-15 13:29:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2020-03-15 13:29:29 UTC

Size: 4.00 KB

patch

obsolete

>Index: sysutils/javaservicewrapper/Makefile
>===================================================================
>--- sysutils/javaservicewrapper/Makefile	(revision 528459)
>+++ sysutils/javaservicewrapper/Makefile	(working copy)
>@@ -16,7 +16,9 @@
> ONLY_FOR_ARCHS=	amd64 i386
> 
> USES=		gmake iconv
>-USE_JAVA=	1.8+
>+USE_JAVA=	yes
>+JAVA_VERSION=	8+
>+
> USE_ANT=	yes
> USE_LDCONFIG=	${PREFIX}/lib/javaservicewrapper/lib
> 
>@@ -39,6 +41,8 @@
> 			s|-liconv|${ICONV_LIB}|' \
> 		${WRKSRC}/src/c/Makefile-freebsd-x86-32.gmake \
> 		${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake
>+	@${REINPLACE_CMD} -e 's|$javac\.target\.version$=.*|\1=1.8|' \
>+		${WRKSRC}/default.properties
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>Index: sysutils/javaservicewrapper/files/patch-build.xml
>===================================================================
>--- sysutils/javaservicewrapper/files/patch-build.xml	(nonexistent)
>+++ sysutils/javaservicewrapper/files/patch-build.xml	(working copy)
>@@ -0,0 +1,59 @@
>+--- 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: sysutils/javaservicewrapper/files/patch-build.xml
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 244776: 212424