- Add ldconfig -m to apache2's apr libs (install time and boot time)

Requested by, discussed with: lev

6 files changed, 50 insertions, 10 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 89220b0440d3..e7ed01fc3c26 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -135,6 +135,8 @@ IGNORE=			apr is installed and may conflict with apache one\
 				at your own risk)
 .   endif
 PLIST_SUB+=	PORTS_APR=""
+INSTALLS_SHLIB=		yes
+LDCONFIG_DIRS=		%%PREFIX%%/lib/apache2
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
@@ -183,6 +185,8 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
 	@${CAT} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
@@ -202,10 +206,10 @@ pre-install:
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/apache2/Includes
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
-	fi
-	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."
+	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
+	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup file."
+	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
+	@@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/apache2/files/apache2libs.sh b/www/apache2/files/apache2libs.sh
new file mode 100644
index 000000000000..67fe5c302561
--- /dev/null
+++ b/www/apache2/files/apache2libs.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+case "$1" in
+	start)
+		/sbin/ldconfig -m %%PREFIX%%/lib/apache2
+		;;
+	stop)
+		;;
+	*)
+		echo ""
+		echo "Usage: `basename $0` { start | stop }"
+		echo ""
+		exit 64
+		;;
+esac
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 230a8eac38a4..b37c326e8eca 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -14,6 +14,7 @@ etc/apache2/mime.types-dist
 @unexec if cmp -s %D/etc/apache2/ssl.conf %D/etc/apache2/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
 etc/apache2/ssl-std.conf
 @exec [ -f %B/ssl.conf ] || cp %B/%f %B/ssl.conf
+etc/rc.d/000.apache2libs.sh
 etc/rc.d/apache2.sh
 include/apache2/ap_compat.h
 include/apache2/ap_config.h
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 89220b0440d3..e7ed01fc3c26 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -135,6 +135,8 @@ IGNORE=			apr is installed and may conflict with apache one\
 				at your own risk)
 .   endif
 PLIST_SUB+=	PORTS_APR=""
+INSTALLS_SHLIB=		yes
+LDCONFIG_DIRS=		%%PREFIX%%/lib/apache2
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
@@ -183,6 +185,8 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
 	@${CAT} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
@@ -202,10 +206,10 @@ pre-install:
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/apache2/Includes
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
-	fi
-	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."
+	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
+	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup file."
+	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
+	@@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/apache20/files/apache2libs.sh b/www/apache20/files/apache2libs.sh
new file mode 100644
index 000000000000..67fe5c302561
--- /dev/null
+++ b/www/apache20/files/apache2libs.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+case "$1" in
+	start)
+		/sbin/ldconfig -m %%PREFIX%%/lib/apache2
+		;;
+	stop)
+		;;
+	*)
+		echo ""
+		echo "Usage: `basename $0` { start | stop }"
+		echo ""
+		exit 64
+		;;
+esac
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 230a8eac38a4..b37c326e8eca 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -14,6 +14,7 @@ etc/apache2/mime.types-dist
 @unexec if cmp -s %D/etc/apache2/ssl.conf %D/etc/apache2/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
 etc/apache2/ssl-std.conf
 @exec [ -f %B/ssl.conf ] || cp %B/%f %B/ssl.conf
+etc/rc.d/000.apache2libs.sh
 etc/rc.d/apache2.sh
 include/apache2/ap_compat.h
 include/apache2/ap_config.h