[pkgsrc/pkgsrc-2018Q2]: pkgsrc/www/ap2-jk Rollback pkgsrc-2018Q2 changes that...

[manu <manu%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b1eacbc2a03
branches:  pkgsrc-2018Q2
changeset: 408435:2b1eacbc2a03
user:      manu <manu%pkgsrc.org@localhost>
date:      Sat Aug 25 01:53:50 2018 +0000

description:
Rollback pkgsrc-2018Q2 changes that were meant for trunk

diffstat:

 www/ap2-jk/Makefile         |  12 +++---------
 www/ap2-jk/distinfo         |  12 ++++++------
 www/ap2-jk/patches/patch-ab |  19 ++++++++-----------
 3 files changed, 17 insertions(+), 26 deletions(-)

diffs (78 lines):

diff -r 4e161804d6a6 -r 2b1eacbc2a03 www/ap2-jk/Makefile
--- a/www/ap2-jk/Makefile       Fri Aug 24 20:16:04 2018 +0000
+++ b/www/ap2-jk/Makefile       Sat Aug 25 01:53:50 2018 +0000
@@ -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 @@
 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 -r 4e161804d6a6 -r 2b1eacbc2a03 www/ap2-jk/distinfo
--- a/www/ap2-jk/distinfo       Fri Aug 24 20:16:04 2018 +0000
+++ b/www/ap2-jk/distinfo       Sat Aug 25 01:53:50 2018 +0000
@@ -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 -r 4e161804d6a6 -r 2b1eacbc2a03 www/ap2-jk/patches/patch-ab
--- a/www/ap2-jk/patches/patch-ab       Fri Aug 24 20:16:04 2018 +0000
+++ b/www/ap2-jk/patches/patch-ab       Sat Aug 25 01:53:50 2018 +0000
@@ -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 = 
  
-+top_builddir = ..
-+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