[Midnightbsd-cvs] mports [20848] trunk/Mk/extensions/apache.mk: until we figure out how to fake this right, go back to the old way of installing modules.

[laffer1 at midnightbsd.org]

Revision: 20848
          http://svnweb.midnightbsd.org/mports/?rev=20848
Author:   laffer1
Date:     2015-11-13 18:34:51 -0500 (Fri, 13 Nov 2015)
Log Message:
-----------
until we figure out how to fake this right, go back to the old way of installing modules.

Modified Paths:
--------------
    trunk/Mk/extensions/apache.mk

Modified: trunk/Mk/extensions/apache.mk
===================================================================
--- trunk/Mk/extensions/apache.mk	2015-11-13 23:34:06 UTC (rev 20847)
+++ trunk/Mk/extensions/apache.mk	2015-11-13 23:34:51 UTC (rev 20848)
@@ -341,6 +341,7 @@
 APACHEMODDIR=	libexec/apache${APACHE_VERSION}
 APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
 APACHEETCDIR=	etc/apache${APACHE_VERSION}
+APACHEBUILDDIR= share/apache${APACHE_VERSION}/build
 APACHE_PORT?=	www/apache${APACHE_VERSION}
 .endif
 
@@ -447,6 +448,14 @@
 
 .elif defined(AP_PORT_IS_MODULE)
 
+.if exists(${APXS})	 
+APR_CONFIG!=	${APXS} -q APR_CONFIG	 
+AP_LIBTOOL!=	${APR_CONFIG} --apr-libtool	 
+.else	 
+APR_CONFIG=	${LOCALBASE}/bin/apr-1-config	 
+AP_LIBTOOL=	${LOCALBASE}/build-1/libtool	 
+.endif
+
 .if defined(AP_FAST_BUILD)
 .if !target(ap-gen-plist)
 ap-gen-plist:
@@ -475,12 +484,15 @@
 
 .if !target(do-install)
 do-install:
-.if defined(AP_MODENABLE)
-	@${APXS} -i -a -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
-.else
-	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
+	${MKDIR} ${PREFIX}/${APACHEMODDIR}
+	${TRUE_PREFIX}/${APACHEBUILDDIR}/instdso.sh SH_LIBTOOL=${AP_LIBTOOL} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} ${PREFIX}/${APACHEMODDIR}
+
+#.if defined(AP_MODENABLE)
+#	@${APXS} -i -a -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
+#.else
+#	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
+#.endif
 .endif
 .endif
 .endif
-.endif
 .endif          # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)