i2p: fix post-build, add a download mirror (original has cert problems)

net/i2p/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2020/11/23 12:37:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2020/11/23 14:40:26 sthen Exp $
 
 # would normally be set in java.port.mk, but i2p pulls in bsd.port.arch.mk
 # itself which interferes with ONLY_FOR_ARCHS coming from MODULES.
@@ -11,7 +11,7 @@ V=		0.9.47
 DISTNAME=	i2psource_${V}
 EXTRACT_SUFX=	.tar.bz2
 PKGNAME=	i2p-${V}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	net
 
@@ -25,7 +25,8 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB +=	gmp
 
-MASTER_SITES=	https://download.i2p2.de/releases/$V/
+MASTER_SITES=	https://download.i2p2.de/releases/$V/ \
+		https://launchpad.net/i2p/trunk/$V/+download/
 
 MODULES=	java
 MODJAVA_VER=	1.8
@@ -48,6 +49,8 @@ DB_DIR=		${LOCALSTATEDIR}/i2p
 
 SUBST_VARS=	DB_DIR JAVA_HOME
 
+MAKE_ENV=	CC=${CC} BITS=${BITS}
+
 WRKDIST=	${WRKDIR}/${PKGNAME}
 
 # test requires addition dependencies (atleast: junit, hamcrest, jmockfit)
@@ -59,8 +62,7 @@ post-patch:
 	${SUBST_CMD} ${WRKSRC}/installer/resources/eepget
 
 post-build:
-	cd ${WRKSRC}/core/c && CC=${CC} BITS=${BITS} \
-		${WRKSRC}/core/c/build.sh
+	cd ${WRKSRC}/core/c && ${MAKE_ENV} ${WRKSRC}/core/c/build.sh
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/i2p

net/i2p/patches/patch-core_c_build_sh

@@ -0,0 +1,21 @@
+$OpenBSD: patch-core_c_build_sh,v 1.1 2020/11/23 14:40:26 sthen Exp $
+
+fix jar location
+
+Index: core/c/build.sh
+--- core/c/build.sh.orig
++++ core/c/build.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/sh -e
+ 
+ (cd jcpuid ; sh build.sh ; cd ..)
+ (cd jbigi ; sh build.sh ; cd ..)
+@@ -9,6 +9,6 @@ cp jcpuid/lib/freenet/support/CPUInformation/*jcpuid* 
+ mkdir -p t/net/i2p/util/
+ cp jbigi/lib/*jbigi* t/
+ 
+-(cd t ; jar cf ../jbigi.jar . ; cd ..)
++(cd t ; ${JAVA_HOME}/bin/jar cf ../jbigi.jar . ; cd ..)
+ 
+ echo "Native code built into jbigi.jar"