diff options
| author | rillig <rillig@pkgsrc.org> | 2016-07-10 10:41:38 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2016-07-10 10:41:38 +0000 |
| commit | 41cad12745e4d66f2d577b8500900694fdee4128 (patch) | |
| tree | af5998f68fb1d2a8f0fe39bcce4959af2b752833 /security/openssh | |
| parent | 3a2b5c8de1e4585daa3d371ed2f1cc8d8ab7e9b9 (diff) | |
| download | pkgsrc-41cad12745e4d66f2d577b8500900694fdee4128.tar.gz | |
Fixed pkglint warnings about indentation.
Diffstat (limited to 'security/openssh')
| -rw-r--r-- | security/openssh/Makefile | 18 | ||||
| -rw-r--r-- | security/openssh/options.mk | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index d159fbaeed2..4a598466de4 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.247 2016/07/10 10:40:23 rillig Exp $ +# $NetBSD: Makefile,v 1.248 2016/07/10 10:41:38 rillig Exp $ DISTNAME= openssh-7.2p2 PKGNAME= ${DISTNAME:S/p2/.2/} @@ -44,13 +44,13 @@ BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib/bind CONFIGURE_ENV+= ac_cv_func_openpty=no CONFIGURE_ENV+= ac_cv_type_struct_timespec=yes CPPFLAGS+= -DIOV_MAX=16 # default is INT_MAX, way too large -.if exists(/usr/local/include/bind/resolv.h) +. if exists(/usr/local/include/bind/resolv.h) CPPFLAGS+= -I/usr/local/include/bind BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind -.elif exists(/usr/local/bind/include/resolv.h) +. elif exists(/usr/local/bind/include/resolv.h) CPPFLAGS+= -I/usr/local/bind/include BUILDLINK_PASSTHRU_DIRS+= /usr/local/bind/include -.endif +. endif LDFLAGS+= -L/usr/local/lib/bind LIBS+= -lbind -ldb -lcrypt @@ -70,13 +70,13 @@ PKG_SYSCONFSUBDIR= ssh GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mantype=man -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR} CONFIGURE_ARGS+= --with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers} .if ${OPSYS} != "Interix" CONFIGURE_ARGS+= --with-privsep-path=${OPENSSH_CHROOT:Q} -CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER:Q} +CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER} .endif # pkgsrc already enforces a "secure" version of zlib via dependencies, @@ -173,7 +173,7 @@ RCD_SCRIPTS= sshd RCD_SCRIPT_SRC.sshd= ${WRKDIR}/sshd.sh SMF_METHODS= sshd -FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q} +FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR} SUBST_CLASSES+= patch SUBST_STAGE.patch= pre-configure @@ -199,7 +199,7 @@ post-configure: ${SED} -e '/HAVE_ECDSA_START/,/HAVE_ECDSA_STOP/d' \ ${FILESDIR}/sshd.sh > ${WRKDIR}/sshd.sh; \ fi - ${SED} -e 's,@VARBASE@,${VARBASE:Q},g' \ + ${SED} -e 's,@VARBASE@,${VARBASE},g' \ < ${FILESDIR}/org.openssh.sshd.sb.in \ > ${WRKDIR}/org.openssh.sshd.sb diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 7326be91568..eb169e3096e 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.32 2016/06/10 23:15:36 alnsn Exp $ +# $NetBSD: options.mk,v 1.33 2016/07/10 10:41:38 rillig Exp $ .include "../../mk/bsd.prefs.mk" @@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --without-openssl .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q} +CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE} . if ${KRB5_TYPE} == "mit-krb5" CONFIGURE_ENV+= ac_cv_search_k_hasafs=no . endif @@ -36,7 +36,7 @@ PLIST_VARS+= pam CONFIGURE_ARGS+= --with-pam MESSAGE_SRC+= ${.CURDIR}/MESSAGE.pam MESSAGE_SUBST+= EGDIR=${EGDIR} -.if ${OPSYS} == "Linux" +. if ${OPSYS} == "Linux" PLIST.pam= yes -.endif +. endif .endif |