2 files changed, 21 insertions, 51 deletions

diff --git a/www/mod_log_sql/Makefile b/www/mod_log_sql/Makefile
index c25f07407c4e..c3af789676a8 100644
--- a/www/mod_log_sql/Makefile
+++ b/www/mod_log_sql/Makefile
@@ -6,26 +6,27 @@
 
 PORTNAME=	mod_log_sql
 PORTVERSION=	1.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.outoforder.cc/downloads/${PORTNAME}/
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_MYSQL=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-APACHE_COMPAT=	yes
+USE_APACHE=	1.3
 
 ALL_TARGET=	dso
 INSTALL_TARGET=	dsoinstall
 
+PORTDOCS=	LICENSE CHANGELOG create_tables.sql make_combined_log.pl \
+			documentation.ps documentation.txt README FreeBSD-readme.txt \
+			HTML
+
 do-configure:
 	@${REINPLACE_CMD} "s|^APACHEINSTALLED = .*\$$|APACHEINSTALLED = ${LOCALBASE}|" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} "s|^APACHEHEADERS   = .*\$$|APACHEHEADERS   = ${LOCALBASE}/include/apache|" ${WRKSRC}/Makefile
@@ -35,20 +36,19 @@ do-configure:
 	@${REINPLACE_CMD} "s|sql_log_module|log_sql_module|g" ${WRKSRC}/${PORTNAME}.c
 
 post-install:
-	${APXS} -e -a -n log_sql ${LOCALBASE}/libexec/apache/${PORTNAME}.so
-	@${MKDIR} ${LOCALBASE}/share/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${LOCALBASE}/share/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${LOCALBASE}/share/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/create_tables.sql ${LOCALBASE}/share/${PORTNAME}
-	@${INSTALL_SCRIPT} ${WRKSRC}/make_combined_log.pl ${LOCALBASE}/share/${PORTNAME}
+	${APXS} -e -a -n log_sql ${LOCALBASE}/${APACHEMODDIR}/${PORTNAME}.so
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${LOCALBASE}/share/doc/${PORTNAME}/HTML
-	@${INSTALL_DATA} ${FILESDIR}/FreeBSD-readme.txt ${LOCALBASE}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/Documentation/documentation.ps ${LOCALBASE}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/Documentation/documentation.txt ${LOCALBASE}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/Documentation/README ${LOCALBASE}/share/doc/${PORTNAME}/
-	@${INSTALL_DATA} ${WRKSRC}/Documentation/HTML/* ${LOCALBASE}/share/doc/${PORTNAME}/HTML/
-
+	@${MKDIR} ${DOCSDIR}/
+	@${MKDIR} ${DOCSDIR}/HTML/
+	@${INSTALL_DATA} ${FILESDIR}/FreeBSD-readme.txt ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/create_tables.sql ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/Documentation/documentation.ps ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/Documentation/documentation.txt ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/Documentation/README ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/Documentation/HTML/* ${DOCSDIR}/HTML/
+	@${INSTALL_SCRIPT} ${WRKSRC}/make_combined_log.pl ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/mod_log_sql/pkg-plist b/www/mod_log_sql/pkg-plist
index be9bc372073f..307c20bf8b41 100644
--- a/www/mod_log_sql/pkg-plist
+++ b/www/mod_log_sql/pkg-plist
@@ -1,33 +1,3 @@
-@unexec %D/sbin/apxs -e -A -n log_sql %D/libexec/apache/mod_log_sql.so
-libexec/apache/mod_log_sql.so
-@exec %D/sbin/apxs -e -a -n log_sql %D/libexec/apache/mod_log_sql.so
-share/mod_log_sql/LICENSE
-share/mod_log_sql/CHANGELOG
-share/mod_log_sql/create_tables.sql
-share/mod_log_sql/make_combined_log.pl
-%%PORTDOCS%%share/doc/mod_log_sql/FreeBSD-readme.txt
-%%PORTDOCS%%share/doc/mod_log_sql/documentation.ps
-%%PORTDOCS%%share/doc/mod_log_sql/documentation.txt
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/contents.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/documentation.css
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/documentation.html
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/img1.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/img2.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/img3.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/img4.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/next.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/next_g.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/node1.html
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/node2.html
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/node3.html
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/node4.html
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/node5.html
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/node6.html
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/prev.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/prev_g.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/up.png
-%%PORTDOCS%%share/doc/mod_log_sql/HTML/up_g.png
-%%PORTDOCS%%share/doc/mod_log_sql/README
-%%PORTDOCS%%@dirrm share/doc/mod_log_sql/HTML
-%%PORTDOCS%%@dirrm share/doc/mod_log_sql
-@dirrm share/mod_log_sql
+%%APACHEMODDIR%%/mod_log_sql.so
+@unexec %D/sbin/apxs -e -A -n log_sql %D%%APACHEMODDIR%%/mod_log_sql.so
+@exec %D/sbin/apxs -e -a -n log_sql %D%%APACHEMODDIR%%/mod_log_sql.so