Attachment 206053 Details for Bug 239428 – update-jinput

[patch] update-jinput

jinput.diff (text/plain), 3.20 KB, created by voidanix on 2019-07-25 08:34:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: voidanix

Created: 2019-07-25 08:34:19 UTC

Size: 3.20 KB

patch

obsolete

>diff --git a/games/jinput/Makefile b/games/jinput/Makefile
>index f221db1f9..d296ccc42 100644
>--- a/games/jinput/Makefile
>+++ b/games/jinput/Makefile
>@@ -1,41 +1,39 @@
> # Created by: loader <loader@freebsdmall.com>
> # $FreeBSD$
> 
> PORTNAME=	jinput
>-DISTVERSION=	20110801.r247
>+DISTVERSION=	2.0.9
> CATEGORIES=	games java
>-MASTER_SITES=	LOCAL/loader
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	voidanix@420blaze.it
> COMMENT=	Java Game Controller API
> 
>-BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:games/jutils
>+BROKEN_armv6=	fails to compile: compilation failed
>+BROKEN_armv7=	fails to compile: compilation failed
>+
>+BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:games/jutils \
>+		mvn:devel/maven
> RUN_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:games/jutils
> 
>-BROKEN_armv6=		fails to compile: build.xml: compilation failed
>-BROKEN_armv7=		fails to compile: build.xml: compilation failed
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	jinput
> 
>-USES=		tar:bzip2
> USE_JAVA=	yes
> JAVA_VERSION=	1.6+
>-JAVA_OS=	native
>-JAVA_VENDOR=	openjdk
>-USE_ANT=	yes
>-ALL_TARGET=	simple_linux
>+
> NO_ARCH=	yes
> 
>-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}.jar
>+MAVEN_ARGS=	-Dmaven.antrun.skip -Dmaven.javadoc.skip -Dmaven.source.skip -Dmaven.test.skip -DskinTests -DskipITs
> 
>-post-patch:
>-	@${LN} -sf ${JAVALIBDIR}/jutils/jutils.jar ${WRKSRC}/lib/
>+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
> 
> do-build:
>-	@(cd ${BUILD_WRKSRC}; \
>-		${SETENV} ${MAKE_ENV} ${ANT} ${ALL_TARGET})
>+	cd ${WRKSRC}; \
>+		${SETENV} mvn -P windows,linux,osx,wintab ${MAVEN_ARGS} package
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
>-	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}.jar \
>-		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/
>+	${INSTALL_DATA} ${WRKSRC}/uberjar/target/${PORTNAME}-${PORTVERSION}-SNAPSHOT.jar \
>+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
> 
> .include <bsd.port.mk>
>diff --git a/games/jinput/distinfo b/games/jinput/distinfo
>index 67cd2f8e1..b053d8037 100644
>--- a/games/jinput/distinfo
>+++ b/games/jinput/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (jinput-20110801.r247.tar.bz2) = 2275512294a1ed8ca739d60653ff12a4beb775dd43e929433488884e7d4691f7
>-SIZE (jinput-20110801.r247.tar.bz2) = 1565811
>+TIMESTAMP = 1563900798
>+SHA256 (jinput-jinput-2.0.9_GH0.tar.gz) = 0bd786ef85f3c9a25446bd6f2328630a57b0f7e0bf075923dfe7de25eac3aecb
>+SIZE (jinput-jinput-2.0.9_GH0.tar.gz) = 140453
>diff --git a/games/jinput/files/patch-openjdk7 b/games/jinput/files/patch-openjdk7
>deleted file mode 100644
>index a054a387c..000000000
>--- a/games/jinput/files/patch-openjdk7
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- plugins/linux/build.xml.orig
>-+++ plugins/linux/build.xml
>-@@ -56,6 +56,7 @@
>- 		<javah destdir="src/native">
>-             <classpath>
>-                 <pathelement location="classes"/>
>-+                <pathelement location="../../coreAPI/bin/jinput-core.jar"/>
>-             </classpath>
>- 			<class name="net.java.games.input.LinuxEventDevice"/>
>- 			<class name="net.java.games.input.LinuxJoystickDevice"/>
>diff --git a/games/jinput/pkg-descr b/games/jinput/pkg-descr
>index a7031c770..61216694b 100644
>--- a/games/jinput/pkg-descr
>+++ b/games/jinput/pkg-descr
>@@ -1,3 +1,3 @@
> Java Game Controller API
> 
>-WWW: https://svn.java.net/svn/jinput~svn/trunk
>+WWW: https://github.com/jinput/jinput

Actions: View | Diff

Attachments on bug 239428: 206039 | 206053 | 209787