Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Mar 2014 14:30:28 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
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
Message-ID:  <201403161430.s2GEUSlj002239@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403161430.s2GEUSlj002239>