diff options
| author | abs <abs> | 2006-07-22 19:41:34 +0000 |
|---|---|---|
| committer | abs <abs> | 2006-07-22 19:41:34 +0000 |
| commit | f97d34d07dfb34dc655847a50d7a6000ce12e418 (patch) | |
| tree | c215bbc2cdb91d407f9654dbbc81b96534f10494 /www/ap-jk | |
| parent | 062ed7459c7bc39003f15a7569892b0eb59c86a8 (diff) | |
| download | pkgsrc-f97d34d07dfb34dc655847a50d7a6000ce12e418.tar.gz | |
ap-* should be using apache1 not apache2. Split out most of the Makefile
into Makefile.common to be used by upcoming ap2-jk package. Bump package
revision
Diffstat (limited to 'www/ap-jk')
| -rw-r--r-- | www/ap-jk/Makefile | 45 | ||||
| -rw-r--r-- | www/ap-jk/Makefile.common | 42 |
2 files changed, 49 insertions, 38 deletions
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile index bab17197719..96e9bfbcc6e 100644 --- a/www/ap-jk/Makefile +++ b/www/ap-jk/Makefile @@ -1,43 +1,12 @@ -# $NetBSD: Makefile,v 1.37 2006/06/08 12:15:12 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2006/07/22 19:41:34 abs Exp $ DISTNAME= jakarta-tomcat-connectors-${JK_VERSION}-src -PKGNAME= ap13-jk-${JK_VERSION} -JK_VERSION= 1.2.15 -CATEGORIES= www java -MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-${JK_VERSION}/ +PKGNAME= ap-jk-${JK_VERSION} +PKGREVISION= 1 -MAINTAINER= erh@NetBSD.org -HOMEPAGE= http://jakarta.apache.org/tomcat/connectors-doc/ -COMMENT= Apache connector for accessing Jakarta Tomcat +MAKE_PARAMS+= USE_APXS=1 +MAKE_PARAMS+= WITH_APXS=${APXS} -CONFLICTS= ap-jk-[0-9]* - -WRKSRC= ${WRKDIR}/${DISTNAME}/jk/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 - -.include "../../mk/apache.mk" -.if defined(JK_ENABLE_JNI) -.include "../../mk/java-vm.mk" -.endif +.include "../../www/ap-jk/Makefile.common" +.include "../../www/apache/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-jk/Makefile.common b/www/ap-jk/Makefile.common new file mode 100644 index 00000000000..0ba389cc044 --- /dev/null +++ b/www/ap-jk/Makefile.common @@ -0,0 +1,42 @@ +# $NetBSD: Makefile.common,v 1.1 2006/07/22 19:41:34 abs Exp $ + +JK_VERSION= 1.2.15 +CATEGORIES= www java +MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-${JK_VERSION}/ + +MAINTAINER= erh@NetBSD.org +HOMEPAGE= http://jakarta.apache.org/tomcat/connectors-doc/ +COMMENT= Apache connector for accessing Jakarta Tomcat + +CONFLICTS= ap-jk-[0-9]* + +PATCHDIR= ${.CURDIR}/../../www/ap-jk/patches +DISTINFO_FILE= ${.CURDIR}/../../www/ap-jk/distinfo + +WRKSRC= ${WRKDIR}/${DISTNAME}/jk/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 |