diff options
| author | jmmv <jmmv> | 2004-09-07 22:22:18 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-09-07 22:22:18 +0000 |
| commit | 443812e7e1b13476b13634f135345fb6e487a516 (patch) | |
| tree | d71247c315742cfb25f4232d3bfaeeb6c704a5f6 /net | |
| parent | 744a3e33f47349f58f152d0bea4a39c6d59742cb (diff) | |
| download | pkgsrc-443812e7e1b13476b13634f135345fb6e487a516.tar.gz | |
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 (limited to 'net')
| -rw-r--r-- | net/ntop2/Makefile | 11 | ||||
| -rw-r--r-- | net/ntop2/distinfo | 3 | ||||
| -rw-r--r-- | net/ntop2/patches/patch-ab | 33 |
3 files changed, 36 insertions, 11 deletions
diff --git a/net/ntop2/Makefile b/net/ntop2/Makefile index e07ddfc5107..a3ff0fde47e 100644 --- a/net/ntop2/Makefile +++ b/net/ntop2/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 @@ CONFIGURE_ARGS+= --with-libpng-root=${BUILDLINK_PREFIX.png} 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 --git a/net/ntop2/distinfo b/net/ntop2/distinfo index 529048e62b8..610053fdeb6 100644 --- a/net/ntop2/distinfo +++ b/net/ntop2/distinfo @@ -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 --git a/net/ntop2/patches/patch-ab b/net/ntop2/patches/patch-ab new file mode 100644 index 00000000000..6bd9872d79d --- /dev/null +++ b/net/ntop2/patches/patch-ab @@ -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 $?)` |