From 46a3ce7f505adb2ccfbdd0ce9e855a34bdb0f707 Mon Sep 17 00:00:00 2001 From: adrianp Date: Sun, 18 Feb 2007 18:49:03 +0000 Subject: buildlink updates and patches to handle the new libnet package structure bump PKGREVISION --- net/ettercap-NG/Makefile | 13 +++++++++++-- net/ettercap-NG/distinfo | 4 ++-- net/ettercap-NG/patches/patch-ae | 19 +++++++++++++++++-- net/isic/Makefile | 3 ++- net/isic/distinfo | 3 ++- net/isic/patches/patch-aa | 17 +++++++++++++++++ net/tcpreplay/Makefile | 12 ++++++++++-- net/tcpreplay/distinfo | 3 ++- net/tcpreplay/patches/patch-aa | 25 +++++++++++++++++++++++++ 9 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 net/isic/patches/patch-aa create mode 100644 net/tcpreplay/patches/patch-aa (limited to 'net') diff --git a/net/ettercap-NG/Makefile b/net/ettercap-NG/Makefile index 696a24a7da7..2ad81664c8f 100644 --- a/net/ettercap-NG/Makefile +++ b/net/ettercap-NG/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:32 reed Exp $ +# $NetBSD: Makefile,v 1.7 2007/02/18 18:50:43 adrianp Exp $ DISTNAME= ettercap-NG-0.7.3 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ettercap/} @@ -17,8 +18,9 @@ PTHREAD_OPTS+= require USE_LIBTOOL= YES USE_NCURSES= # ncurses.h menu.h panel.h form.h USE_OLD_DES_API= YES +CPPFLAGS+= -L${BUILDLINK_PREFIX.libnet11}/lib/libnet11 -CONFIGURE_ARGS+= --with-libnet=${BUILDLINK_PREFIX.libnet} +CONFIGURE_ARGS+= --with-libnet=${BUILDLINK_PREFIX.libnet11} CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} @@ -26,6 +28,13 @@ CONFIGURE_ARGS+= --with-libncurses=${BUILDLINK_PREFIX.ncurses} CONFIGURE_ARGS+= --enable-plugins CONFIGURE_ARGS+= --disable-gtk +SUBST_CLASSES+= conf +SUBST_STAGE.conf= pre-configure +SUBST_FILES.conf= configure +SUBST_SED.conf+= -e "s|@@LN_INC@@|${BUILDLINK_PREFIX.libnet11}/include/libnet11|g" +SUBST_SED.conf+= -e "s|@@LN_LIB@@|${BUILDLINK_PREFIX.libnet11}/lib/libnet11|g" +SUBST_MESSAGE.conf= Fixing configuration script. + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" diff --git a/net/ettercap-NG/distinfo b/net/ettercap-NG/distinfo index 7a7f42887e3..fa02ab84793 100644 --- a/net/ettercap-NG/distinfo +++ b/net/ettercap-NG/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2006/03/22 17:07:10 joerg Exp $ +$NetBSD: distinfo,v 1.5 2007/02/18 18:50:43 adrianp Exp $ SHA1 (ettercap-NG-0.7.3.tar.gz) = 7a2c3f848ca4f39c07fddeb0d6308641265bc4ff RMD160 (ettercap-NG-0.7.3.tar.gz) = f4e6c0d87b2064b3775e9af60f34575273742616 @@ -7,4 +7,4 @@ SHA1 (patch-aa) = 27c7f53e0d704b7dc2b8c9c76bf1f9aeff1bbece SHA1 (patch-ab) = 7cf863797abac4b67dbca55f6f763bf7b9830259 SHA1 (patch-ac) = ad04400499dcfdb4067079a58c849c287a34d12f SHA1 (patch-ad) = f39de66feb894ef2f1134abd3a3ca36677bea2b4 -SHA1 (patch-ae) = d362e8e405113c775d67fd5f7a30f360649acc19 +SHA1 (patch-ae) = 6020176efc2bf9e34af24c527efbc769cc18385b diff --git a/net/ettercap-NG/patches/patch-ae b/net/ettercap-NG/patches/patch-ae index de43f3b86cb..a4d9c71255a 100644 --- a/net/ettercap-NG/patches/patch-ae +++ b/net/ettercap-NG/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1 2006/03/22 17:07:10 joerg Exp $ +$NetBSD: patch-ae,v 1.2 2007/02/18 18:50:43 adrianp Exp $ ---- configure.orig 2006-03-22 16:47:46.000000000 +0000 +--- configure.orig 2005-05-27 16:11:45.000000000 +0100 +++ configure @@ -2169,7 +2169,7 @@ fi @@ -11,3 +11,18 @@ $NetBSD: patch-ae,v 1.1 2006/03/22 17:07:10 joerg Exp $ cat >>confdefs.h <<\_ACEOF #define OS_BSD 1 _ACEOF +@@ -31721,11 +31721,11 @@ echo "$as_me: error: \"*** ettercap cann + ac_ec_libnet=$withval + echo "$as_me:$LINENO: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- elif test -f $withval/include/libnet.h; then ++ elif test -f @@LN_INC@@/libnet.h; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi +- LNETINC="-I$withval/include" +- LNETLIB="-L$withval/lib -L$withval/src -lnet" ++ LNETINC="-I@@LN_INC@@" ++ LNETLIB="-L@@_LNLIB@@ -L$withval/src -lnet" + ac_ec_libnet=$withval + echo "$as_me:$LINENO: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 diff --git a/net/isic/Makefile b/net/isic/Makefile index a1aa8f15d0a..9482b9ec310 100644 --- a/net/isic/Makefile +++ b/net/isic/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:46 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2007/02/18 18:49:03 adrianp Exp $ # DISTNAME= isic-0.06 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.packetfactory.net/Projects/ISIC/ EXTRACT_SUFX= .tgz diff --git a/net/isic/distinfo b/net/isic/distinfo index d67a7db34ee..942c2ed8602 100644 --- a/net/isic/distinfo +++ b/net/isic/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 12:13:50 agc Exp $ +$NetBSD: distinfo,v 1.7 2007/02/18 18:49:29 adrianp Exp $ SHA1 (isic-0.06.tgz) = 69433d4c6f351648655991d30e5c64e958a82e6b RMD160 (isic-0.06.tgz) = 2f6a336d4a4a59f4e85b51c45bab83ff3f1390b5 Size (isic-0.06.tgz) = 27611 bytes +SHA1 (patch-aa) = c72e8c011d295490c8dacdc48c7802fc56d5df39 diff --git a/net/isic/patches/patch-aa b/net/isic/patches/patch-aa new file mode 100644 index 00000000000..6b254281d1f --- /dev/null +++ b/net/isic/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.1 2007/02/18 18:49:36 adrianp Exp $ + +--- Makefile.in.orig 2004-11-06 20:39:55.000000000 +0000 ++++ Makefile.in +@@ -5,9 +5,9 @@ + PREFIX ?= /usr/local + + CC = @CC@ +-DEFS = @DEFS@ `libnet-config --defines` +-CFLAGS = @CFLAGS@ `libnet-config --cflags` +-LIBS = @LIBS@ `libnet-config --libs` ++DEFS = @DEFS@ `libnet11-config --defines` ++CFLAGS = @CFLAGS@ `libnet11-config --cflags` ++LIBS = @LIBS@ `libnet11-config --libs` + LDFLAGS = @LDFLAGS@ + + INSTALL = @INSTALL@ diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile index 7431165d85c..35362ddda0d 100644 --- a/net/tcpreplay/Makefile +++ b/net/tcpreplay/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:35 reed Exp $ +# $NetBSD: Makefile,v 1.16 2007/02/18 18:51:55 adrianp Exp $ DISTNAME= tcpreplay-2.3.5 +PKGREVSION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcpreplay/} @@ -12,10 +13,17 @@ BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.6 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libnet=${BUILDLINK_PREFIX.libnet} CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --without-pcapnav-config +SUBST_CLASSES+= conf +SUBST_STAGE.conf= pre-configure +SUBST_FILES.conf= configure +SUBST_SED.conf= -e "s|libnet-config|libnet11-config|g" +SUBST_SED.conf+= -e "s|@@LN_INC@@|${BUILDLINK_PREFIX.libnet11}/include/libnet11|g" +SUBST_SED.conf+= -e "s|@@LN_LIB@@|${BUILDLINK_PREFIX.libnet11}/lib/libnet11|g" +SUBST_MESSAGE.conf= Fixing configuration script. + .include "../../devel/libnet11/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/tcpreplay/distinfo b/net/tcpreplay/distinfo index aa323d6c3ac..340fb18e67e 100644 --- a/net/tcpreplay/distinfo +++ b/net/tcpreplay/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2006/01/05 23:35:30 wiz Exp $ +$NetBSD: distinfo,v 1.7 2007/02/18 18:51:55 adrianp Exp $ SHA1 (tcpreplay-2.3.5.tar.gz) = 161eb4ac7985d3026f068eda93314f988eff05c7 RMD160 (tcpreplay-2.3.5.tar.gz) = f94e35bbe96e95416bbc320cb853fe889f2b630d Size (tcpreplay-2.3.5.tar.gz) = 682045 bytes +SHA1 (patch-aa) = 3797bf005a94165d22c6c3383eaeb4684b38265c diff --git a/net/tcpreplay/patches/patch-aa b/net/tcpreplay/patches/patch-aa new file mode 100644 index 00000000000..09760717d6e --- /dev/null +++ b/net/tcpreplay/patches/patch-aa @@ -0,0 +1,25 @@ +$NetBSD: patch-aa,v 1.1 2007/02/18 18:51:55 adrianp Exp $ + +--- configure.orig 2007-02-18 17:30:43.000000000 +0000 ++++ configure +@@ -6974,14 +6974,12 @@ if test "${with_libnet+set}" = set; then + trynetdir=$withval + fi; + +-for testdir in $trynetdir /usr/local /usr ; do +- if test -f "${testdir}/include/libnet.h" -a $foundnet = no ; then +- LNETINC="-I${testdir}/include" +- LNETINCDIR="$testdir/include" +- LNETLIB="-L${testdir}/lib -lnet" +- foundnet=$testdir +- fi +-done ++if test -f "@@LN_INC@@/libnet.h" -a $foundnet = no ; then ++ LNETINC="-I@@LN_INC@@" ++ LNETINCDIR="@@LN_INC@@" ++ LNETLIB="-L@@LN_LIB@@ -lnet" ++ foundnet=$testdir ++fi + + if test $foundnet = no ; then + echo "$as_me:$LINENO: result: no" >&5 -- cgit v1.2.3