diff options
| author | obache <obache@pkgsrc.org> | 2010-03-08 11:47:19 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-03-08 11:47:19 +0000 |
| commit | b154cf7955bf6f71257cdd0ad488c2d96d2e0ddc (patch) | |
| tree | 110f4647317f2f3e33c6ede607e3b176e8d7863b /net | |
| parent | 7b4b7f062895787994dd18235c9d85f44fe78855 (diff) | |
| download | pkgsrc-b154cf7955bf6f71257cdd0ad488c2d96d2e0ddc.tar.gz | |
* set USE_BSD_MAKEFILE=yes
* add user-destdir installation support.
Diffstat (limited to 'net')
| -rw-r--r-- | net/dtcpclient/Makefile | 8 | ||||
| -rw-r--r-- | net/dtcpclient/distinfo | 4 | ||||
| -rw-r--r-- | net/dtcpclient/patches/patch-aa | 21 |
3 files changed, 21 insertions, 12 deletions
diff --git a/net/dtcpclient/Makefile b/net/dtcpclient/Makefile index 61c76be402f..35987abb4b8 100644 --- a/net/dtcpclient/Makefile +++ b/net/dtcpclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2010/01/17 12:02:31 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2010/03/08 11:47:19 obache Exp $ # DISTNAME= dtcpclient-20060526 @@ -14,6 +14,10 @@ COMMENT= Dynamic Tunnel Configuration Protocol client ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* OpenBSD-*-* Darwin-*-* ONLY_FOR_PLATFORM+= DragonFly-*-* +PKG_DESTDIR_SUPPORT= user-destdir + +USE_BSD_MAKEFILE= yes + RCD_SCRIPTS= dtcpclient SUBST_CLASSES+= paths @@ -24,7 +28,7 @@ SUBST_SED.paths= -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g' SUBST_SED.paths+= -e 's|/usr/local|${PREFIX}|g' SUBST_SED.paths+= -e 's|/var|${VARBASE}|g' -MAKE_ENV+= ${BSD_MAKE_ENV} VARBASE=${VARBASE} +MAKE_ENV+= VARBASE=${VARBASE} BUILD_DEFS+= VARBASE diff --git a/net/dtcpclient/distinfo b/net/dtcpclient/distinfo index 6f2bacbd1e1..dddafe391e7 100644 --- a/net/dtcpclient/distinfo +++ b/net/dtcpclient/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2007/09/15 11:39:16 obache Exp $ +$NetBSD: distinfo,v 1.8 2010/03/08 11:47:19 obache Exp $ SHA1 (dtcpclient-20060526.tar.gz) = bcafcfbc90a64dbb8f9f3104ebcacd43a3222aa7 RMD160 (dtcpclient-20060526.tar.gz) = 60c4d85cb71af8514cf3ab50dcc4a5bb47994e4b Size (dtcpclient-20060526.tar.gz) = 13571 bytes -SHA1 (patch-aa) = 4a3700c367d0fd0b3d5ad9db8f43ace6a1d13915 +SHA1 (patch-aa) = a93a99918f7724e0a101fccf84ad7e6811c8e30c SHA1 (patch-ab) = 235e037b7fee523e3039ed94497136885eb43277 SHA1 (patch-ac) = d98e45c284143bc0790685cb9cb743cd0833a0af diff --git a/net/dtcpclient/patches/patch-aa b/net/dtcpclient/patches/patch-aa index 520c8fec904..390f662128a 100644 --- a/net/dtcpclient/patches/patch-aa +++ b/net/dtcpclient/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2007/06/17 04:23:32 obache Exp $ +$NetBSD: patch-aa,v 1.4 2010/03/08 11:47:19 obache Exp $ --- Makefile.orig 2005-12-28 07:29:24.000000000 +0000 +++ Makefile @@ -25,17 +25,22 @@ $NetBSD: patch-aa,v 1.3 2007/06/17 04:23:32 obache Exp $ CFLAGS+= -DHAVE_MD5 LDADD= -lmd .elif ($(OPSYS) == "NetBSD") || ($(OPSYS) == "OpenBSD") -@@ -61,9 +57,10 @@ realinstall: - dtcpclient $(BINDIR)/dtcpclient - $(INSTALL) -d $(EXAMPLESDIR) +@@ -58,12 +54,13 @@ all: $(PROG) + + realinstall: + $(INSTALL) -s $(COPY) -o $(BINOWN) -g $(BINGRP) -m 555 \ +- dtcpclient $(BINDIR)/dtcpclient +- $(INSTALL) -d $(EXAMPLESDIR) ++ dtcpclient $(DESTDIR)$(BINDIR)/dtcpclient ++ $(INSTALL) -d $(DESTDIR)$(EXAMPLESDIR) $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m 555 \ - dtcpclient.script $(EXAMPLESDIR)/dtcpclient.script - if [ ! -f $(SCRIPTSDIR)/dtcpclient.script ]; then \ - cp -p $(EXAMPLESDIR)/dtcpclient.script $(SCRIPTSDIR)/; \ -+ dtcpclient.script $(EXAMPLESDIR)/dtcpclient-script -+ if [ ! -f $(SCRIPTSDIR)/dtcpclient-script ]; then \ -+ cp -p $(EXAMPLESDIR)/dtcpclient-script \ -+ $(SCRIPTSDIR)/dtcpclient-script; \ ++ dtcpclient.script $(DESTDIR)$(EXAMPLESDIR)/dtcpclient-script ++ if [ ! -f $(DESTDIR)$(SCRIPTSDIR)/dtcpclient-script ]; then \ ++ cp -p $(DESTDIR)$(EXAMPLESDIR)/dtcpclient-script \ ++ $(DESTDIR)$(SCRIPTSDIR)/dtcpclient-script; \ fi dist: |