Attachment 209787 Details for Bug 239428 – update-jinput2

[patch] update-jinput2

jinput.diff (text/plain), 4.12 KB, created by voidanix on 2019-12-08 11:24:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: voidanix

Created: 2019-12-08 11:24:38 UTC

Size: 4.12 KB

patch

obsolete

>Index: games/jinput/Makefile
>===================================================================
>--- games/jinput/Makefile	(revision 519290)
>+++ games/jinput/Makefile	(working copy)
>@@ -1,40 +1,45 @@
>-# Created by: loader <loader@freebsdmall.com>
> # $FreeBSD$
> 
> PORTNAME=	jinput
>-DISTVERSION=	20110801.r247
>+DISTVERSION=	2.0.10
>+PORTEPOCH=	1
> 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
>-RUN_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:games/jutils
>+LICENSE=	BSD2CLAUSE
> 
>-BROKEN_armv6=		fails to compile: build.xml: compilation failed
>-BROKEN_armv7=		fails to compile: build.xml: compilation failed
>+BROKEN_armv6=	fails to compile
>+BROKEN_armv7=	fails to compile
> 
>-USES=		tar:bzip2
>-USE_JAVA=	yes
>-JAVA_OS=	native
>-JAVA_VENDOR=	openjdk
>-USE_ANT=	yes
>-ALL_TARGET=	simple_linux
>-NO_ARCH=	yes
>+BUILD_DEPENDS=	${JAVAJARDIR}/jutils/jutils.jar:games/jutils \
>+		mvn:devel/maven
>+RUN_DEPENDS=	${JAVAJARDIR}/jutils/jutils.jar:games/jutils
> 
>-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}.jar
>+# Using a fork because of maven dependencies
>+USE_GITLAB=	yes
>+GL_ACCOUNT=	voidanix
>+GL_COMMIT=	bf22dd975bbba31f01895332255b63df376894e6
> 
>-post-patch:
>-	@${LN} -sf ${JAVALIBDIR}/jutils/jutils.jar ${WRKSRC}/lib/
>+USE_JAVA=	8+
> 
>+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
>+PLIST_DIRS=	${JAVAJARDIR}/${PORTNAME}
>+
>+MAVEN_ARGS=	-Dmaven.antrun.skip -Dmaven.javadoc.skip -Dmaven.source.skip -Dmaven.test.skip -DskipTests -DskipITs
>+MAVEN_REPO=	-Dmaven.repo.local=${WRKSRC}/repository
>+
>+pre-build:
>+	${CP} ${JAVAJARDIR}/jutils/jutils.jar ${WRKSRC}/repository/net/java/jutils/jutils/1/jutils-1.jar
>+
> do-build:
>-	@(cd ${BUILD_WRKSRC}; \
>-		${SETENV} ${MAKE_ENV} ${ANT} ${ALL_TARGET})
>+	cd ${WRKSRC}; \
>+		${SETENV} mvn -P windows,linux,osx,wintab ${MAVEN_REPO} ${MAVEN_ARGS} --offline 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>
>Index: games/jinput/distinfo
>===================================================================
>--- games/jinput/distinfo	(revision 519290)
>+++ games/jinput/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (jinput-20110801.r247.tar.bz2) = 2275512294a1ed8ca739d60653ff12a4beb775dd43e929433488884e7d4691f7
>-SIZE (jinput-20110801.r247.tar.bz2) = 1565811
>+TIMESTAMP = 1575771995
>+SHA256 (voidanix-jinput-bf22dd975bbba31f01895332255b63df376894e6_GL0.tar.gz) = 33b9c7c07c0a27c54df9fd89ba9431b9ce5f6b6a0f2498f6f855ee533ad09570
>+SIZE (voidanix-jinput-bf22dd975bbba31f01895332255b63df376894e6_GL0.tar.gz) = 33104752
>Index: games/jinput/files/patch-openjdk7
>===================================================================
>--- games/jinput/files/patch-openjdk7	(revision 519290)
>+++ games/jinput/files/patch-openjdk7	(nonexistent)
>@@ -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"/>
>
>Property changes on: games/jinput/files/patch-openjdk7
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: games/jinput/pkg-descr
>===================================================================
>--- games/jinput/pkg-descr	(revision 519290)
>+++ games/jinput/pkg-descr	(working copy)
>@@ -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