Add support for STAGEDIR

7 files changed, 13 insertions, 54 deletions

diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 59a00c0e8e6b..5deaa427af8d 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gsmartcontrol
 PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://artificialtime.com/${PORTNAME}/
 
@@ -19,18 +19,8 @@ USE_AUTOTOOLS=	libtool
 USES=		pkgconfig
 INSTALLS_ICONS=	yes
 
-MAN1=		gsmartcontrol.1
-
 CONFIGURE_ARGS=	--disable-libglade
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-post-patch:
-.if !${PORT_OPTIONS:MDOCS}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
-.endif
-
 .include <bsd.port.mk>
diff --git a/sysutils/gsmartcontrol/files/extra-Makefile.in b/sysutils/gsmartcontrol/files/extra-Makefile.in
deleted file mode 100644
index 07e62798e241..000000000000
--- a/sysutils/gsmartcontrol/files/extra-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2011-10-02 22:15:43.000000000 +0200
-+++ Makefile.in	2011-10-02 22:16:06.000000000 +0200
-@@ -745,7 +745,7 @@
- uninstall: uninstall-recursive
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- 
- installcheck: installcheck-recursive
- install-strip:
diff --git a/sysutils/gsmartcontrol/files/patch-data_Makefile.in b/sysutils/gsmartcontrol/files/patch-data_Makefile.in
deleted file mode 100644
index a4e3ffa4b66b..000000000000
--- a/sysutils/gsmartcontrol/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./data/Makefile.in.orig	2009-03-26 11:27:18.000000000 +0100
-+++ data/Makefile.in	2009-03-26 11:27:35.000000000 +0100
-@@ -686,7 +686,7 @@
- uninstall-extra-mans:
- 	cd $(DESTDIR)$(mandir)/man1 && rm -f gsmartcontrol-root.1
- 
--install-data-hook: install-extra-mans update-icon-cache
-+install-data-hook: update-icon-cache
- uninstall-hook: uninstall-extra-mans update-icon-cache
- 
- update-icon-cache:
diff --git a/sysutils/gsmartcontrol/pkg-plist b/sysutils/gsmartcontrol/pkg-plist
index e5c0ea7de594..745258308429 100644
--- a/sysutils/gsmartcontrol/pkg-plist
+++ b/sysutils/gsmartcontrol/pkg-plist
@@ -1,5 +1,7 @@
 bin/gsmartcontrol
 bin/gsmartcontrol-root
+man/man1/gsmartcontrol.1.gz
+man/man1/gsmartcontrol-root.1.gz
 share/applications/gsmartcontrol.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/sysutils/lookat/Makefile b/sysutils/lookat/Makefile
index b4f814e69678..d9f78aea3d19 100644
--- a/sysutils/lookat/Makefile
+++ b/sysutils/lookat/Makefile
@@ -14,29 +14,20 @@ FETCH_ARGS=	-Fpr
 GNU_CONFIGURE=	yes
 USES=		gmake
 
-MAN1=		lookat.1
+PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/lookat.conf|${PREFIX}&|g' \
 		${WRKSRC}/${PORTNAME}.1
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/lookat ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/lookat.1 ${PREFIX}/man/man1
-	@${INSTALL_DATA} ${WRKSRC}/lookat.conf.default \
-		${PREFIX}/etc/lookat.conf.sample
-	@if [ ! -f ${PREFIX}/etc/lookat.conf ]; then \
-		${CP} -p ${PREFIX}/etc/lookat.conf.sample ${PREFIX}/etc/lookat.conf ; \
-	fi
-
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/lookat ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/lookat.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/lookat.conf.default \
+		${STAGEDIR}${PREFIX}/etc/lookat.conf.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/lookat/pkg-plist b/sysutils/lookat/pkg-plist
index d60d81c42c11..c92852b0cd49 100644
--- a/sysutils/lookat/pkg-plist
+++ b/sysutils/lookat/pkg-plist
@@ -2,5 +2,4 @@ bin/lookat
 @unexec if cmp -s %D/etc/lookat.conf.sample %D/etc/lookat.conf; then rm -f %D/etc/lookat.conf; fi
 etc/lookat.conf.sample
 @exec if [ ! -f %D/etc/lookat.conf ] ; then cp -p %D/%F %B/lookat.conf; fi
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+man/man1/lookat.1.gz
diff --git a/sysutils/ncdu/Makefile b/sysutils/ncdu/Makefile
index acea8cc37eca..2eac7473e503 100644
--- a/sysutils/ncdu/Makefile
+++ b/sysutils/ncdu/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Ncurses du(1)
 LICENSE=	MIT
 
 GNU_CONFIGURE=	yes
-PLIST_FILES=	bin/${PORTNAME}
-MAN1=		${PORTNAME}.1
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>