17 files changed, 24 insertions, 24 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index ea2d46c81c98..d4fd1515a435 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -180,7 +180,7 @@ pre-install:
 .endif
 
 post-install:
-	( cd ${STAGEDIR}${MANPREFIX}/man/man1 && ${__pmlinks1} )
+	( cd ${STAGEDIR}${PREFIX}/man/man1 && ${__pmlinks1} )
 .if ${PORT_OPTIONS:MDOCS}
 	${LN} -sf vice_toc.html ${STAGEDIR}${DOCSDIR}/index.html
 .endif
diff --git a/german/dtaus/Makefile b/german/dtaus/Makefile
index c28e42143350..4032b23b4c69 100644
--- a/german/dtaus/Makefile
+++ b/german/dtaus/Makefile
@@ -25,8 +25,8 @@ do-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dtaus ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/dtaus.1 ${STAGEDIR}${MANPREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/dtaus.5 ${STAGEDIR}${MANPREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC}/dtaus.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/dtaus.5 ${STAGEDIR}${PREFIX}/man/man5/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index f6e913e8484a..709652771eda 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -130,11 +130,11 @@ pre-build:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/util/pm_c_util.h ${STAGEDIR}${PREFIX}/include/
-	${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${STAGEDIR}${PREFIX}/man/man1/
 .if ${PORT_OPTIONS:MMANPAGES}
-	cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN1} ${STAGEDIR}${MANPREFIX}/man/man1/
-	cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN3} ${STAGEDIR}${MANPREFIX}/man/man3/
-	cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN5} ${STAGEDIR}${MANPREFIX}/man/man5/
+	cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN1} ${STAGEDIR}${PREFIX}/man/man1/
+	cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN3} ${STAGEDIR}${PREFIX}/man/man3/
+	cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN5} ${STAGEDIR}${PREFIX}/man/man5/
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 3b19d06a2443..e8a342417229 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -107,9 +107,9 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dk-filter/gentxt.csh \
 		${STAGEDIR}${PREFIX}/sbin/gentxt-dk
 .for i in ${MAN8}
-	@${RM} -f ${STAGEDIR}${MANPREFIX}/man/cat8/${i} \
-		${STAGEDIR}${MANPREFIX}/man/cat8/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man8/
+	@${RM} -f ${STAGEDIR}${PREFIX}/man/cat8/${i} \
+		${STAGEDIR}${PREFIX}/man/cat8/${i}.gz
+	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man8/
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index d361805d380c..8c1e4a18a48e 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.benzedrine.cx/
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Milter plugin to sendmail for regular expression filtering
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${FILESDIR}/COPYRIGHT
 
 USE_RC_SUBR=	milterregex
@@ -39,6 +39,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${STAGEDIR}${PREFIX}/libexec/
-	${INSTALL_MAN} ${WRKSRC}/milter-regex.8 ${STAGEDIR}${MANPREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/milter-regex.8 ${STAGEDIR}${PREFIX}/man/man8/
 
 .include <bsd.port.post.mk>
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index 148db5ef91b6..7bff0a29ba4b 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -23,7 +23,7 @@ pre-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/ripmime.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/ripmime.1 ${STAGEDIR}${PREFIX}/man/man1/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index 2c2a9c347c06..1f593b57f7d4 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -25,7 +25,7 @@ do-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sma ${STAGEDIR}${PREFIX}/bin/sma
-	${INSTALL_MAN} ${WRKSRC}/sma.8 ${STAGEDIR}${MANPREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/sma.8 ${STAGEDIR}${PREFIX}/man/man8/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCSFILES}
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index 6a1ede7b41a7..9005e0882942 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -19,7 +19,7 @@ NO_WRKSUBDIR=	yes
 # Personal Preferences, Where to install.
 PBX_VAR=${STAGEDIR}${PREFIX}/var/log/pbx
 PBX_ETC=${STAGEDIR}${PREFIX}/etc/pbx
-PBX_MAN=${STAGEDIR}${MANPREFIX}/man/man1
+PBX_MAN=${STAGEDIR}${PREFIX}/man/man1
 PBX_BIN=${STAGEDIR}${PREFIX}/bin
 PBX_DOC=${STAGEDIR}${DOCSDIR}
 ESTIC=${WRKSRC}/estic
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index 97d735183e98..97cf8b190fd1 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -77,7 +77,7 @@ post-build:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/contrib/xmindpath/xmindpath.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL} ${WRKSRC}/contrib/xmindpath/xmindpath \
 		${STAGEDIR}${PREFIX}/bin/
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index c79c6e28f5e0..4584f3a5edb2 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -32,7 +32,7 @@ post-patch:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 \
-		${STAGEDIR}${MANPREFIX}/man/man3/libnet${PKGNAMESUFFIX}.3
+		${STAGEDIR}${PREFIX}/man/man3/libnet${PKGNAMESUFFIX}.3
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ancillary ${STAGEDIR}${DOCSDIR}/examples
 .for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1
diff --git a/news/pgpmoose/Makefile b/news/pgpmoose/Makefile
index 6f377022ecbe..fa17a1d2c551 100644
--- a/news/pgpmoose/Makefile
+++ b/news/pgpmoose/Makefile
@@ -31,7 +31,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 .for i in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/man/man1/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/pkg_jail/Makefile b/ports-mgmt/pkg_jail/Makefile
index af0e7f7de3f5..9c5a0f779dda 100644
--- a/ports-mgmt/pkg_jail/Makefile
+++ b/ports-mgmt/pkg_jail/Makefile
@@ -24,7 +24,7 @@ do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/pkg_jail ${FILESDIR}/pkg_update \
 		${STAGEDIR}${PREFIX}/bin/
 .for i in ${MAN1}
-	${INSTALL_MAN} ${FILESDIR}/${i} ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${FILESDIR}/${i} ${STAGEDIR}${PREFIX}/man/man1/
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 1752dec202d5..c076d823cb1c 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -207,7 +207,7 @@ do-configure:
 		-L${PREFIX}/lib ${EXTRACONFIGURE}
 .endif
 	${REINPLACE_CMD} \
-		-e 's|^MANDIR=.*$$|MANDIR=$$(MANPREFIX)/man|' \
+		-e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \
 		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
 		-e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \
 		${WRKSRC}/Makefile
diff --git a/sysutils/ua/Makefile b/sysutils/ua/Makefile
index a108baa57741..e6fdd4268dda 100644
--- a/sysutils/ua/Makefile
+++ b/sysutils/ua/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-install:
 .for i in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/man/man1/
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/zidrav/Makefile b/sysutils/zidrav/Makefile
index 6e9b4167077c..f483bb03d45b 100644
--- a/sysutils/zidrav/Makefile
+++ b/sysutils/zidrav/Makefile
@@ -18,7 +18,7 @@ PLIST_FILES=	bin/zidrav man/man1/zidrav.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zidrav ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/zidrav.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/zidrav.1 ${STAGEDIR}${PREFIX}/man/man1/
 
 .include <bsd.port.options.mk>
 
diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile
index 8bae85eb4bb0..ef0c2f018a36 100644
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@@ -29,7 +29,7 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/agrep ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/agrep.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/agrep.1 ${STAGEDIR}${PREFIX}/man/man1/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
diff --git a/www/opera/Makefile b/www/opera/Makefile
index cf725b7700b2..5ed0bb9815b2 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -107,7 +107,7 @@ post-extract:
 	@${MV} ${WRKSRC}/share/man ${WRKSRC}/man
 
 do-install:
-	@${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1.gz ${MANPREFIX}/man/man1/
+	@${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1.gz ${PREFIX}/man/man1/
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/install
 	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/install
 	@(cd ${WRKSRC} && ./install --text --system --unattended)