From owner-svn-ports-head@freebsd.org Tue Sep 24 01:49:47 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B429E127D31; Tue, 24 Sep 2019 01:49:47 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46ckdl4QhLz3JtG; Tue, 24 Sep 2019 01:49:47 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6158E1FE3B; Tue, 24 Sep 2019 01:49:47 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8O1nl9Q055589; Tue, 24 Sep 2019 01:49:47 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8O1nknL055587; Tue, 24 Sep 2019 01:49:46 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201909240149.x8O1nknL055587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Tue, 24 Sep 2019 01:49:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512693 - in head/java/netty: . files X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java/netty: . files X-SVN-Commit-Revision: 512693 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Sep 2019 01:49:47 -0000 Author: glewis Date: Tue Sep 24 01:49:46 2019 New Revision: 512693 URL: https://svnweb.freebsd.org/changeset/ports/512693 Log: Build the native transport library * Build the native KQueue transport library * Add that library to the installed netty.jar * Bump PORTREVISION This was only tested on amd64, but should work on all architectures with Java support Added: head/java/netty/files/ head/java/netty/files/Makefile.in (contents, props changed) Modified: head/java/netty/Makefile Modified: head/java/netty/Makefile ============================================================================== --- head/java/netty/Makefile Tue Sep 24 00:51:21 2019 (r512692) +++ head/java/netty/Makefile Tue Sep 24 01:49:46 2019 (r512693) @@ -4,6 +4,7 @@ PORTNAME= netty PORTVERSION= 4.1.41 DISTVERSIONSUFFIX= .Final +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= http://dl.bintray.com/netty/downloads/ @@ -18,7 +19,6 @@ USE_JAVA= yes CPE_VENDOR= netty_project JAVA_VERSION= 8+ -NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.Final @@ -36,6 +36,44 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS +.include + +.if ${ARCH} == "aarch64" +NETTY_ARCH= aarch_64 +.elif ${ARCH} == "amd64" +NETTY_ARCH= x86_64 +.elif ${ARCH} == "arm6" +NETTY_ARCH= arm_32 +.elif ${ARCH} == "arm7" +NETTY_ARCH= arm_32 +.elif ${ARCH} == "i386" +NETTY_ARCH= x86_32 +.elif ${ARCH} == "powerpc" +NETTY_ARCH= ppc_32 +.elif ${ARCH} == "powerpc64" +NETTY_ARCH= ppc_64 +.elif ${ARCH} == "sparc64" +NETTY_ARCH= sparc_64 +.else +# Default to ${ARCH} +NETTY_ARCH= ${ARCH} +.endif + +post-extract: + (cd ${WRKSRC} && \ + ${JAR} xf jar/netty-transport-native-kqueue-${PORTVERSION}.Final-sources.jar) + (cd ${WRKSRC} && \ + ${JAR} xf jar/netty-transport-native-unix-common-${PORTVERSION}.Final-sources.jar) + @${SED} -e 's!%%NETTY_ARCH%%!${NETTY_ARCH}!g' \ + -e 's!%%JAVA_HOME%%!${JAVA_HOME}!g' \ + ${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile + +pre-install: + @${MKDIR} ${WRKSRC}/jar/all-in-one/META-INF/native + @${MV} ${WRKSRC}/libnetty_transport_native_kqueue*.so \ + ${WRKSRC}/jar/all-in-one/META-INF/native/ + @(cd ${WRKSRC}/jar/all-in-one && ${JAR} uvf ${PORTNAME}-all-${PORTVERSION}.Final.jar META-INF/native/libnetty_transport_native_kqueue*.so) + do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKSRC}/jar/all-in-one/${PORTNAME}-all-${PORTVERSION}.Final.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar @@ -47,4 +85,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor -.include +.include Added: head/java/netty/files/Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/netty/files/Makefile.in Tue Sep 24 01:49:46 2019 (r512693) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +SHLIB_NAME= libnetty_transport_native_kqueue_%%NETTY_ARCH%%.so +SRCS!= ls *.c +INCS!= ls *.h +CFLAGS+= -I%%JAVA_HOME%%/include -I%%JAVA_HOME%%/include/freebsd + +.include