Attachment #221442 for bug #252561

View | Details | Raw Unified | Return to bug 252561
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-2 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= javaservicewrapper	4	PORTNAME= javaservicewrapper
5	PORTVERSION= 3.5.43	5	PORTVERSION= 3.5.45
6	CATEGORIES= sysutils java	6	CATEGORIES= sysutils java
7	MASTER_SITES= https://wrapper.tanukisoftware.com/download/${PORTVERSION}/	7	MASTER_SITES= https://wrapper.tanukisoftware.com/download/${PORTVERSION}/
8	DISTNAME= wrapper_${PORTVERSION}_src	8	DISTNAME= wrapper_${PORTVERSION}_src
Lines 35-40 Link Here
35	CFLAGS+= -fPIC	35	CFLAGS+= -fPIC
36	.endif	36	.endif
37		37
		38	.include <bsd.port.pre.mk>
		39
		40	.if ${JAVA_PORT_VERSION} >= 15
		41	PLIST_SUB+= JS_ENGINE="@comment "
		42	.else
		43	PLIST_SUB+= JS_ENGINE=""
		44	.endif
		45
38	post-patch:	46	post-patch:
39	@${REINPLACE_CMD} -e 's\|gcc\|${CC} ${CFLAGS}\| ; \	47	@${REINPLACE_CMD} -e 's\|gcc\|${CC} ${CFLAGS}\| ; \
40	s\|/usr/local\|${ICONV_PREFIX}\|g ; \	48	s\|/usr/local\|${ICONV_PREFIX}\|g ; \
Lines 58-61 Link Here
58	@${MKDIR} ${STAGEDIR}${DOCSDIR}	66	@${MKDIR} ${STAGEDIR}${DOCSDIR}
59	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}	67	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
60		68
61	.include <bsd.port.mk>	69	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1592680865	1	TIMESTAMP = 1610005557
2	SHA256 (wrapper_3.5.43_src.tar.gz) = 4b802ee036541eed97f0fab3a36579ba464d9cedfba26f0a10ebcc4c0a1a9da5	2	SHA256 (wrapper_3.5.45_src.tar.gz) = ae7965a1ad0389c593d5194fdaccc3bc120dbd3e7f459d7b18e6ab533bd7d402
3	SIZE (wrapper_3.5.43_src.tar.gz) = 736950	3	SIZE (wrapper_3.5.45_src.tar.gz) = 748917




--- build-tests.xml.orig	2019-10-30 07:02:29 UTC
+++ build-tests.xml
@@ -31,10 +31,7 @@
  
     <!-- Does Java include the JavaScript Engine ? -->
     <condition property="java-includes-jsEngine">
-        <and>
-            <isfalse value="${is.java 1.5 or lower}"/>
-            <istrue  value="${is.JavaSunOracleApple}"/>
-        </and>
+        <javaversion atleast="1.8"/>
     </condition>
  
     <!-- platform -->




--- 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"/>




%%DATADIR%%/test/filter.conf
%%DATADIR%%/test/growinglogoutput
%%DATADIR%%/test/growinglogoutput.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

%%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

Return to bug 252561

Lines 1-14 Link Here

(-)files/patch-build-tests.xml (-14 lines)
1	--- build-tests.xml.orig 2019-10-30 07:02:29 UTC
2	+++ build-tests.xml
3	@@ -31,10 +31,7 @@
4
5	<!-- Does Java include the JavaScript Engine ? -->
6	<condition property="java-includes-jsEngine">
7	- <and>
8	- <isfalse value="${is.java 1.5 or lower}"/>
9	- <istrue value="${is.JavaSunOracleApple}"/>
10	- </and>
11	+ <javaversion atleast="1.8"/>
12	</condition>
13
14	<!-- platform -->

Lines 1-59 Link Here

(-)files/patch-build.xml (-59 lines)
1	--- build.xml.orig 2020-03-13 16:37:05 UTC
2	+++ build.xml
3	@@ -515,7 +515,7 @@
4	<mkdir dir="${lib.dir}"/>
5
6	<!-- compile everything under src/java -->
7	- <javac srcdir="${src.dir}/java" destdir="${build.classes}"
8	+ <javac srcdir="${src.dir}/java" destdir="${build.classes}" nativeheaderdir="${src.dir}/c"
9	deprecation="on"
10	debug="on"
11	optimize="on"
12	@@ -524,6 +524,7 @@
13	target="${javac.target.version}">
14	<classpath refid="project.class.path"/>
15	</javac>
16	+ <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_*.h" eol="lf" />
17
18	<!-- copy resource files to build directory -->
19	<copy todir="${build.classes}" >
20	@@ -545,39 +546,6 @@
21	</fileset>
22	</copy>
23
24	- <!-- Generate the jni header files. This is done here rather than with the
25	- c code to make intermediate pre-release distributions possible. -->
26	- <javah
27	- destdir="${src.dir}/c"
28	- classpath="${build.classes}">
29	- <class name="org.tanukisoftware.wrapper.WrapperManager"/>
30	- </javah>
31	- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperManager.h" eol="lf" />
32	- <javah
33	- destdir="${src.dir}/c"
34	- classpath="${build.classes}">
35	- <class name="org.tanukisoftware.wrapper.WrapperProcessInputStream"/>
36	- </javah>
37	- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessInputStream.h" eol="lf" />
38	- <javah
39	- destdir="${src.dir}/c"
40	- classpath="${build.classes}">
41	- <class name="org.tanukisoftware.wrapper.WrapperProcessOutputStream"/>
42	- </javah>
43	- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessOutputStream.h" eol="lf" />
44	- <javah
45	- destdir="${src.dir}/c"
46	- classpath="${build.classes}">
47	- <class name="org.tanukisoftware.wrapper.WrapperProcessConfig"/>
48	- </javah>
49	- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessConfig.h" eol="lf" />
50	- <javah
51	- destdir="${src.dir}/c"
52	- classpath="${build.classes}">
53	- <class name="org.tanukisoftware.wrapper.WrapperResources"/>
54	- </javah>
55	- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperResources.h" eol="lf" />
56	-
57	<available property="junit.present"
58	classname="junit.framework.TestCase">
59	<classpath refid="project.class.path"/>

Lines 59-70 Link Here

(-)pkg-plist (-6 / +10 lines)
59	%%DATADIR%%/test/filter.conf	59	%%DATADIR%%/test/filter.conf
60	%%DATADIR%%/test/growinglogoutput	60	%%DATADIR%%/test/growinglogoutput
61	%%DATADIR%%/test/growinglogoutput.conf	61	%%DATADIR%%/test/growinglogoutput.conf
62	%%DATADIR%%/test/hugeclasspathenvmaxsize	62	%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize
63	%%DATADIR%%/test/hugeclasspathenvmaxsize-path.conf	63	%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize-path.conf
64	%%DATADIR%%/test/hugeclasspathenvmaxsize.conf	64	%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize.conf
65	%%DATADIR%%/test/hugeclasspathenvoversize	65	%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvoversize
66	%%DATADIR%%/test/hugeclasspathenvoversize-path.conf	66	%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvoversize-path.conf
67	%%DATADIR%%/test/hugeclasspathenvoversize.conf	67	%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvoversize.conf
68	%%DATADIR%%/test/hugeclasspathmaxsize	68	%%DATADIR%%/test/hugeclasspathmaxsize
69	%%DATADIR%%/test/hugeclasspathmaxsize.conf	69	%%DATADIR%%/test/hugeclasspathmaxsize.conf
70	%%DATADIR%%/test/hugeclasspathoversize	70	%%DATADIR%%/test/hugeclasspathoversize
Lines 149-154 Link Here
149	%%DATADIR%%/test/simplewrapperlistener.conf	149	%%DATADIR%%/test/simplewrapperlistener.conf
150	%%DATADIR%%/test/slowstop	150	%%DATADIR%%/test/slowstop
151	%%DATADIR%%/test/slowstop.conf	151	%%DATADIR%%/test/slowstop.conf
		152	%%DATADIR%%/test/startstopstopandreturnwhilestarting
		153	%%DATADIR%%/test/startstopstopandreturnwhilestarting.conf
		154	%%DATADIR%%/test/startstopstopwhilestarting
		155	%%DATADIR%%/test/startstopstopwhilestarting.conf
152	%%DATADIR%%/test/stopwhilestarting	156	%%DATADIR%%/test/stopwhilestarting
153	%%DATADIR%%/test/stopwhilestarting.conf	157	%%DATADIR%%/test/stopwhilestarting.conf
154	%%DATADIR%%/test/stopwhilestartingforcestop	158	%%DATADIR%%/test/stopwhilestartingforcestop