32 files changed, 12 insertions, 45 deletions

diff --git a/security/aespipe/Makefile b/security/aespipe/Makefile
index 2e94cb0ec44d..1e45846b4a67 100644
--- a/security/aespipe/Makefile
+++ b/security/aespipe/Makefile
@@ -20,8 +20,7 @@ MAN1=		aespipe.1
 
 USE_BZIP2=	yes
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--mandir="${MANPREFIX}/man"
+GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/aespipe
 
 .include <bsd.port.pre.mk>
diff --git a/security/cksfv/Makefile b/security/cksfv/Makefile
index 335df4f92592..394f858c077b 100644
--- a/security/cksfv/Makefile
+++ b/security/cksfv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Create or manipulate Simple File Verification (SFV) checksum files
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man --prefix=${PREFIX}
+CONFIGURE_ARGS=	--manir=${PREFIX}/man --prefix=${PREFIX}
 
 MAN1=		cksfv.1
 PLIST_FILES=	bin/cksfv
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index dff0c84005e0..a2e5b9ad47f3 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -43,7 +43,6 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-dbdir=${DBDIR} \
 		--with-zlib=/usr \
-		--mandir=${MANPREFIX}/man \
 		--disable-zlib-vcheck \
 		--disable-clamuko \
 		--disable-clamav \
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 531c69b8cb6a..9de0fae5b013 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -39,7 +39,6 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-dbdir=${DBDIR} \
 		--with-zlib=/usr \
-		--mandir=${MANPREFIX}/man \
 		--disable-zlib-vcheck \
 		--disable-clamuko \
 		--disable-clamav \
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index f540a240467e..67d3a0f5af8d 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -20,7 +20,6 @@ SUB_LIST=	CLAMAV_PID_DIR=${CLAMAV_PID_DIR}
 SUB_FILES+=	pkg-message
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 
 CLAMAV_PID_DIR?=	/var/run/clamav
 
diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
index 8bfdc44a7817..0776a5fc6226 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -44,7 +44,6 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
 		--includedir=${PREFIX}/include \
-		--mandir=${MANPREFIX}/man \
 		--enable-static \
 		--with-rc4=openssl
 
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 2b76567cdadd..3e3c25a7177e 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -36,7 +36,6 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
 		--includedir=${PREFIX}/include \
-		--mandir=${MANPREFIX}/man \
 		--enable-static \
 		--enable-login \
 		--enable-auth-sasldb \
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 3722a3e7202f..3e7126c70ca5 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -49,7 +49,6 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
 		--includedir=${PREFIX}/include \
-		--mandir=${MANPREFIX}/man \
 		--enable-static \
 		--enable-auth-sasldb \
 		--with-rc4=openssl \
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 8769af1af77d..d24cb2048a4c 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -29,7 +29,6 @@ USE_GMAKE=	yes
 INFO=		dirmngr
 MAN1=		dirmngr-client.1 dirmngr.1
 
-CONFIGURE_ARGS+=--infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 .if defined(WITHOUT_NLS)
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 5c46bdbe1d0f..2548213a0747 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -31,7 +31,6 @@ USE_ICONV=	YES
 USE_LDCONFIG=	YES
 USE_GETTEXT=	YES
 CONFIGURE_TARGET=# empty
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
 CONFIGURE_ARGS+=	--enable-nls
 MAN1=		gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \
 		gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index ec300cf98b0e..0be7a4e64422 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -21,7 +21,6 @@ USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
 .if ${MACHINE_CPU:Mi586}
 MACHINE_ARCH=	i586
 .endif
diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 566494f2a088..fd521e59c725 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -34,8 +34,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-included-lzo \
-			--infodir="${PREFIX}/info" --mandir="${PREFIX}/man/"
+CONFIGURE_ARGS+=	--with-included-lzo
 MANCOMPRESSED=	no
 
 .include <bsd.port.pre.mk>
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index c7b017e84985..8abf5a8d080a 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -34,8 +34,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-included-lzo \
-			--infodir="${PREFIX}/info" --mandir="${PREFIX}/man/"
+CONFIGURE_ARGS+=	--with-included-lzo
 MANCOMPRESSED=	no
 
 .include <bsd.port.pre.mk>
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index afe6d6fde17c..58d0f1db39f7 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -24,8 +24,7 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
-		--includedir=${PREFIX}/include/gpgme \
-		--infodir=${PREFIX}/${INFO_PATH}
+		--includedir=${PREFIX}/include/gpgme
 
 INFO=		gpgme
 
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 3c123cf1a739..75f8e866e35f 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -24,8 +24,6 @@ USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man \
-		--infodir=${PREFIX}/info
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 7f507ae97fdc..332ecee732f5 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -26,8 +26,7 @@ USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--disable-kerberos5 \
-		--infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man
+CONFIGURE_ARGS=	--disable-kerberos5
 USE_LDCONFIG=	yes
 
 INFO=		gss
diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile
index 945c184df766..35523191cd30 100644
--- a/security/libassuan/Makefile
+++ b/security/libassuan/Makefile
@@ -20,8 +20,6 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 INFO=		assuan
 
-CONFIGURE_ARGS+=--infodir=${PREFIX}/info
-
 CFLAGS+=	-I${LOCALBASE}/include/pth
 
 .include <bsd.port.mk>
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 481f2ed4412b..32c721d94613 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -20,7 +20,6 @@ USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
 INSTALLS_SHLIB=	yes
 
 INFO=	gcrypt
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index b2983f64ed28..b5edf37f12a2 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -23,8 +23,7 @@ INSTALLS_SHLIB=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-		--infodir=${PREFIX}/${INFO_PATH}
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_PERL5_BUILD=yes
 
 INFO=		ksba
diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index 0beedf56d5ee..f62bf6271672 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A library implementing the SSH2 protocol
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	include/libssh2.h \
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 759cfd23c3f6..2a75eb73ed11 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -20,7 +20,6 @@ USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--infodir="${PREFIX}/info" --mandir="${PREFIX}/man/"
 
 DOCS=		AUTHORS NEWS README THANKS doc/TODO \
 		doc/libtasn1.html doc/libtasn1.pdf doc/libtasn1.ps
diff --git a/security/openct/Makefile b/security/openct/Makefile
index a14fe9c7524c..8f4585cb89d0 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -28,8 +28,6 @@ SUB_FILES=	etoken.conf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
-
 MAN1=		openct-tool.1
 
 DOC_FILES=	README export-wiki.sh export-wiki.xsl trac.css *.html api
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 36ab220e9d8e..b7a53db4b792 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -33,8 +33,6 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
 
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
-
 DOC_FILES=	README *.sh *.xsl *.css *.html api html tools
 
 PORTDOCS=	*
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index ced66efdfb70..8e57e2c36dcb 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -41,7 +41,7 @@ USE_OPENSSL=		yes
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=		--prefix=${PREFIX} --mandir=${MANPREFIX}/man \
+CONFIGURE_ARGS=		--prefix=${PREFIX} \
 			--with-md5-passwords --without-zlib-version-check
 PRECIOUS=		ssh_config sshd_config ssh_host_key ssh_host_key.pub \
 			ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_dsa_key \
diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
index 3f5c12b8f60b..682f89ac4b6c 100644
--- a/security/pam_krb5/Makefile
+++ b/security/pam_krb5/Makefile
@@ -55,7 +55,6 @@ CONFIGURE_ENV=		CFLAGS="${CFLAGS}"
 CONFIGURE_ARGS=		--with-krb5="${KRB5_DIR}"	\
 			--with-pamdir="${PREFIX}/lib"	\
 			--with-man-sect=8		\
-			--mandir=${MANDIR}		\
 			--without-krbafs
 
 post-install:
diff --git a/security/pkcs11-helper/Makefile b/security/pkcs11-helper/Makefile
index 96a984d15e15..fd06b96ff951 100644
--- a/security/pkcs11-helper/Makefile
+++ b/security/pkcs11-helper/Makefile
@@ -22,8 +22,7 @@ USE_LDCONFIG=	yes
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
 
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man \
-		--disable-crypto-engine-gnutls
+CONFIGURE_ARGS=	--disable-crypto-engine-gnutls
 
 MAN8=		pkcs11-helper-1.8
 
diff --git a/security/samhain/Makefile b/security/samhain/Makefile
index 971d2e2751c0..e27cd804ce5c 100644
--- a/security/samhain/Makefile
+++ b/security/samhain/Makefile
@@ -36,7 +36,7 @@ BUILD_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-login-watch --localstatedir=/var \
-		--mandir=${PREFIX}/man --enable-suidcheck
+		--enable-suidcheck
 
 .if !defined(WITHOUT_XML_LOGS)
 CONFIGURE_ARGS+=	--enable-xml-log
diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 702843f365d8..bf29b1a7ff32 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Tools for large-scale network capture analysis
 LIB_DEPENDS=	lzo:${PORTSDIR}/archivers/lzo
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-lzo=${LOCALBASE} --enable-packing-tools \
-	--mandir=${MANPREFIX}/man
+CONFIGURE_ARGS=	--with-lzo=${LOCALBASE} --enable-packing-tools
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" GCC_FLAGS="" CFLAGS_RELEASE=""
 USE_LDCONFIG=	yes
diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 0c5a9a78ddc2..7904fb91f476 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -24,8 +24,7 @@ USE_GCC=	3.4+
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--localstatedir=/var --infodir=${PREFIX}/${INFO_PATH} \
-		--mandir=${MANPREFIX}/man
+CONFIGURE_ARGS=	--localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN5=	tinc.conf.5
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index db996f84d9be..c46b5c89ec94 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -36,7 +36,6 @@ MAN1=		tor.1 tor-resolve.1 torify.1
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 CONFIGURE_ENV+=	CPPFLAGS+=-I{LOCALBASE}/include \
 		LDFLAGS+=-L{LOCALBASE}/lib
 
diff --git a/security/tor/Makefile b/security/tor/Makefile
index ffb535c74065..e431ec16dab5 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -36,7 +36,6 @@ MAN1=		tor.1 tor-resolve.1 torify.1
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 CONFIGURE_ENV+=	CPPFLAGS+=-I{LOCALBASE}/include \
 		LDFLAGS+=-L{LOCALBASE}/lib
 
diff --git a/security/zzuf/Makefile b/security/zzuf/Makefile
index 1f4c25bbee87..91e20d0f0f2a 100644
--- a/security/zzuf/Makefile
+++ b/security/zzuf/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Transparent application input fuzzer
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
 MAN1=	zzuf.1