[pkgsrc/trunk]: pkgsrc/net/ntop2 Avoid invoking automake and autoconf, and in...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9124e1ff91e4
branches:  trunk
changeset: 480381:9124e1ff91e4
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Sep 07 22:22:18 2004 +0000

description:
Avoid invoking automake and autoconf, and instead patch configure directly.
This fixes the build of this package, which was failing because recent
versions of automake do not accept some constructions used in it.

diffstat:

 net/ntop2/Makefile         |  11 +----------
 net/ntop2/distinfo         |   3 ++-
 net/ntop2/patches/patch-ab |  33 +++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 11 deletions(-)

diffs (83 lines):

diff -r 9f6a5229f2b4 -r 9124e1ff91e4 net/ntop2/Makefile
--- a/net/ntop2/Makefile        Tue Sep 07 22:14:09 2004 +0000
+++ b/net/ntop2/Makefile        Tue Sep 07 22:22:18 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/05/05 03:02:01 snj Exp $
+# $NetBSD: Makefile,v 1.28 2004/09/07 22:22:18 jmmv Exp $
 
 DISTNAME=              ntop-2.2
 PKGNAME=               ntop2-2.2
@@ -21,7 +21,6 @@
 USE_LIBTOOL=           yes
 
 # --enable-micro-ntop causes compile to fail 
-CONFIGURE_ARGS+=       --enable-automake171
 CONFIGURE_ARGS+=       --enable-sslv3
 CONFIGURE_ARGS+=       --with-pcap-root=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=       --with-ossl-root=${BUILDLINK_PREFIX.openssl}
@@ -33,17 +32,9 @@
 
 PTHREAD_OPTS+=         require
 
-pre-configure:
-       cd ${WRKSRC} && ${ACLOCAL}
-       cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake
-       cd ${WRKSRC} && ${AUTOHEADER}
-       cd ${WRKSRC} && ${AUTOMAKE} -a --foreign -i
-       cd ${WRKSRC} && ${AUTOCONF}
-
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../graphics/gdchart/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9f6a5229f2b4 -r 9124e1ff91e4 net/ntop2/distinfo
--- a/net/ntop2/distinfo        Tue Sep 07 22:14:09 2004 +0000
+++ b/net/ntop2/distinfo        Tue Sep 07 22:22:18 2004 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2003/06/23 13:23:37 adam Exp $
+$NetBSD: distinfo,v 1.5 2004/09/07 22:22:18 jmmv Exp $
 
 SHA1 (ntop-2.2.tgz) = 062d33668ca29dd22a97c3bf8cb3a142aff360cd
 Size (ntop-2.2.tgz) = 2551153 bytes
 SHA1 (patch-aa) = e464ffc668512c773d8f528673ec67346dfb487e
+SHA1 (patch-ab) = b9fbe28fe6eb39c0283190927b058e897cd8b135
diff -r 9f6a5229f2b4 -r 9124e1ff91e4 net/ntop2/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ntop2/patches/patch-ab        Tue Sep 07 22:22:18 2004 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.1 2004/09/07 22:22:18 jmmv Exp $
+
+--- configure.orig     2003-04-14 20:41:50.000000000 +0200
++++ configure
+@@ -8080,6 +8080,28 @@ if test ".${OSSL_LIB}" != "." ||
+     fi
+ # Finished expansion of NTOP_APPEND_LIBS()
+ 
++        # Expansion of NTOP_APPEND_LIBS(${OSSL_LIB}, crypto)
++    if test ".${OSSL_LIB}" != "."; then
++        rc=`(echo $LIBS | grep '${OSSL_LIB} ' > /dev/null 2> /dev/null; echo $?)`
++        if [ $rc -eq 1 ]; then
++            case "${DEFINEOS}" in
++              DARWIN )
++                LIBS="$LIBS -L${OSSL_LIB} -L${OSSL_LIB}/lib"
++                ;;
++              * )
++                LIBS="$LIBS -L${OSSL_LIB}"
++                ;;
++            esac
++        fi
++        if test ".crypto" != "."; then
++            rc=`(echo $LIBS | grep '\-lcrypto ' > /dev/null 2> /dev/null; echo $?)`
++            if [ $rc -eq 1 ]; then
++                LIBS="$LIBS -lcrypto"
++            fi
++        fi
++    fi
++# Finished expansion of NTOP_APPEND_LIBS()
++
+         # Expansion of NTOP_APPEND_INCS(${OSSL_INCLUDE})
+     if test ".${OSSL_INCLUDE}" != "."; then
+         rc=`(echo $INCS | grep '${OSSL_INCLUDE}' > /dev/null 2> /dev/null; echo $?)`