Index: Makefile =================================================================== --- Makefile (revision 346985) +++ Makefile (working copy) @@ -2,54 +2,48 @@ # $FreeBSD$ PORTNAME= i2p -PORTVERSION= 0.8.7 +PORTVERSION= 0.9.11 CATEGORIES= net-p2p java security -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}:i2p \ - http://mirror.i2p2.de/:i2p \ - http://dist.codehaus.org/jetty/jetty-5.1.x/:jetty -DISTFILES= \ - i2psource_${PORTVERSION}${EXTRACT_SUFX}:i2p \ - ${JETTY_DISTFILE}:jetty -EXTRACT_ONLY= i2psource_${PORTVERSION}${EXTRACT_SUFX} +MASTER_SITES= http://download.i2p2.no/releases/${PORTVERSION}/ \ + http://download2.geti2p.com/${PORTVERSION}/ \ + http://download.geti2p.com/${PORTVERSION}/ \ + http://download.i2p2.de/releases/${PORTVERSION}/ \ + https://dl.dropboxusercontent.com/u/18621288/I2P/${PORTVERSION}/ \ + https://launchpad.net/i2p/trunk/${PORTVERSION}/+download/ \ + https://googledrive.com/host/0B4jHEq5G7_EPWV9UeERwdGplZXc/${PORTVERSION}/ +DISTFILES= i2psource_${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= An anonymizing network -LICENSE= APACHE20 EULA -LICENSE_COMB= multi +LICENSE= EULA +LICENSE_NAME= End User License Agreement +LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_DISTFILES= i2psource_${PORTVERSION}${EXTRACT_SUFX} -BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp \ - msgfmt:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LICENSE_NAME_EULA= End User License Agreement -LICENSE_PERMS_EULA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_FILE_EULA= ${WRKSRC}/LICENSE.txt -LICENSE_DISTFILES_ASL= ${JETTY_DISTFILE} -LICENSE_DISTFILES_EULA= i2psource_${PORTVERSION}${EXTRACT_SUFX} +ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS_REASON= i2p libwrapper.so library binary only available for i386 and amd64 +OPTIONS_DEFINE= DOCS + +USES= gettext iconv USE_BZIP2= yes USE_RC_SUBR= i2p +NO_STAGE= yes +USE_ANT= yes +USE_JAVA= yes JAVA_BUILD= jdk -USE_JAVA= yes JAVA_VERSION= 1.6+ -USE_ANT= yes ALL_TARGET= \ updater \ tarball -.ifndef(NOPORTDOCS) -ALL_TARGET+= javadoc -.endif - -JAVADOC_WRKSRC= ${WRKSRC}/build/javadoc - -.ifndef(NOPORTDOCS) -PORTDOCS= * -.endif - PLIST_DIRS= \ %%DATADIR%% PLIST_FILES= \ @@ -57,20 +51,36 @@ %%DATADIR%%/i2p.tar.bz2 \ %%DATADIR%%/i2pupdate.zip -JETTY_DISTFILE= jetty-5.1.15.tgz - SUB_FILES= wrapper.sh -NO_STAGE= yes -post-extract: - @${MKDIR} ${WRKSRC}/apps/jetty/ - @${CP} -f ${DISTDIR}/${JETTY_DISTFILE} ${WRKSRC}/apps/jetty/ +.include +.if ${PORT_OPTIONS:MDOCS} +ALL_TARGET+= javadoc + +PORTDOCS= * + +JAVADOC_WRKSRC= ${WRKSRC}/build/javadoc +.endif + +.include + +# Only works with converters/iconv port due to binary dependency: +# source code isn't available at this moment +.if ${OSVERSION} >= 1000043 +#IGNORE= libwrapper.so binary depends on converters/iconv. Therefore, it's not compatible with FreeBSD 10.x and above +.endif + post-patch: # postinstall.sh SHOULD only do post installation house keeping @${REINPLACE_CMD} -E \ -e 's|./i2prouter[[:space:]]+start||' \ ${WRKSRC}/installer/resources/postinstall.sh + @${REINPLACE_CMD} -E \ + -e 's|%INSTALL_PATH|$${HOME}/i2p|' \ + -e 's|%USER_HOME|$${HOME}|' \ + ${WRKSRC}/installer/resources/i2prouter \ + ${WRKSRC}/installer/resources/runplain.sh do-install: @${MKDIR} ${DATADIR} @@ -84,7 +94,7 @@ @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \ ${PREFIX}/sbin/i2prouter # doc -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/installer/resources/readme/readme*.html ${DOCSDIR} # line taken from textproc/xerces-j maintained by hq@FreeBSD.org @@ -93,4 +103,4 @@ ${FIND} * -not -type d -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \; .endif -.include +.include Index: distinfo =================================================================== --- distinfo (revision 346985) +++ distinfo (working copy) @@ -1,4 +1,2 @@ -SHA256 (i2psource_0.8.7.tar.bz2) = 31acef3fcd1a5839edc3b931f108944222c833d218bd427fe89a57b4acd92ece -SIZE (i2psource_0.8.7.tar.bz2) = 18473515 -SHA256 (jetty-5.1.15.tgz) = c866bfe7715941e343e66bd5d6696a743b9c0811ef9763848eb673070f4a53d6 -SIZE (jetty-5.1.15.tgz) = 11063548 +SHA256 (i2psource_0.9.11.tar.bz2) = 50b18c6e012cae1f05295b54ec88ab71c56b8ebf8b9267242bab37f918b80166 +SIZE (i2psource_0.9.11.tar.bz2) = 22618918 Index: files/patch-installer__resources__clients.config =================================================================== --- files/patch-installer__resources__clients.config (revision 346985) +++ files/patch-installer__resources__clients.config (working copy) @@ -1,8 +1,8 @@ ---- ./installer/resources/clients.config.orig 2009-05-31 20:15:45.000000000 -0300 -+++ ./installer/resources/clients.config 2009-05-31 20:16:20.000000000 -0300 -@@ -36,7 +36,7 @@ +--- installer/resources/clients.config.orig 2014-02-13 23:18:57.000000000 -0200 ++++ installer/resources/clients.config 2014-02-13 23:19:16.000000000 -0200 +@@ -57,7 +57,7 @@ clientApp.4.name=Open Router Console in web browser at startup - clientApp.4.args=http://127.0.0.1:7657/index.jsp + clientApp.4.args=http://127.0.0.1:7657/ clientApp.4.delay=3 -clientApp.4.startOnLoad=true +clientApp.4.startOnLoad=false Index: files/patch-installer__resources__postinstall.sh =================================================================== --- files/patch-installer__resources__postinstall.sh (revision 0) +++ files/patch-installer__resources__postinstall.sh (working copy) @@ -0,0 +1,11 @@ +--- installer/resources/postinstall.sh.orig 2014-02-14 00:08:38.000000000 -0200 ++++ installer/resources/postinstall.sh 2014-02-14 00:08:49.000000000 -0200 +@@ -72,7 +72,7 @@ + wrapperpath="./lib/wrapper/freebsd64" + cp ${wrapperpath}/libwrapper.so ./lib/ + # the 32bit libwrapper.so will be needed if a 32 bit jvm is used +- cp ./lib/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so ++ cp ./lib/wrapper/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so + fi + ;; + osx ) Property changes on: files/patch-installer__resources__postinstall.sh ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: pkg-descr =================================================================== --- pkg-descr (revision 346985) +++ pkg-descr (working copy) @@ -1,19 +1,16 @@ [ excerpt from developer's web site ] -I2P is an anonymizing network, offering a simple layer that -identity-sensitive applications can use to securely communicate. -All data is wrapped with several layers of encryption, and the -network is both distributed and dynamic, with no trusted parties. +I2P is an anonymous overlay network - a network within a network. +It is intended to protect communication from dragnet surveillance +and monitoring by third parties such as ISPs. -Many applications are available that interface with I2P, including -mail, peer-peer, IRC chat, and others. +I2P is used by many people who care about their privacy: activists, +oppressed people, journalists and whistleblowers, as well as the +average person. -Anonymity is not a boolean - we are not trying to make something -"perfectly anonymous", but instead are working at making attacks -more and more expensive to mount. I2P alone is what could be called -a "low latency mix network", and there are limits to the anonymity -offered by such a system, but the applications on top of I2P, such -as Syndie, I2P mail, and I2PSnark extend it to offer both additional -functionality and protection. +No network can be "perfectly anonymous". The continued goal of I2P +is to make attacks more and more difficult to mount. Its anonymity +will get stronger as the size of the network increases and with +ongoing academic review. -WWW: http://www.i2p2.de/ +WWW: http://geti2p.net/