From owner-svn-ports-all@FreeBSD.ORG Sun Mar 2 21:51:35 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 4759634D; Sun, 2 Mar 2014 21:51:35 +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 335651CAF; Sun, 2 Mar 2014 21:51:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22LpZet090283; Sun, 2 Mar 2014 21:51:35 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22LpYQe090281; Sun, 2 Mar 2014 21:51:34 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201403022151.s22LpYQe090281@svn.freebsd.org> From: Olli Hauer Date: Sun, 2 Mar 2014 21:51:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346813 - in head/www/mod_log_sql2: . 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.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: Sun, 02 Mar 2014 21:51:35 -0000 Author: ohauer Date: Sun Mar 2 21:51:34 2014 New Revision: 346813 URL: http://svnweb.freebsd.org/changeset/ports/346813 QAT: https://qat.redports.org/buildarchive/r346813/ Log: - fix commit r346541 Pointyhat to: miwi Added: head/www/mod_log_sql2/files/patch-Makefile.in (contents, props changed) Modified: head/www/mod_log_sql2/Makefile Modified: head/www/mod_log_sql2/Makefile ============================================================================== --- head/www/mod_log_sql2/Makefile Sun Mar 2 21:47:22 2014 (r346812) +++ head/www/mod_log_sql2/Makefile Sun Mar 2 21:51:34 2014 (r346813) @@ -11,7 +11,6 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= apache@FreeBSD.org COMMENT= Allows Apache to log to a MySQL database - LATEST_LINK= mod_log_sql2 GNU_CONFIGURE= yes USE_BZIP2= yes @@ -29,7 +28,7 @@ CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib .if defined(WITH_DBI) || exists(${LOCALBASE}/include/dbi/dbi.h) CONFIGURE_ARGS+= --with-dbi=${LOCALBASE} -LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi +LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi .endif .if defined(WITHOUT_SSL) @@ -37,7 +36,11 @@ CONFIGURE_ARGS+= --disable-ssl SSL_PLIST= "@comment " .endif -post-install: - @${APXS} -e -a -n "${SHORTMODNAME}" "${STAGEDIR}${APACHEMODDIR}/${MODULENAME}.so" +post-patch: + ${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \ + ${WRKSRC}/Makefile.in + +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .include Added: head/www/mod_log_sql2/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_log_sql2/files/patch-Makefile.in Sun Mar 2 21:51:34 2014 (r346813) @@ -0,0 +1,51 @@ +--- ./Makefile.in.orig 2014-02-28 21:04:39.000000000 +0100 ++++ ./Makefile.in 2014-02-28 21:15:40.000000000 +0100 +@@ -20,6 +20,8 @@ + EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG \ + build-apache13.bat build-apache2.bat \ + ++APXS_STAGE = @APXS_STAGE@ ++ + coreSOURCES = @PACKAGE_NAME@.c + coreTARGET = @PACKAGE_NAME@@APXS_EXTENSION@ + coreLDADD = @RT_LIBS@ +@@ -151,21 +153,21 @@ + @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES) + + install: $(TARGETS) install-subdirs +- @@APXS_BIN@ -n $(coreNAME) -i $(coreTARGET); \ ++ @@APXS_BIN@ $(APXS_STAGE) -n $(coreNAME) -i $(coreTARGET); \ + if test @WANT_MYSQL_MOD@ -eq 1; then \ +- @APXS_BIN@ -n $(mysqlNAME) -i $(mysqlTARGET); \ ++ @APXS_BIN@ $(APXS_STAGE) -n $(mysqlNAME) -i $(mysqlTARGET); \ + fi; \ + if test @WANT_PGSQL_MOD@ -eq 1; then \ +- @APXS_BIN@ -n $(pgsqlNAME) -i $(pgsqlTARGET); \ ++ @APXS_BIN@ $(APXS_STAGE) -n $(pgsqlNAME) -i $(pgsqlTARGET); \ + fi; \ + if test @WANT_DBI_MOD@ -eq 1; then \ +- @APXS_BIN@ -n $(dbiNAME) -i $(dbiTARGET); \ ++ @APXS_BIN@ $(APXS_STAGE) -n $(dbiNAME) -i $(dbiTARGET); \ + fi; \ + if test @WANT_SSL_MOD@ -eq 1; then \ +- @APXS_BIN@ -n $(sslNAME) -i $(sslTARGET); \ ++ @APXS_BIN@ $(APXS_STAGE) -n $(sslNAME) -i $(sslTARGET); \ + fi; \ + if test @WANT_LOGIO_MOD@ -eq 1; then \ +- @APXS_BIN@ -n $(logioNAME) -i $(logioTARGET); \ ++ @APXS_BIN@ $(APXS_STAGE) -n $(logioNAME) -i $(logioTARGET); \ + fi; \ + echo "*************************************************************************"; \ + echo "*** The mod_log_sql modules have been installed."; \ +@@ -183,9 +185,9 @@ + echo "*************************************************************************"; + + activate: activate-subdirs +- @@APXS_BIN@ -n $(coreNAME) -i -a $(coreTARGET); \ ++ @@APXS_BIN@ $(APXS_STAGE) -n $(coreNAME) -i $(coreTARGET); \ + if test @WANT_SSL_MOD@ -eq 1; then \ +- @APXS_BIN@ -n $(sslNAME) -i -a $(sslTARGET); \ ++ @APXS_BIN@ $(APXS_STAGE) -n $(sslNAME) -i $(sslTARGET); \ + fi + + clean: clean-subdirs