From owner-svn-ports-all@FreeBSD.ORG Fri Jan 17 18:07:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92364DB8; Fri, 17 Jan 2014 18:07:13 +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 7D6181B34; Fri, 17 Jan 2014 18:07:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HI7DiZ006598; Fri, 17 Jan 2014 18:07:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HI7DXD006596; Fri, 17 Jan 2014 18:07:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401171807.s0HI7DXD006596@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 17 Jan 2014 18:07:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340091 - head/sysutils/loganalyzer 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.17 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, 17 Jan 2014 18:07:13 -0000 Author: bapt Date: Fri Jan 17 18:07:12 2014 New Revision: 340091 URL: http://svnweb.freebsd.org/changeset/ports/340091 QAT: https://qat.redports.org/buildarchive/r340091/ Log: Support stage Use options helpers drop support for NOPORTDATA Modified: head/sysutils/loganalyzer/Makefile head/sysutils/loganalyzer/pkg-plist Modified: head/sysutils/loganalyzer/Makefile ============================================================================== --- head/sysutils/loganalyzer/Makefile Fri Jan 17 18:01:54 2014 (r340090) +++ head/sysutils/loganalyzer/Makefile Fri Jan 17 18:07:12 2014 (r340091) @@ -27,56 +27,25 @@ USE_PHP= session pdo gd xml zlib WANT_PHP_WEB= YES DEFAULT_PHP_VER=5 -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MPHP_MYSQL} -USE_PHP+= mysql -.endif - -.if ${PORT_OPTIONS:MPDO_DBLIB} -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_dblib.so:${PORTSDIR}/databases/php5-pdo_dblib -.endif - -.if ${PORT_OPTIONS:MPDO_FIREBIRD} -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_firebird.so:${PORTSDIR}/databases/php5-pdo_firebird -.endif - -.if ${PORT_OPTIONS:MPDO_MYSQL} -USE_PHP+= pdo_mysql -.endif - -.if ${PORT_OPTIONS:MPDO_ODBC} -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php5-pdo_odbc -.endif - -.if ${PORT_OPTIONS:MPDO_PGSQL} -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql -.endif - -.if ${PORT_OPTIONS:MPDO_SQLITE} -USE_PHP+= pdo_sqlite -.endif - -.include +PHP_MYSQL_USE= php=mysql +PDO_DBLIB_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_dblib.so:${PORTSDIR}/databases/php5-pdo_dblib +PDO_FIREBIRD_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_firebird.so:${PORTSDIR}/databases/php5-pdo_firebird +PDO_MYSQL_USE= php=pgo_mysql +PDO_ODBC_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php5-pdo_odbc +PDO_PGSQL_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql +PDO_SQLITE_USE= php=pdo_sqlite pre-everything:: @${ECHO_CMD} "# you can customize the installation directory" @${ECHO_CMD} "# by setting ANALYZERDIR in /etc/make.conf" do-install: - ${MKDIR} ${PREFIX}/${ANALYZERDIR} - cd ${WRKSRC}/src/ && ${COPYTREE_SHARE} \* ${PREFIX}/${ANALYZERDIR}/ - ${INSTALL_DATA} ${WRKSRC}/src/.htaccess ${PREFIX}/${ANALYZERDIR}/ - -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/* ${DOCSDIR} -.endif -.if !defined(NOPORTDATA) - ${MKDIR} ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/* ${DATADIR} -.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/${ANALYZERDIR} + cd ${WRKSRC}/src/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${ANALYZERDIR}/ + ${INSTALL_DATA} ${WRKSRC}/src/.htaccess ${STAGEDIR}${PREFIX}/${ANALYZERDIR}/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/* ${STAGEDIR}${DATADIR} -.include +.include Modified: head/sysutils/loganalyzer/pkg-plist ============================================================================== --- head/sysutils/loganalyzer/pkg-plist Fri Jan 17 18:01:54 2014 (r340090) +++ head/sysutils/loganalyzer/pkg-plist Fri Jan 17 18:07:12 2014 (r340091) @@ -8,8 +8,8 @@ %%PORTDOCS%%%%DOCSDIR%%/textfiles.html %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html %%PORTDOCS%%%%DOCSDIR%%/windowsevent.html -%%PORTDATA%%%%DATADIR%%/configure.sh -%%PORTDATA%%%%DATADIR%%/secure.sh +%%DATADIR%%/configure.sh +%%DATADIR%%/secure.sh %%ANALYZERDIR%%/.htaccess %%ANALYZERDIR%%/BitstreamVeraFonts/COPYRIGHT.TXT %%ANALYZERDIR%%/BitstreamVeraFonts/README.TXT @@ -413,5 +413,5 @@ @dirrm %%ANALYZERDIR%%/admin @dirrm %%ANALYZERDIR%%/BitstreamVeraFonts @dirrmtry %%ANALYZERDIR%% -%%PORTDATA%%@dirrm %%DATADIR%% +@dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%