From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 13:15:28 2014 Return-Path: Delivered-To: svn-ports-all@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 C65B7FB3; Fri, 27 Jun 2014 13:15:28 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B31F72DB3; Fri, 27 Jun 2014 13:15:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RDFSQH077415; Fri, 27 Jun 2014 13:15:28 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RDFSeG077412; Fri, 27 Jun 2014 13:15:28 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201406271315.s5RDFSeG077412@svn.freebsd.org> From: "Vanilla I. Shu" Date: Fri, 27 Jun 2014 13:15:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359518 - in head/sysutils/logwatch: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 13:15:29 -0000 Author: vanilla Date: Fri Jun 27 13:15:27 2014 New Revision: 359518 URL: http://svnweb.freebsd.org/changeset/ports/359518 QAT: https://qat.redports.org/buildarchive/r359518/ Log: Stagify. Approved by: portmgr@ (blanket approval) Modified: head/sysutils/logwatch/Makefile head/sysutils/logwatch/files/Makefile head/sysutils/logwatch/pkg-plist Modified: head/sysutils/logwatch/Makefile ============================================================================== --- head/sysutils/logwatch/Makefile Fri Jun 27 13:05:35 2014 (r359517) +++ head/sysutils/logwatch/Makefile Fri Jun 27 13:15:27 2014 (r359518) @@ -14,17 +14,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -USES= perl5 +USES= perl5 shebangfix USE_PERL5= run - -MAN8= logwatch.8 -DOCS= HOWTO-Customize-LogWatch License README - +SHEBANG_FILES= scripts/logwatch.pl +PORTDOCS= HOWTO-Customize-LogWatch README NO_BUILD= yes - MAKE_ENV+= SITE_PERL_REL=${SITE_PERL_REL} +OPTIONS_DEFINE= DOCS + +.include -NO_STAGE= yes pre-configure: @${CP} ${FILESDIR}/Makefile ${WRKSRC} @@ -45,10 +44,10 @@ post-patch: ${WRKSRC}/conf/logwatch.conf post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/HOWTO-Customize-LogWatch ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/HOWTO-Customize-LogWatch ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/sysutils/logwatch/files/Makefile ============================================================================== --- head/sysutils/logwatch/files/Makefile Fri Jun 27 13:05:35 2014 (r359517) +++ head/sysutils/logwatch/files/Makefile Fri Jun 27 13:15:27 2014 (r359518) @@ -19,29 +19,29 @@ logwatch: @echo "reading the ./README file." install: - install -d ${PREFIX}/sbin - install -d ${ETCDIR}/html - install -d ${ETCDIR}/logfiles - install -d ${ETCDIR}/services - install -d ${ETCDIR}/defaults/html - install -d ${ETCDIR}/defaults/logfiles - install -d ${ETCDIR}/defaults/services - install -d ${LIBEXECDIR} - install -d ${SITE_PERL} - install -d ${CACHEDIR} - install -d ${MAN8DIR} - install -m 555 scripts/logwatch.pl ${PREFIX}/sbin - install -m 555 lib/Logwatch.pm ${SITE_PERL} - install -m 444 logwatch.8 ${MAN8DIR} - install -m 644 conf/logwatch.conf ${ETCDIR}/defaults - install -m 640 conf/ignore.conf ${ETCDIR}/defaults - install -m 444 conf/html/header.html ${ETCDIR}/defaults/html - install -m 444 conf/html/footer.html ${ETCDIR}/defaults/html + install -d $(DESTDIR)${PREFIX}/sbin + install -d $(DESTDIR)${ETCDIR}/html + install -d $(DESTDIR)${ETCDIR}/logfiles + install -d $(DESTDIR)${ETCDIR}/services + install -d $(DESTDIR)${ETCDIR}/defaults/html + install -d $(DESTDIR)${ETCDIR}/defaults/logfiles + install -d $(DESTDIR)${ETCDIR}/defaults/services + install -d $(DESTDIR)${LIBEXECDIR} + install -d $(DESTDIR)${SITE_PERL} + install -d $(DESTDIR)${CACHEDIR} + install -d $(DESTDIR)${MAN8DIR} + install -m 555 scripts/logwatch.pl $(DESTDIR)${PREFIX}/sbin + install -m 555 lib/Logwatch.pm $(DESTDIR)${SITE_PERL} + install -m 444 logwatch.8 $(DESTDIR)${MAN8DIR} + install -m 644 conf/logwatch.conf $(DESTDIR)${ETCDIR}/defaults + install -m 640 conf/ignore.conf $(DESTDIR)${ETCDIR}/defaults + install -m 444 conf/html/header.html $(DESTDIR)${ETCDIR}/defaults/html + install -m 444 conf/html/footer.html $(DESTDIR)${ETCDIR}/defaults/html .for etcdir in html logfiles services - mkdir -p ${ETCDIR}/defaults/${etcdir} + mkdir -p $(DESTDIR)${ETCDIR}/defaults/${etcdir} .endfor .for scriptdir in logfiles services shared - mkdir -p ${LIBEXECDIR}/defaults/${scriptdir} + mkdir -p $(DESTDIR)${LIBEXECDIR}/defaults/${scriptdir} .endfor .for logfile in \ autorpm \ @@ -88,7 +88,7 @@ install: windows \ xferlog \ yum - install -m 640 conf/logfiles/${logfile}.conf ${ETCDIR}/defaults/logfiles/${logfile}.conf + install -m 640 conf/logfiles/${logfile}.conf $(DESTDIR)${ETCDIR}/defaults/logfiles/${logfile}.conf .endfor .for service in \ afpd \ @@ -189,8 +189,8 @@ install: zz-runtime \ zz-sys \ zz-zfs - install -m 444 scripts/services/${service} ${LIBEXECDIR}/defaults/services/${service} - install -m 444 conf/services/${service}.conf ${ETCDIR}/defaults/services/${service}.conf + install -m 444 scripts/services/${service} $(DESTDIR)${LIBEXECDIR}/defaults/services/${service} + install -m 444 conf/services/${service}.conf $(DESTDIR)${ETCDIR}/defaults/services/${service}.conf .endfor .for script in \ applybinddate \ @@ -211,12 +211,12 @@ install: remove \ removeheaders \ removeservice - install -m 555 scripts/shared/${script} ${LIBEXECDIR}/defaults/shared/${script} + install -m 555 scripts/shared/${script} $(DESTDIR)${LIBEXECDIR}/defaults/shared/${script} .endfor .for logfile in autorpm cron emerge samba up2date xferlog yum - mkdir -p ${LIBEXECDIR}/defaults/logfiles/${logfile} - install -m 555 scripts/logfiles/${logfile}/applydate ${LIBEXECDIR}/defaults/logfiles/${logfile} + mkdir -p $(DESTDIR)${LIBEXECDIR}/defaults/logfiles/${logfile} + install -m 555 scripts/logfiles/${logfile}/applydate $(DESTDIR)${LIBEXECDIR}/defaults/logfiles/${logfile} .endfor .for logfile in samba up2date xferlog - install -m 555 scripts/logfiles/${logfile}/removeheaders ${LIBEXECDIR}/defaults/logfiles/${logfile} + install -m 555 scripts/logfiles/${logfile}/removeheaders $(DESTDIR)${LIBEXECDIR}/defaults/logfiles/${logfile} .endfor Modified: head/sysutils/logwatch/pkg-plist ============================================================================== --- head/sysutils/logwatch/pkg-plist Fri Jun 27 13:05:35 2014 (r359517) +++ head/sysutils/logwatch/pkg-plist Fri Jun 27 13:15:27 2014 (r359518) @@ -144,8 +144,6 @@ etc/logwatch/defaults/services/zz-sys.co etc/logwatch/defaults/services/zz-zfs.conf etc/logwatch/defaults/ignore.conf etc/logwatch/defaults/logwatch.conf -%%PORTDOCS%%%%DOCSDIR%%/HOWTO-Customize-LogWatch -%%PORTDOCS%%%%DOCSDIR%%/README %%SITE_PERL%%/Logwatch.pm libexec/logwatch/defaults/logfiles/autorpm/applydate libexec/logwatch/defaults/logfiles/cron/applydate @@ -273,6 +271,7 @@ libexec/logwatch/defaults/shared/onlyser libexec/logwatch/defaults/shared/remove libexec/logwatch/defaults/shared/removeheaders libexec/logwatch/defaults/shared/removeservice +man/man8/logwatch.8.gz sbin/logwatch.pl @exec mkdir -p %D/var/logwatch @dirrm var/logwatch @@ -289,7 +288,6 @@ sbin/logwatch.pl @dirrm libexec/logwatch/defaults/logfiles @dirrm libexec/logwatch/defaults @dirrm libexec/logwatch -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm etc/logwatch/defaults/services @dirrm etc/logwatch/defaults/logfiles @dirrm etc/logwatch/defaults/html