svn commit: r443507 - in head/www/mod_mpm_itk: . files

[Richard Gallamore]

Author: ultima
Date: Tue Jun 13 15:53:01 2017
New Revision: 443507
URL: https://svnweb.freebsd.org/changeset/ports/443507

Log:
  * Updated to 2.4.7-04
  * Moved LoadModule from httpd.conf to modules.d/
  
  PR:		219726
  Submitted by:	Lukasz Wasikowski <lukasz at wasikowski.net> (maintainer)
  Reviewed by:	lifanov (mentor), matthew (mentor)
  Approved by:	lifanov (mentor), matthew (mentor)
  Differential Revision:	https://reviews.freebsd.org/D11164

Added:
  head/www/mod_mpm_itk/files/
  head/www/mod_mpm_itk/files/200_mod_mpm_itk.conf.sample.in   (contents, props changed)
Modified:
  head/www/mod_mpm_itk/Makefile
  head/www/mod_mpm_itk/distinfo
  head/www/mod_mpm_itk/pkg-plist

Modified: head/www/mod_mpm_itk/Makefile
==============================================================================
--- head/www/mod_mpm_itk/Makefile	Tue Jun 13 15:17:26 2017	(r443506)
+++ head/www/mod_mpm_itk/Makefile	Tue Jun 13 15:53:01 2017	(r443507)
@@ -3,12 +3,12 @@
 
 PORTNAME=	mod_mpm_itk
 PORTVERSION=	2.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://mpm-itk.sesse.net/ \
 		http://lukasz.wasikowski.net/files/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
-DISTNAME=	mpm-itk-2.4.7-03
+DISTNAME=	mpm-itk-2.4.7-04
 
 MAINTAINER=	lukasz at wasikowski.net
 COMMENT=	This MPM allows you to run each vhost under a separate uid and gid
@@ -19,8 +19,14 @@ USE_APACHE=	24
 GNU_CONFIGURE=	yes
 
 AP_FAST_BUILD=	yes
-SRC_FILE=	mpm_itk.c
+SRC_FILE=	*.c
 
-PLIST_SUB=	SED=${SED}
+SUB_FILES+=	${APMOD_FILE}.sample
+APMOD_FILE=	200_${PORTNAME}.conf
+SUB_LIST+=	APMOD_FILE=${APMOD_FILE}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
+	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE}.sample ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 
 .include <bsd.port.mk>

Modified: head/www/mod_mpm_itk/distinfo
==============================================================================
--- head/www/mod_mpm_itk/distinfo	Tue Jun 13 15:17:26 2017	(r443506)
+++ head/www/mod_mpm_itk/distinfo	Tue Jun 13 15:53:01 2017	(r443507)
@@ -1,2 +1,3 @@
-SHA256 (mpm-itk-2.4.7-03.tar.gz) = 9479fabd97dbbff5aec0fe60ae2437606dc66302a69933c9a597c015d6c937f6
-SIZE (mpm-itk-2.4.7-03.tar.gz) = 45419
+TIMESTAMP = 1496399078
+SHA256 (mpm-itk-2.4.7-04.tar.gz) = 609f83e8995416c5491348e07139f26046a579db20cf8488ebf75d314668efcf
+SIZE (mpm-itk-2.4.7-04.tar.gz) = 45843

Added: head/www/mod_mpm_itk/files/200_mod_mpm_itk.conf.sample.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/mod_mpm_itk/files/200_mod_mpm_itk.conf.sample.in	Tue Jun 13 15:53:01 2017	(r443507)
@@ -0,0 +1,11 @@
+## $FreeBSD$
+## vim: set filetype=apache:
+##
+## module file for mod_mpm_itk
+##
+## PROVIDE: mod_mpm_itk
+## REQUIRE: mod_mpm_prefork
+
+<IfModule mpm_prefork_module>
+  LoadModule mpm_itk_module %%APACHEMODDIR%%/mod_mpm_itk.so
+</IfModule>

Modified: head/www/mod_mpm_itk/pkg-plist
==============================================================================
--- head/www/mod_mpm_itk/pkg-plist	Tue Jun 13 15:17:26 2017	(r443506)
+++ head/www/mod_mpm_itk/pkg-plist	Tue Jun 13 15:53:01 2017	(r443507)
@@ -1,4 +1,2 @@
- at unexec %%SED%% -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%APACHEMODDIR%%/%%AP_MODULE%%
- at exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
- at unexec echo "Don't forget to remove all %%AP_NAME%%-related directives in your httpd.conf"
+ at sample %%APACHEETCDIR%%/modules.d/200_mod_mpm_itk.conf.sample