aboutsummaryrefslogtreecommitdiffstats
path: root/net-p2p/i2p
diff options
context:
space:
mode:
Diffstat (limited to 'net-p2p/i2p')
-rw-r--r--net-p2p/i2p/Makefile38
-rw-r--r--net-p2p/i2p/distinfo9
2 files changed, 21 insertions, 26 deletions
diff --git a/net-p2p/i2p/Makefile b/net-p2p/i2p/Makefile
index 3d034da64c4f..cfac132504da 100644
--- a/net-p2p/i2p/Makefile
+++ b/net-p2p/i2p/Makefile
@@ -6,19 +6,22 @@
#
PORTNAME= i2p
-PORTVERSION= 0.6.1.27
+PORTVERSION= 0.6.1.28
CATEGORIES= net-p2p java security
-MASTER_SITES= http://dev.i2p.net/i2p/
+MASTER_SITES= http://dev.i2p.net/i2p/:i2p \
+ ${MASTER_SITE_SOURCEFORGE:S/$/:jetty/}
+MASTER_SITE_SUBDIR= jetty/:jetty
+DISTFILES= \
+ ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+ ${JETTY_DISTFILE}:jetty
+EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= lioux@FreeBSD.org
COMMENT= An anonymous network
-BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/libgmp4 \
- ${LOCALBASE}/sbin/jettyctl:${PORTSDIR}/www/jetty
+BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/libgmp4
RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
-BROKEN= Does not build
-
USE_BZIP2= yes
USE_RC_SUBR= i2p.sh
@@ -51,7 +54,6 @@ DOC_FILES= \
overview-summary.html \
overview-tree.html \
package-list \
- packages.html \
serialized-form.html \
stylesheet.css
DOC_DIRS= \
@@ -73,15 +75,12 @@ PLIST_FILES= \
%%DATADIR%%/i2p.tar.bz2 \
%%DATADIR%%/i2pupdate.zip
-JETTY_JAR_FILES= \
- ext/ant.jar \
- ext/commons-el.jar \
- ext/commons-logging.jar \
- ext/jasper-compiler.jar \
- ext/jasper-runtime.jar \
- ext/xercesImpl.jar \
- lib/javax.servlet.jar \
- lib/org.mortbay.jetty.jar
+JETTY_DISTFILE= jetty-5.1.12.zip
+
+post-extract:
+ @${MKDIR} ${WRKSRC}/apps/jetty/
+ @${CP} -f ${DISTDIR}/${JETTY_DISTFILE} ${WRKSRC}/apps/jetty/
+ @cd ${WRKSRC}/apps/jetty && ${ANT} doExtract
post-patch:
@${SED} \
@@ -92,13 +91,6 @@ post-patch:
-e 's|./i2prouter[[:space:]]+start||' \
${WRKSRC}/installer/resources/postinstall.sh
-pre-build:
-# copy jetty jars instead of fetching/building
- @${MKDIR} ${WRKSRC}/apps/jetty/jettylib
-.for file in ${JETTY_JAR_FILES}
- @${CP} ${JAVASHAREDIR}/jetty/${file} ${WRKSRC}/apps/jetty/jettylib
-.endfor
-
do-install:
@${MKDIR} ${DATADIR}
# install
diff --git a/net-p2p/i2p/distinfo b/net-p2p/i2p/distinfo
index 998a26ea74a9..70c1cafa85d8 100644
--- a/net-p2p/i2p/distinfo
+++ b/net-p2p/i2p/distinfo
@@ -1,3 +1,6 @@
-MD5 (i2p-0.6.1.27.tar.bz2) = 70df6755f73d6b99df4cd5e0124b75a7
-SHA256 (i2p-0.6.1.27.tar.bz2) = 3ccee782c6d272dc20fe3036ef86611dde471d1d52cd7b3bfd8dcf6406f25d27
-SIZE (i2p-0.6.1.27.tar.bz2) = 9538121
+MD5 (i2p-0.6.1.28.tar.bz2) = 4184a059962a2a1566e8b1e78e6fc64e
+SHA256 (i2p-0.6.1.28.tar.bz2) = 681075e64030c5c4b16e99dc5e554d2df37f23d939ac3b9a5007b1487e65e637
+SIZE (i2p-0.6.1.28.tar.bz2) = 9538038
+MD5 (jetty-5.1.12.zip) = a61adc832be6baf2678935506743cfc3
+SHA256 (jetty-5.1.12.zip) = a165222106a3f10a827ecbc0bab2e4130daf22cafe4a101074dbd3fca4d2de12
+SIZE (jetty-5.1.12.zip) = 20802634