From owner-svn-ports-all@FreeBSD.ORG Mon May 12 16:25:21 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 EAC4976E; Mon, 12 May 2014 16:25:21 +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 CD2AB2709; Mon, 12 May 2014 16:25:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CGPLim028444; Mon, 12 May 2014 16:25:21 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CGPLDr028442; Mon, 12 May 2014 16:25:21 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201405121625.s4CGPLDr028442@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 12 May 2014 16:25:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353863 - head/mail/exilog 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: Mon, 12 May 2014 16:25:22 -0000 Author: sunpoet Date: Mon May 12 16:25:21 2014 New Revision: 353863 URL: http://svnweb.freebsd.org/changeset/ports/353863 QAT: https://qat.redports.org/buildarchive/r353863/ Log: - Reset maintainership - While I'm here: - Convert to new options framework - Support STAGEDIR PR: ports/189684 Submitted by: Larry Rosenman (maintainer) Modified: head/mail/exilog/Makefile head/mail/exilog/pkg-plist Modified: head/mail/exilog/Makefile ============================================================================== --- head/mail/exilog/Makefile Mon May 12 16:25:16 2014 (r353862) +++ head/mail/exilog/Makefile Mon May 12 16:25:21 2014 (r353863) @@ -3,20 +3,24 @@ PORTNAME= exilog PORTVERSION= 0.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail MASTER_SITES= http://duncanthrax.net/exilog/ -MAINTAINER= ler@lerctr.org +MAINTAINER= ports@FreeBSD.org COMMENT= Tool to centralize and visualize Exim logs with a web front end LICENSE= GPLv2 -RUN_DEPENDS= p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask +#RUN_DEPENDS= p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask -USES= perl5 +OPTIONS_DEFINE= DOCS + +USES= perl5 shebangfix NO_BUILD= yes +SHEBANG_FILES= exilog_agent.pl exilog_cleanup.pl + # Default sql backend WITH_SQL_BACKEND?= mysql @@ -37,8 +41,9 @@ EXILOGDIR?= ${PREFIX}/www/exilog .else EXILOGDIR?= ${PREFIX}/exilog .endif -NO_STAGE= yes + .include + .if defined(WITHOUT_AGENT) PLIST_SUB+= AGENT="@comment " .else @@ -48,12 +53,10 @@ PLIST_SUB+= AGENT="" PLIST_SUB+= EXILOGDIR="${EXILOGDIR:S,^${PREFIX}/,,}" -.if !defined(NOPORTDOCS) PORTDOC_FILES= doc/Changelog \ doc/exilog.txt \ doc/mysql-db-script.sql \ doc/pgsql-db-script.sql -.endif post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} @@ -64,25 +67,20 @@ pre-patch: @${REINPLACE_CMD} -e "s,\(use exilog_config\),use lib \'${EXILOGDIR}\'; \1," ${WRKSRC}/exilog_cleanup.pl do-install: - @${MKDIR} ${EXILOGDIR} - @${MKDIR} ${EXILOGDIR}/icons - @${CP} ${WRKSRC}/*.pm ${WRKSRC}/*.css ${WRKSRC}/*.js ${EXILOGDIR} - @${CP} ${WRKSRC}/icons/* ${EXILOGDIR}/icons - + @${MKDIR} ${STAGEDIR}${EXILOGDIR} ${STAGEDIR}${EXILOGDIR}/icons + @${CP} ${WRKSRC}/*.pm ${WRKSRC}/*.css ${WRKSRC}/*.js ${STAGEDIR}${EXILOGDIR} + @${CP} ${WRKSRC}/icons/* ${STAGEDIR}${EXILOGDIR}/icons .if !defined(WITHOUT_AGENT) - @${INSTALL_SCRIPT} ${WRKSRC}/exilog_agent.pl ${PREFIX}/sbin + @${INSTALL_SCRIPT} ${WRKSRC}/exilog_agent.pl ${STAGEDIR}${PREFIX}/sbin .endif - @${INSTALL_SCRIPT} ${WRKSRC}/exilog_cleanup.pl ${PREFIX}/sbin - @${INSTALL_SCRIPT} ${WRKSRC}/exilog_cgi.pl ${EXILOGDIR} - @${CP} ${WRKSRC}/exilog.conf-example ${PREFIX}/etc/exilog.conf-dist - @${CHMOD} 0600 ${PREFIX}/etc/exilog.conf-dist - @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/etc/exilog.conf-dist - @${CP} ${FILESDIR}/htaccess ${EXILOGDIR}/.htaccess -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${INSTALL_SCRIPT} ${WRKSRC}/exilog_cleanup.pl ${STAGEDIR}${PREFIX}/sbin + @${INSTALL_SCRIPT} ${WRKSRC}/exilog_cgi.pl ${STAGEDIR}${EXILOGDIR} + @${CP} ${WRKSRC}/exilog.conf-example ${STAGEDIR}${PREFIX}/etc/exilog.conf-dist + @${CHMOD} 0600 ${STAGEDIR}${PREFIX}/etc/exilog.conf-dist + @${CP} ${FILESDIR}/htaccess ${STAGEDIR}${EXILOGDIR}/.htaccess + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Modified: head/mail/exilog/pkg-plist ============================================================================== --- head/mail/exilog/pkg-plist Mon May 12 16:25:16 2014 (r353862) +++ head/mail/exilog/pkg-plist Mon May 12 16:25:21 2014 (r353863) @@ -1,6 +1,16 @@ %%AGENT%%@stopdaemon exilog +@owner www +@group www +etc/exilog.conf-dist +@owner +@group %%AGENT%%sbin/exilog_agent.pl sbin/exilog_cleanup.pl +%%PORTDOCS%%%%DOCSDIR%%/Changelog +%%PORTDOCS%%%%DOCSDIR%%/exilog.txt +%%PORTDOCS%%%%DOCSDIR%%/mysql-db-script.sql +%%PORTDOCS%%%%DOCSDIR%%/pgsql-db-script.sql +%%EXILOGDIR%%/.htaccess %%EXILOGDIR%%/exilog_cgi.pl %%EXILOGDIR%%/exilog_cgi_html.pm %%EXILOGDIR%%/exilog_cgi_messages.pm @@ -8,12 +18,11 @@ sbin/exilog_cleanup.pl %%EXILOGDIR%%/exilog_cgi_queues.pm %%EXILOGDIR%%/exilog_cgi_servers.pm %%EXILOGDIR%%/exilog_config.pm +%%EXILOGDIR%%/exilog_jscript.js %%EXILOGDIR%%/exilog_parse.pm %%EXILOGDIR%%/exilog_sql.pm -%%EXILOGDIR%%/exilog_util.pm -%%EXILOGDIR%%/exilog_jscript.js %%EXILOGDIR%%/exilog_stylesheet.css -%%EXILOGDIR%%/.htaccess +%%EXILOGDIR%%/exilog_util.pm %%EXILOGDIR%%/icons/address.png %%EXILOGDIR%%/icons/arrival.png %%EXILOGDIR%%/icons/arrival_auth.png @@ -53,11 +62,6 @@ sbin/exilog_cleanup.pl %%EXILOGDIR%%/icons/stopwatch.png %%EXILOGDIR%%/icons/timerange.png %%EXILOGDIR%%/icons/unknown.png -etc/exilog.conf-dist -%%PORTDOCS%%%%DOCSDIR%%/Changelog -%%PORTDOCS%%%%DOCSDIR%%/exilog.txt -%%PORTDOCS%%%%DOCSDIR%%/mysql-db-script.sql -%%PORTDOCS%%%%DOCSDIR%%/pgsql-db-script.sql @dirrm %%EXILOGDIR%%/icons @dirrm %%EXILOGDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%