From 2489e3fa32323e69f42b1ae522395241f91993b5 Mon Sep 17 00:00:00 2001 From: obache Date: Wed, 9 Dec 2009 12:27:27 +0000 Subject: Some clean up realted to net/libnet{10,11}. * buildlink bin/libnet{10,11}-config to bin/libnet-config for comvenience (they ware renamed in pkgsrc to avoid conflict) * remove -lnet from BUILDLINK_CPPFLAGS.libnet11. linker flags should not be in CPPFLAGS, and it berak likage with libtool as reported in PR 37300. * libnet11 install just a static library, so set defaut DEPMETHOD = build Bump PKGREVISION for libnet11 related packages (net/isic will be updated later). --- devel/libnet10/buildlink3.mk | 4 +++- devel/libnet11/buildlink3.mk | 6 ++++-- net/arping/Makefile | 3 ++- net/ettercap-NG/Makefile | 4 ++-- net/firewalk/Makefile | 4 ++-- net/libnids/Makefile | 7 +------ net/libnids/options.mk | 4 +--- net/packit/Makefile | 4 ++-- 8 files changed, 17 insertions(+), 19 deletions(-) diff --git a/devel/libnet10/buildlink3.mk b/devel/libnet10/buildlink3.mk index 8e76fbaa63c..cd5d9c9d034 100644 --- a/devel/libnet10/buildlink3.mk +++ b/devel/libnet10/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:21 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/12/09 12:27:27 obache Exp $ BUILDLINK_TREE+= libnet10 @@ -10,6 +10,8 @@ BUILDLINK_PKGSRCDIR.libnet10?= ../../devel/libnet10 BUILDLINK_INCDIRS.libnet10+= include/libnet10 BUILDLINK_LIBDIRS.libnet10+= lib/libnet10 +BUILDLINK_FILES.libnet10+= bin/libnet10-config +BUILDLINK_FNAME_TRANSFORM.libnet10+= -e 's|bin/libnet10-config|bin/libnet-config|' .endif # LIBNET10_BUILDLINK3_MK BUILDLINK_TREE+= -libnet10 diff --git a/devel/libnet11/buildlink3.mk b/devel/libnet11/buildlink3.mk index cd80c3bc434..44606cbfe1f 100644 --- a/devel/libnet11/buildlink3.mk +++ b/devel/libnet11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:21 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/12/09 12:27:27 obache Exp $ BUILDLINK_TREE+= libnet11 @@ -7,10 +7,12 @@ LIBNET11_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libnet11+= libnet11>=1.1.2.1 BUILDLINK_PKGSRCDIR.libnet11?= ../../devel/libnet11 +BUILDLINK_DEPMETHOD.libnet11?= build BUILDLINK_INCDIRS.libnet11+= include/libnet11 BUILDLINK_LIBDIRS.libnet11+= lib/libnet11 -BUILDLINK_CPPFLAGS.libnet11+= -lnet +BUILDLINK_FILES.libnet11+= bin/libnet11-config +BUILDLINK_FNAME_TRANSFORM.libnet11+= -e 's|bin/libnet11-config|bin/libnet-config|' .endif # LIBNET11_BUILDLINK3_MK BUILDLINK_TREE+= -libnet11 diff --git a/net/arping/Makefile b/net/arping/Makefile index e8511c4d61c..8cbd77c15a1 100644 --- a/net/arping/Makefile +++ b/net/arping/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2009/12/09 08:42:04 obache Exp $ +# $NetBSD: Makefile,v 1.17 2009/12/09 12:27:27 obache Exp $ # DISTNAME= arping-2.08 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.habets.pp.se/pub/synscan/ diff --git a/net/ettercap-NG/Makefile b/net/ettercap-NG/Makefile index 3840788394c..c1cc11402fc 100644 --- a/net/ettercap-NG/Makefile +++ b/net/ettercap-NG/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2009/12/09 08:04:32 obache Exp $ +# $NetBSD: Makefile,v 1.11 2009/12/09 12:27:27 obache Exp $ DISTNAME= ettercap-NG-0.7.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ettercap/} diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile index a59b8672d0b..9e22ea485b3 100644 --- a/net/firewalk/Makefile +++ b/net/firewalk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2009/12/09 09:02:08 obache Exp $ +# $NetBSD: Makefile,v 1.21 2009/12/09 12:27:28 obache Exp $ DISTNAME= firewalk-5.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net security MASTER_SITES= http://www.packetfactory.net/firewalk/dist/ EXTRACT_SUFX= .tgz diff --git a/net/libnids/Makefile b/net/libnids/Makefile index 194c45bd22f..37a080a051c 100644 --- a/net/libnids/Makefile +++ b/net/libnids/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2009/12/09 11:25:52 obache Exp $ +# $NetBSD: Makefile,v 1.26 2009/12/09 12:27:28 obache Exp $ # DISTNAME= libnids-1.23 @@ -18,11 +18,6 @@ USE_TOOLS+= pkg-config BUILDLINK_DEPMETHOD.libpcap= build -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-configure -SUBST_FILES.conf= configure -SUBST_MESSAGE.conf= Fixing configuration script. - INSTALL_MAKE_FLAGS+= install_prefix=${DESTDIR} .include "../../mk/bsd.prefs.mk" diff --git a/net/libnids/options.mk b/net/libnids/options.mk index 1515dcdfeb2..526667a3afb 100644 --- a/net/libnids/options.mk +++ b/net/libnids/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2009/05/06 21:54:54 adrianp Exp $ +# $NetBSD: options.mk,v 1.8 2009/12/09 12:27:28 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libnids @@ -17,7 +17,6 @@ PKG_SUGGESTED_OPTIONS= libnet10 glib .if !empty(PKG_OPTIONS:Mlibnet10) . include "../../devel/libnet10/buildlink3.mk" BUILDLINK_DEPMETHOD.libnet10+= build -SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" .endif ### @@ -26,7 +25,6 @@ SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" .if !empty(PKG_OPTIONS:Mlibnet11) . include "../../devel/libnet11/buildlink3.mk" BUILDLINK_DEPMETHOD.libnet11+= build -SUBST_SED.conf= -e "s|libnet-config|libnet11-config|g" .endif ### diff --git a/net/packit/Makefile b/net/packit/Makefile index 711309be086..309947ef0cf 100644 --- a/net/packit/Makefile +++ b/net/packit/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2009/07/17 18:00:19 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2009/12/09 12:27:28 obache Exp $ DISTNAME= packit-1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= http://packit.sourceforge.net/downloads/ EXTRACT_SUFX= .tgz -- cgit v1.2.3