From 73349944aa784a5c905e9df831c6a0905de6e835 Mon Sep 17 00:00:00 2001 From: minskim Date: Thu, 30 Jun 2005 04:06:39 +0000 Subject: Do not install a config file directly into PKG_SYSCONFDIR. Use CONF_FILES instead. Bump PKGREVISION due to PLIST change. --- security/skey/Makefile | 6 +++++- security/skey/PLIST | 4 +++- security/skey/distinfo | 4 ++-- security/skey/patches/patch-aa | 22 ++++++++++++++++------ 4 files changed, 26 insertions(+), 10 deletions(-) (limited to 'security/skey') diff --git a/security/skey/Makefile b/security/skey/Makefile index d6d4498f1a7..b63b1268cec 100644 --- a/security/skey/Makefile +++ b/security/skey/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:31 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/30 04:06:39 minskim Exp $ # DISTNAME= skey-1.1.5 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.sparc.spb.su/solaris/skey/ EXTRACT_SUFX= .tar.bz2 @@ -13,7 +14,10 @@ COMMENT= Port of OpenBSD s/key implementation USE_PERL5= build USE_TOOLS+= gmake GNU_CONFIGURE= yes +USE_PKGINSTALL= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONF_FILES+= ${PREFIX}/share/examples/skey/skeykeys \ + ${PKG_SYSCONFDIR}/skeykeys INSTALLATION_DIRS= bin include lib man/man1 man/man8 diff --git a/security/skey/PLIST b/security/skey/PLIST index c4e8cf4a0c2..a43c317a0f4 100644 --- a/security/skey/PLIST +++ b/security/skey/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/26 09:10:06 grant Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/06/30 04:06:39 minskim Exp $ bin/skey bin/skeyaudit bin/skeyinfo @@ -13,3 +13,5 @@ man/man1/skeyaudit.1 man/man1/skeyinfo.1 man/man1/skeyinit.1 man/man8/skeyprune.1 +share/examples/skey/skeykeys +@dirrm share/examples/skey diff --git a/security/skey/distinfo b/security/skey/distinfo index 60a2f5e35ac..c59f3c8cf73 100644 --- a/security/skey/distinfo +++ b/security/skey/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 13:10:13 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/06/30 04:06:39 minskim 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) = ab3dd6d56ee0c8d031d110815f5ef7c0edd84fac +SHA1 (patch-aa) = c9c0cde8f648fae44bbfbffcb7da0d331fad537d SHA1 (patch-ab) = 69d8f92968b3ebffc9b05fe7af1cde7e9d116587 diff --git a/security/skey/patches/patch-aa b/security/skey/patches/patch-aa index 042371917fb..9d0629c3894 100644 --- a/security/skey/patches/patch-aa +++ b/security/skey/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2003/07/23 16:03:56 salo Exp $ +$NetBSD: patch-aa,v 1.3 2005/06/30 04:06:39 minskim Exp $ ---- Makefile.in.orig Thu May 10 18:10:49 2001 -+++ Makefile.in Wed Jul 23 17:18:18 2003 -@@ -18,15 +18,18 @@ +--- Makefile.in.orig 2001-05-10 11:10:49.000000000 -0500 ++++ Makefile.in +@@ -18,15 +18,18 @@ LIBS=@LIBS@ AR=@AR@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ @@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/23 16:03:56 salo Exp $ TARGETS=skey skeyinit skeyinfo skeyaudit LIBOBJS=skeylogin.o skeysubr.o put.o errx.o md4c.o md5c.o rmd160.o rmd160hl.o sha1.o sha1hl.o flock.o strlcpy.o login_cap.o SKEYOBJS=skey.o -@@ -49,6 +52,13 @@ +@@ -49,6 +52,13 @@ HDRS= skey.h sha1.h rmd160.h all: ${TARGETS} ${MANPAGES} @@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/23 16:03:56 salo Exp $ ${LIBOBJS}: config.h libskey.a: ${LIBOBJS} -@@ -88,14 +98,6 @@ +@@ -88,14 +98,7 @@ catman-do: done install: ${TARGETS} @@ -51,6 +51,16 @@ $NetBSD: patch-aa,v 1.2 2003/07/23 16:03:56 salo Exp $ - $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)8 - $(INSTALL) -d $(DESTDIR)$(includedir) - $(INSTALL) -d $(DESTDIR)$(sysconfdir) ++ ${BSD_INSTALL_DATA_DIR} $(prefix)/share/examples/skey ${INSTALL_DATA} libskey.a $(DESTDIR)$(libdir) ${INSTALL_DATA} ${HDRS} $(DESTDIR)$(includedir) @for target in ${TARGETS}; do \ +@@ -107,7 +110,7 @@ install: ${TARGETS} + ${INSTALL_MAN} skeyinfo.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinfo.1 + ${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 + + uninstallall: uninstall + -rm -f $(DESTDIR)$(sysconfdir)/skeykeys -- cgit v1.2.3