From d2c77f7190b1e52e510422dfd1a473a09adece24 Mon Sep 17 00:00:00 2001 From: hamajima Date: Sat, 27 Nov 2004 01:14:32 +0000 Subject: Update to 20040611. --- net/dtcp/Makefile | 11 +--- net/dtcp/distinfo | 7 ++- net/dtcp/patches/patch-aa | 133 ---------------------------------------------- 3 files changed, 5 insertions(+), 146 deletions(-) delete mode 100644 net/dtcp/patches/patch-aa (limited to 'net/dtcp') diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile index bcae50482c7..94ee913d525 100644 --- a/net/dtcp/Makefile +++ b/net/dtcp/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2004/06/23 04:58:21 hamajima Exp $ +# $NetBSD: Makefile,v 1.4 2004/11/27 01:14:32 hamajima Exp $ # -DISTNAME= dtcp-20030228 -PKGREVISION= 1 +DISTNAME= dtcp-20040611 CATEGORIES= net MASTER_SITES= http://www.imasy.or.jp/~ume/ipv6/ \ http://home.jp.FreeBSD.org/~ume/ipv6/ @@ -17,10 +16,4 @@ DEPENDS+= qpopper-*:../../mail/qpopper RCD_SCRIPTS= dtcpc dtcps CONF_DEPENDS= YES -SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= "Fixing hardcoded paths." -SUBST_STAGE.paths= post-patch -SUBST_FILES.paths= dtcpauth.8 dtcpc.8 dtcps.8 -SUBST_SED.paths= 's|/usr/local|${PREFIX}|g' - .include "../../mk/bsd.pkg.mk" diff --git a/net/dtcp/distinfo b/net/dtcp/distinfo index bb073ce2ef9..1aa0c735bdf 100644 --- a/net/dtcp/distinfo +++ b/net/dtcp/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/06/05 07:43:25 hamajima Exp $ +$NetBSD: distinfo,v 1.2 2004/11/27 01:14:32 hamajima Exp $ -SHA1 (dtcp-20030228.tar.gz) = bb9b4eea12eda6a31d35e2b1b7861aac0d74ae39 -Size (dtcp-20030228.tar.gz) = 17221 bytes -SHA1 (patch-aa) = 6666ff340134f013311cd400d67ff7cdbbcfb930 +SHA1 (dtcp-20040611.tar.gz) = ca70a697c33c989b62724ba96debf1c0c06e9d9d +Size (dtcp-20040611.tar.gz) = 17981 bytes diff --git a/net/dtcp/patches/patch-aa b/net/dtcp/patches/patch-aa deleted file mode 100644 index a9f4f3f7899..00000000000 --- a/net/dtcp/patches/patch-aa +++ /dev/null @@ -1,133 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/06/05 07:43:25 hamajima Exp $ - ---- Makefile.orig 2003-02-28 03:18:03.000000000 +0900 -+++ Makefile 2004-06-05 15:30:10.000000000 +0900 -@@ -21,21 +21,16 @@ - MAN= dtcps.8 dtcpc.8 dtcpauth.8 - .endif - --.if (${OPSYS} == "NetBSD") --LPREFIX= /usr/pkg/bin --.else --LPREFIX= /usr/local/bin --.endif - CLEANFILES+= dtcps dtcpc dtcpauth - - all: dtcps dtcpc dtcpauth - - dtcps: dtcps.rb -- sed -e 's#@PREFIX@#${LPREFIX}#' < dtcps.rb > dtcps -+ sed -e 's#@PREFIX@#${PREFIX}#' < dtcps.rb > dtcps - dtcpc: dtcpc.rb -- sed -e 's#@PREFIX@#${LPREFIX}#' < dtcpc.rb > dtcpc -+ sed -e 's#@PREFIX@#${PREFIX}#' < dtcpc.rb > dtcpc - dtcpauth: dtcpauth.rb -- sed -e 's#@PREFIX@#${LPREFIX}#' < dtcpauth.rb > dtcpauth -+ sed -e 's#@PREFIX@#${PREFIX}#' < dtcpauth.rb > dtcpauth - - realinstall: - install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 555 dtcps \ ---- dtcpauth.rb.orig 2002-11-29 00:46:59.000000000 +0900 -+++ dtcpauth.rb 2004-06-05 15:40:03.000000000 +0900 -@@ -1,4 +1,4 @@ --#! @PREFIX@/ruby -+#! @PREFIX@/bin/ruby - - # - # dtcpauth, manipulate POP authorization DB -@@ -37,7 +37,12 @@ - require 'etc' - - POPAUTHUID = 'pop' --POPAUTHDB = '/usr/local/etc/qpopper/pop.auth' -+# FreeBSD port of qpopper 4.X -+#POPAUTHDB = '/usr/local/etc/qpopper/pop.auth' -+# FreeBSD port of qpopper 2.X -+#POPAUTHDB = '/usr/local/etc/popper/pop.auth' -+# NetBSD pkg of qpopper 4.X -+POPAUTHDB = '@PREFIX@/etc/apop.auth' - - #$debug = true - ---- dtcpc.rb.orig 2003-02-28 20:18:56.000000000 +0900 -+++ dtcpc.rb 2004-06-05 15:30:24.000000000 +0900 -@@ -1,4 +1,4 @@ --#! @PREFIX@/ruby -+#! @PREFIX@/bin/ruby - - # - # dtcpc, Turmpet Dynamic Tunel Configuration Protocol client -@@ -50,7 +50,7 @@ - TIMEOUT = 60 - TUNTIMEOUT = 300 - DEBUG = false --PASSWDFILE = '/usr/local/etc/dtcpc.auth' -+PASSWDFILE = '@PREFIX@/etc/dtcpc.auth' - PIDFILE = '/var/run/dtcpc.pid' - - ROUTE_GATEWAY = 0 -@@ -59,11 +59,11 @@ - ROUTE_IFP = 3 - - # NetBSD 1.6 or later --#TUNIF = "gif0" --#TUNIF_CLONING = true --#TUNNEL_CREATE = 'ifconfig %s tunnel %s %s' --#TUNNEL_DELETE = 'ifconfig %s deletetunnel' --#ROUTE_METHOD = ROUTE_IFP -+TUNIF = "gif0" -+TUNIF_CLONING = true -+TUNNEL_CREATE = 'ifconfig %s tunnel %s %s' -+TUNNEL_DELETE = 'ifconfig %s deletetunnel' -+ROUTE_METHOD = ROUTE_IFP - # - # NetBSD 1.5.x or earlier - # and OpenBSD -@@ -74,11 +74,11 @@ - #ROUTE_METHOD = ROUTE_CHANGE - # - # FreeBSD 4.6-RELEASE or later --TUNIF = "gif" --TUNIF_CLONING = true --TUNNEL_CREATE = 'ifconfig %s tunnel %s %s' --TUNNEL_DELETE = 'ifconfig %s deletetunnel' --ROUTE_METHOD = ROUTE_IFP -+#TUNIF = "gif" -+#TUNIF_CLONING = true -+#TUNNEL_CREATE = 'ifconfig %s tunnel %s %s' -+#TUNNEL_DELETE = 'ifconfig %s deletetunnel' -+#ROUTE_METHOD = ROUTE_IFP - #ROUTE_METHOD = ROUTE_INTERFACE - # - # FreeBSD 4.4-RELEASE or 4.5-RELEASE ---- dtcps.rb.orig 2003-02-28 13:36:04.000000000 +0900 -+++ dtcps.rb 2004-06-05 15:30:30.000000000 +0900 -@@ -1,4 +1,4 @@ --#! @PREFIX@/ruby -+#! @PREFIX@/bin/ruby - - # - # dtcpd, Turmpet Dynamic Tunel Configuration Protocol daemon -@@ -56,7 +56,7 @@ - # must be less than 10, against RIPng and PIM6 - useless - TRAFFICTIMEOUT = 0 - POPAUTHUID = 'pop' --ROUTETABLE = '/usr/local/etc/routetable' -+ROUTETABLE = '@PREFIX@/etc/routetable' - PIDFILE = '/var/run/dtcps.pid' - - ROUTE_GATEWAY = 0 -@@ -65,11 +65,11 @@ - ROUTE_IFP = 3 - - # FreeBSD port of qpopper 4.X --POPAUTHDB = '/usr/local/etc/qpopper/pop.auth' -+#POPAUTHDB = '/usr/local/etc/qpopper/pop.auth' - # FreeBSD port of qpopper 2.X - #POPAUTHDB = '/usr/local/etc/popper/pop.auth' - # NetBSD pkg of qpopper 4.X --#POPAUTHDB = '/usr/pkg/etc/apop.auth' -+POPAUTHDB = '@PREFIX@/etc/apop.auth' - - # NetBSD 1.5.x or earlier - # and OpenBSD -- cgit v1.2.3