11 files changed, 38 insertions, 50 deletions

diff --git a/security/cksfv/Makefile b/security/cksfv/Makefile
index 3998bcc2bf31..4ce821c0851a 100644
--- a/security/cksfv/Makefile
+++ b/security/cksfv/Makefile
@@ -15,26 +15,24 @@ LICENSE=	GPLv2
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man --prefix=${PREFIX}
 
-MAN1=		cksfv.1
-PLIST_FILES=	bin/cksfv
+PLIST_FILES=	bin/cksfv man/man1/cksfv.1.gz
 PORTDOCS=	README ChangeLog
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(CC\)=|\1?=|' ${WRKSRC}/src/Makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/security/idea/Makefile b/security/idea/Makefile
index 3488322f948a..12e733c49724 100644
--- a/security/idea/Makefile
+++ b/security/idea/Makefile
@@ -15,12 +15,8 @@ COMMENT=	Command-line IDEA encryption and decryption utility
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MANL=		idea.l
-MANCOMPRESSED=	no
-
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-build:
@@ -28,14 +24,15 @@ do-build:
 		-o ${WRKSRC}/${PORTNAME}
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/manl/idea.l ${PREFIX}/man/manl
-	${INSTALL_PROGRAM} -m 0555 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/Examples ${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/manl/idea.l ${STAGEDIR}${PREFIX}/man/manl
+	${INSTALL_PROGRAM} -m 0555 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/Examples ${STAGEDIR}${EXAMPLESDIR}
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/byte_ord.ps ${WRKSRC}/idea_cmd.txt ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/byte_ord.ps ${WRKSRC}/idea_cmd.txt \
+		${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/idea/pkg-plist b/security/idea/pkg-plist
index caec515e858c..e34fd779a8b6 100644
--- a/security/idea/pkg-plist
+++ b/security/idea/pkg-plist
@@ -1,4 +1,5 @@
 bin/idea
+man/manl/idea.l.gz
 %%PORTDOCS%%%%DOCSDIR%%/idea_cmd.txt
 %%PORTDOCS%%%%DOCSDIR%%/byte_ord.ps
 %%EXAMPLESDIR%%/Examples
diff --git a/security/op/Makefile b/security/op/Makefile
index ae86d3088f6a..df039493ad5f 100644
--- a/security/op/Makefile
+++ b/security/op/Makefile
@@ -12,16 +12,14 @@ COMMENT=	Controlled privilege escalation tool
 
 GNU_CONFIGURE=	yes
 
-MAN1=		op.1
-
-NO_STAGE=	yes
 post-install:
-	${MKDIR} ${PREFIX}/etc/op.d
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/op.d
 	${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf \
-		${PREFIX}/etc/${PORTNAME}.conf.sample
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
-.if !exists(${PREFIX}/etc/${PORTNAME}.conf)
-	${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc
+.if !exists(${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf)
+	${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf \
+		${STAGEDIR}${PREFIX}/etc
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/op/pkg-plist b/security/op/pkg-plist
index de4747e2dfe7..6fb053e21e57 100644
--- a/security/op/pkg-plist
+++ b/security/op/pkg-plist
@@ -1,3 +1,5 @@
+@comment $FreeBSD$
+man/man1/op.1.gz
 @unexec if cmp -s %D/etc/op.conf %D/etc/op.conf.sample; then rm -f %D/etc/op.conf; fi
 etc/op.conf.sample
 @exec [ -f %B/op.conf ] || cp %B/%f %B/op.conf
diff --git a/security/pkcrack/Makefile b/security/pkcrack/Makefile
index 36a7a6ddd2d4..b82bc5575b89 100644
--- a/security/pkcrack/Makefile
+++ b/security/pkcrack/Makefile
@@ -18,22 +18,21 @@ PORTDOCS=	README pkzip.ps.gz
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
 .for f in pkcrack zipdecrypt
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 # these file names are too generic
 .for f in extract findkey makekey
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin/pk${f}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin/pk${f}
 .endfor
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/security/proxytunnel/Makefile b/security/proxytunnel/Makefile
index f991f499fcec..af94d85828bf 100644
--- a/security/proxytunnel/Makefile
+++ b/security/proxytunnel/Makefile
@@ -14,12 +14,10 @@ USES=		pkgconfig gmake
 
 ALL_TARGET=	${PORTNAME}
 
-MAN1=		proxytunnel.1
-PLIST_FILES=	bin/proxytunnel
+PLIST_FILES=	bin/proxytunnel man/man1/proxytunnel.1.gz
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/pure-sfv/Makefile b/security/pure-sfv/Makefile
index 2fb7a2878df6..d8c972c50ee6 100644
--- a/security/pure-sfv/Makefile
+++ b/security/pure-sfv/Makefile
@@ -21,7 +21,6 @@ PORTDOCS=	ReadMe.txt
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -29,11 +28,11 @@ post-patch:
 		${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/ssh-copy-id/Makefile b/security/ssh-copy-id/Makefile
index feb32d6d0e92..ef2138bfbc01 100644
--- a/security/ssh-copy-id/Makefile
+++ b/security/ssh-copy-id/Makefile
@@ -12,10 +12,8 @@ COMMENT=	Small script which copies your ssh public-key to a remote host
 
 NO_BUILD=	yes
 
-MAN1=		ssh-copy-id.1
-PLIST_FILES=	bin/ssh-copy-id
+PLIST_FILES=	bin/ssh-copy-id man/man1/ssh-copy-id.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 1000024
@@ -28,7 +26,7 @@ pre-patch:
 .endfor
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/${MAN1} ${MANPREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile
index 3abe63b71ca2..bb4ade7618a3 100644
--- a/security/tthsum/Makefile
+++ b/security/tthsum/Makefile
@@ -15,15 +15,13 @@ LICENSE=	GPLv3
 CONFLICTS=	microdc2-[0-9]*
 
 USES=		gmake
-MANCOMPRESSED=	yes
 
-MAN1=		tthsum.1
-PLIST_FILES=	bin/tthsum
+PLIST_FILES=	bin/tthsum man/man1/tthsum.1.gz
 
+MAKE_ENV+=	STAGEDIR=${STAGEDIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} test runtest
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/security/tthsum/files/patch-Makefile b/security/tthsum/files/patch-Makefile
index 5ec8ace69e3b..cd42b6eafe49 100644
--- a/security/tthsum/files/patch-Makefile
+++ b/security/tthsum/files/patch-Makefile
@@ -29,9 +29,9 @@
 -	install $(BINS)/tthsum $(BIN)
 -	install -m644 $(SHARES)/tthsum.1.gz $(MAN)/man1
 +install: tthsum manual
-+	install -d $(BIN) $(MANPREFIX)/man/man1
-+	install $(BINS)/tthsum $(PREFIX)/bin
-+	install -m644 $(SHARES)/tthsum.1.gz $(MANPREFIX)/man/man1
++	install -d $(BIN) $(STAGEDIR)$(MANPREFIX)/man/man1
++	install $(BINS)/tthsum $(STAGEDIR)$(PREFIX)/bin
++	install -m644 $(SHARES)/tthsum.1.gz $(STAGEDIR)$(MANPREFIX)/man/man1
  
  uninstall:
  	$(RM) $(BIN)/tthsum