Stagify.

15 files changed, 73 insertions, 68 deletions

diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 4a8fa47..4ded6dd 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -11,26 +11,23 @@ DISTNAME=	gDesklets-${PORTVERSION}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A framework for Gnome 2.x for desktop applets
 
-USE_BZIP2=	yes
-
 LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
 
 OPTIONS_DEFINE=	GDBM
 
 WRKSRC=		${WRKDIR}/gDesklets-${PORTVERSION}
 
-USE_GNOME=	gnomehack gnomeprefix intlhack librsvg2 pygnomeextras
+USE_GNOME=	gnomeprefix intlhack librsvg2 pygnomeextras
 USE_PYTHON=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:bzip2 pathfix \
+		desktop-file-utils shared-mime-info libtool
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
-MAN1=		${PORTNAME}.1
-
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGDBM}
@@ -44,11 +41,11 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-	@${MKDIR} ${DATADIR}/Displays
-	@${TOUCH} ${DATADIR}/Displays/.keep_me
-	@${MKDIR} ${DATADIR}/Sensors
-	@${TOUCH} ${DATADIR}/Sensors/.keep_me
-	@-update-mime-database ${PREFIX}/share/mime
+	@${MKDIR} ${STAGEDIR}${DATADIR}/Displays
+	@${TOUCH} ${STAGEDIR}${DATADIR}/Displays/.keep_me
+	@${MKDIR} ${STAGEDIR}${DATADIR}/Sensors
+	@${TOUCH} ${STAGEDIR}${DATADIR}/Sensors/.keep_me
+	@-update-mime-database ${STAGEDIR}${PREFIX}/share/mime
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index c1b5c62..dcf5905 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -430,7 +430,6 @@ lib/gdesklets/libdesklets/system/Swap.pyo
 lib/gdesklets/libdesklets/system/__init__.py
 lib/gdesklets/libdesklets/system/__init__.pyc
 lib/gdesklets/libdesklets/system/__init__.pyo
-lib/gdesklets/libdesklets/system/gtop.la
 lib/gdesklets/libdesklets/system/gtop.so
 lib/gdesklets/macros/python-include.m4
 lib/gdesklets/main/AboutDialog.py
@@ -669,9 +668,7 @@ lib/gdesklets/utils/logger.pyo
 lib/gdesklets/utils/pwstore.py
 lib/gdesklets/utils/pwstore.pyc
 lib/gdesklets/utils/pwstore.pyo
-lib/gdesklets/utils/svg.la
 lib/gdesklets/utils/svg.so
-lib/gdesklets/utils/tiling.la
 lib/gdesklets/utils/tiling.so
 lib/gdesklets/utils/typeconverter.py
 lib/gdesklets/utils/typeconverter.pyc
@@ -682,11 +679,11 @@ lib/gdesklets/utils/vfs.pyo
 lib/gdesklets/utils/wallpaper.py
 lib/gdesklets/utils/wallpaper.pyc
 lib/gdesklets/utils/wallpaper.pyo
-lib/gdesklets/utils/x11.la
 lib/gdesklets/utils/x11.so
 lib/gdesklets/utils/xdr.py
 lib/gdesklets/utils/xdr.pyc
 lib/gdesklets/utils/xdr.pyo
+man/man1/gdesklets.1.gz
 share/applications/gdesklets.desktop
 %%DATADIR%%/Displays/.keep_me
 %%DATADIR%%/Sensors/.keep_me
@@ -736,8 +733,10 @@ share/locale/vi/LC_MESSAGES/gdesklets.mo
 share/locale/zh_CN/LC_MESSAGES/gdesklets.mo
 share/locale/zh_HK/LC_MESSAGES/gdesklets.mo
 share/locale/zh_TW/LC_MESSAGES/gdesklets.mo
+share/mime/application/x-gdesklets-display.xml
 share/mime/packages/gdesklets.xml
 share/pixmaps/gdesklets.png
+@dirrmtry share/mime/application
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -810,3 +809,4 @@ share/pixmaps/gdesklets.png
 @dirrm lib/gdesklets
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/icons/gnome/48x48/mimetypes
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index f51e8aa..2ac1db7 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -33,7 +33,6 @@ SCRIPTS_ENV+=	USE_NMH=YES
 # full mime support needs mmencode/mmdecode from metamail
 RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
 
-NO_STAGE=	yes
 # Additionally, exmh will use the following ports if present:
 # lang/expect
 # textproc/glimpse
@@ -45,8 +44,6 @@ NO_STAGE=	yes
 
 PLIST_SUB=	EXMH_VERSION=${PORTVERSION}
 
-MAN1=		exmh.1
-
 .if defined(JAPANESE_EXMH)
 do-build:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
@@ -60,7 +57,7 @@ do-build:
 .endif
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
+	@cd ${WRKSRC} && ${SETENV} PREFIX=${STAGEDIR}${PREFIX} \
 		WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install
 
 
diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index 2d19012..a711368 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -1,9 +1,15 @@
+@mode 555
+@owner bin
+@group bin
 bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/exmh-strip
 bin/ftp.expect
 bin/inc.expect
+@mode 444
+@owner bin
+@group bin
 lib/exmh-%%EXMH_VERSION%%/PgpDecryptExpect
 lib/exmh-%%EXMH_VERSION%%/addr.tcl
 lib/exmh-%%EXMH_VERSION%%/aliases.tcl
@@ -219,6 +225,7 @@ lib/exmh-%%EXMH_VERSION%%/widgetText.tcl
 lib/exmh-%%EXMH_VERSION%%/widgets.tcl
 lib/exmh-%%EXMH_VERSION%%/xns.tcl
 lib/exmh-%%EXMH_VERSION%%/xnsgetmail.exp
+man/man1/exmh.1.gz
 @dirrm lib/exmh-%%EXMH_VERSION%%/bitmaps
 @dirrm lib/exmh-%%EXMH_VERSION%%/html
 @dirrm lib/exmh-%%EXMH_VERSION%%
diff --git a/mail/exmh2/scripts/install b/mail/exmh2/scripts/install
index bc24175..1bf1189 100644
--- a/mail/exmh2/scripts/install
+++ b/mail/exmh2/scripts/install
@@ -8,14 +8,14 @@ VERSION="`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`"
 # Rename while installing..
 for i in exmh
 do
-	echo "install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1"
-	install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1
+	echo "install -c $i.l ${PREFIX}/man/man1/$i.1"
+	install -c $i.l ${PREFIX}/man/man1/$i.1
 done
 
 BINS="exmh-async exmh-bg exmh-strip exmh ftp.expect inc.expect"
 
-echo "install -c -o bin -g bin -m 755 ${BINS} ${PREFIX}/bin"
-install -c -o bin -g bin -m 755 ${BINS} ${PREFIX}/bin
+echo "install -c ${BINS} ${PREFIX}/bin"
+install -c ${BINS} ${PREFIX}/bin
 
 if [ ! -d ${PREFIX}/lib/exmh-${VERSION} ]
 then
@@ -25,8 +25,8 @@ fi
 
 LIBFILES='lib/*.tcl lib/*.bitmap lib/*.gif lib/*.ppm lib/help.* lib/tclIndex lib/app-defaults lib/app-defaults-* lib/*.mask lib/*.exp lib/mime.types lib/*.au lib/PgpDecryptExpect'
 
-echo "install -c -o bin -g bin -m 444 ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}"
-install -c -o bin -g bin -m 444 ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}
+echo "install -c ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}"
+install -c ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}
 
 if [ ! -d ${PREFIX}/lib/exmh-${VERSION}/html ]
 then
@@ -34,8 +34,8 @@ then
 	mkdir ${PREFIX}/lib/exmh-${VERSION}/html
 fi
 
-echo "install -c -o bin -g bin -m 444 lib/html/* lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html"
-install -c -o bin -g bin -m 444 lib/html/*.html lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html
+echo "install -c lib/html/* lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html"
+install -c lib/html/*.html lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html
 
 if [ ! -d ${PREFIX}/lib/exmh-${VERSION}/bitmaps ]
 then
@@ -43,7 +43,7 @@ then
 	mkdir ${PREFIX}/lib/exmh-${VERSION}/bitmaps
 fi
 
-echo "install -c -o bin -g bin -m 444 lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps"
-install -c -o bin -g bin -m 444 lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps
+echo "install -c lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps"
+install -c lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps
 
 
diff --git a/misc/gman/Makefile b/misc/gman/Makefile
index 969e715..1d45de5 100644
--- a/misc/gman/Makefile
+++ b/misc/gman/Makefile
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A user-friendly graphical front end for the man system
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	ghostview:${PORTSDIR}/print/ghostview	\
 		man2html:${PORTSDIR}/textproc/man2html
 
@@ -26,11 +26,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		gettext gmake
 USE_GNOME=	gtk12
 
-MAN1=	gman.1x
-
 CXXFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
+.include <bsd.port.pre.mk>
+SHEBANG_LANG+=	perlw
+perlw_OLD_CMD=  /usr/bin/perl -w
+perlw_CMD=	${LOCALBASE}/bin/perl -w
+SHEBANG_FILES=	*.pl
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,^CXX =,#CXX =,g' \
 		-e 's,^CXXFLAGS =,CXXFLAGS+=,g' \
@@ -40,10 +43,10 @@ post-patch:
 		-e 's,\-lgtk \-lgdk \-lpthread ,`${GTK_CONFIG} \-\-libs gthread` ,g' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gman ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/bin/gman.cgi
-	@${MKDIR} ${PREFIX}/www/cgi-bin
-	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/www/cgi-bin
-	${INSTALL_MAN} ${WRKSRC}/gman.1x ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/gman ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${STAGEDIR}${PREFIX}/bin/gman.cgi
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${STAGEDIR}${PREFIX}/www/cgi-bin
+	${INSTALL_MAN} ${WRKSRC}/gman.1x ${STAGEDIR}${MANPREFIX}/man/man1
 	@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/gman/pkg-plist b/misc/gman/pkg-plist
index 6dabe70..15dbb1c 100644
--- a/misc/gman/pkg-plist
+++ b/misc/gman/pkg-plist
@@ -1,4 +1,5 @@
 bin/gman
 bin/gman.cgi
+man/man1/gman.1x.gz
 www/cgi-bin/gman.pl
 @dirrmtry www/cgi-bin
diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
index 60ddc45..a7a8fd1 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 91d3fc2..3fccf49 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 eb01a50..cd1b97a 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 54acfde..c8fa4c5 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 b7ecafb..b1c78af 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
diff --git a/sysutils/44bsd-more/Makefile b/sysutils/44bsd-more/Makefile
index e708982..7da9e33 100644
--- a/sysutils/44bsd-more/Makefile
+++ b/sysutils/44bsd-more/Makefile
@@ -10,15 +10,13 @@ MASTER_SITE_SUBDIR=	cy
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The pager installed with FreeBSD before less(1) was imported
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 NO_WRKSUBDIR=	yes
 
-MAN1=		44bsd-more.1
 CFLAGS=		-Wno-return-type
 
 RELDATE=	20000521
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-extract:
@@ -33,13 +31,13 @@ post-patch:
 	    ${WRKSRC}/ncommand.c
 
 do-install:
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_MAN} ${WRKSRC}/more.1 ${PREFIX}/man/man1/44bsd-more.1
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/more.1 ${STAGEDIR}${PREFIX}/man/man1/44bsd-more.1
 .for f in default.morerc less.morerc most.morerc
-	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/more.help ${PREFIX}/share/misc/44bsd-more.help
-	${INSTALL_PROGRAM} ${WRKSRC}/more ${PREFIX}/bin/44bsd-more
+	${INSTALL_DATA} ${WRKSRC}/more.help ${STAGEDIR}${PREFIX}/share/misc/44bsd-more.help
+	${INSTALL_PROGRAM} ${WRKSRC}/more ${STAGEDIR}${PREFIX}/bin/44bsd-more
 
 tarup:
 	cd ${WRKSRC} && tar cyf /tmp/${DISTFILES} RCS
diff --git a/sysutils/44bsd-more/pkg-plist b/sysutils/44bsd-more/pkg-plist
index 0f18d76..a488a49 100644
--- a/sysutils/44bsd-more/pkg-plist
+++ b/sysutils/44bsd-more/pkg-plist
@@ -1,4 +1,5 @@
 bin/44bsd-more
+man/man1/44bsd-more.1.gz
 share/misc/44bsd-more.help
 share/examples/44bsd-more/default.morerc
 share/examples/44bsd-more/less.morerc
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index da87bd2..a65bd44 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -5,5 +5,4 @@ CFENGINE_VERSION?=	35
 
 MASTERDIR=		${.CURDIR}/../cfengine${CFENGINE_VERSION}
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"