Attachment 62501 Details for Bug 93405 – i2p.diff.txt

i2p.diff.txt

i2p.diff.txt (text/plain), 3.96 KB, created by Peter Thoenen on 2006-02-16 19:47:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Thoenen

Created: 2006-02-16 19:47:45 UTC

Size: 3.96 KB

patch

obsolete

>diff -ruN i2p.orig/Makefile i2p/Makefile
>--- i2p.orig/Makefile	Wed Feb 15 22:51:21 2006
>+++ i2p/Makefile	Wed Feb 15 22:57:40 2006
>@@ -13,14 +13,14 @@
> MAINTAINER=	lioux@FreeBSD.org
> COMMENT=	An anonymous network
> 
>+BUILD_DEPENDS=	gmp:${PORTSDIR}/math/libgmp4
> RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
> 
> USE_BZIP2=	yes
>-USE_RC_SUBR=	yes
>-USE_REINPLACE=	yes
>+USE_RC_SUBR=	i2p.sh
> 
> USE_JAVA=	yes
>-JAVA_VERSION=	1.4
>+JAVA_VERSION=	1.4+
> JAVA_OS=	native
> USE_ANT=	yes
> 
>@@ -75,9 +75,6 @@
> 	@${REINPLACE_CMD} -E \
> 		-e 's|./i2prouter[[:space:]]+start||' \
> 		${WRKSRC}/installer/resources/postinstall.sh
>-# rc.d
>-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" \
>-		${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
> 
> do-install:
> 	@${MKDIR} ${DATADIR}
>@@ -87,9 +84,6 @@
> # update
> 	@${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip \
> 		${DATADIR}/
>-# rc.d
>-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
>-		${PREFIX}/etc/rc.d
> # wrapper
> 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
> 		${PREFIX}/sbin/i2prouter
>diff -ruN i2p.orig/files/i2p.sh i2p/files/i2p.sh
>--- i2p.orig/files/i2p.sh	Wed Feb 15 22:51:21 2006
>+++ i2p/files/i2p.sh	Thu Jan  1 03:00:00 1970
>@@ -1,89 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/net-p2p/i2p/files/i2p.sh,v 1.2 2005/10/10 11:05:03 lioux Exp $
>-#
>-# Under a BSDL license. Copyright 2005. Mario S F Ferreira <lioux@FreeBSD.org>
>-
>-# PROVIDE: i2p
>-# REQUIRE: LOGIN
>-# KEYWORD: FreeBSD shutdown
>-
>-#
>-# Add the following lines to /etc/rc.conf to enable i2p:
>-#
>-#i2p_enable="YES"
>-#i2p_user=""
>-#
>-
>-. /etc/rc.subr
>-
>-name="i2p"
>-rcvar=`set_rcvar`
>-command="%%PREFIX%%/sbin/i2prouter"
>-extra_commands="install uninstall update"
>-
>-i2p_check_vars()
>-{
>-  if [ -z "${i2p_user}" ]; then
>-    i2p_user=$(whoami)
>-  fi
>-
>-  if [ "x${i2p_user}" = "xroot" ]; then
>-    err 1 "You have to set i2p_user to a non-root user for security reasons"
>-  fi
>-}
>-
>-start_cmd="start_cmd"
>-stop_cmd="stop_cmd"
>-status_cmd="status_cmd"
>-restart_cmd="restart_cmd"
>-install_cmd="install_cmd"
>-uninstall_cmd="uninstall_cmd"
>-update_cmd="update_cmd"
>-
>-generic_cmd()
>-{
>-  i2p_check_vars
>-  su -l ${i2p_user} -c "${command} ${1}"
>-}
>-
>-start_cmd()
>-{
>-  generic_cmd start
>-}
>-
>-stop_cmd()
>-{
>-  generic_cmd stop
>-}
>-
>-status_cmd()
>-{
>-  generic_cmd status
>-}
>-
>-restart_cmd()
>-{
>-  generic_cmd restart
>-}
>-
>-install_cmd()
>-{
>-  generic_cmd install
>-}
>-
>-uninstall_cmd()
>-{
>-  generic_cmd uninstall
>-}
>-
>-update_cmd()
>-{
>-  generic_cmd update
>-}
>-
>-load_rc_config "${name}"
>-: ${i2p_enable="NO"}
>-: ${i2p_user=""}
>-
>-run_rc_command "$1"
>diff -ruN i2p.orig/files/i2p.sh.in i2p/files/i2p.sh.in
>--- i2p.orig/files/i2p.sh.in	Thu Jan  1 03:00:00 1970
>+++ i2p/files/i2p.sh.in	Mon Oct 10 14:05:03 2005
>@@ -0,0 +1,89 @@
>+#!/bin/sh
>+#
>+# $FreeBSD: ports/net-p2p/i2p/files/i2p.sh,v 1.2 2005/10/10 11:05:03 lioux Exp $
>+#
>+# Under a BSDL license. Copyright 2005. Mario S F Ferreira <lioux@FreeBSD.org>
>+
>+# PROVIDE: i2p
>+# REQUIRE: LOGIN
>+# KEYWORD: FreeBSD shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable i2p:
>+#
>+#i2p_enable="YES"
>+#i2p_user=""
>+#
>+
>+. /etc/rc.subr
>+
>+name="i2p"
>+rcvar=`set_rcvar`
>+command="%%PREFIX%%/sbin/i2prouter"
>+extra_commands="install uninstall update"
>+
>+i2p_check_vars()
>+{
>+  if [ -z "${i2p_user}" ]; then
>+    i2p_user=$(whoami)
>+  fi
>+
>+  if [ "x${i2p_user}" = "xroot" ]; then
>+    err 1 "You have to set i2p_user to a non-root user for security reasons"
>+  fi
>+}
>+
>+start_cmd="start_cmd"
>+stop_cmd="stop_cmd"
>+status_cmd="status_cmd"
>+restart_cmd="restart_cmd"
>+install_cmd="install_cmd"
>+uninstall_cmd="uninstall_cmd"
>+update_cmd="update_cmd"
>+
>+generic_cmd()
>+{
>+  i2p_check_vars
>+  su -l ${i2p_user} -c "${command} ${1}"
>+}
>+
>+start_cmd()
>+{
>+  generic_cmd start
>+}
>+
>+stop_cmd()
>+{
>+  generic_cmd stop
>+}
>+
>+status_cmd()
>+{
>+  generic_cmd status
>+}
>+
>+restart_cmd()
>+{
>+  generic_cmd restart
>+}
>+
>+install_cmd()
>+{
>+  generic_cmd install
>+}
>+
>+uninstall_cmd()
>+{
>+  generic_cmd uninstall
>+}
>+
>+update_cmd()
>+{
>+  generic_cmd update
>+}
>+
>+load_rc_config "${name}"
>+: ${i2p_enable="NO"}
>+: ${i2p_user=""}
>+
>+run_rc_command "$1"

Actions: View

Attachments on bug 93405: 62501