diff options
| author | manu <manu@pkgsrc.org> | 2018-08-25 01:53:50 +0000 |
|---|---|---|
| committer | manu <manu@pkgsrc.org> | 2018-08-25 01:53:50 +0000 |
| commit | c97eeda915a5ef672250c3452c7f228ccc187fe3 (patch) | |
| tree | 5e992d6d35e95d740991b9f76d29b6e8955c83a0 /www | |
| parent | 12dc37bbc4b3858c53aa802347ffedd6692dd84b (diff) | |
| download | pkgsrc-c97eeda915a5ef672250c3452c7f228ccc187fe3.tar.gz | |
Rollback pkgsrc-2018Q2 changes that were meant for trunk
Diffstat (limited to 'www')
| -rw-r--r-- | www/ap2-jk/Makefile | 12 | ||||
| -rw-r--r-- | www/ap2-jk/distinfo | 12 | ||||
| -rw-r--r-- | www/ap2-jk/patches/patch-ab | 19 |
3 files changed, 17 insertions, 26 deletions
diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile index bd045cf18a3..76decddd379 100644 --- a/www/ap2-jk/Makefile +++ b/www/ap2-jk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11.4.1 2018/08/24 11:32:02 manu Exp $ +# $NetBSD: Makefile,v 1.11.4.2 2018/08/25 01:53:50 manu Exp $ DISTNAME= tomcat-connectors-${JK_VERSION}-src PKGNAME= ${APACHE_PKG_PREFIX}-jk-${JK_VERSION} -JK_VERSION= 1.2.43 +JK_VERSION= 1.2.37 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/} @@ -36,15 +36,9 @@ OVERRIDE_DIRDEPTH= 3 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_SED.jk-lt= -e "s|^\\(LIBTOOL =\\) [^ ]*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g" SUBST_MESSAGE.jk-lt= Fixing libtool references. -SUBST_CLASSES+= jk-shlt -SUBST_STAGE.jk-shlt= post-configure -SUBST_FILES.jk-shlt= scripts/build/instdso.s -SUBST_SED.jk-shlt= -e "s|^\\(SH_LIBTOOL *=\\).*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g" -SUBST_MESSAGE.jk-shlt= Fixing libtool references in install script. - # XXX The standard --with-apxs2 when using apache2 doesn't work CONFIGURE_ARGS+= --with-apxs=${APXS:Q} diff --git a/www/ap2-jk/distinfo b/www/ap2-jk/distinfo index 6590d9c994b..e2d1f41c739 100644 --- a/www/ap2-jk/distinfo +++ b/www/ap2-jk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2.24.1 2018/08/24 11:32:02 manu Exp $ +$NetBSD: distinfo,v 1.2.24.2 2018/08/25 01:53:50 manu Exp $ -SHA1 (tomcat-connectors-1.2.43-src.tar.gz) = 04136649eca7ea42a31564021a7f8959dbcb9822 -RMD160 (tomcat-connectors-1.2.43-src.tar.gz) = 9669e16a8dbec6b2e1a07f88b2d2fb281a95523b -SHA512 (tomcat-connectors-1.2.43-src.tar.gz) = eee06e5eaadd237aa98cd0f6a15c4d8f96edb3b4d8b6b8d9cbdd91abc6b89b50aa75132d76b87791d1800b904d84aea03bafabbe5697541e5ec66bf07cc507f4 -Size (tomcat-connectors-1.2.43-src.tar.gz) = 3242555 bytes -SHA1 (patch-ab) = b9e0422fd52a8e153623258fc4a83ebd800a421e +SHA1 (tomcat-connectors-1.2.37-src.tar.gz) = 99e9ba0b2e72b28da7de6b14f103302e7b392a5d +RMD160 (tomcat-connectors-1.2.37-src.tar.gz) = fbc47d9f767c75b039554dfc0776876290c580d9 +SHA512 (tomcat-connectors-1.2.37-src.tar.gz) = 96d0d3baba661a14a2235424ad7bdd78b8b44db168cabd015cba328a200f3df00aa922fd6afb4cd3cff896591e7aeb65cdde16c641ccff5bdcb84518d8d0862f +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 index 715a8083ff2..ace6b4e2309 100644 --- a/www/ap2-jk/patches/patch-ab +++ b/www/ap2-jk/patches/patch-ab @@ -1,18 +1,15 @@ -$NetBSD: patch-ab,v 1.1.36.1 2018/08/24 11:32:03 manu Exp $ +$NetBSD: patch-ab,v 1.1.36.2 2018/08/25 01:53:50 manu Exp $ Fixup the Makefile so it uses the right libtool. ---- apache-2.0/Makefile.in.orig -+++ apache-2.0/Makefile.in -@@ -36,8 +36,11 @@ - # Apache settings, values guessed by Apache config and used to build it +--- 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 = -+ ++LIBTOOL = + # Local settings ( overriding/appending to Apache's ) - COMMON=common - JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON} - CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS} + COMMON=../common |