Update to 1.13

PR:		34342
Submitted by:	maintainer

6 files changed, 62 insertions, 10 deletions

diff --git a/www/mod_log_mysql/Makefile b/www/mod_log_mysql/Makefile
index 86eaadbe791..dd416ebe1d8 100644
--- a/www/mod_log_mysql/Makefile
+++ b/www/mod_log_mysql/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	mod_log_mysql
-PORTVERSION=	1.09
+PORTVERSION=	1.13
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.grubbybaby.com/mod_log_mysql/
-DISTNAME=	${PORTNAME}
 
 MAINTAINER=	lev@serebryakov.spb.ru
 
@@ -16,15 +15,31 @@ BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT}
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${AP_PORT}
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 AP_PORT?=	www/apache13
 APXS?=		${LOCALBASE}/sbin/apxs
 
+# Here is no mod_ssl by default
+HAVE_MOD_SSL=
+
+MOD_SSL_HEADER=	${LOCALBASE}/include/apache/mod_ssl.h
+
+.if exists(${MOD_SSL_HEADER})
+HAVE_MOD_SSL=	-DWANT_SSL_LOGGING
+do-configure:
+	@${ECHO_MSG} "Make with mod_ssl support"
+.else
+do-configure:
+	@${ECHO_MSG} "Make without mod_ssl support"
+.endif
+
 do-build:
 	@cd ${WRKSRC} && ${APXS} -c -o ${PORTNAME}.so -I${LOCALBASE}/include \
-		-L${LOCALBASE}/lib/mysql -lmysqlclient ${PORTNAME}.c
+		-L${LOCALBASE}/lib/mysql -lmysqlclient -DMYSQLSOCKET=\\\"/tmp/mysql.sock\\\" ${HAVE_MOD_SSL} ${PORTNAME}.c
 
 do-install:
-	cd ${WRKSRC} && ${APXS} -i -n ${PORTNAME:S/^mod_//} -A ${PORTNAME}.so
+	cd ${WRKSRC} && ${APXS} -i -n${PORTNAME:S/^mod_//}  -A ${PORTNAME}.so
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in CONFIGURATION INSTALL README access_log.sql make_combined_log.pl
diff --git a/www/mod_log_mysql/distinfo b/www/mod_log_mysql/distinfo
index a1a51befd13..0925e7b5f6d 100644
--- a/www/mod_log_mysql/distinfo
+++ b/www/mod_log_mysql/distinfo
@@ -1 +1 @@
-MD5 (mod_log_mysql.tar.gz) = ced2720abc250f19b4ec8caf1c22cfdb
+MD5 (mod_log_mysql-1.13.tar.gz) = fc9f0c718601d70f5892553506e6d21c
diff --git a/www/mod_log_mysql/files/patch-mod_log_mysql.c b/www/mod_log_mysql/files/patch-mod_log_mysql.c
new file mode 100644
index 00000000000..1abd8257ea8
--- /dev/null
+++ b/www/mod_log_mysql/files/patch-mod_log_mysql.c
@@ -0,0 +1,11 @@
+--- mod_log_mysql.c.orig	Sun Jan 27 20:03:27 2002
++++ mod_log_mysql.c	Sun Jan 27 20:03:47 2002
+@@ -856,7 +856,7 @@
+ 
+ 
+ /* The configuration array that sets up the hooks into the module. */
+-module mysql_log_module = {
++module log_mysql_module = {
+ 	STANDARD_MODULE_STUFF,
+ 	NULL,					 /* initializer */
+ 	NULL,					 /* create per-dir config */
diff --git a/www/mod_log_sql/Makefile b/www/mod_log_sql/Makefile
index 86eaadbe791..dd416ebe1d8 100644
--- a/www/mod_log_sql/Makefile
+++ b/www/mod_log_sql/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	mod_log_mysql
-PORTVERSION=	1.09
+PORTVERSION=	1.13
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.grubbybaby.com/mod_log_mysql/
-DISTNAME=	${PORTNAME}
 
 MAINTAINER=	lev@serebryakov.spb.ru
 
@@ -16,15 +15,31 @@ BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT}
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${AP_PORT}
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 AP_PORT?=	www/apache13
 APXS?=		${LOCALBASE}/sbin/apxs
 
+# Here is no mod_ssl by default
+HAVE_MOD_SSL=
+
+MOD_SSL_HEADER=	${LOCALBASE}/include/apache/mod_ssl.h
+
+.if exists(${MOD_SSL_HEADER})
+HAVE_MOD_SSL=	-DWANT_SSL_LOGGING
+do-configure:
+	@${ECHO_MSG} "Make with mod_ssl support"
+.else
+do-configure:
+	@${ECHO_MSG} "Make without mod_ssl support"
+.endif
+
 do-build:
 	@cd ${WRKSRC} && ${APXS} -c -o ${PORTNAME}.so -I${LOCALBASE}/include \
-		-L${LOCALBASE}/lib/mysql -lmysqlclient ${PORTNAME}.c
+		-L${LOCALBASE}/lib/mysql -lmysqlclient -DMYSQLSOCKET=\\\"/tmp/mysql.sock\\\" ${HAVE_MOD_SSL} ${PORTNAME}.c
 
 do-install:
-	cd ${WRKSRC} && ${APXS} -i -n ${PORTNAME:S/^mod_//} -A ${PORTNAME}.so
+	cd ${WRKSRC} && ${APXS} -i -n${PORTNAME:S/^mod_//}  -A ${PORTNAME}.so
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in CONFIGURATION INSTALL README access_log.sql make_combined_log.pl
diff --git a/www/mod_log_sql/distinfo b/www/mod_log_sql/distinfo
index a1a51befd13..0925e7b5f6d 100644
--- a/www/mod_log_sql/distinfo
+++ b/www/mod_log_sql/distinfo
@@ -1 +1 @@
-MD5 (mod_log_mysql.tar.gz) = ced2720abc250f19b4ec8caf1c22cfdb
+MD5 (mod_log_mysql-1.13.tar.gz) = fc9f0c718601d70f5892553506e6d21c
diff --git a/www/mod_log_sql/files/patch-mod_log_mysql.c b/www/mod_log_sql/files/patch-mod_log_mysql.c
new file mode 100644
index 00000000000..1abd8257ea8
--- /dev/null
+++ b/www/mod_log_sql/files/patch-mod_log_mysql.c
@@ -0,0 +1,11 @@
+--- mod_log_mysql.c.orig	Sun Jan 27 20:03:27 2002
++++ mod_log_mysql.c	Sun Jan 27 20:03:47 2002
+@@ -856,7 +856,7 @@
+ 
+ 
+ /* The configuration array that sets up the hooks into the module. */
+-module mysql_log_module = {
++module log_mysql_module = {
+ 	STANDARD_MODULE_STUFF,
+ 	NULL,					 /* initializer */
+ 	NULL,					 /* create per-dir config */