Date: Sat, 16 Nov 2013 13:50:54 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333997 - in head/sysutils: wait_on whowatch whowatch/files wmdiskmon wmfire wmflame wmmemfree Message-ID: <201311161350.rAGDos7C023759@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Sat Nov 16 13:50:53 2013 New Revision: 333997 URL: http://svnweb.freebsd.org/changeset/ports/333997 Log: Support STAGEDIR. Modified: head/sysutils/wait_on/Makefile head/sysutils/whowatch/Makefile head/sysutils/whowatch/files/patch-aa head/sysutils/wmdiskmon/Makefile head/sysutils/wmfire/Makefile head/sysutils/wmflame/Makefile head/sysutils/wmmemfree/Makefile Modified: head/sysutils/wait_on/Makefile ============================================================================== --- head/sysutils/wait_on/Makefile Sat Nov 16 13:36:56 2013 (r333996) +++ head/sysutils/wait_on/Makefile Sat Nov 16 13:50:53 2013 (r333997) @@ -11,9 +11,6 @@ COMMENT= Enable shell scripts to monitor 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> Modified: head/sysutils/whowatch/Makefile ============================================================================== --- head/sysutils/whowatch/Makefile Sat Nov 16 13:36:56 2013 (r333996) +++ head/sysutils/whowatch/Makefile Sat Nov 16 13:50:53 2013 (r333997) @@ -14,10 +14,8 @@ COMMENT= Displays information in real ti 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 Modified: head/sysutils/whowatch/files/patch-aa ============================================================================== --- head/sysutils/whowatch/files/patch-aa Sat Nov 16 13:36:56 2013 (r333996) +++ head/sysutils/whowatch/files/patch-aa Sat Nov 16 13:50:53 2013 (r333997) @@ -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 Modified: head/sysutils/wmdiskmon/Makefile ============================================================================== --- head/sysutils/wmdiskmon/Makefile Sat Nov 16 13:36:56 2013 (r333996) +++ head/sysutils/wmdiskmon/Makefile Sat Nov 16 13:50:53 2013 (r333997) @@ -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> Modified: head/sysutils/wmfire/Makefile ============================================================================== --- head/sysutils/wmfire/Makefile Sat Nov 16 13:36:56 2013 (r333996) +++ head/sysutils/wmfire/Makefile Sat Nov 16 13:50:53 2013 (r333997) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.swanson.ukfsn.o 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> Modified: head/sysutils/wmflame/Makefile ============================================================================== --- head/sysutils/wmflame/Makefile Sat Nov 16 13:36:56 2013 (r333996) +++ head/sysutils/wmflame/Makefile Sat Nov 16 13:50:53 2013 (r333997) @@ -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> Modified: head/sysutils/wmmemfree/Makefile ============================================================================== --- head/sysutils/wmmemfree/Makefile Sat Nov 16 13:36:56 2013 (r333996) +++ head/sysutils/wmmemfree/Makefile Sat Nov 16 13:50:53 2013 (r333997) @@ -14,17 +14,15 @@ COMMENT= Memory and swap monitoring dock 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311161350.rAGDos7C023759>