7 files changed, 105 insertions, 47 deletions

diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index 076e80444b22..cdd83593367a 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_log_sql
 PORTVERSION=	1.101
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.outoforder.cc/downloads/${PORTNAME}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -11,32 +11,29 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-LATEST_LINK=	mod_log_sql2
-GNU_CONFIGURE=	yes
 USES=		gmake tar:bzip2
-CONFIGURE_ARGS+=	--with-apxs=${APXS}
-SSL_PLIST=	""
-APACHE2X=	""
-PLIST_SUB+=	SSL=${SSL_PLIST} APACHE2X=${APACHE2X}
-
+USE_APACHE=	22+
 USE_MYSQL=	yes
-USE_APACHE=	22
-LIBS+=		-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql
+GNU_CONFIGURE=	yes
+
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	DBI DOCS
 
-.include <bsd.port.pre.mk>
+DBI_CONFIGURE_WITH=	dbi=${LOCALBASE}
+DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
 
-.if defined(WITH_DBI) || exists(${LOCALBASE}/include/dbi/dbi.h)
-CONFIGURE_ARGS+=	--with-dbi=${LOCALBASE}
-LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
-PLIST_SUB+=		DBI=""
-.else
-PLIST_SUB+=		DBI="@comment "
-.endif
+DBI_DESC=	depend on databases/libdbi
+PORTDOCS=	manual.html manual.xml
 
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=	--disable-ssl
-SSL_PLIST=	"@comment "
-.endif
+.include <bsd.port.options.mk>
+
+APMODCFG=	330_mod_log_sql.conf.sample
+SUB_FILES+=	${APMODCFG} pkg-message
+SUB_LIST+=	APMODCFG=${APMODCFG:C/.sample//}
+PLIST_SUB+=	APMODCFG=${APMODCFG}
+
+CONFIGURE_ARGS+=--with-apxs=${APXS}
+LIBS+=		-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql
 
 post-patch:
 	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
@@ -45,4 +42,11 @@ post-patch:
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
-.include <bsd.port.post.mk>
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
+	${CP} ${WRKDIR}/${APMODCFG} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/*.so
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in b/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in
new file mode 100644
index 000000000000..ba92edca0412
--- /dev/null
+++ b/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in
@@ -0,0 +1,35 @@
+# www/mod_log_sql2
+# vim: set syntax=apache:
+
+# =====================================================
+# required module
+# =====================================================
+#LoadModule log_sql_module %%APACHEMODDIR%%/mod_log_sql.so
+#LoadModule log_sql_mysql_module %%APACHEMODDIR%%/mod_log_sql_mysql.so
+
+# =====================================================
+# optional modules
+# =====================================================
+#<IfModule ssl_module>
+#LoadModule log_sql_ssl_module %%APACHEMODDIR%%/mod_log_sql_ssl.so
+#</IfModule>
+
+## optional if build with DBI
+#LoadModule log_sql_dbi %%APACHEMODDIR%%/mod_log_sql_dbi.so
+
+
+## =====================================================
+## sample db connection, see
+## %%DOCSDIR%%/manual.html / manual.xml
+## =====================================================
+## <IfModule log_sql_module>
+### log over IP
+## LogSQLLoginInfo mysql://userid:passwd@db.host.name/apachelogs
+### log via socket
+## LogSQLDBParam socketfile /your/path/to/mysql.sock
+## LogSQLCreateTables On
+## LogSQLMassVirtualHosting On
+## LogSQLTransferLogFormat AbHhmRSsTUuv
+## LogSQLRequestIgnore /sample-path/token /server-status
+## LogSQLPreserveFile /var/tmp/offline-preserve
+## </IfModule> 
diff --git a/www/mod_log_sql2/files/patch-Makefile.in b/www/mod_log_sql2/files/patch-Makefile.in
index e90d0102e091..070fd43bb5fe 100644
--- a/www/mod_log_sql2/files/patch-Makefile.in
+++ b/www/mod_log_sql2/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- ./Makefile.in.orig	2014-02-28 21:04:39.000000000 +0100
-+++ ./Makefile.in	2014-02-28 21:15:40.000000000 +0100
+--- Makefile.in.orig	2006-11-05 03:47:23 UTC
++++ Makefile.in
 @@ -20,6 +20,8 @@
  EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG \
  	build-apache13.bat build-apache2.bat \
@@ -9,7 +9,7 @@
  coreSOURCES = @PACKAGE_NAME@.c
  coreTARGET = @PACKAGE_NAME@@APXS_EXTENSION@
  coreLDADD = @RT_LIBS@
-@@ -151,21 +153,21 @@
+@@ -151,41 +153,27 @@
  		@DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES)
  
  install: $(TARGETS) install-subdirs
@@ -33,12 +33,23 @@
  	fi; \
  	if test @WANT_LOGIO_MOD@ -eq 1; then \
 -	    @APXS_BIN@ -n $(logioNAME) -i $(logioTARGET); \
+-    fi; \
+-	echo "*************************************************************************"; \
+-	echo "*** The mod_log_sql modules have been installed."; \
+-	echo "*** Please edit your Apache configuration files and"; \
+-	echo "*** add the appropriate LoadModule directives per the documentation"; \
+-	echo "*** in docs/manual.html"; \
+-	echo "*** If you have previously used 1.18 or lower then you must change"; \
+-	echo "*** >LoadModule sql_log_module modules/mod_log_sql.so"; \
+-	echo "***   to"; \
+-	echo "*** >LoadModule log_sql_module modules/mod_log_sql.so"; \
+-	echo "*** in your httpd.conf as the internal name of the module has changed."; \
+-	echo "*** "; \
+-	echo "*** Also read the documentation about using SSL support and new "; \
+-	echo "*** configuration directives."; \
+-	echo "*************************************************************************";
 +	    @APXS_BIN@ $(APXS_STAGE) -n $(logioNAME) -i $(logioTARGET); \
-     fi; \
- 	echo "*************************************************************************"; \
- 	echo "*** The mod_log_sql modules have been installed."; \
-@@ -183,9 +185,9 @@
- 	echo "*************************************************************************";
++    fi;
  
  activate: activate-subdirs
 -	@@APXS_BIN@ -n $(coreNAME) -i -a $(coreTARGET); \
diff --git a/www/mod_log_sql2/files/patch-functions.h b/www/mod_log_sql2/files/patch-functions.h
new file mode 100644
index 000000000000..6370a7d9887e
--- /dev/null
+++ b/www/mod_log_sql2/files/patch-functions.h
@@ -0,0 +1,14 @@
+--- functions.h.orig	2004-09-20 02:50:46 UTC
++++ functions.h
+@@ -14,7 +14,11 @@
+ 
+ static const char *extract_remote_address(request_rec *r, char *a)
+ {
++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
++    return r->useragent_ip;
++#else
+     return r->connection->remote_ip;
++#endif
+ }
+ 
+ static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused));
diff --git a/www/mod_log_sql2/files/patch-functions13.h b/www/mod_log_sql2/files/patch-functions13.h
deleted file mode 100644
index 4fda5d4d58bc..000000000000
--- a/www/mod_log_sql2/files/patch-functions13.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- functions13.h.orig	Fri Apr 16 15:03:25 2004
-+++ functions13.h	Fri Apr 16 15:03:46 2004
-@@ -37,7 +37,7 @@
- 
- static const char *extract_request_duration(request_rec *r, char *a)
- {
--	return ap_psprintf(r->pool, "%ld", time(NULL) - r->request_time);
-+	return ap_psprintf(r->pool, "%ld", (long)time(NULL) - r->request_time);
- }
- 
- static const char *extract_request_timestamp(request_rec *r, char *a)
diff --git a/www/mod_log_sql2/files/pkg-message.in b/www/mod_log_sql2/files/pkg-message.in
new file mode 100644
index 000000000000..ceb3aeb29219
--- /dev/null
+++ b/www/mod_log_sql2/files/pkg-message.in
@@ -0,0 +1,6 @@
+============================================================
+* The mod_log_sql modules have been installed.
+*
+* The module config file was installed as
+*   %%PREFIX%%/%%APACHEETCDIR%%/modules.d/%%APMODCFG%%
+============================================================
diff --git a/www/mod_log_sql2/pkg-plist b/www/mod_log_sql2/pkg-plist
index 14eec8d4b923..1ba40b04cf2f 100644
--- a/www/mod_log_sql2/pkg-plist
+++ b/www/mod_log_sql2/pkg-plist
@@ -1,7 +1,6 @@
+@sample %%APACHEETCDIR%%/modules.d/%%APMODCFG%%
 %%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
-@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
-%%DBI%%%%APACHEMODDIR%%/mod_log_sql_dbi.so
 %%APACHEMODDIR%%/mod_log_sql_mysql.so
-%%APACHE2X%%%%APACHEMODDIR%%/mod_log_sql_logio.so
-%%SSL%%%%APACHEMODDIR%%/mod_log_sql_ssl.so
+%%APACHEMODDIR%%/mod_log_sql_logio.so
+%%APACHEMODDIR%%/mod_log_sql_ssl.so
+%%DBI%%%%APACHEMODDIR%%/mod_log_sql_dbi.so