diff options
Diffstat (limited to 'www/mod_jk/Makefile')
| -rw-r--r-- | www/mod_jk/Makefile | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index 815f5e8611cf..c6b92cad6d62 100644 --- a/www/mod_jk/Makefile +++ b/www/mod_jk/Makefile @@ -6,52 +6,44 @@ # PORTNAME= mod_jk -PORTVERSION= 1.2.15 +PORTVERSION= 1.2.18 PORTREVISION= 0 PORTEPOCH?= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= tomcat-connectors/jk/source/jk-${PORTVERSION:S/.1$//} -DISTNAME= jakarta-tomcat-connectors-${PORTVERSION}-src +MASTER_SITES= ${MASTER_SITE_APACHE} +MASTER_SITE_SUBDIR= tomcat/tomcat-connectors/jk/source/jk-${PORTVERSION} +DISTNAME= tomcat-connectors-${PORTVERSION}-src MAINTAINER?= girgen@FreeBSD.org COMMENT?= Apache JK module for connecting to Tomcat using AJP1X -USE_APACHE= YES +USE_APACHE= 1.3+ .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/include/apache2/apr.h) -WITH_APACHE2= YES -.endif - -.if defined(WITH_APACHE2) +.if ${APACHE_VERSION} >= 20 APACHE_VER= 2.0 -APACHE2= 2 -PLIST_SUB= APACHE2=2 -PKGNAMESUFFIX= -apache2 .else APACHE_VER= 1.3 -APACHE2= -PLIST_SUB= APACHE2= .endif -APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2} -WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-${PORTVERSION}-src/jk/native +WRKSRC= ${WRKDIR}/tomcat-connectors-${PORTVERSION}-src/native USE_GMAKE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-apxs=${APXS} +PLIST_SUB= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} + 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%%#${APACHE_CONF}#g" ${FILESDIR}/mod_jk.conf.sample \ + ${SED} -e "s#%%APACHE_CONF%%#${APACHEETCDIR}#g" ${FILESDIR}/mod_jk.conf.sample \ > ${WRKDIR}/mod_jk.conf.sample - ${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${APACHE_CONF} - ${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF} + ${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${PREFIX}/${APACHEETCDIR} + ${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${PREFIX}/${APACHEETCDIR} post-install: - ${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g" + ${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g; s|etc/apache|etc/apache${APACHE2}|g" .include <bsd.port.post.mk> |