From 0c152e7442b8ddde8405ba9d0f2d4d981d5c3151 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 22 Feb 2007 19:26:05 +0000 Subject: Whitespace cleanup, courtesy of pkglint. Patch provided by Sergey Svishchev in private mail. --- security/AiSSLtelnet/Makefile | 10 +++++----- security/aide/Makefile | 6 +++--- security/aide06/Makefile | 6 +++--- security/amap/Makefile | 26 +++++++++++++------------- security/amavisd-new/Makefile | 6 +++--- security/ap-modsecurity2/Makefile | 4 ++-- security/crypto++/Makefile | 4 ++-- security/cyrus-sasl/Makefile | 4 ++-- security/fragroute/Makefile | 4 ++-- security/gnupg/hacks.mk | 6 +++--- security/gss/Makefile | 4 ++-- security/ipsec-tools/Makefile | 4 ++-- security/libdes/Makefile | 6 +++--- security/libpreludedb/Makefile | 4 ++-- security/mirrordir/Makefile | 4 ++-- security/mit-krb5/builtin.mk | 4 ++-- security/mixminion/Makefile | 4 ++-- security/nfsbug/Makefile | 4 ++-- security/openssh+gssapi/Makefile | 6 +++--- security/openssh/Makefile | 4 ++-- security/openssh/options.mk | 4 ++-- security/openssl/builtin.mk | 16 ++++++++-------- security/p5-Crypt-OpenPGP/Makefile | 4 ++-- security/pflkm/builtin.mk | 6 +++--- security/pgp2/Makefile | 4 ++-- security/pgp5/Makefile | 4 ++-- security/prelude-manager/Makefile | 22 +++++++++++----------- security/py-OpenSSL/Makefile | 6 +++--- security/py-mcrypt/Makefile | 6 +++--- security/qca-tls/Makefile | 6 +++--- security/seahorse-gedit/Makefile | 4 ++-- security/seahorse/Makefile | 4 ++-- security/smimemsg/Makefile | 8 ++++---- security/ssh2/Makefile | 4 ++-- security/tcp_wrappers/Makefile | 6 +++--- 35 files changed, 112 insertions(+), 112 deletions(-) (limited to 'security') diff --git a/security/AiSSLtelnet/Makefile b/security/AiSSLtelnet/Makefile index efa9707a3bb..8b8306927d9 100644 --- a/security/AiSSLtelnet/Makefile +++ b/security/AiSSLtelnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/04/22 09:22:14 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:06 wiz Exp $ # DISTNAME= AiSSLtelnet-0.15 @@ -12,11 +12,11 @@ COMMENT= SSL Telnet based on AiSSL GNU_CONFIGURE= YES -RESTRICTED= Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp. -NO_SRC_ON_FTP= ${RESTRICTED} -NO_SRC_ON_CDROM= ${RESTRICTED} +RESTRICTED= Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp. +NO_SRC_ON_FTP= ${RESTRICTED} +NO_SRC_ON_CDROM= ${RESTRICTED} -WRKSRC= ${WRKDIR}/AiSSLtelnet +WRKSRC= ${WRKDIR}/AiSSLtelnet pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/AiSSLtelnet diff --git a/security/aide/Makefile b/security/aide/Makefile index 16f8e8ea8b4..0524d09b698 100644 --- a/security/aide/Makefile +++ b/security/aide/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.26 2006/07/21 20:26:45 minskim Exp $ +# $NetBSD: Makefile,v 1.27 2007/02/22 19:27:06 wiz Exp $ # -DISTNAME= aide-0.10 +DISTNAME= aide-0.10 PKGREVISION= 1 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aide/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aide/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html diff --git a/security/aide06/Makefile b/security/aide06/Makefile index 3f3bdf25947..8874bacfc02 100644 --- a/security/aide06/Makefile +++ b/security/aide06/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:33 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:06 wiz Exp $ # -DISTNAME= aide-0.6 +DISTNAME= aide-0.6 PKGREVISION= 1 CATEGORIES= security -MASTER_SITES= ftp://ftp.cs.tut.fi/pub/src/gnu/ +MASTER_SITES= ftp://ftp.cs.tut.fi/pub/src/gnu/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html diff --git a/security/amap/Makefile b/security/amap/Makefile index 294bf06fb38..8ed407c71e7 100644 --- a/security/amap/Makefile +++ b/security/amap/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.12 2006/10/30 14:07:28 adrianp Exp $ +# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:06 wiz Exp $ # -DISTNAME= amap-5.2 -CATEGORIES= net security -MASTER_SITES= http://thc.segfault.net/releases/ \ +DISTNAME= amap-5.2 +CATEGORIES= net security +MASTER_SITES= http://thc.segfault.net/releases/ \ http://www.thc.org/releases/ -MAINTAINER= adrianp@NetBSD.org -HOMEPAGE= http://thc.org.segfault.net/thc-amap/ -COMMENT= Applications and Services scanner +MAINTAINER= adrianp@NetBSD.org +HOMEPAGE= http://thc.org.segfault.net/thc-amap/ +COMMENT= Applications and Services scanner HAS_CONFIGURE= YES @@ -26,12 +26,12 @@ SUBST_CLASSES+= conf SUBST_FILES.conf= configure SUBST_STAGE.conf= pre-configure SUBST_SED.conf= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.conf+= -e 's|@MANDIR@|${PREFIX}/man|g' -SUBST_SED.conf+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g' -SUBST_SED.conf+= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' -SUBST_SED.conf+= -e "s|@UNAME@|${UNAME}|g" -SUBST_SED.conf+= -e "s|@GREP@|${GREP}|g" -SUBST_SED.conf+= -e "s|@SED@|${SED}|g" +SUBST_SED.conf+= -e 's|@MANDIR@|${PREFIX}/man|g' +SUBST_SED.conf+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g' +SUBST_SED.conf+= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' +SUBST_SED.conf+= -e "s|@UNAME@|${UNAME}|g" +SUBST_SED.conf+= -e "s|@GREP@|${GREP}|g" +SUBST_SED.conf+= -e "s|@SED@|${SED}|g" SUBST_MESSAGE.conf= Fixing configure script. INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 7e72064d74d..feaae237bc3 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2007/02/09 02:39:40 obache Exp $ +# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:07 wiz Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -69,7 +69,7 @@ PKG_SUPPORTED_OPTIONS= milter .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mmilter) -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-runtime-dir=${AMAVIS_DIR:Q} CONFIGURE_ARGS+= --with-sockname=${AMAVIS_DIR}/amavisd.sock CONFIGURE_ARGS+= --with-user=${AMAVIS_USER:Q} @@ -81,7 +81,7 @@ RCD_SCRIPTS+= amavismilter MESSAGE_SRC+= ${PKGDIR}/MESSAGE.milter PLIST_SUBST+= MILTER= -PTHREAD_OPTS+= require native # doesn't work with pth +PTHREAD_OPTS+= require native # doesn't work with pth . include "../../mail/libmilter/buildlink3.mk" . include "../../mk/pthread.buildlink3.mk" .else diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile index f7be9754c1a..72abd1a08b3 100644 --- a/security/ap-modsecurity2/Makefile +++ b/security/ap-modsecurity2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/11/05 18:05:33 adrianp Exp $ +# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:07 wiz Exp $ DISTNAME= modsecurity-apache_2.0.3 PKGNAME= ${APACHE_PKG_PREFIX}-modsecurity-2.0.3 @@ -24,7 +24,7 @@ BUILDLINK_API_DEPENDS.apache+= apache>=2.0.59nb2 SUBST_CLASSES= make SUBST_STAGE.make= post-patch SUBST_FILES.make= apache2/Makefile -SUBST_SED.make= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_SED.make= -e "s|@PREFIX@|${PREFIX}|g" SUBST_MESSAGE.make= Fixing Makefiles. .if !empty(PKG_OPTIONS:Mxml) diff --git a/security/crypto++/Makefile b/security/crypto++/Makefile index 0b66f382910..de228dc7621 100644 --- a/security/crypto++/Makefile +++ b/security/crypto++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/09/09 02:46:08 obache Exp $ +# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:07 wiz Exp $ # DISTNAME= cryptopp521 @@ -9,7 +9,7 @@ MASTER_SITES= http://www.eskimo.com/~weidai/ \ ${MASTER_SITE_SOURCEFORGE:=cryptopp/} \ http://gd.tuwien.ac.at/privacy/crypto/libs/cryptlib/ \ http://www.mirrors.wiretapped.net/security/cryptography/libraries/cryptolib/ -EXTRACT_SUFX= .zip +EXTRACT_SUFX= .zip MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cryptopp.com/ diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 5f1a6f0054b..032f3b8571a 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2006/11/02 13:02:39 obache Exp $ +# $NetBSD: Makefile,v 1.54 2007/02/22 19:27:07 wiz Exp $ .include "Makefile.common" @@ -32,7 +32,7 @@ BUILD_DEFS+= SASLSOCKETDIR # plaintext password authentication. # AUTHDAEMONVAR?= ${VARBASE}/authdaemon -CONFIGURE_ARGS+= --with-authdaemond=${AUTHDAEMONVAR}/socket +CONFIGURE_ARGS+= --with-authdaemond=${AUTHDAEMONVAR}/socket BUILD_DEFS+= AUTHDAEMONVAR # Support using APOP against a POP server for plaintext password diff --git a/security/fragroute/Makefile b/security/fragroute/Makefile index 350cefb83f7..91b39e0af58 100644 --- a/security/fragroute/Makefile +++ b/security/fragroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/02/11 05:22:24 tv Exp $ +# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:07 wiz Exp $ DISTNAME= fragroute-1.2 PKGREVISION= 4 @@ -7,7 +7,7 @@ MASTER_SITES= http://monkey.org/~dugsong/fragroute/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.monkey.org/~dugsong/fragroute/ -COMMENT= Tool for intercepting, modifying and rewriting egress traffic +COMMENT= Tool for intercepting, modifying and rewriting egress traffic GNU_CONFIGURE= YES diff --git a/security/gnupg/hacks.mk b/security/gnupg/hacks.mk index ed619453afb..3d2ac664f8a 100644 --- a/security/gnupg/hacks.mk +++ b/security/gnupg/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.3 2005/12/05 20:50:56 rillig Exp $ +# $NetBSD: hacks.mk,v 1.4 2007/02/22 19:27:07 wiz Exp $ .if !defined(GNUPG_HACKS_MK) GNUPG_HACKS_MK= # defined @@ -7,8 +7,8 @@ GNUPG_HACKS_MK= # defined ### drop any -mcpu flag ### .if ${MACHINE_ARCH} == "sparc" -PKG_HACKS+= mcpu -BUILDLINK_TRANSFORM+= rm:-mcpu=.* +PKG_HACKS+= mcpu +BUILDLINK_TRANSFORM+= rm:-mcpu=.* .endif .endif diff --git a/security/gss/Makefile b/security/gss/Makefile index 771909d5ee5..56511c71af2 100644 --- a/security/gss/Makefile +++ b/security/gss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/31 23:56:29 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2007/02/22 19:27:07 wiz Exp $ # DISTNAME= gss-0.0.15 @@ -19,6 +19,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes INFO_FILES= # PLIST -PKGCONFIG_OVERRIDE+= gss.pc.in +PKGCONFIG_OVERRIDE+= gss.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 9adbf14730a..a992acb3d30 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/10/25 17:12:18 bad Exp $ +# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:07 wiz Exp $ DISTNAME= ipsec-tools-0.6.6 CATEGORIES= security @@ -15,7 +15,7 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -PKG_OPTIONS_VAR= PKG_OPTIONS.ipsec-tools +PKG_OPTIONS_VAR= PKG_OPTIONS.ipsec-tools PKG_SUPPORTED_OPTIONS= radius PKG_SUGGESTED_OPTIONS= radius diff --git a/security/libdes/Makefile b/security/libdes/Makefile index 56255961ebf..006810d5ccc 100644 --- a/security/libdes/Makefile +++ b/security/libdes/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:13 tv Exp $ +# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:07 wiz Exp $ DISTNAME= libdes-4.04b CATEGORIES= security -MASTER_SITES= ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/ +MASTER_SITES= ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/ MAINTAINER= refling@comet.lbl.gov COMMENT= Small DES (Data Encryption Standard) lib & standalone program -WRKSRC= ${WRKDIR}/des +WRKSRC= ${WRKDIR}/des CRYPTO= YES .include "../../mk/bsd.pkg.mk" diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile index 3ee785f82f9..5f9d339f1e4 100644 --- a/security/libpreludedb/Makefile +++ b/security/libpreludedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/01/25 14:39:03 shannonjr Exp $ +# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:07 wiz Exp $ # DISTNAME= libpreludedb-0.9.10 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= -enable-mysql CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-python CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} -CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} +CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} CONFIGURE_ARGS+= --with-pgsql=no LDFLAGS+= ${BUILDLINK_LDFLAGS.mysql-client} PYBINMODULE= yes diff --git a/security/mirrordir/Makefile b/security/mirrordir/Makefile index c25bb94811a..647425c824c 100644 --- a/security/mirrordir/Makefile +++ b/security/mirrordir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/10/04 21:58:14 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:07 wiz Exp $ # DISTNAME= mirrordir-0.10.49 @@ -17,6 +17,6 @@ USE_LIBTOOL= yes EGDIR= ${PREFIX}/share/examples/mirrordir -CONF_FILES= ${EGDIR}/secure-mcservusers ${PKG_SYSCONFDIR}/secure-mcservusers +CONF_FILES= ${EGDIR}/secure-mcservusers ${PKG_SYSCONFDIR}/secure-mcservusers .include "../../mk/bsd.pkg.mk" diff --git a/security/mit-krb5/builtin.mk b/security/mit-krb5/builtin.mk index 05555451474..7e5b7f9cfb6 100644 --- a/security/mit-krb5/builtin.mk +++ b/security/mit-krb5/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2006/04/10 18:05:16 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2007/02/22 19:27:08 wiz Exp $ BUILTIN_PKG:= mit-krb5 @@ -35,7 +35,7 @@ BUILTIN_VERSION.mit-krb5!= ${SH_KRB5_CONFIG} --version | \ BUILTIN_VERSION.mit-krb5?= 1.4.0 BUILTIN_PKG.mit-krb5= mit-krb5-${BUILTIN_VERSION.mit-krb5} .endif -MAKEVARS+= BUILTIN_PKG.mit-krb5 +MAKEVARS+= BUILTIN_PKG.mit-krb5 ### ### Determine whether we should use the built-in implementation if it diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile index 1b8d618a512..8324dc3b297 100644 --- a/security/mixminion/Makefile +++ b/security/mixminion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/04/06 06:22:43 reed Exp $ +# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:08 wiz Exp $ # DISTNAME= Mixminion-0.0.7.1 @@ -14,7 +14,7 @@ COMMENT= Mixminion impedes message traffic analysis BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7d CRYPTO= YES -PYTHON_VERSIONS_ACCEPTED= 23 22 21 +PYTHON_VERSIONS_ACCEPTED= 23 22 21 PYDISTUTILSPKG= YES TEST_TARGET= test diff --git a/security/nfsbug/Makefile b/security/nfsbug/Makefile index c56318ba29c..2f686a02ec9 100644 --- a/security/nfsbug/Makefile +++ b/security/nfsbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/28 22:07:18 hubertf Exp $ +# $NetBSD: Makefile,v 1.18 2007/02/22 19:27:08 wiz Exp $ DISTNAME= nfsshell-1.0 PKGREVISION= 1 @@ -10,7 +10,7 @@ DISTFILES= nfsBugFerret.tgz \ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= NFS security verification suite -EXTRACT_ONLY= nfsBugFerret.tgz +EXTRACT_ONLY= nfsBugFerret.tgz WRKSRC= ${WRKDIR}/nfsbug diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index c450c6e3ff1..78474dd63fc 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/07/05 20:53:11 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2007/02/22 19:27:08 wiz Exp $ # NOTE: This package is modeled on ../openssh, but does not share # files with it as that package may update faster than the gssapi @@ -15,8 +15,8 @@ MASTER_SITES= ftp://ftp7.usa.openbsd.org/pub/os/OpenBSD/OpenSSH/portable/ \ ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \ ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/old/ -PATCH_SITES= http://www.sxw.org.uk/computing/patches/ -PATCHFILES= openssh-3.6.1p2-gssapi-20030430.diff +PATCH_SITES= http://www.sxw.org.uk/computing/patches/ +PATCHFILES= openssh-3.6.1p2-gssapi-20030430.diff PATCH_DIST_STRIP= -p1 # Don't delete the last entry -- it's there if the pkgsrc version is not diff --git a/security/openssh/Makefile b/security/openssh/Makefile index a9eef0f2193..f9e886490e5 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.176 2007/01/20 10:03:39 taca Exp $ +# $NetBSD: Makefile,v 1.177 2007/02/22 19:27:08 wiz Exp $ DISTNAME= openssh-4.5p1 PKGNAME= openssh-4.5.1 @@ -53,7 +53,7 @@ LIBS+= -lbind -ldb -lcrypt .else # not Interix -PKG_GROUPS= ${OPENSSH_GROUP} +PKG_GROUPS= ${OPENSSH_GROUP} PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP} PKG_GECOS.${OPENSSH_USER}= sshd privsep pseudo-user diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 4b06e08de53..2c6d283edf6 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2007/01/20 10:03:39 taca Exp $ +# $NetBSD: options.mk,v 1.12 2007/02/22 19:27:08 wiz Exp $ .include "../../mk/bsd.prefs.mk" @@ -13,7 +13,7 @@ PKG_SUPPORTED_OPTIONS+= pam .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q} +CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q} .endif .if !empty(PKG_OPTIONS:Mhpn-patch) diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk index c798453222b..379ad87baf9 100644 --- a/security/openssl/builtin.mk +++ b/security/openssl/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.20 2006/08/09 11:23:20 abs Exp $ +# $NetBSD: builtin.mk,v 1.21 2007/02/22 19:27:08 wiz Exp $ BUILTIN_PKG:= openssl @@ -59,7 +59,7 @@ BUILTIN_VERSION.openssl!= \ # # If the native OpenSSL contains the security fixes pulled up to the # netbsd-1-6 branch on 2003-11-07, then pretend it's openssl-0.9.6l. -# +# BUILTIN_OPENSSL_HAS_20031107_FIX!= \ ${AWK} 'BEGIN { ans = "no" } \ /OPENSSL_HAS_20031107_FIX/ { ans = "yes" } \ @@ -71,7 +71,7 @@ BUILTIN_VERSION.openssl= 0.9.6l # # If the native OpenSSL contains the security fixes pulled up to the # netbsd-1-6 branch on 2004-04-01, then pretend it's openssl-0.9.6m. -# +# BUILTIN_OPENSSL_HAS_20040401_FIX!= \ ${AWK} 'BEGIN { ans = "no" } \ /OPENSSL_HAS_20040401_FIX/ { ans = "yes" } \ @@ -86,7 +86,7 @@ BUILTIN_VERSION.openssl= 0.9.6m # If the native OpenSSL contains the security fixes pulled up to the # netbsd-2-0, netbsd-2, and netbsd-3-0 branches on 2005-10-11, then # pretend it's openssl-0.9.7h. -# +# BUILTIN_OPENSSL_HAS_20051011_FIX!= \ ${AWK} 'BEGIN { ans = "no" } \ /OPENSSL_HAS_20051011_FIX/ { ans = "yes" } \ @@ -209,13 +209,13 @@ buildlink-openssl-des-h: . endif # USE_OLD_DES_API == yes . if defined(PKG_SYSCONFDIR.openssl) -SSLDIR= ${PKG_SYSCONFDIR.openssl} +SSLDIR= ${PKG_SYSCONFDIR.openssl} . elif ${OPSYS} == "NetBSD" -SSLDIR= /etc/openssl +SSLDIR= /etc/openssl . elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) -SSLDIR= /etc/ssl # most likely place +SSLDIR= /etc/ssl # most likely place . else -SSLDIR= ${PKG_SYSCONFBASEDIR}/openssl +SSLDIR= ${PKG_SYSCONFBASEDIR}/openssl . endif SSLCERTS= ${SSLDIR}/certs diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile index 586b3614690..e8495ae777b 100644 --- a/security/p5-Crypt-OpenPGP/Makefile +++ b/security/p5-Crypt-OpenPGP/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2005/08/06 06:19:29 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2007/02/22 19:27:08 wiz Exp $ # DISTNAME= Crypt-OpenPGP-1.03 -PKGNAME= p5-${DISTNAME} +PKGNAME= p5-${DISTNAME} PKGREVISION= 3 SVR4_PKGNAME= p5pgp CATEGORIES= security perl5 diff --git a/security/pflkm/builtin.mk b/security/pflkm/builtin.mk index 3c65b587d2a..cb65df32e94 100644 --- a/security/pflkm/builtin.mk +++ b/security/pflkm/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:22:44 reed Exp $ +# $NetBSD: builtin.mk,v 1.11 2007/02/22 19:27:08 wiz Exp $ BUILTIN_PKG:= pflkm @@ -102,9 +102,9 @@ CHECK_BUILTIN.pflkm?= no .if !empty(CHECK_BUILTIN.pflkm:M[nN][oO]) . if !empty(USE_BUILTIN.pflkm:M[nN][oO]) -PFCTL?= ${BUILDLINK_PREFIX.pflkm}/bin/pfctl +PFCTL?= ${BUILDLINK_PREFIX.pflkm}/bin/pfctl . else -PFCTL?= ${EXE_PFCTL} +PFCTL?= ${EXE_PFCTL} . endif .endif # CHECK_BUILTIN.pflkm diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile index d0f72446a14..24e54f7f5e6 100644 --- a/security/pgp2/Makefile +++ b/security/pgp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2007/01/07 09:14:10 rillig Exp $ +# $NetBSD: Makefile,v 1.51 2007/02/22 19:27:08 wiz Exp $ DISTNAME= pgp263is PKGREVISION= 1 @@ -37,7 +37,7 @@ ASMFLAG= -DPORTABLE -DMPORTABLE .include "../../mk/endian.mk" .if (${MACHINE_ENDIAN} == "big") -CFLAGS+= -DHIGHFIRST +CFLAGS+= -DHIGHFIRST .endif BUILD_DEFS+= ASMFLAG diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile index abe367bad78..292c6dc7ce0 100644 --- a/security/pgp5/Makefile +++ b/security/pgp5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/10/04 21:58:14 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2007/02/22 19:27:09 wiz Exp $ # DISTNAME= pgp50i-unix-src @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \ http://ftp.tuwien.ac.at/privacy/pgp/5.0/unix/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.pgpi.org/ +HOMEPAGE= http://www.pgpi.org/ COMMENT= Public-key encryption and digital signature utilities (v5) USE_TOOLS+= perl diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 4bc59043184..900f0215fe0 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/08/24 16:10:12 shannonjr Exp $ +# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:09 wiz Exp $ # DISTNAME= prelude-manager-0.9.6 @@ -25,21 +25,21 @@ PRELUDE_USER?= _prelude PRELUDE_GROUP?= _prelude PRELUDE_HOME?= /var/spool/prelude-manager -PKG_GROUPS= ${PRELUDE_GROUP} -PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP} +PKG_GROUPS= ${PRELUDE_GROUP} +PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP} PKG_GECOS.${PRELUDE_USER}= Prelude IDS manager PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME} FILES_SUBST+= PRELUDE_MANAGER_PID_DIR=${PRELUDE_MANAGER_PID_DIR:Q} -FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q} -FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_USER:Q} - -SUBST_CLASSES+= code -SUBST_STAGE.code= post-patch -SUBST_FILES.code= run-prelude-manager.c -SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g' +FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q} +FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_USER:Q} + +SUBST_CLASSES+= code +SUBST_STAGE.code= post-patch +SUBST_FILES.code= run-prelude-manager.c +SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' +SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g' EGDIR= share/examples/prelude-manager/ CONF_FILES_PERMS+= ${EGDIR}/prelude-manager.conf ${PKG_SYSCONFDIR}/prelude-manager/prelude-manager.conf \ diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile index 43d5de0bc5c..b827987b823 100644 --- a/security/py-OpenSSL/Makefile +++ b/security/py-OpenSSL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/08/14 13:19:24 rpaulo Exp $ +# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:09 wiz Exp $ # DISTNAME= pyOpenSSL-0.6 @@ -8,8 +8,8 @@ CATEGORIES= security python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyopenssl/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://pyopenssl.sourceforge.net/ -COMMENT= Python interface to the OpenSSL library +HOMEPAGE= http://pyopenssl.sourceforge.net/ +COMMENT= Python interface to the OpenSSL library PYTHON_VERSIONS_ACCEPTED= 24 23 22 diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile index c0f925436f8..17fdef9053f 100644 --- a/security/py-mcrypt/Makefile +++ b/security/py-mcrypt/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2006/09/03 00:56:30 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:09 wiz Exp $ # DISTNAME= python-mcrypt-1.1 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} +PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-mcrypt/} @@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/python-mcrypt/ COMMENT= Python interface to mcrypt library -PYBINMODULE= yes +PYBINMODULE= yes PYDISTUTILSPKG= yes PYTHON_VERSIONS_ACCEPTED= 24 23 22 diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile index 2002d6795de..f0c115cb2a3 100644 --- a/security/qca-tls/Makefile +++ b/security/qca-tls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/08/07 19:38:43 jdolecek Exp $ +# $NetBSD: Makefile,v 1.20 2007/02/22 19:27:09 wiz Exp $ DISTNAME= qca-tls-1.0 PKGREVISION= 3 @@ -15,8 +15,8 @@ USE_LIBTOOL= yes HAS_CONFIGURE= yes USE_LANGUAGES= c c++ -CONFIGURE_ARGS+= --with-openssl-inc=${SSLBASE}/include -CONFIGURE_ARGS+= --with-openssl-lib=${SSLBASE}/lib +CONFIGURE_ARGS+= --with-openssl-inc=${SSLBASE}/include +CONFIGURE_ARGS+= --with-openssl-lib=${SSLBASE}/lib .include "../../security/openssl/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile index 350f944d6d5..e327a031cb8 100644 --- a/security/seahorse-gedit/Makefile +++ b/security/seahorse-gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/12/06 19:51:52 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:09 wiz Exp $ DISTNAME= seahorse-0.8.1 PKGNAME= seahorse-gedit-0.8.1 @@ -22,7 +22,7 @@ USE_PKGLOCALEDIR= yes CONFIGURE_ARGS+= --disable-nautilus -GCONF2_SCHEMAS= seahorse-gedit.schemas +GCONF2_SCHEMAS= seahorse-gedit.schemas BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2 diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 6ac08bcdd29..0bac38dcbc2 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2006/12/06 19:51:52 joerg Exp $ +# $NetBSD: Makefile,v 1.59 2007/02/22 19:27:09 wiz Exp $ DISTNAME= seahorse-0.8.1 PKGREVISION= 3 @@ -21,7 +21,7 @@ USE_PKGLOCALEDIR= yes CONFIGURE_ARGS+= --disable-gedit CONFIGURE_ARGS+= --disable-nautilus -GCONF2_SCHEMAS= seahorse.schemas +GCONF2_SCHEMAS= seahorse.schemas BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2 diff --git a/security/smimemsg/Makefile b/security/smimemsg/Makefile index 3fac487acb4..4ff4adc7b19 100644 --- a/security/smimemsg/Makefile +++ b/security/smimemsg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/22 09:22:14 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:09 wiz Exp $ # DISTNAME= smimemsg15 @@ -13,9 +13,9 @@ COMMENT= Generate and read S/MIME messages WRKSRC= ${WRKDIR}/smimemsg GNU_CONFIGURE= yes -RESTRICTED= Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp. -NO_SRC_ON_FTP= ${RESTRICTED} -NO_SRC_ON_CDROM= ${RESTRICTED} +RESTRICTED= Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp. +NO_SRC_ON_FTP= ${RESTRICTED} +NO_SRC_ON_CDROM= ${RESTRICTED} pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smimemsg diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index b5fa9e8c140..975db3e4e20 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/11/02 12:31:58 kivinen Exp $ +# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:09 wiz Exp $ DISTNAME= ssh-3.2.9.1 PKGNAME= ${DISTNAME:C/ssh-/ssh2-/} @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ssh.com/ -COMMENT= Secure Shell client and server for V.2 SSH protocol +COMMENT= Secure Shell client and server for V.2 SSH protocol CONFLICTS+= openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]* CONFLICTS+= openssh+gssapi-[0-9]* ssh2-nox11-[0-9]* diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile index e8adadf89a2..6ffdbc34dd4 100644 --- a/security/tcp_wrappers/Makefile +++ b/security/tcp_wrappers/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2006/03/04 21:30:38 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2007/02/22 19:27:09 wiz Exp $ -DISTNAME= tcp_wrappers_7.6-ipv6.1 +DISTNAME= tcp_wrappers_7.6-ipv6.1 PKGNAME= tcp_wrappers-7.6.1 -PKGREVISION= 4 +PKGREVISION= 4 CATEGORIES= security net MASTER_SITES= ftp://ftp.porcupine.org/pub/security/ -- cgit v1.2.3