cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove java-tanukiwrapper, it was never used and the original software that required

Browse Source 
it never made it into the tree.

ok kurt@
This commit is contained in:
jasper 2019-09-24 11:47:40 +00:00
parent 28da13877f
commit e4ea48352d
14 changed files with 1 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2019/06/17 02:07:21 lteo Exp $
# $OpenBSD: Makefile,v 1.16 2019/09/24 11:47:40 jasper Exp $
SUBDIR =
SUBDIR += gradle
@ -6,6 +6,5 @@
SUBDIR += javaPathHelper
SUBDIR += jlint
SUBDIR += jna
SUBDIR += tanukiwrapper
.include <bsd.port.subdir.mk>

65
java/tanukiwrapper/Makefile
View File

@ -1,65 +0,0 @@
# $OpenBSD: Makefile,v 1.14 2019/09/23 14:04:25 kurt Exp $
# manually set to arches list for jdk 1.8; bsd.port.arch.mk interferes
# with java MODULES. can be removed if moved to MODJAVA_VER=1.8+
ONLY_FOR_ARCHS= amd64 i386
COMMENT= Tanuki Java Service Wrapper
SVN_REV= 1780
DISTNAME= wrapper-code-${SVN_REV}-trunk
PKGNAME= java-tanukiwrapper-3.5.19.1
REVISION= 7
CATEGORIES= java
HOMEPAGE= http://wrapper.tanukisoftware.com/
MASTER_SITES= https://distfiles.nl/
# GPLv2
# http://wrapper.tanukisoftware.com/doc/english/licenseCommunity.html
PERMIT_PACKAGE= Yes
EXTRACT_SUFX= .zip
MODULES= java
MODJAVA_VER= 1.8
MODJAVA_BUILD= ant
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mlp64}
BITS=64
.else
BITS=32
.endif
MODJAVA_BUILD_ARGS=-Dbits=${BITS}
WANTLIB= c iconv m pthread
LIB_DEPENDS= converters/libiconv
USE_GMAKE= Yes
WRKDIST= ${WRKDIR}/${DISTNAME}/wrapper
SUBST_VARS+= CC CFLAGS
post-extract:
cp ${FILESDIR}/Makefile-openbsd-x86-${BITS}.gmake ${WRKSRC}/src/c/
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/c/Makefile-openbsd-x86-${BITS}.gmake
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/java/classes/ \
${PREFIX}/lib/tanukuwrapper/
${INSTALL_DATA} ${WRKSRC}/lib/wrapper.jar \
${PREFIX}/share/java/classes/tanukiwrapper.jar
${INSTALL_PROGRAM} ${WRKSRC}/lib/libwrapper.so ${PREFIX}/lib/tanukuwrapper/
${INSTALL_PROGRAM} ${WRKSRC}/bin/wrapper ${PREFIX}/sbin/tanukiwrapper
do-test:
cd ${WRKSRC} && ant -Dbits=${BITS} -f build-tests.xml
.include <bsd.port.mk>

2
java/tanukiwrapper/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (wrapper-code-1780-trunk.zip) = ThNDvRx7Ow0oA9wxP1O3XAUGPFRcNP0IxjahaktN65M=
SIZE (wrapper-code-1780-trunk.zip) = 700572

42
java/tanukiwrapper/files/Makefile-openbsd-x86-32.gmake
View File

@ -1,42 +0,0 @@
# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
# http://www.tanukisoftware.com
# All rights reserved.
#
# This software is the proprietary information of Tanuki Software.
# You shall use it only in accordance with the terms of the
# 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
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 wrapper_file.c wrapper_i18n.c
libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o
BIN = ../../bin
LIB = ../../lib
all: init wrapper libwrapper.so
clean:
rm -f *.o
cleanall: clean
rm -rf *~ .deps
rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
init:
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
$(CC) $(wrapper_SOURCE) -lm -pthread -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
$(CC) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
#%.o: %.c
# $(COMPILE) -c $(DEFS) $<

42
java/tanukiwrapper/files/Makefile-openbsd-x86-64.gmake
View File

@ -1,42 +0,0 @@
# Copyright (c) 1999, 2013 Tanuki Software, Ltd.
# http://www.tanukisoftware.com
# All rights reserved.
#
# This software is the proprietary information of Tanuki Software.
# You shall use it only in accordance with the terms of the
# 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
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 wrapper_file.c wrapper_i18n.c
libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o
BIN = ../../bin
LIB = ../../lib
all: init wrapper libwrapper.so
clean:
rm -f *.o
cleanall: clean
rm -rf *~ .deps
rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
init:
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
$(CC) $(wrapper_SOURCE) -lm -pthread -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
$(CC) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
#%.o: %.c
# $(COMPILE) -c $(DEFS) $<

23
java/tanukiwrapper/patches/patch-build-tests_xml
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-build-tests_xml,v 1.1.1.1 2013/07/10 14:40:29 jasper Exp $
Correctly recognize and handle OpenBSD.
--- build-tests.xml.orig Tue Jul 2 14:27:15 2013
+++ build-tests.xml Tue Jul 2 14:30:42 2013
@@ -85,11 +85,15 @@
<property name="is.Unix" value="true"/>
<property name="is.shell.sh" value="true"/>
</target>
+ <target name="init-openbsd" if="is.OpenBSD">
+ <property name="is.Unix" value="true"/>
+ <property name="is.shell.sh" value="true"/>
+ </target>
<!-- =================================================================== -->
<!-- Initialize build. -->
<!-- =================================================================== -->
- <target name="init" depends="init-windows, init-linux, init-solaris, init-aix, init-hpux, init-macosx, init-osf1, init-freebsd, init-irix">
+ <target name="init" depends="init-windows, init-linux, init-solaris, init-aix, init-hpux, init-macosx, init-osf1, init-freebsd, init-irix, init-openbsd">
</target>
<!-- =================================================================== -->

33
java/tanukiwrapper/patches/patch-build_xml
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-build_xml,v 1.1.1.1 2013/07/10 14:40:29 jasper Exp $
Correctly recognize and handle OpenBSD.
--- build.xml.orig Wed Apr 17 07:48:52 2013
+++ build.xml Tue Jul 2 14:28:54 2013
@@ -95,6 +95,9 @@
<condition property="dist.os" value="os400">
<equals arg1="${os.name}" arg2="OS/400"/>
</condition>
+ <condition property="dist.os" value="openbsd">
+ <equals arg1="${os.name}" arg2="OpenBSD"/>
+ </condition>
<property name="dist.os" value="${os.name}"/>
<!-- Resolve an architecture to use in release names. -->
@@ -395,6 +398,7 @@
<or>
<isset property="is.osf1"/>
<isset property="is.freebsd"/>
+ <isset property="is.openbsd"/>
<isset property="is.irix"/>
<isset property="is.solaris"/>
</or>
@@ -1833,6 +1837,8 @@ original tar distribution due to a lack of support for
<release-delta-extract-platform osname="windows" osarch="x86" bits="32" wrapperbinhead="wrapper" wrapperbintail=".exe" wrapperlibhead="wrapper" wrapperlibtail=".dll" archivetype="zip"/>
<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="openbsd" osarch="x86" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="x86" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
</target>
<target name="release-delta" depends="pre-release:check, release-delta:init, pre-release:restore-jdocs, release-delta:extract-platforms">
<property name="deltareleasefile" value="wrapper-delta-pack-${version}"/>

12
java/tanukiwrapper/patches/patch-src_c_logger_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_c_logger_c,v 1.1.1.1 2013/07/10 14:40:29 jasper Exp $
--- src/c/logger.c.orig Tue Jul 2 14:22:31 2013
+++ src/c/logger.c Tue Jul 2 14:22:43 2013
@@ -76,7 +76,7 @@ typedef long intptr_t;
#elif defined(AIX) || defined(HPUX) || defined(MACOSX) || defined(OSF1)
#elif defined(IRIX)
#define PATH_MAX FILENAME_MAX
- #elif defined(FREEBSD)
+ #elif defined(FREEBSD) || defined(OPENBSD)
#include <sys/param.h>
#include <errno.h>
#else /* LINUX */

21
java/tanukiwrapper/patches/patch-src_c_property_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_c_property_c,v 1.2 2016/01/13 22:09:32 jasper Exp $
--- src/c/property.c.orig Wed Apr 17 07:48:52 2013
+++ src/c/property.c Wed Jan 13 23:08:34 2016
@@ -27,7 +27,7 @@
* included in all copies or substantial portions of the Software.
*/
-#if defined(MACOSX) || defined(FREEBSD)
+#if defined(MACOSX) || defined(FREEBSD) || defined(OPENBSD)
#else
#include <malloc.h>
#endif
@@ -453,7 +453,7 @@ int getEncodingByName(char* encodingMB, int *encoding)
int getEncodingByName(char* encodingMB, char** encoding) {
#endif
if (strIgnoreCaseCmp(encodingMB, "Shift_JIS") == 0) {
-#if defined(FREEBSD) || defined (AIX) || defined(MACOSX)
+#if defined(FREEBSD) || defined (AIX) || defined(MACOSX) || defined(OPENBSD)
*encoding = "SJIS";
#elif defined(WIN32)
*encoding = 932;

48
java/tanukiwrapper/patches/patch-src_c_wrapper_c
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-src_c_wrapper_c,v 1.1.1.1 2013/07/10 14:40:29 jasper Exp $
--- src/c/wrapper.c.orig Tue Jul 2 14:18:26 2013
+++ src/c/wrapper.c Tue Jul 2 14:21:35 2013
@@ -98,7 +98,7 @@
#elif defined(AIX) || defined(HPUX) || defined(MACOSX) || defined(OSF1)
#elif defined(IRIX)
#define PATH_MAX FILENAME_MAX
- #elif defined(FREEBSD)
+ #elif defined(FREEBSD) || defined(OPENBSD)
#include <sys/param.h>
#include <errno.h>
#else /* LINUX */
@@ -3978,7 +3978,7 @@ int wrapperRunCommonInner() {
tz1 = tzname[0];
tz2 = tzname[1];
#endif
-#ifndef FREEBSD
+#if !defined(FREEBSD) && !defined(OPENBSD)
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, TEXT("Timezone: %s (%s) Offset: %ld, hasDaylight: %d"),
tz1, tz2, timezone, daylight);
#else
@@ -4555,7 +4555,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]);
}
-#if defined(LINUX) || defined(FREEBSD) || defined(SOLARIS)
+#if defined(LINUX) || defined(FREEBSD) || defined(SOLARIS) || defined(OPENBSD)
if (head[1] == 'E' && head[2] == 'L' && head[3] == 'F') {
return 1; /*ELF */
#elif defined(AIX)
@@ -5834,7 +5834,7 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
/* 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)
+#if /*defined(WIN32) || defined(LINUX) ||*/ defined(HPUX) || defined(MACOSX) || defined(SOLARIS) || defined(FREEBSD) || defined(OPENBSD)
if (getBooleanProperty(properties,
@@ -5851,6 +5851,8 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
TEXT("wrapper.java.additional.auto_bits.freebsd"),
#elif defined(MACOSX)
TEXT("wrapper.java.additional.auto_bits.macosx"),
+#elif defined(OPENBSD)
+ TEXT("wrapper.java.additional.auto_bits.openbsd"),
#endif
getBooleanProperty(properties, TEXT("wrapper.java.additional.auto_bits"), FALSE, showWarnings),
showWarnings)) {

17
java/tanukiwrapper/patches/patch-src_c_wrapper_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_c_wrapper_h,v 1.1 2013/12/08 16:35:18 ian Exp $
--- src/c/wrapper.h.orig Wed Apr 17 01:48:52 2013
+++ src/c/wrapper.h Sat Dec 7 14:45:36 2013
@@ -52,7 +52,12 @@
#define DWORD unsigned long
#endif
-#include <sys/timeb.h>
+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 */
+};
#include "property.h"

25
java/tanukiwrapper/patches/patch-src_c_wrapper_unix_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_c_wrapper_unix_c,v 1.2 2013/12/08 16:35:18 ian Exp $
Wrap SI_ASYNCIO like is being done for other signals.
--- src/c/wrapper_unix.c.orig Wed Apr 17 01:48:52 2013
+++ src/c/wrapper_unix.c Thu Dec 5 18:09:19 2013
@@ -48,7 +48,6 @@
#include <pthread.h>
#include <pwd.h>
#include <sys/resource.h>
-#include <sys/timeb.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
@@ -408,8 +407,10 @@ const TCHAR* getSignalCodeDesc(int code) {
return TEXT("mesq state changed");
#endif
+#ifdef SI_ASYNCIO
case SI_ASYNCIO:
return TEXT("AIO completed");
+#endif
#ifdef SI_SIGIO
case SI_SIGIO:

10
java/tanukiwrapper/pkg/DESCR
View File

@ -1,10 +0,0 @@
The Java Service Wrapper is an application which has evolved out of a
desire to solve a number of problems common to many Java applications:
- Run as a Windows Service or Unix Daemon
- Application Reliability
- Standard, Out of the Box Scripting
- On Demand Restarts
- Flexible Configuration
- Ease Application Installations
- Logging

7
java/tanukiwrapper/pkg/PLIST
View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/07/10 14:40:29 jasper Exp $
@bin sbin/tanukiwrapper
lib/tanukuwrapper/
lib/tanukuwrapper/libwrapper.so
share/java/
share/java/classes/
share/java/classes/tanukiwrapper.jar