17 files changed, 9 insertions, 19 deletions

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 8b28b84ac9ff..f5ca9ad96ce3 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -33,7 +33,7 @@ PATCH_STRIP=	-p1
 
 BF_LIBS?=		-ldb-4.3
 BF_CPPFLAGS?=		-I${LOCALBASE}/include/db43 -I${LOCALBASE}/include
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc --mandir=${PREFIX}/man
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 .if !defined(WITHOUT_UNICODE)
 CONFIGURE_ARGS+=	--enable-unicode
 USE_ICONV=		yes
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 2617463860a2..4ea867f56698 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -43,8 +43,7 @@ MAN1=		claws-mail.1
 CONFIGURE_ARGS=	\
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-manualdir=${DOCSDIR}/manual \
-		--with-faqdir=${DOCSDIR}/faq \
-		--mandir=${PREFIX}/man
+		--with-faqdir=${DOCSDIR}/faq
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index e4ab75c352ad..0a8825e815db 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -35,7 +35,7 @@ CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-pkglibdir=${LOCALBASE}/lib/dbmail
-MAKE_ARGS+=	mandir=${PREFIX}/man
+MAKE_ARGS+=	mandir=${MANPREFIX}/man
 
 PORTDOCS=	AUTHORS BUGS COPYING INSTALL NEWS README \
 		README.aliases README.exim README.ldap \
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index e4ab75c352ad..0a8825e815db 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -35,7 +35,7 @@ CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-pkglibdir=${LOCALBASE}/lib/dbmail
-MAKE_ARGS+=	mandir=${PREFIX}/man
+MAKE_ARGS+=	mandir=${MANPREFIX}/man
 
 PORTDOCS=	AUTHORS BUGS COPYING INSTALL NEWS README \
 		README.aliases README.exim README.ldap \
diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index ffd8ffdb17f8..0b6dac2e92fb 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -38,7 +38,7 @@ DCCGID?=	112
 # sed scripting breaks things.
 #
 
-CONFIGURE_ARGS=	--homedir=${PREFIX}/dcc --bindir=${PREFIX}/bin --mandir=${PREFIX}/man --with-rundir=/var/run
+CONFIGURE_ARGS=	--homedir=${PREFIX}/dcc --bindir=${PREFIX}/bin --mandir=${MANPREFIX}/man --with-rundir=/var/run
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index c17b42a2b746..d178b2e542da 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -36,8 +36,7 @@ GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
-		--with-hesiod=no --enable-fallback=no \
-		--mandir=${PREFIX}/man
+		--with-hesiod=no --enable-fallback=no
 # bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 2572c9927cff..155452b11db2 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -26,7 +26,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 # CXXFLAGS needed to work round issue with gcc and openssl 0.9.8a
 # /usr/local/include/openssl/sha.h:173: error: ISO C++ does not support `long long'
 
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
 MAN1=		gnubiff.1
 INFO=		gnubiff
 
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index fc6f27a9c846..cd6eca282c05 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -21,7 +21,6 @@ USE_BDB=	42+
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 
 MAN1=		isync.1 mbsync.1 mdconvert.1
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
diff --git a/mail/masqmail/Makefile b/mail/masqmail/Makefile
index 2d1e43d4764a..1e391824a2a4 100644
--- a/mail/masqmail/Makefile
+++ b/mail/masqmail/Makefile
@@ -19,7 +19,7 @@ MAN8=		masqmail.8 mservdetect.8
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-Wno-trigraphs
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/man --with-user=mailnull --with-group=mail \
+CONFIGURE_ARGS+=	--with-user=mailnull --with-group=mail \
 		--with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index c44e35e08492..725c21dbbfdc 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -22,7 +22,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--infodir="${PREFIX}/info" --mandir="${PREFIX}/man"
 MAN1=	msmtp.1
 INFO=	msmtp
 
diff --git a/mail/nullpop/Makefile b/mail/nullpop/Makefile
index 05892dfb31da..aefa3dafdce3 100644
--- a/mail/nullpop/Makefile
+++ b/mail/nullpop/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	pankov_p@mail.ru
 COMMENT=	A POP3 server that allows logins, but never returns any email
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--libexecdir="${TARGETDIR}/bin" --mandir="${TARGETDIR}/man"
+CONFIGURE_ARGS+=--libexecdir="${TARGETDIR}/bin"
 
 PLIST_FILES=	bin/nullpop
 MAN8=		nullpop.8
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 4f4b88dfc990..9878f7a959af 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -18,7 +18,6 @@ USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		pfqueue.1
diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index 4e4d2d0f2cc2..e8e67b91c314 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A flexible SMTP filter which can act also as transparent proxy
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL} --mandir=${MANPREFIX}/man
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 
 USE_RC_SUBR=	proxsmtpd.sh
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 8008344f0a12..d814c72a7ee2 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -71,7 +71,6 @@ CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
 		--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
 		--localstatedir=${PREFIX}/var/sqwebmail \
 		--sysconfdir=${PREFIX}/etc/sqwebmail \
-		--mandir=${PREFIX}/man \
 		--enable-imageurl=/${IMAGEURL} \
 		--with-locking-method=fcntl \
 		--with-libintl-prefix=${LOCALBASE} \
diff --git a/mail/surblhost/Makefile b/mail/surblhost/Makefile
index 2bef92f73ef8..040787f7f50f 100644
--- a/mail/surblhost/Makefile
+++ b/mail/surblhost/Makefile
@@ -17,6 +17,5 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
-CONFIGURE_ARGS=	--mandir=${MAN1PREFIX}/man
 
 .include <bsd.port.mk>
diff --git a/mail/sympa5/Makefile b/mail/sympa5/Makefile
index d7dad2359d37..e3e298ee129b 100644
--- a/mail/sympa5/Makefile
+++ b/mail/sympa5/Makefile
@@ -86,7 +86,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--with-lockdir=/var/spool/lock \
 		--with-piddir=/var/run \
 		--with-localedir=${PREFIX}/share/locale \
-		--with-mandir=${PREFIX}/man \
 		--with-docdir=${DOCSDIR} \
 		--with-sampledir=${EXAMPLESDIR} \
 		--with-spooldir=${PREFIX}/sympa/spool
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 8c559dd8dac8..65f048d161b3 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -45,7 +45,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}/ \
 		--with-vacationpath=${PREFIX}/bin/vacation \
 		--includedir=${PREFIX}/include \
 		--libdir=${PREFIX}/lib \
-		--mandir=${PREFIX}/man \
 		--with-ta-mmap
 
 MAN1=		rmail.1zm vacation.1zm zmailer.1zm zmsh.1zm mboxpath.1zm mailq.1zm \