Decouple from removed www/ap-jk.

3 files changed, 60 insertions, 2 deletions

diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile
index d5a25fbac21..8586f99ead7 100644
--- a/www/ap2-jk/Makefile
+++ b/www/ap2-jk/Makefile
@@ -1,7 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2014/06/10 15:22:17 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/06/12 13:34:14 joerg Exp $
 
 DISTNAME=	tomcat-connectors-${JK_VERSION}-src
 PKGNAME=	${APACHE_PKG_PREFIX}-jk-${JK_VERSION}
+JK_VERSION=	1.2.37
+CATEGORIES=	www java
+MASTER_SITES=	${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://tomcat.apache.org/connectors-doc/
+COMMENT=	Apache connector for accessing Jakarta Tomcat
+LICENSE=    apache-2.0
+
+CONFLICTS=	ap-jk-[0-9]*
 
 MAKE_PARAMS+=		USE_APXS=1
 MAKE_PARAMS+=		WITH_APXS=${APXS}
@@ -16,6 +26,33 @@ do-install:
 	    ${WRKSRC}/apache-2.0/mod_jk.la \
 	    ${DESTDIR}${PREFIX}/lib/httpd
 
-.include "../../www/ap-jk/Makefile.common"
+WRKSRC=		${WRKDIR}/${DISTNAME}/native
+APACHE_MODULE=	YES
+BUILD_DEFS+=	JK_ENABLE_JNI
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake
+
+SUBST_CLASSES+=		jk-lt
+SUBST_STAGE.jk-lt=	post-configure
+SUBST_FILES.jk-lt=	Makefile common/Makefile apache-2.0/Makefile
+SUBST_SED.jk-lt=	-e "s|^\\(LIBTOOL =\\) [^ ]*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
+SUBST_MESSAGE.jk-lt=	Fixing libtool references.
+
+# XXX The standard --with-apxs2 when using apache2 doesn't work
+CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
+
+.if defined(JK_ENABLE_JNI)
+USE_JAVA=	yes
+CONFIGURE_ARGS+=	--enable-jni
+CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME:Q}
+SUBST_FILES.jk-lt+=	jni/Makefile
+.endif
+
+.if defined(JK_ENABLE_JNI)
+.include "../../mk/java-vm.mk"
+.endif
+
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-jk/distinfo b/www/ap2-jk/distinfo
new file mode 100644
index 00000000000..e40d503481d
--- /dev/null
+++ b/www/ap2-jk/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2014/06/12 13:34:14 joerg Exp $
+
+SHA1 (tomcat-connectors-1.2.37-src.tar.gz) = 99e9ba0b2e72b28da7de6b14f103302e7b392a5d
+RMD160 (tomcat-connectors-1.2.37-src.tar.gz) = fbc47d9f767c75b039554dfc0776876290c580d9
+Size (tomcat-connectors-1.2.37-src.tar.gz) = 1528647 bytes
+SHA1 (patch-ab) = ce0e84952f94a97d55fe143a27d3208afe027cf0
diff --git a/www/ap2-jk/patches/patch-ab b/www/ap2-jk/patches/patch-ab
new file mode 100644
index 00000000000..5242e871a62
--- /dev/null
+++ b/www/ap2-jk/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2014/06/12 13:34:15 joerg Exp $
+
+Fixup the Makefile so it uses the right libtool.
+
+--- apache-2.0/Makefile.in.orig	2012-05-09 08:08:26.000000000 -0500
++++ apache-2.0/Makefile.in	2012-10-21 15:25:01.000000000 -0500
+@@ -34,6 +34,8 @@
+ # Apache2 settings, values guessed by Apache config and used to build it
+ # Will define libexecdir, LIBTOOL, etc
+ include @APACHE_CONFIG_VARS@
++top_builddir = ..
++LIBTOOL = 
+ 
+ # Local settings ( overriding/appending to Apache's )
+ COMMON=../common