Support STAGEDIR.

7 files changed, 16 insertions, 28 deletions

diff --git a/sysutils/wait_on/Makefile b/sysutils/wait_on/Makefile
index 7a2ab38b8942..b8e1dcab242d 100644
--- a/sysutils/wait_on/Makefile
+++ b/sysutils/wait_on/Makefile
@@ -11,9 +11,6 @@ COMMENT=	Enable shell scripts to monitor directories for new files
 
 WRKSRC=		${WRKDIR}/wait_on
 
-MAN1=		wait_on.1
-MANCOMPRESSED=	maybe
-PLIST_FILES=	bin/wait_on
+PLIST_FILES=	bin/wait_on man/man1/wait_on.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index 88f2fe27df44..e61093812cf8 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -14,10 +14,8 @@ COMMENT=	Displays information in real time about users currently logged on
 
 GNU_CONFIGURE=	yes
 
-MAN1=		whowatch.1
-PLIST_FILES=	bin/whowatch
+PLIST_FILES=	bin/whowatch man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 900006
diff --git a/sysutils/whowatch/files/patch-aa b/sysutils/whowatch/files/patch-aa
index 053c3914337b..28e3c6ec6e86 100644
--- a/sysutils/whowatch/files/patch-aa
+++ b/sysutils/whowatch/files/patch-aa
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Wed Jun 21 18:42:29 2000
-+++ Makefile.in	Wed Jun 21 18:42:36 2000
-@@ -70,8 +70,8 @@
+--- Makefile.in.orig	2000-06-06 18:42:04.000000000 +0800
++++ Makefile.in	2013-11-16 21:39:43.000000000 +0800
+@@ -70,8 +70,8 @@ clean: 
  	rm -rf ./*.o
  	rm -f whowatch
  install: whowatch
 -	$(INSTALL) -m 755 whowatch $(bindir)/whowatch
 -	$(INSTALL) -m 644 whowatch.1 $(mandir)/man1/whowatch.1
-+	$(BSD_INSTALL_PROGRAM) whowatch $(bindir)/whowatch
-+	$(BSD_INSTALL_MAN) whowatch.1 $(mandir)/man1/whowatch.1
++	$(BSD_INSTALL_PROGRAM) whowatch $(DESTDIR)$(bindir)/whowatch
++	$(BSD_INSTALL_MAN) whowatch.1 $(DESTDIR)$(mandir)/man1/whowatch.1
  	
  distclean:
  	make clean
diff --git a/sysutils/wmdiskmon/Makefile b/sysutils/wmdiskmon/Makefile
index 1800000bf884..d125f4edbb30 100644
--- a/sysutils/wmdiskmon/Makefile
+++ b/sysutils/wmdiskmon/Makefile
@@ -14,8 +14,6 @@ USE_XORG=	x11 xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=""
 
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 13c5bf413a90..357ed551debc 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.swanson.ukfsn.org/wmfire/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Maker dock app showing load average as a flame
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
@@ -21,8 +21,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lm
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 
-MAN1=		wmfire.1
-PLIST_FILES=	bin/wmfire
+PLIST_FILES=	bin/wmfire man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/wmflame/Makefile b/sysutils/wmflame/Makefile
index 20196e037053..09bda6e84789 100644
--- a/sysutils/wmflame/Makefile
+++ b/sysutils/wmflame/Makefile
@@ -20,8 +20,7 @@ PLIST_FILES=	bin/wmflame
 
 WRKSRC=		${WRKDIR}/wmflame.app/${PORTNAME}
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmflame ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/wmflame ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile
index 583a0f90f405..b652012b4aae 100644
--- a/sysutils/wmmemfree/Makefile
+++ b/sysutils/wmmemfree/Makefile
@@ -14,17 +14,15 @@ COMMENT=	Memory and swap monitoring dockapp
 USE_BZIP2=	yes
 USE_XORG=	xpm
 
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/wmmemfree
+PLIST_FILES=	bin/wmmemfree man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 post-patch:
 	@${CP} ${FILESDIR}/mem_freebsd.* ${WRKSRC}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${CHMOD} g+s ${PREFIX}/bin/${PORTNAME}
-	@${CHOWN} root:kmem ${PREFIX}/bin/${PORTNAME}
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${CHMOD} g+s ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${CHOWN} root:kmem ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>