diff options
author | joerg <joerg@pkgsrc.org> | 2006-02-24 20:44:14 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-02-24 20:44:14 +0000 |
commit | 5471ae4077ce1fc783e2ab2bdca9484b26f1c6c3 (patch) | |
tree | 9b112c076d84c0310ba2ca7a7eca63ec9ce3bc8a /net | |
parent | 30e0f6de31600dbd1ba00a6a2dcac71674b28dae (diff) | |
download | pkgsrc-5471ae4077ce1fc783e2ab2bdca9484b26f1c6c3.tar.gz |
Split patch-aa. Honour PKGMANDIR and get working man installation
on !NetBSD.
Diffstat (limited to 'net')
-rw-r--r-- | net/dtcpclient/distinfo | 6 | ||||
-rw-r--r-- | net/dtcpclient/patches/patch-aa | 56 | ||||
-rw-r--r-- | net/dtcpclient/patches/patch-ab | 29 | ||||
-rw-r--r-- | net/dtcpclient/patches/patch-ac | 13 |
4 files changed, 65 insertions, 39 deletions
diff --git a/net/dtcpclient/distinfo b/net/dtcpclient/distinfo index f68dc179cae..72c4a1f6499 100644 --- a/net/dtcpclient/distinfo +++ b/net/dtcpclient/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/06/05 16:35:07 hamajima Exp $ +$NetBSD: distinfo,v 1.4 2006/02/24 20:44:14 joerg Exp $ SHA1 (dtcpclient-20050521.tar.gz) = d4301a20dafc5e5190d3c43ea65f9c551e230450 RMD160 (dtcpclient-20050521.tar.gz) = bbc9dbb611d1229f6d988b2055c6a1a02bc64369 Size (dtcpclient-20050521.tar.gz) = 12232 bytes -SHA1 (patch-aa) = 0a0b46dbe8ed56e0276c32cb777aaaeb21d7082e +SHA1 (patch-aa) = 100975f5578392446a812feb9286ce5ff0758657 +SHA1 (patch-ab) = d4b7c355da9000898944ccd0470db0ed5655f771 +SHA1 (patch-ac) = bfbf0bd55b1c8729a30ac518bd4e9eb3182867f6 diff --git a/net/dtcpclient/patches/patch-aa b/net/dtcpclient/patches/patch-aa index e64d48aa049..4ca8fc3158a 100644 --- a/net/dtcpclient/patches/patch-aa +++ b/net/dtcpclient/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/01/23 05:07:44 hamajima Exp $ +$NetBSD: patch-aa,v 1.2 2006/02/24 20:44:14 joerg Exp $ ---- Makefile.orig 2004-06-21 14:18:18.000000000 +0900 -+++ Makefile 2005-01-23 12:25:32.000000000 +0900 -@@ -34,7 +34,7 @@ +--- Makefile.orig 2004-06-21 05:18:18.000000000 +0000 ++++ Makefile +@@ -34,18 +34,14 @@ PROG= dtcpclient MAN= dtcpclient.8 BINDIR= $(PREFIX)/sbin @@ -10,8 +10,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/01/23 05:07:44 hamajima Exp $ +SCRIPTSDIR= $(PREFIX)/sbin EXAMPLESDIR= $(PREFIX)/share/examples/dtcpclient - .if ($(OPSYS) == "NetBSD") -@@ -61,9 +61,10 @@ +-.if ($(OPSYS) == "NetBSD") +-MANDIR= $(PREFIX)/man +-.else +-MANDIR= $(PREFIX)/man/man +-.endif ++MANDIR= $(PREFIX)/${PKGMANDIR} + + CFLAGS+= -Wall -DPREFIX=\"$(PREFIX)\" + +-.if ($(OPSYS) == "FreeBSD") ++.if ($(OPSYS) == "FreeBSD") || ${OPSYS} == "DragonFly" + CFLAGS+= -DHAVE_MD5 + LDADD= -lmd + .elif ($(OPSYS) == "NetBSD") || ($(OPSYS) == "OpenBSD") +@@ -61,9 +57,10 @@ realinstall: dtcpclient $(BINDIR)/dtcpclient $(INSTALL) -d $(EXAMPLESDIR) $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m 555 \ @@ -25,34 +38,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/01/23 05:07:44 hamajima Exp $ fi dist: ---- dtcpclient.c.orig 2005-01-23 12:17:28.000000000 +0900 -+++ dtcpclient.c 2005-01-23 12:17:56.000000000 +0900 -@@ -73,7 +73,7 @@ - - #define PIDFILE _PATH_VARRUN "/dtcpclient.pid" - #define PASSWDFILE PREFIX "/etc/dtcpclient.auth" --#define SCRIPTFLIE PREFIX "/etc/dtcpclient.script" -+#define SCRIPTFLIE PREFIX "/sbin/dtcpclient-script" - - typedef enum { - FALSE = 0, ---- dtcpclient.8.orig 2004-06-24 00:18:18.000000000 +0900 -+++ dtcpclient.8 2005-01-23 12:31:48.000000000 +0900 -@@ -97,7 +97,7 @@ - .It Fl s Ar script - Specify the command to invoke on DTCP session is established or - closed. The default is --.Pa /usr/local/etc/dtcpclient.script . -+.Pa /usr/local/sbin/dtcpclient-script . - .It Fl t Ar tuntype - The spec defines several kind of tunnel requests. - .Nm -@@ -180,7 +180,7 @@ - .Nm - does not ask for your password. The format is a colon-separated list of - the server name, the user name and the password. --.It Pa /usr/local/etc/dtcpclient.script -+.It Pa /usr/local/sbin/dtcpclient-script - Default script invoked for setup or cleanup tunnel when DTCP session - is established or closed. - .It Pa /var/run/dtcpclient.pid diff --git a/net/dtcpclient/patches/patch-ab b/net/dtcpclient/patches/patch-ab new file mode 100644 index 00000000000..9cd749e4e1c --- /dev/null +++ b/net/dtcpclient/patches/patch-ab @@ -0,0 +1,29 @@ +$NetBSD: patch-ab,v 1.1 2006/02/24 20:44:14 joerg Exp $ + +--- dtcpclient.8.orig 2005-05-21 08:03:05.000000000 +0000 ++++ dtcpclient.8 +@@ -103,7 +103,7 @@ The default is + .It Fl s Ar script + Specify the command to invoke on DTCP session is established or + closed. The default is +-.Pa /usr/local/etc/dtcpclient.script . ++.Pa /usr/pkg/sbin/dtcpclient-script . + .It Fl t Ar tuntype + The spec defines several kind of tunnel requests. + .Nm +@@ -180,13 +180,13 @@ tunnel type . + .\" + .Sh FILES + .Bl -tag -width " " -compact +-.It Pa /usr/local/etc/dtcpclient.auth ++.It Pa /usr/pkg/etc/dtcpclient.auth + You can specify your password to connect to DTCP server in this file. + If your password is found in this file, + .Nm + does not ask for your password. The format is a colon-separated list of + the server name, the user name and the password. +-.It Pa /usr/local/etc/dtcpclient.script ++.It Pa /usr/pkg/sbin/dtcpclient-script + Default script invoked for setup or cleanup tunnel when DTCP session + is established or closed. + .It Pa /var/run/dtcpclient.pid diff --git a/net/dtcpclient/patches/patch-ac b/net/dtcpclient/patches/patch-ac new file mode 100644 index 00000000000..0f15e259475 --- /dev/null +++ b/net/dtcpclient/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2006/02/24 20:44:14 joerg Exp $ + +--- dtcpclient.c.orig 2005-05-21 08:03:05.000000000 +0000 ++++ dtcpclient.c +@@ -73,7 +73,7 @@ + + #define PIDFILE _PATH_VARRUN "/dtcpclient.pid" + #define PASSWDFILE PREFIX "/etc/dtcpclient.auth" +-#define SCRIPTFLIE PREFIX "/etc/dtcpclient.script" ++#define SCRIPTFLIE PREFIX "/sbin/dtcpclient-script" + + typedef enum { + FALSE = 0, |