summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorobache <obache>2008-12-13 13:26:19 +0000
committerobache <obache>2008-12-13 13:26:19 +0000
commitd62239d2207db3b5f76b76194f81b3873a290d42 (patch)
tree993570c6d2152754b8a615f14ba576ef3f42f7f9 /security
parent090306f4dc195273020442f6399cb7f032bec58d (diff)
downloadpkgsrc-d62239d2207db3b5f76b76194f81b3873a290d42.tar.gz
Restore to original DESTDIR ready.
Diffstat (limited to 'security')
-rw-r--r--security/skey/Makefile6
-rw-r--r--security/skey/distinfo4
-rw-r--r--security/skey/patches/patch-aa6
3 files changed, 9 insertions, 7 deletions
diff --git a/security/skey/Makefile b/security/skey/Makefile
index d54d6b16bed..bcc2def7201 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/12/13 13:18:08 obache Exp $
+# $NetBSD: Makefile,v 1.21 2008/12/13 13:26:19 obache Exp $
#
DISTNAME= skey-1.1.5
@@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${MASTER_SITES}
COMMENT= Port of OpenBSD s/key implementation
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake perl
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -22,6 +24,6 @@ REPLACE_PERL= skeyprune.pl
INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
post-install:
- ${RANLIB} ${PREFIX}/lib/libskey.a
+ ${RANLIB} ${DESTDIR}${PREFIX}/lib/libskey.a
.include "../../mk/bsd.pkg.mk"
diff --git a/security/skey/distinfo b/security/skey/distinfo
index 4f0e73326bb..9d95a0b2712 100644
--- a/security/skey/distinfo
+++ b/security/skey/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2008/12/13 12:07:54 obache Exp $
+$NetBSD: distinfo,v 1.8 2008/12/13 13:26:19 obache Exp $
SHA1 (skey-1.1.5.tar.bz2) = d55fb286098900cdf3eb6b174a720a06c722312a
RMD160 (skey-1.1.5.tar.bz2) = 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d
Size (skey-1.1.5.tar.bz2) = 61911 bytes
-SHA1 (patch-aa) = c9c0cde8f648fae44bbfbffcb7da0d331fad537d
+SHA1 (patch-aa) = 9ffb4f7c3b562ff5d50ea396ac130d7056b4a216
SHA1 (patch-ab) = 69d8f92968b3ebffc9b05fe7af1cde7e9d116587
SHA1 (patch-ac) = f3e9a6ebb7ac22116c8d8e6fe8ca0db7f8d37051
diff --git a/security/skey/patches/patch-aa b/security/skey/patches/patch-aa
index 9d0629c3894..7bdc6a539da 100644
--- a/security/skey/patches/patch-aa
+++ b/security/skey/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/06/30 04:06:39 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2008/12/13 13:26:19 obache Exp $
--- Makefile.in.orig 2001-05-10 11:10:49.000000000 -0500
+++ Makefile.in
@@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.3 2005/06/30 04:06:39 minskim Exp $
- $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)8
- $(INSTALL) -d $(DESTDIR)$(includedir)
- $(INSTALL) -d $(DESTDIR)$(sysconfdir)
-+ ${BSD_INSTALL_DATA_DIR} $(prefix)/share/examples/skey
++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/examples/skey
${INSTALL_DATA} libskey.a $(DESTDIR)$(libdir)
${INSTALL_DATA} ${HDRS} $(DESTDIR)$(includedir)
@for target in ${TARGETS}; do \
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.3 2005/06/30 04:06:39 minskim Exp $
${INSTALL_MAN} skeyaudit.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyaudit.1
${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.1
- ${TOUCH} ${DESTDIR}${sysconfdir}/skeykeys
-+ ${TOUCH} $(prefix)/share/examples/skey/skeykeys
++ ${TOUCH} ${DESTDIR}$(prefix)/share/examples/skey/skeykeys
uninstallall: uninstall
-rm -f $(DESTDIR)$(sysconfdir)/skeykeys