5 files changed, 21 insertions, 19 deletions

diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
index 60ddc4588f2f..a7a8fd1afd60 100644
--- a/net/pipsecd/Makefile
+++ b/net/pipsecd/Makefile
@@ -16,21 +16,20 @@ USE_OPENSSL=	YES
 
 ALL_TARGET=	pipsecd
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pipsecd ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/pipsecd.sh ${PREFIX}/etc/rc.d
-	${CHMOD} 755 ${PREFIX}/etc/rc.d/pipsecd.sh;
-	${MKDIR} ${PREFIX}/etc/ipsec
-	${INSTALL_DATA} ${WRKSRC}/pipsecd.conf.sample ${PREFIX}/etc/ipsec
+	${INSTALL_PROGRAM} ${WRKSRC}/pipsecd ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/pipsecd.sh ${STAGEDIR}${PREFIX}/etc/rc.d
+	# ${CHMOD} 755 ${STAGEDIR}${PREFIX}/etc/rc.d/pipsecd.sh;
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ipsec
+	${INSTALL_DATA} ${WRKSRC}/pipsecd.conf.sample ${STAGEDIR}${PREFIX}/etc/ipsec
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/pipsecd
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/pipsecd
-	${INSTALL_MAN} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/pipsecd
-	${INSTALL_MAN} ${WRKSRC}/README.port ${PREFIX}/share/doc/pipsecd
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/pipsecd
+	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/pipsecd
+	${INSTALL_MAN} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${PREFIX}/share/doc/pipsecd
+	${INSTALL_MAN} ${WRKSRC}/README.port ${STAGEDIR}${PREFIX}/share/doc/pipsecd
 .endif
 
 post-install:
-	${STRIP_CMD} ${PREFIX}/sbin/pipsecd
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/pipsecd
 
 .include <bsd.port.mk>
diff --git a/net/pipsecd/pkg-plist b/net/pipsecd/pkg-plist
index 91d3fc2312e7..3fccf49b9e60 100644
--- a/net/pipsecd/pkg-plist
+++ b/net/pipsecd/pkg-plist
@@ -1,6 +1,8 @@
 sbin/pipsecd
 etc/ipsec/pipsecd.conf.sample
+@mode 755
 etc/rc.d/pipsecd.sh
+@mode 644
 %%PORTDOCS%%share/doc/pipsecd/README
 %%PORTDOCS%%share/doc/pipsecd/COPYRIGHT
 %%PORTDOCS%%share/doc/pipsecd/README.port
diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile
index eb01a50f738b..cd1b97abc416 100644
--- a/net/tcpview/Makefile
+++ b/net/tcpview/Makefile
@@ -11,17 +11,17 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Motif-based TCP/IP protocol analyzer
 
-USES=		bison motif
+MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		tcpview.1
+USES=		bison motif
+MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
-NO_STAGE=	yes
 post-patch:
 .for f in nametoaddr.c addrtoname.c print-nfs.c detail-tcp.c tv_addrtoname.c
 	@${REINPLACE_CMD} -e 's/NTOHL/ntohl/ ; s/NTOHS/ntohs/' ${WRKSRC}/${f}
 .endfor
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${LOCALBASE}/lib/X11/app-defaults
+	${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
 
 .include <bsd.port.mk>
diff --git a/net/tcpview/files/patch-Makefile b/net/tcpview/files/patch-Makefile
index 54acfde83bb9..c8fa4c56f6fc 100644
--- a/net/tcpview/files/patch-Makefile
+++ b/net/tcpview/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Apr 22 23:40:24 1993
-+++ Makefile	Mon Feb 17 13:32:10 2003
+--- Makefile.orig	1993-04-22 14:40:24.000000000 -0700
++++ Makefile	2014-05-29 22:43:08.670436162 -0700
 @@ -21,17 +21,16 @@
  # @(#) $Header: /usr/staff/martinh/tcpview/RCS/Makefile,v 1.3 1992/11/17 21:59:47 martinh Exp martinh $ (UW)
  
@@ -157,13 +157,13 @@
 -	install -c tcpdump.1 $(DESTDIR)$(TCPDUMP_MANDEST); \
 -	install -c tcpview.1 $(DESTDIR)$(TCPVIEW_MANDEST); \
 -	install -c tcpslice.1 $(DESTDIR)$(TCPSLICE_MANDEST)
-+	${BSD_INSTALL_PROGRAM} -c $$dir/tcpview $(DESTDIR)$(BINDEST); \
++	${BSD_INSTALL_PROGRAM} -c $$dir/tcpview $(BINDEST); \
 +	${BSD_INSTALL_PROGRAM} -c $$dir/BGP $(FILTER_DIR); \
 +	${BSD_INSTALL_PROGRAM} -c $$dir/telnet $(FILTER_DIR); \
 +	${BSD_INSTALL_PROGRAM} -c $$dir/generic $(FILTER_DIR); \
 +	${BSD_INSTALL_DATA} -c $$dir/../DOC/hosts $(TCPVIEW_DIR); \
 +	${BSD_INSTALL_DATA} -c $$dir/../DOC/manuf $(TCPVIEW_DIR); \
-+	${BSD_INSTALL_MAN} -c $$dir/../DOC/tcpview.1 $(DESTDIR)$(TCPVIEW_MANDEST); \
++	${BSD_INSTALL_MAN} -c $$dir/../DOC/tcpview.1 $(TCPVIEW_MANDEST); \
 +#	install -m 444 -c tcpdump.1 $(DESTDIR)$(TCPDUMP_MANDEST); \
 +#	install -m 444 -c tcpslice.1 $(DESTDIR)$(TCPSLICE_MANDEST)
  
diff --git a/net/tcpview/pkg-plist b/net/tcpview/pkg-plist
index b7ecafba2833..b1c78afa761d 100644
--- a/net/tcpview/pkg-plist
+++ b/net/tcpview/pkg-plist
@@ -4,6 +4,7 @@ lib/tcpview/filters/telnet
 lib/tcpview/filters/generic
 lib/tcpview/hosts
 lib/tcpview/manuf
+man/man1/tcpview.1.gz
 @dirrm lib/tcpview/filters
 @dirrm lib/tcpview
 lib/X11/app-defaults/Tcpview