diff options
| author | agc <agc> | 1998-06-03 13:49:07 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-06-03 13:49:07 +0000 |
| commit | 22b04bef0aeefac1f67ecee9c0d0ebed42c6d6ab (patch) | |
| tree | cc3c3a4a66534bccdfb5dea7bc32bb8951ee9ec9 /security | |
| parent | 7cfbd333530a7297e9ceeaeaf172f5fbaebc997e (diff) | |
| download | pkgsrc-22b04bef0aeefac1f67ecee9c0d0ebed42c6d6ab.tar.gz | |
Consolidate inclusion of /etc/mk.conf by using bsd.prefs.mk
Diffstat (limited to 'security')
| -rw-r--r-- | security/pgp2/Makefile | 8 | ||||
| -rw-r--r-- | security/ssh/Makefile | 20 |
2 files changed, 4 insertions, 24 deletions
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile index ecd8487c05e..e4dcaa430d7 100644 --- a/security/pgp2/Makefile +++ b/security/pgp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/05/08 10:18:54 hubertf Exp $ +# $NetBSD: Makefile,v 1.9 1998/06/03 13:49:07 agc Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp # @@ -11,11 +11,7 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \ MAINTAINER= packages@NetBSD.ORG -.if defined(MAKECONF) && exists(${MAKECONF}) -.include "${MAKECONF}" -.elif exists(/etc/mk.conf) -.include "/etc/mk.conf" -.endif +.include "../../mk/bsd.prefs.mk" .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES PKGNAME= pgp-2.6.3a diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 7e94da22b88..8d8feb72387 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 1998/05/26 19:43:49 tron Exp $ +# $NetBSD: Makefile,v 1.21 1998/06/03 13:49:07 agc Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -16,23 +16,7 @@ IS_INTERACTIVE= YES CFLAGS= -O2 GNU_CONFIGURE= YES -# Include local make config file here. It is essential to have this -# precede any override targets (those that override defaults in -# <bsd.pkg.mk> that test variables that may be set here. Note that -# this inclusion is otherwise redundant, since <bsd.pkg.mk> includes -# <bsd.own.mk>, which includes it. -# XXX: FIXME ! We need a simple way of doing this in many dozen pkgs. - -OPSYS!= uname -s -.if (${OPSYS} == "FreeBSD") -.if exists(/etc/make.conf) -.include "/etc/make.conf" -.endif -.else -.if exists(/etc/mk.conf) -.include "/etc/mk.conf" -.endif -.endif +.include "../../mk/bsd.prefs.mk" # Use SSH_CONF_DIR from /etc/mk.conf, if defined; otherwise default to /etc SSH_CONF_DIR?= /etc |