diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2014-03-16 14:30:28 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2014-03-16 14:30:28 +0000 |
| commit | 9885f020e5c659dad3bd4389f4909fbecbea80d5 (patch) | |
| tree | 85f3ede40499dd3de51ef88e2b3a08a6698b992f /www/mod_log_sql2-dtc | |
| parent | b97113ea56f8cec49560f375d260887ab5ab37ea (diff) | |
| download | ports-9885f020e5c659dad3bd4389f4909fbecbea80d5.tar.gz ports-9885f020e5c659dad3bd4389f4909fbecbea80d5.zip | |
- fix staged package building
Noted by antoine@
Notes
Notes:
svn path=/head/; revision=348412
Diffstat (limited to 'www/mod_log_sql2-dtc')
| -rw-r--r-- | www/mod_log_sql2-dtc/files/patch-Makefile.in | 9 | ||||
| -rw-r--r-- | www/mod_log_sql2-dtc/pkg-plist | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/www/mod_log_sql2-dtc/files/patch-Makefile.in b/www/mod_log_sql2-dtc/files/patch-Makefile.in index 34f8b610b0a8..1be467baf53a 100644 --- a/www/mod_log_sql2-dtc/files/patch-Makefile.in +++ b/www/mod_log_sql2-dtc/files/patch-Makefile.in @@ -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); \ diff --git a/www/mod_log_sql2-dtc/pkg-plist b/www/mod_log_sql2-dtc/pkg-plist index ab18e9bcedce..d450643cea4f 100644 --- a/www/mod_log_sql2-dtc/pkg-plist +++ b/www/mod_log_sql2-dtc/pkg-plist @@ -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 |