- Update to 1.100

3 files changed, 16 insertions, 85 deletions

diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index e8601fa73804..901023f9eb2a 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_log_sql
-PORTVERSION=	1.99
+PORTVERSION=	1.100
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.outoforder.cc/downloads/${PORTNAME}/
 
@@ -14,30 +14,32 @@ COMMENT=	Allows Apache to log to a MySQL database
 
 LATEST_LINK=	mod_log_sql2
 GNU_CONFIGURE=	yes
-USE_MYSQL=	yes
+USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
-SSL_PLIST=	"@comment "
+SSL_PLIST=	""
 PLIST_SUB+=	SSL=${SSL_PLIST}
+
+USE_MYSQL=	yes
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
 
-.if defined(WITH_DBI)
+.include <bsd.port.pre.mk>
+.if defined(WITH_DBI) || exists(${LOCALBASE}/include/dbi/dbi.h)
 CONFIGURE_ARGS+=	--with-dbi=${LOCALBASE}
 LIB_DEPENDS+=		dbi.0:${PORTSDIR}/databases/libdbi
 .endif
-
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
-.if defined(WITH_SSL)
-.    if ${AP_VER} != 2
-BROKEN=		"SSL support needs apache2"
-.    endif
+.   if ${AP_VER} == 13
+WITHOUT_SSL=	YES
+.   endif
+.if defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=	--disable-ssl
+SSL_PLIST=	"@comment"
+.else
 .if !exists(${LOCALBASE}/include/apache2/mod_ssl.h)
 BROKEN=		"Please recompile apache2 with SSL support"
 .endif
-CONFIGURE_ARGS+=	--enable-ssl
-SSL_PLIST=	""
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/mod_log_sql2/distinfo b/www/mod_log_sql2/distinfo
index 2c78a0c99e69..093ed69122da 100644
--- a/www/mod_log_sql2/distinfo
+++ b/www/mod_log_sql2/distinfo
@@ -1,2 +1,2 @@
-MD5 (mod_log_sql-1.99.tar.gz) = e246a3d8e96d2d62715eb34f75c7c11d
-SIZE (mod_log_sql-1.99.tar.gz) = 159167
+MD5 (mod_log_sql-1.100.tar.bz2) = b54657ad270cffc34dfab12302c53306
+SIZE (mod_log_sql-1.100.tar.bz2) = 122507
diff --git a/www/mod_log_sql2/files/patch-configure b/www/mod_log_sql2/files/patch-configure
deleted file mode 100644
index a8398ac4b8af..000000000000
--- a/www/mod_log_sql2/files/patch-configure
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure.orig	Wed Jul 21 00:47:33 2004
-+++ configure	Tue Sep 14 13:59:13 2004
-@@ -3174,9 +3174,8 @@
-         MYSQL_CFLAGS=""
-         MYSQL_LDFLAGS=""
-         MYSQL_LIBS=""
--        { { echo "$as_me:$LINENO: error: *** Mysql client libraries not found!" >&5
--echo "$as_me: error: *** Mysql client libraries not found!" >&2;}
--   { (exit 1); exit 1; }; }
-+        { echo "$as_me:$LINENO: WARNING: *** Mysql client libraries not found!" >&5
-+echo "$as_me: WARNING: *** Mysql client libraries not found!" >&2;}
-         WANT_MYSQL_MOD=0
- 
-       fi
-@@ -3218,9 +3217,8 @@
- done
- 
- if test -z "$DBI_CFLAGS"; then
--  { { echo "$as_me:$LINENO: error: ** libDBI client libraries not found!" >&5
--echo "$as_me: error: ** libDBI client libraries not found!" >&2;}
--   { (exit 1); exit 1; }; }
-+  { echo "$as_me:$LINENO: WARNING: ** libDBI client libraries not found!" >&5
-+echo "$as_me: WARNING: ** libDBI client libraries not found!" >&2;}
-         WANT_DBI_MOD=0
- 
- fi
-@@ -3309,9 +3307,8 @@
-     fi
- done
- if test -z "$DBI_LDFLAGS"; then
--  { { echo "$as_me:$LINENO: error: ** libDBI client libraries not found!" >&5
--echo "$as_me: error: ** libDBI client libraries not found!" >&2;}
--   { (exit 1); exit 1; }; }
-+  { echo "$as_me:$LINENO: WARNING: ** libDBI client libraries not found!" >&5
-+echo "$as_me: WARNING: ** libDBI client libraries not found!" >&2;}
-         WANT_DBI_MOD=0
- 
- else
-@@ -3983,9 +3980,8 @@
-         CFLAGS=$ac_save_CFLAGS
-         CPPFLAGS=$ac_save_CPPFLAGS
-         if test "x$mod_ssl_h" = "x"; then
--            { { echo "$as_me:$LINENO: error: ** mod_ssl.h not found or missing SSL headers!" >&5
--echo "$as_me: error: ** mod_ssl.h not found or missing SSL headers!" >&2;}
--   { (exit 1); exit 1; }; }
-+            { echo "$as_me:$LINENO: WARNING: ** mod_ssl.h not found or missing SSL headers!" >&5
-+echo "$as_me: WARNING: ** mod_ssl.h not found or missing SSL headers!" >&2;}
- 		WANT_SSL_MOD=0
- 
-         else
-@@ -3993,9 +3989,8 @@
-             WANT_SSL_MOD=1
-         fi
-     else
--        { { echo "$as_me:$LINENO: error: ** mod_ssl.h not found or missing SSL headers!" >&5
--echo "$as_me: error: ** mod_ssl.h not found or missing SSL headers!" >&2;}
--   { (exit 1); exit 1; }; }
-+        { echo "$as_me:$LINENO: WARNING: ** mod_ssl.h not found or missing SSL headers!" >&5
-+echo "$as_me: WARNING: ** mod_ssl.h not found or missing SSL headers!" >&2;}
- 		WANT_SSL_MOD=0
- 
-     fi
-@@ -4004,7 +3999,7 @@
- 
- case "$target" in
- 	*-*-solaris* | *-*-osf* )
--		if test $APACHE_VERSION -eq 1.3; then
-+		if test $AP_VERSION -eq 1.3; then
- 			RT_LIBS=-lrt
- 		fi
- 		;;