- fix commit r346541

Pointyhat to: miwi

2 files changed, 58 insertions, 4 deletions

diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index 73291836ef47..4397f13c183c 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -11,7 +11,6 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-
 LATEST_LINK=	mod_log_sql2
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -29,7 +28,7 @@ CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
 
 .if defined(WITH_DBI) || exists(${LOCALBASE}/include/dbi/dbi.h)
 CONFIGURE_ARGS+=	--with-dbi=${LOCALBASE}
-LIB_DEPENDS+=		dbi.1:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
 .endif
 
 .if defined(WITHOUT_SSL)
@@ -37,7 +36,11 @@ CONFIGURE_ARGS+=	--disable-ssl
 SSL_PLIST=	"@comment "
 .endif
 
-post-install:
-	@${APXS} -e -a -n "${SHORTMODNAME}" "${STAGEDIR}${APACHEMODDIR}/${MODULENAME}.so"
+post-patch:
+	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
+		${WRKSRC}/Makefile.in
+
+pre-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 .include <bsd.port.post.mk>
diff --git a/www/mod_log_sql2/files/patch-Makefile.in b/www/mod_log_sql2/files/patch-Makefile.in
new file mode 100644
index 000000000000..e90d0102e091
--- /dev/null
+++ b/www/mod_log_sql2/files/patch-Makefile.in
@@ -0,0 +1,51 @@
+--- ./Makefile.in.orig	2014-02-28 21:04:39.000000000 +0100
++++ ./Makefile.in	2014-02-28 21:15:40.000000000 +0100
+@@ -20,6 +20,8 @@
+ EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG \
+ 	build-apache13.bat build-apache2.bat \
+ 
++APXS_STAGE = @APXS_STAGE@
++
+ coreSOURCES = @PACKAGE_NAME@.c
+ coreTARGET = @PACKAGE_NAME@@APXS_EXTENSION@
+ coreLDADD = @RT_LIBS@
+@@ -151,21 +153,21 @@
+ 		@DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES)
+ 
+ install: $(TARGETS) install-subdirs
+-	@@APXS_BIN@ -n $(coreNAME) -i $(coreTARGET); \
++	@@APXS_BIN@ $(APXS_STAGE) -n $(coreNAME) -i $(coreTARGET); \
+ 	if test @WANT_MYSQL_MOD@ -eq 1; then \
+-	    @APXS_BIN@ -n $(mysqlNAME) -i $(mysqlTARGET); \
++	    @APXS_BIN@ $(APXS_STAGE) -n $(mysqlNAME) -i $(mysqlTARGET); \
+     fi; \
+ 	if test @WANT_PGSQL_MOD@ -eq 1; then \
+-	    @APXS_BIN@ -n $(pgsqlNAME) -i $(pgsqlTARGET); \
++	    @APXS_BIN@ $(APXS_STAGE) -n $(pgsqlNAME) -i $(pgsqlTARGET); \
+     fi; \
+ 	if test @WANT_DBI_MOD@ -eq 1; then \
+-	    @APXS_BIN@ -n $(dbiNAME) -i $(dbiTARGET); \
++	    @APXS_BIN@ $(APXS_STAGE) -n $(dbiNAME) -i $(dbiTARGET); \
+     fi; \
+ 	if test @WANT_SSL_MOD@ -eq 1; then \
+-		@APXS_BIN@ -n $(sslNAME) -i $(sslTARGET); \
++		@APXS_BIN@ $(APXS_STAGE) -n $(sslNAME) -i $(sslTARGET); \
+ 	fi; \
+ 	if test @WANT_LOGIO_MOD@ -eq 1; then \
+-	    @APXS_BIN@ -n $(logioNAME) -i $(logioTARGET); \
++	    @APXS_BIN@ $(APXS_STAGE) -n $(logioNAME) -i $(logioTARGET); \
+     fi; \
+ 	echo "*************************************************************************"; \
+ 	echo "*** The mod_log_sql modules have been installed."; \
+@@ -183,9 +185,9 @@
+ 	echo "*************************************************************************";
+ 
+ activate: activate-subdirs
+-	@@APXS_BIN@ -n $(coreNAME) -i -a $(coreTARGET); \
++	@@APXS_BIN@ $(APXS_STAGE) -n $(coreNAME) -i $(coreTARGET); \
+ 	if test @WANT_SSL_MOD@ -eq 1; then \
+-		@APXS_BIN@ -n $(sslNAME) -i -a $(sslTARGET); \
++		@APXS_BIN@ $(APXS_STAGE) -n $(sslNAME) -i $(sslTARGET); \
+ 	fi
+ 
+ clean: clean-subdirs