10 files changed, 5 insertions, 5 deletions

diff --git a/MOVED b/MOVED
index 1756b1df25ab..f193db911257 100644
--- a/MOVED
+++ b/MOVED
@@ -3016,7 +3016,6 @@ www/mod_index_rss||2012-01-01|Has expired: Depends on expired www/apache13
 www/mod_layout|www/mod_layout22|2012-01-01|Has expired: Depends on expired www/apache13
 www/mod_limitipconn|www/mod_limitipconn2|2012-01-01|Has expired: Depends on expired www/apache13
 www/mod_log_spread||2012-01-01|Has expired: Depends on expired www/apache13
-www/mod_log_sql|www/mod_log_sql2|2012-01-01|Has expired: Depends on expired www/apache13
 www/mod_macro|www/mod_macro22|2012-01-01|Has expired: Depends on expired www/apache13
 www/mod_mp3||2012-01-01|Has expired: Depends on expired www/apache13
 www/mod_mylo||2012-01-01|Has expired: Depends on expired www/apache13
@@ -15172,3 +15171,4 @@ databases/sqliteodbc-sqlite2|databases/sqliteodbc|2020-07-27|Has expired: SQLite
 graphics/wayland-info|graphics/wayland-utils|2020-08-02|Project renamed
 devel/rubygem-grape11|devel/rubygem-grape|2020-08-03|Has expired: use devel/rubygem-grape instead
 astro/pyephem|astro/py-ephem|2020-08-04|Has expired: Use py-ephem instead.
+www/mod_log_sql2|www/mod_log_sql|2020-08-06|Remove Apache major version suffix since it is the only version in ports tree
diff --git a/www/Makefile b/www/Makefile
index 1af29a088021..9094c34b6c77 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -378,7 +378,7 @@
     SUBDIR += mod_jk
     SUBDIR += mod_limitipconn2
     SUBDIR += mod_line_edit
-    SUBDIR += mod_log_sql2
+    SUBDIR += mod_log_sql
     SUBDIR += mod_maxminddb
     SUBDIR += mod_memcache
     SUBDIR += mod_memcache_block
diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql/Makefile
index 8c17422c0896..28ba3df8243f 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_log_sql
 PORTVERSION=	1.101
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.outoforder.cc/downloads/${PORTNAME}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-USES=		apache:2.2+ gmake mysql tar:bzip2
+USES=		apache gmake mysql tar:bzip2
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
diff --git a/www/mod_log_sql2/distinfo b/www/mod_log_sql/distinfo
index 2294e79a9daf..2294e79a9daf 100644
--- a/www/mod_log_sql2/distinfo
+++ b/www/mod_log_sql/distinfo
diff --git a/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in b/www/mod_log_sql/files/330_mod_log_sql.conf.sample.in
index ba92edca0412..ba92edca0412 100644
--- a/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in
+++ b/www/mod_log_sql/files/330_mod_log_sql.conf.sample.in
diff --git a/www/mod_log_sql2/files/patch-Makefile.in b/www/mod_log_sql/files/patch-Makefile.in
index 070fd43bb5fe..070fd43bb5fe 100644
--- a/www/mod_log_sql2/files/patch-Makefile.in
+++ b/www/mod_log_sql/files/patch-Makefile.in
diff --git a/www/mod_log_sql2/files/patch-functions.h b/www/mod_log_sql/files/patch-functions.h
index 6370a7d9887e..6370a7d9887e 100644
--- a/www/mod_log_sql2/files/patch-functions.h
+++ b/www/mod_log_sql/files/patch-functions.h
diff --git a/www/mod_log_sql2/files/pkg-message.in b/www/mod_log_sql/files/pkg-message.in
index fb83310af788..fb83310af788 100644
--- a/www/mod_log_sql2/files/pkg-message.in
+++ b/www/mod_log_sql/files/pkg-message.in
diff --git a/www/mod_log_sql2/pkg-descr b/www/mod_log_sql/pkg-descr
index cb25b6d20072..33ec99bd2f5c 100644
--- a/www/mod_log_sql2/pkg-descr
+++ b/www/mod_log_sql/pkg-descr
@@ -1,4 +1,4 @@
 This add-on module allows the apache web server to use a MySQL database for
 logging of all operations.
 
-WWW: http://www.outoforder.cc/projects/apache/mod_log_sql/
+WWW: http://www.outoforder.cc/projects/httpd/mod_log_sql/
diff --git a/www/mod_log_sql2/pkg-plist b/www/mod_log_sql/pkg-plist
index 1ba40b04cf2f..1ba40b04cf2f 100644
--- a/www/mod_log_sql2/pkg-plist
+++ b/www/mod_log_sql/pkg-plist