openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 3.6.3 and use jdk 11 to build

Browse Source 
* fix misspelled directory name
* clean up patches
* intentionally remove jdk RUN_DEPENDS, applications that use this will
have a RUN_DEPENDS on a jdk
ok sthen@ pascal@ ian@
This commit is contained in:
kurt
2025-12-23 00:42:47 +00:00
parent 07ff3531fe
commit d844465474
12 changed files with 83 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/tanukiwrapper/Makefile
+8 -6
View File
@@ -1,7 +1,6 @@
COMMENT= Tanuki Java Service Wrapper
V= 3.5.49
REVISION= 0
V= 3.6.3
DISTNAME= wrapper_${V}_src
PKGNAME= java-tanukiwrapper-${V}
CATEGORIES= java
@@ -14,9 +13,12 @@ SITES= https://download.tanukisoftware.com/wrapper/${V}/
PERMIT_PACKAGE= Yes
MODULES= java
MODJAVA_VER= 1.8
MODJAVA_VER= 11
MODJAVA_BUILD= ant
# The application which uses this defines what jdk it will run with
MODJAVA_RUN_DEPENDS=
.if ${MACHINE_ARCH} == "i386"
BITS=32
.else
@@ -44,17 +46,17 @@ USE_GMAKE= Yes
SUBST_VARS+= CC CFLAGS
post-extract:
cp ${FILESDIR}/Makefile-openbsd-${MAKE_ARCH}.gmake ${WRKSRC}/src/c/
cp ${FILESDIR}/Makefile-openbsd-*.gmake ${WRKSRC}/src/c/
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/c/Makefile-openbsd-${MAKE_ARCH}.gmake
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/java/classes/ \
${PREFIX}/lib/tanukuwrapper/
${PREFIX}/lib/tanukiwrapper/
${INSTALL_DATA} ${WRKSRC}/lib/wrapper.jar \
${PREFIX}/share/java/classes/tanukiwrapper.jar
${INSTALL_PROGRAM} ${WRKSRC}/lib/libwrapper.so ${PREFIX}/lib/tanukuwrapper/
${INSTALL_PROGRAM} ${WRKSRC}/lib/libwrapper.so ${PREFIX}/lib/tanukiwrapper/
${INSTALL_PROGRAM} ${WRKSRC}/bin/wrapper ${PREFIX}/sbin/tanukiwrapper
do-test:
java/tanukiwrapper/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (wrapper_3.5.49_src.tar.gz) = gcScF5LIqWVBv8erI3hG5tt5BZPO2XlhFACz1Y60+v4=
SIZE (wrapper_3.5.49_src.tar.gz) = 774890
SHA256 (wrapper_3.6.3_src.tar.gz) = e8Wtie0ho5tKTtVI3+kvxYeu1A5sdQWacTCfuAQv9YA=
SIZE (wrapper_3.6.3_src.tar.gz) = 902583
java/tanukiwrapper/files/Makefile-openbsd-arm-64.gmake
+5 -5
View File
@@ -1,4 +1,4 @@
# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
# Copyright (c) 1999, 2025 Tanuki Software, Ltd.
# http://www.tanukisoftware.com
# All rights reserved.
#
@@ -7,13 +7,13 @@
# license agreement you entered into with Tanuki Software.
# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
CC = ${CC} -Wall -fPIC -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE
CC = ${CC} -Wall -pedantic -Wno-strict-prototypes -DOPENBSD -DJSW64 -fPIC -I${LOCALBASE}/include -DUNICODE -D_UNICODE
INCLUDE=$(JAVA_HOME)/include
CFLAGS = ${CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/openbsd
wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c
wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_jvm_launch.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c wrapper_secure_file.c wrapper_sysinfo.c wrapper_cipher.c wrapper_cipher_base.c
libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
@@ -33,10 +33,10 @@ init:
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
$(CC) $(wrapper_SOURCE) -lm -rdynamic -lc -pthread -o $(BIN)/wrapper
$(CC) $(wrapper_SOURCE) -lm -rdynamic -L${LOCALBASE}/lib -liconv -lc -pthread -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
$(CC) -shared -rdynamic -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
$(CC) -shared -rdynamic -L${LOCALBASE}/lib -liconv -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
#%.o: %.c
# $(COMPILE) -c $(DEFS) $<
java/tanukiwrapper/files/Makefile-openbsd-sparc-64.gmake
+5 -5
View File
@@ -1,4 +1,4 @@
# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
# Copyright (c) 1999, 2025 Tanuki Software, Ltd.
# http://www.tanukisoftware.com
# All rights reserved.
#
@@ -7,13 +7,13 @@
# license agreement you entered into with Tanuki Software.
# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
CC = ${CC} -Wall -fPIC -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE
CC = ${CC} -Wall -pedantic -Wno-strict-prototypes -DOPENBSD -DJSW64 -fPIC -I${LOCALBASE}/include -DUNICODE -D_UNICODE
INCLUDE=$(JAVA_HOME)/include
CFLAGS = ${CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/openbsd
wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c
wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_jvm_launch.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c wrapper_secure_file.c wrapper_sysinfo.c wrapper_cipher.c wrapper_cipher_base.c
libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
@@ -33,10 +33,10 @@ init:
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
$(CC) $(wrapper_SOURCE) -lm -rdynamic -lc -pthread -o $(BIN)/wrapper
$(CC) $(wrapper_SOURCE) -lm -rdynamic -L${LOCALBASE}/lib -liconv -lc -pthread -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
$(CC) -shared -rdynamic -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
$(CC) -shared -rdynamic -L${LOCALBASE}/lib -liconv -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
#%.o: %.c
# $(COMPILE) -c $(DEFS) $<
java/tanukiwrapper/files/Makefile-openbsd-x86-32.gmake
+5 -5
View File
@@ -1,4 +1,4 @@
# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
# Copyright (c) 1999, 2025 Tanuki Software, Ltd.
# http://www.tanukisoftware.com
# All rights reserved.
#
@@ -7,13 +7,13 @@
# license agreement you entered into with Tanuki Software.
# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
CC = ${CC} -Wall -fPIC -pedantic -DOPENBSD -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE
CC = ${CC} -Wall -pedantic -Wno-strict-prototypes -DOPENBSD -fPIC -I${LOCALBASE}/include -DUNICODE -D_UNICODE
INCLUDE=$(JAVA_HOME)/include
CFLAGS = ${CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/openbsd
wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c
wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_jvm_launch.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c wrapper_secure_file.c wrapper_sysinfo.c wrapper_cipher.c wrapper_cipher_base.c
libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
@@ -33,10 +33,10 @@ init:
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
$(CC) $(wrapper_SOURCE) -lm -rdynamic -lc -pthread -o $(BIN)/wrapper
$(CC) $(wrapper_SOURCE) -lm -rdynamic -L${LOCALBASE}/lib -liconv -lc -pthread -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
$(CC) -shared -rdynamic -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
$(CC) -shared -rdynamic -L${LOCALBASE}/lib -liconv -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
#%.o: %.c
# $(COMPILE) -c $(DEFS) $<
java/tanukiwrapper/files/Makefile-openbsd-x86-64.gmake
+5 -5
View File
@@ -1,4 +1,4 @@
# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
# Copyright (c) 1999, 2025 Tanuki Software, Ltd.
# http://www.tanukisoftware.com
# All rights reserved.
#
@@ -7,13 +7,13 @@
# license agreement you entered into with Tanuki Software.
# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
CC = ${CC} -Wall -fPIC -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE
CC = ${CC} -Wall -pedantic -Wno-strict-prototypes -DOPENBSD -DJSW64 -fPIC -I${LOCALBASE}/include -DUNICODE -D_UNICODE
INCLUDE=$(JAVA_HOME)/include
CFLAGS = ${CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/openbsd
wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c
wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_jvm_launch.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c wrapper_secure_file.c wrapper_sysinfo.c wrapper_cipher.c wrapper_cipher_base.c
libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
@@ -33,10 +33,10 @@ init:
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
$(CC) $(wrapper_SOURCE) -lm -rdynamic -lc -pthread -o $(BIN)/wrapper
$(CC) $(wrapper_SOURCE) -lm -rdynamic -L${LOCALBASE}/lib -liconv -lc -pthread -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
$(CC) -shared -rdynamic -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
$(CC) -shared -rdynamic -L${LOCALBASE}/lib -liconv -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
#%.o: %.c
# $(COMPILE) -c $(DEFS) $<
java/tanukiwrapper/patches/patch-build_xml
+13 -3
View File
@@ -1,4 +1,5 @@
define OpenBSD property
Suppress deprecation warnings
Index: build.xml
--- build.xml.orig
@@ -13,7 +14,7 @@ Index: build.xml
<property name="dist.os" value="${os.name}"/>
<!-- Resolve an architecture to use in release names. -->
@@ -427,6 +430,7 @@
@@ -440,6 +443,7 @@
<condition property="make.name" value="gmake">
<or>
<isset property="is.freebsd"/>
@@ -21,7 +22,7 @@ Index: build.xml
<isset property="is.solaris"/>
</or>
</condition>
@@ -444,6 +448,7 @@
@@ -457,6 +461,7 @@
<or>
<isset property="is.linux"/>
<isset property="is.freebsd"/>
@@ -29,7 +30,16 @@ Index: build.xml
<isset property="is.solaris"/>
</or>
</condition>
@@ -1846,6 +1851,10 @@ wrapper.filter.action.999=NONE]]></replacevalue>
@@ -633,7 +638,7 @@
excludes="testmodule/**/*,module-info.java"
destdir="${build.classes}"
nativeheaderdir="${build.headers}"
- deprecation="on"
+ deprecation="off"
debug="on"
optimize="on"
includeantruntime="false"
@@ -2105,6 +2110,10 @@ wrapper.filter.action.999=NONE]]></replacevalue>
<release-delta-extract-platform osname="linux" osarch="armel" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
<release-delta-extract-platform osname="linux" osarch="armhf" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
<release-delta-extract-platform osname="linux" osarch="arm" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
java/tanukiwrapper/patches/patch-default_properties
+14
View File
@@ -0,0 +1,14 @@
Bump up source/target version
Index: default.properties
--- default.properties.orig
+++ default.properties
@@ -28,7 +28,7 @@ build.compress = false
junit.failonerror = true
# Minimum version of Java required to build the Wrapper
-javac.target.version=1.4
+javac.target.version=1.6
# Location of java to build the pre-release
javac.dir=E:\\j2sdk1.4.2_19
java/tanukiwrapper/patches/patch-src_c_wrapper_c
+6 -6
View File
@@ -3,7 +3,7 @@ add OpenBSD support
Index: src/c/wrapper.c
--- src/c/wrapper.c.orig
+++ src/c/wrapper.c
@@ -105,7 +105,7 @@
@@ -107,7 +107,7 @@
#include <sys/errno.h>
#include <sys/fcntl.h>
#elif defined(AIX) || defined(HPUX) || defined(MACOSX)
@@ -12,7 +12,7 @@ Index: src/c/wrapper.c
#include <sys/param.h>
#include <errno.h>
#else /* LINUX */
@@ -5886,7 +5886,7 @@ int wrapperRunCommonInner() {
@@ -7417,7 +7417,7 @@ int wrapperRunCommonInner() {
tz1 = tzname[0];
tz2 = tzname[1];
#endif
@@ -21,7 +21,7 @@ Index: src/c/wrapper.c
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, TEXT("Timezone: %s (%s) Offset: %ld, hasDaylight: %d"),
tz1, tz2, timezone, daylight);
#else
@@ -6561,7 +6561,7 @@ int checkIfBinary(const TCHAR *filename) {
@@ -8111,7 +8111,7 @@ int checkIfBinary(const TCHAR *filename) {
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, TEXT("Magic number for file %s: 0x%02x%02x%02x%02x"), filename, head[0], head[1], head[2], head[3]);
}
@@ -30,8 +30,8 @@ Index: src/c/wrapper.c
if (head[1] == 'E' && head[2] == 'L' && head[3] == 'F') {
return 1; /*ELF */
#elif defined(AIX)
@@ -8282,7 +8282,7 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
@@ -10849,7 +10849,7 @@ static int wrapperBuildJavaAdditionals(TCHAR **strings
static int wrapperBuildAutoBits(TCHAR **strings, int index) {
/* See if the auto bits parameter is set. Ignored by all but the following platforms. */
-#if /*defined(WIN32) || defined(LINUX) ||*/ defined(HPUX) || defined(MACOSX) || defined(SOLARIS) || defined(FREEBSD)
@@ -39,7 +39,7 @@ Index: src/c/wrapper.c
if (wrapperData->javaVersion->major < 9) {
if (getBooleanProperty(properties,
@@ -8297,6 +8297,8 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
@@ -10864,6 +10864,8 @@ static int wrapperBuildAutoBits(TCHAR **strings, int i
TEXT("wrapper.java.additional.auto_bits.solaris"),
#elif defined(FREEBSD)
TEXT("wrapper.java.additional.auto_bits.freebsd"),
java/tanukiwrapper/patches/patch-src_c_wrapper_h
+8 -4
View File
@@ -1,18 +1,22 @@
OpenBSD doesn't support timeb api
--- src/c/wrapper.h.orig Fri Jul 31 18:19:37 2020
+++ src/c/wrapper.h Fri Jul 31 18:21:15 2020
@@ -51,7 +51,12 @@
Index: src/c/wrapper.h
--- src/c/wrapper.h.orig
+++ src/c/wrapper.h
@@ -52,7 +52,16 @@
#define DWORD unsigned long
#endif
-#include <sys/timeb.h>
+#ifndef OPENBSD
#include <sys/timeb.h>
+#else
+struct timeb {
+ time_t time; /* seconds since the Epoch */
+ unsigned short millitm; /* + milliseconds since the Epoch */
+ short timezone; /* minutes west of UTC */
+ short dstflag; /* DST == non-zero */
+};
+#endif
#include "property.h"
#include "wrapper_jvminfo.h"
java/tanukiwrapper/patches/patch-src_c_wrapper_unix_c
+10 -7
View File
@@ -1,17 +1,20 @@
OpenBSD doesn't support timeb api
add SI_ASYNCIO define
--- src/c/wrapper_unix.c.orig Fri Jul 31 18:22:16 2020
+++ src/c/wrapper_unix.c Fri Jul 31 18:23:10 2020
@@ -51,7 +51,6 @@
#include <pthread.h>
#include <pwd.h>
Index: src/c/wrapper_unix.c
--- src/c/wrapper_unix.c.orig
+++ src/c/wrapper_unix.c
@@ -56,7 +56,9 @@
#include <sys/filio.h> /* for FIONREAD */
#endif
#include <sys/resource.h>
-#include <sys/timeb.h>
+#ifndef OPENBSD
#include <sys/timeb.h>
+#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
@@ -466,8 +465,10 @@ const TCHAR* getSignalCodeDesc(int code) {
@@ -506,8 +508,10 @@ const TCHAR* getSignalCodeDesc(int code) {
return TEXT("mesq state changed");
#endif
java/tanukiwrapper/pkg/PLIST
+2 -2
View File
@@ -1,5 +1,5 @@
lib/tanukuwrapper/
@so lib/tanukuwrapper/libwrapper.so
lib/tanukiwrapper/
@so lib/tanukiwrapper/libwrapper.so
@bin sbin/tanukiwrapper
share/java/
share/java/classes/