From fcdecc69a2236714baef0146be7eb0e95e29da3f Mon Sep 17 00:00:00 2001
From: "Philip M. Gollucci" <pgollucci@FreeBSD.org>
Date: Sun, 10 May 2009 23:25:18 +0000
Subject: [PATCH] - Update to 1.2.27 [1] - While here Use SUB_FILES for
 pkg-message and mod_jk.conf.sample - PORTREVISION bump for slave port
 www/mod_jk-apache2

PR:             ports/130306 [1]
Submitted by:   brd
Approved by:    maintainer timeout (5 months)
---
 www/mod_jk-apache2/Makefile                          |  1 +
 www/mod_jk/Makefile                                  | 12 +++++-------
 www/mod_jk/distinfo                                  |  6 +++---
 .../{mod_jk.conf.sample => mod_jk.conf.sample.in}    |  2 +-
 .../patch-tomcat-connectors-src:native:configure     | 11 +++++++++++
 www/mod_jk/{pkg-message => files/pkg-message.in}     |  0
 6 files changed, 21 insertions(+), 11 deletions(-)
 rename www/mod_jk/files/{mod_jk.conf.sample => mod_jk.conf.sample.in} (89%)
 create mode 100644 www/mod_jk/files/patch-tomcat-connectors-src:native:configure
 rename www/mod_jk/{pkg-message => files/pkg-message.in} (100%)

diff --git a/www/mod_jk-apache2/Makefile b/www/mod_jk-apache2/Makefile
index 00204149e2df..4152cf8b9ad0 100644
--- a/www/mod_jk-apache2/Makefile
+++ b/www/mod_jk-apache2/Makefile
@@ -7,6 +7,7 @@
 
 MASTERDIR=	${.CURDIR}/../mod_jk
 USE_APACHE=	2.0+
+PORTREVISION=	1
 PORTEPOCH=	0
 LATEST_LINK=	mod_jk-ap2
 
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index 0b139ee2f4d4..7cc40cf883a3 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_jk
-PORTVERSION=	1.2.26
+PORTVERSION=	1.2.27
 PORTREVISION=	0
 PORTEPOCH?=	1
 CATEGORIES=	www
@@ -34,17 +34,15 @@ USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 
-PLIST_SUB=	APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR}
+SUB_FILES+=	mod_jk.conf.sample pkg-message
 
 do-install:
 	${APXS} -i -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
 	- ${APXS} -e -A -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
-	${SED} -e "s#%%APACHE_CONF%%#${APACHEETCDIR}#g" ${FILESDIR}/mod_jk.conf.sample \
-		 > ${WRKDIR}/mod_jk.conf.sample
-	${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${PREFIX}/${APACHEETCDIR}
-	${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${PREFIX}/${APACHEETCDIR}
+	${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${LOCALBASE}/${APACHEETCDIR}
+	${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${LOCALBASE}/${APACHEETCDIR}
 
 post-install:
-	${CAT} ${PKGMESSAGE} | ${SED} "s|%%APACHEETCDIR%%|${PREFIX}/${APACHEETCDIR}|g;"
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo
index 5158a5b47012..ca6e9616e22e 100644
--- a/www/mod_jk/distinfo
+++ b/www/mod_jk/distinfo
@@ -1,3 +1,3 @@
-MD5 (tomcat-connectors-1.2.26-src.tar.gz) = feaec245136bc4d99a9dde95a00ea93c
-SHA256 (tomcat-connectors-1.2.26-src.tar.gz) = 75c2ef701622394536be2e0a2e5cf38330e8bb1078d683a733769a8c49a5381a
-SIZE (tomcat-connectors-1.2.26-src.tar.gz) = 1442605
+MD5 (tomcat-connectors-1.2.27-src.tar.gz) = a15cc9e3813ef5b081c7de10e6a1fbed
+SHA256 (tomcat-connectors-1.2.27-src.tar.gz) = 9ea66964194734a16416303ecc92a3b88b764caf17a6406254109e15d9ad3407
+SIZE (tomcat-connectors-1.2.27-src.tar.gz) = 1509182
diff --git a/www/mod_jk/files/mod_jk.conf.sample b/www/mod_jk/files/mod_jk.conf.sample.in
similarity index 89%
rename from www/mod_jk/files/mod_jk.conf.sample
rename to www/mod_jk/files/mod_jk.conf.sample.in
index 2c45d0e17f7a..a2e9188420fb 100644
--- a/www/mod_jk/files/mod_jk.conf.sample
+++ b/www/mod_jk/files/mod_jk.conf.sample.in
@@ -2,7 +2,7 @@
 # specified in workers.properties.
 #
 <IfModule mod_jk.c>
-	JkWorkersFile %%APACHE_CONF%%/workers.properties
+	JkWorkersFile %%APACHEETCDIR%%/workers.properties
 	JkLogFile  /var/log/jk.log
 	JkShmFile  /var/log/jk-runtime-status
 	JkLogLevel error
diff --git a/www/mod_jk/files/patch-tomcat-connectors-src:native:configure b/www/mod_jk/files/patch-tomcat-connectors-src:native:configure
new file mode 100644
index 000000000000..e6d0772a6126
--- /dev/null
+++ b/www/mod_jk/files/patch-tomcat-connectors-src:native:configure
@@ -0,0 +1,11 @@
+--- configure.ori  2009-01-08 09:42:19.000000000 -0800
++++ configure      2009-01-08 10:06:18.000000000 -0800
+@@ -3066,7 +3066,7 @@
+                 APXSCC="`$APXS -q CC`"
+                 APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR}"
+                 APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
+-                APXSLDFLAGS="`$APXS -q LDFLAGS`"
++                APXSLDFLAGS="`$APXS -q LDFLAGS|sed -e 's#/usr/local/lib#-L/usr/local/lib#' -e 's/-pthread//'`"
+                 APACHE_CONFIG_VARS="`${APXS} -q exp_installbuilddir`/config_vars.mk"
+                 LIBTOOL=`$APXS -q LIBTOOL`
+             fi
diff --git a/www/mod_jk/pkg-message b/www/mod_jk/files/pkg-message.in
similarity index 100%
rename from www/mod_jk/pkg-message
rename to www/mod_jk/files/pkg-message.in