From owner-svn-ports-head@FreeBSD.ORG Sun Mar 16 14:30:29 2014 Return-Path: <owner-svn-ports-head@FreeBSD.ORG> 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 1149F68C; Sun, 16 Mar 2014 14:30:29 +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 D9EDCE0F; Sun, 16 Mar 2014 14:30: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 s2GEUSFR002241; Sun, 16 Mar 2014 14:30:28 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2GEUSlj002239; Sun, 16 Mar 2014 14:30:28 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201403161430.s2GEUSlj002239@svn.freebsd.org> From: Olli Hauer <ohauer@FreeBSD.org> Date: Sun, 16 Mar 2014 14:30:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348412 - in head/www/mod_log_sql2-dtc: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head <svn-ports-head.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>, <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/> List-Post: <mailto:svn-ports-head@freebsd.org> List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, <mailto:svn-ports-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 16 Mar 2014 14:30:29 -0000 Author: ohauer Date: Sun Mar 16 14:30:28 2014 New Revision: 348412 URL: http://svnweb.freebsd.org/changeset/ports/348412 QAT: https://qat.redports.org/buildarchive/r348412/ Log: - fix staged package building Noted by antoine@ Modified: head/www/mod_log_sql2-dtc/files/patch-Makefile.in head/www/mod_log_sql2-dtc/pkg-plist Modified: head/www/mod_log_sql2-dtc/files/patch-Makefile.in ============================================================================== --- head/www/mod_log_sql2-dtc/files/patch-Makefile.in Sun Mar 16 14:29:45 2014 (r348411) +++ head/www/mod_log_sql2-dtc/files/patch-Makefile.in Sun Mar 16 14:30:28 2014 (r348412) @@ -1,5 +1,5 @@ --- ./Makefile.in.orig 2006-11-05 04:47:23.000000000 +0100 -+++ ./Makefile.in 2014-03-09 15:26:45.000000000 +0100 ++++ ./Makefile.in 2014-03-16 15:16:25.000000000 +0100 @@ -12,6 +12,7 @@ winconfig.h @@ -8,9 +8,12 @@ ifeq (@OOO_MAINTAIN@,1) CFLAGS += -Wc,-Werror -@@ -153,19 +154,19 @@ +@@ -151,21 +152,21 @@ + @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES) + install: $(TARGETS) install-subdirs - @@APXS_BIN@ -n $(coreNAME) -i $(coreTARGET); \ +- @@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); \ Modified: head/www/mod_log_sql2-dtc/pkg-plist ============================================================================== --- head/www/mod_log_sql2-dtc/pkg-plist Sun Mar 16 14:29:45 2014 (r348411) +++ head/www/mod_log_sql2-dtc/pkg-plist Sun Mar 16 14:30:28 2014 (r348412) @@ -4,4 +4,6 @@ %%APACHEMODDIR%%/mod_log_sql_mysql.so %%APACHEMODDIR%%/mod_log_sql_logio.so %%APACHEMODDIR%%/mod_log_sql_ssl.so +@exec %D/sbin/apxs -e -a -n log_sql_ssl %D/%F +@unexec /usr/bin/sed -i '' '/LoadModule log_sql_ssl_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%DBI%%%%APACHEMODDIR%%/mod_log_sql_dbi.so