Date: Sun, 14 Jun 2020 01:21:49 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538710 - in head/sysutils/javaservicewrapper: . files Message-ID: <202006140121.05E1Ln5q013487@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Jun 14 01:21:49 2020 New Revision: 538710 URL: https://svnweb.freebsd.org/changeset/ports/538710 Log: Fix the build with newer versions of Java PR: 244776 Submitted by: Michael Osipov <michael.osipov@siemens.com> Added: head/sysutils/javaservicewrapper/files/ head/sysutils/javaservicewrapper/files/patch-build.xml (contents, props changed) Modified: head/sysutils/javaservicewrapper/Makefile Modified: head/sysutils/javaservicewrapper/Makefile ============================================================================== --- head/sysutils/javaservicewrapper/Makefile Sun Jun 14 00:48:16 2020 (r538709) +++ head/sysutils/javaservicewrapper/Makefile Sun Jun 14 01:21:49 2020 (r538710) @@ -16,7 +16,9 @@ LICENSE_COMB= dual 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 @@ post-patch: 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} Added: head/sysutils/javaservicewrapper/files/patch-build.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/javaservicewrapper/files/patch-build.xml Sun Jun 14 01:21:49 2020 (r538710) @@ -0,0 +1,59 @@ +--- build.xml.orig 2020-03-13 16:37:05 UTC ++++ build.xml +@@ -515,7 +515,7 @@ + <mkdir dir="${lib.dir}"/> + + <!-- compile everything under src/java --> +- <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 resource files to build directory --> + <copy todir="${build.classes}" > +@@ -545,39 +546,6 @@ + </fileset> + </copy> + +- <!-- Generate the jni header files. This is done here rather than with the +- c code to make intermediate pre-release distributions possible. --> +- <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"/>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006140121.05E1Ln5q013487>