From owner-svn-ports-head@FreeBSD.ORG Fri Nov 15 15:25:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41C98EB4; Fri, 15 Nov 2013 15:25:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2FE4F2098; Fri, 15 Nov 2013 15:25:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAFFPxYU062102; Fri, 15 Nov 2013 15:25:59 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAFFPvKl062089; Fri, 15 Nov 2013 15:25:57 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201311151525.rAFFPvKl062089@svn.freebsd.org> From: "Vanilla I. Shu" Date: Fri, 15 Nov 2013 15:25:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333877 - in head/sysutils: lxsplit mgeupsd mgeupsd/files mksunbootcd monitord monitord/files monkeytail X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 15:25:59 -0000 Author: vanilla Date: Fri Nov 15 15:25:56 2013 New Revision: 333877 URL: http://svnweb.freebsd.org/changeset/ports/333877 Log: Support STAGEDIR. Added: head/sysutils/lxsplit/pkg-plist (contents, props changed) head/sysutils/monkeytail/pkg-plist (contents, props changed) Modified: head/sysutils/mgeupsd/Makefile head/sysutils/mgeupsd/files/patch-ab head/sysutils/mksunbootcd/Makefile head/sysutils/monitord/Makefile head/sysutils/monitord/files/patch-Makefile head/sysutils/monitord/files/patch-aa head/sysutils/monitord/pkg-plist head/sysutils/monkeytail/Makefile Added: head/sysutils/lxsplit/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/lxsplit/pkg-plist Fri Nov 15 15:25:56 2013 (r333877) @@ -0,0 +1,4 @@ +bin/lxsplit +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/sysutils/mgeupsd/Makefile ============================================================================== --- head/sysutils/mgeupsd/Makefile Fri Nov 15 15:17:48 2013 (r333876) +++ head/sysutils/mgeupsd/Makefile Fri Nov 15 15:25:56 2013 (r333877) @@ -1,31 +1,28 @@ # Created by: Andreas Dobloug # $FreeBSD$ -PORTNAME= mgeupsd -PORTVERSION= 0.3 +PORTNAME= mgeupsd +PORTVERSION= 0.3 PORTREVISION= 1 -CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SUNSITE} +CATEGORIES= sysutils +MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= system/ups -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Monitor a state of MGE Pulsar UPS connected to RS-232 port -USE_GMAKE= YES -WRKSRC= ${WRKDIR}/MGE +USES= gmake +WRKSRC= ${WRKDIR}/MGE -PLIST_FILES= sbin/mgeupsd sbin/powerhandler etc/rc.d/mgeupsd.sh -MAN8= mgeupsd.8 -SUB_FILES= pkg-message +PLIST_FILES= man/man8/${PORTNAME}.8.gz sbin/mgeupsd sbin/powerhandler etc/rc.d/mgeupsd.sh +SUB_FILES= pkg-message -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e '/^CC=/s:gcc:${CC}:' \ - -e '/^CFLAGS=/s:-Wall -O2:${CFLAGS}:' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e '/^CC=/s:gcc:${CC}:' \ + -e '/^CFLAGS=/s:-Wall -O2:${CFLAGS}:' ${WRKSRC}/Makefile post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/mgeupsd.sh ${PREFIX}/etc/rc.d - ${INSTALL_SCRIPT} ${FILESDIR}/powerhandler ${PREFIX}/sbin - @${CAT} ${PKGMESSAGE} + ${INSTALL_SCRIPT} ${FILESDIR}/mgeupsd.sh ${STAGEDIR}${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${FILESDIR}/powerhandler ${STAGEDIR}${PREFIX}/sbin .include Modified: head/sysutils/mgeupsd/files/patch-ab ============================================================================== --- head/sysutils/mgeupsd/files/patch-ab Fri Nov 15 15:17:48 2013 (r333876) +++ head/sysutils/mgeupsd/files/patch-ab Fri Nov 15 15:25:56 2013 (r333877) @@ -1,21 +1,13 @@ -*** Makefile.orig Fri Dec 25 10:10:57 1998 ---- Makefile Tue Aug 10 23:36:12 1999 -*************** -*** 8,15 **** - $(CC) $(LDFLAGS) -o $@ $< - - install: mgeupsd -! install mgeupsd /sbin -! install mgeupsd.8 /usr/man/man8 - - clean: - rm -f *.o mgeupsd ---- 8,15 ---- - $(CC) $(LDFLAGS) -o $@ $< - - install: mgeupsd -! install -c mgeupsd ${PREFIX}/sbin -! install -c mgeupsd.8 ${PREFIX}/man/man8 - - clean: - rm -f *.o mgeupsd +--- Makefile.orig 1998-12-25 17:10:57.000000000 +0800 ++++ Makefile 2013-11-15 23:04:20.000000000 +0800 +@@ -8,8 +8,8 @@ mgeupsd: mgeupsd.o + $(CC) $(LDFLAGS) -o $@ $< + + install: mgeupsd +- install mgeupsd /sbin +- install mgeupsd.8 /usr/man/man8 ++ install -c mgeupsd $(DESTDIR)${PREFIX}/sbin ++ install -c mgeupsd.8 $(DESTDIR)${PREFIX}/man/man8 + + clean: + rm -f *.o mgeupsd Modified: head/sysutils/mksunbootcd/Makefile ============================================================================== --- head/sysutils/mksunbootcd/Makefile Fri Nov 15 15:17:48 2013 (r333876) +++ head/sysutils/mksunbootcd/Makefile Fri Nov 15 15:25:56 2013 (r333877) @@ -10,14 +10,12 @@ MASTER_SITES= ${MASTER_SITE_NETBSD} MAINTAINER= ports@FreeBSD.org COMMENT= Makes ISO images suitable to boot on sparc systems -MAN1= mksunbootcd.1 -PLIST_FILES= bin/mksunbootcd +PLIST_FILES= bin/mksunbootcd man/man1/${PORTNAME}.1.gz GNU_CONFIGURE= yes -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mksunbootcd ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/mksunbootcd ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 .include Modified: head/sysutils/monitord/Makefile ============================================================================== --- head/sysutils/monitord/Makefile Fri Nov 15 15:17:48 2013 (r333876) +++ head/sysutils/monitord/Makefile Fri Nov 15 15:25:56 2013 (r333877) @@ -11,16 +11,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Service that restarts other standalone services USE_RC_SUBR= monitord -MAN8= monitord.8 -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's|syslodg|syslogd|' ${WRKSRC}/${MAN8} + @${REINPLACE_CMD} -e 's|syslodg|syslogd|' ${WRKSRC}/${PORTNAME}.8 @${REINPLACE_CMD} -e 's|-pipe||' ${WRKSRC}/Makefile post-install: @${INSTALL_DATA} ${WRKSRC}/monitord.conf.sample \ - ${PREFIX}/etc/monitord.conf.sample - @${CAT} ${PKGMESSAGE} + ${STAGEDIR}${PREFIX}/etc/monitord.conf.sample .include Modified: head/sysutils/monitord/files/patch-Makefile ============================================================================== --- head/sysutils/monitord/files/patch-Makefile Fri Nov 15 15:17:48 2013 (r333876) +++ head/sysutils/monitord/files/patch-Makefile Fri Nov 15 15:25:56 2013 (r333877) @@ -1,6 +1,15 @@ ---- Makefile.orig Thu Jun 7 13:16:14 2007 -+++ Makefile Thu Jun 7 13:16:41 2007 -@@ -24,8 +24,6 @@ +--- Makefile.orig 2003-08-22 06:36:42.000000000 +0800 ++++ Makefile 2013-11-15 23:14:43.000000000 +0800 +@@ -6,7 +6,7 @@ OBJECTS = monitord.o mail.o + + TARGET = monitord + +-MANDIR = /usr/local/man ++MANDIR = $(PREFIX)/man + + .SUFFIXES: + .SUFFIXES: .c .o +@@ -24,10 +24,8 @@ clean: all: $(TARGET) @@ -8,4 +17,9 @@ - $(CC) $(OBJECTS) -o $(TARGET) install: - $(INSTALL) -cs $(TARGET) /usr/local/sbin +- $(INSTALL) -cs $(TARGET) /usr/local/sbin +- $(INSTALL) -c $(TARGET).conf.sample /usr/local/etc +- $(INSTALL) -c $(TARGET).8 $(MANDIR)/man8 ++ $(INSTALL) -cs $(TARGET) $(DESTDIR)$(PREFIX)/sbin ++ $(INSTALL) -c $(TARGET).conf.sample $(DESTDIR)$(PREFIX)/etc ++ $(INSTALL) -c $(TARGET).8 $(DESTDIR)$(MANDIR)/man8 Modified: head/sysutils/monitord/files/patch-aa ============================================================================== --- head/sysutils/monitord/files/patch-aa Fri Nov 15 15:17:48 2013 (r333876) +++ head/sysutils/monitord/files/patch-aa Fri Nov 15 15:25:56 2013 (r333877) @@ -1,21 +0,0 @@ ---- Makefile.orig Fri Aug 22 06:36:42 2003 -+++ Makefile Fri Aug 22 15:07:34 2003 -@@ -6,7 +6,7 @@ - - TARGET = monitord - --MANDIR = /usr/local/man -+MANDIR = $(PREFIX)/man - - .SUFFIXES: - .SUFFIXES: .c .o -@@ -28,6 +28,6 @@ - $(CC) $(OBJECTS) -o $(TARGET) - - install: -- $(INSTALL) -cs $(TARGET) /usr/local/sbin -- $(INSTALL) -c $(TARGET).conf.sample /usr/local/etc -- $(INSTALL) -c $(TARGET).8 $(MANDIR)/man8 -+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(PREFIX)/sbin -+ if [ ! -e $(PREFIX)/etc/$(TARGET).conf.sample ] ; then $(BSD_INSTALL_DATA) $(TARGET).conf.sample $(PREFIX)/etc; fi -+ $(BSD_INSTALL_MAN) -c $(TARGET).8 $(MANDIR)/man8 Modified: head/sysutils/monitord/pkg-plist ============================================================================== --- head/sysutils/monitord/pkg-plist Fri Nov 15 15:17:48 2013 (r333876) +++ head/sysutils/monitord/pkg-plist Fri Nov 15 15:25:56 2013 (r333877) @@ -1,3 +1,4 @@ @unexec if cmp -s %D/etc/monitord.conf %D/etc/monitord.conf.sample; then rm -f %D/etc/monitord.conf; fi etc/monitord.conf.sample +man/man8/monitord.8.gz sbin/monitord Modified: head/sysutils/monkeytail/Makefile ============================================================================== --- head/sysutils/monkeytail/Makefile Fri Nov 15 15:17:48 2013 (r333876) +++ head/sysutils/monkeytail/Makefile Fri Nov 15 15:25:56 2013 (r333877) @@ -19,20 +19,13 @@ USE_PERL5= run NO_BUILD= yes -PORTDOCS= COPYING README -PLIST_FILES= bin/mtail +DOCS= COPYING README -MAN1= mtail.1 -MAN5= mtailrc.5 - -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/mtail ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/mtail.1 ${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/mtailrc.5 ${MAN5PREFIX}/man/man5 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif + ${INSTALL_SCRIPT} ${WRKSRC}/mtail ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/mtail.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/mtailrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Added: head/sysutils/monkeytail/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/monkeytail/pkg-plist Fri Nov 15 15:25:56 2013 (r333877) @@ -0,0 +1,6 @@ +bin/mtail +man/man1/mtail.1.gz +man/man5/mtailrc.5.gz +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%%