diff options
| author | roam <roam@FreeBSD.org> | 2006-06-12 21:28:05 +0800 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2006-06-12 21:28:05 +0800 |
| commit | 86800cda7e5ed5c8e51419b33b5ca08ddf714267 (patch) | |
| tree | 9c4653bbdd6fbbb6ca673a3e2ea5366ee7f55168 | |
| parent | 0672ed41a24590e65127c2d8b29f8e1914703c1c (diff) | |
| download | freebsd-ports-gnome-86800cda7e5ed5c8e51419b33b5ca08ddf714267.tar.gz freebsd-ports-gnome-86800cda7e5ed5c8e51419b33b5ca08ddf714267.tar.zst freebsd-ports-gnome-86800cda7e5ed5c8e51419b33b5ca08ddf714267.zip | |
Update to libnids 1.21. In the process:
- OPTIONS'ify.
- no need to choose between libnet and libnet-devel any longer.
- optionally depend on glib2.
PR: 97183
Submitted by: vd
| -rw-r--r-- | net/libnids/Makefile | 31 | ||||
| -rw-r--r-- | net/libnids/distinfo | 6 |
2 files changed, 26 insertions, 11 deletions
diff --git a/net/libnids/Makefile b/net/libnids/Makefile index f4531dc17985..8a64167ed394 100644 --- a/net/libnids/Makefile +++ b/net/libnids/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libnids -PORTVERSION= 1.20 -PORTREVISION= 1 +PORTVERSION= 1.21 CATEGORIES= net security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,14 +14,30 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= roam@FreeBSD.org COMMENT= Network monitoring library with TCP/IP reassembly -.if defined(WITH_LIBNET_DEVEL) -BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet +OPTIONS= LIBNET "Include code requiring libnet" ON \ + GLIB2 "Use GLIB2 for multiprocessing support" ON + +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + +MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + +.include <bsd.port.pre.mk> + +.if !defined(WITHOUT_LIBNET) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet +RUN_DEPENDS+= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet .else -BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10 +CONFIGURE_ARGS+= --disable-libnet .endif -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +.if !defined(WITHOUT_GLIB2) +LIB_DEPENDS+= glib-2.0:${PORTSDIR}/devel/glib20 +.else +CONFIGURE_ARGS+= --disable-libglib +.endif MAN3= libnids.3 @@ -39,4 +54,4 @@ post-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/libnids/distinfo b/net/libnids/distinfo index 7bd4c4c310be..81ff076c7557 100644 --- a/net/libnids/distinfo +++ b/net/libnids/distinfo @@ -1,3 +1,3 @@ -MD5 (libnids-1.20.tar.gz) = a36cbd45cbada12420ecc8f82a7e0852 -SHA256 (libnids-1.20.tar.gz) = c5a7553f64bed2384ecc9535e67cf7d80ccf7f7f34ab8b132703b60d0eaec604 -SIZE (libnids-1.20.tar.gz) = 119226 +MD5 (libnids-1.21.tar.gz) = 8c43dd7d66350eed99a29be50bc5615f +SHA256 (libnids-1.21.tar.gz) = 91ec08b9aeb2f869009b5b099f318c476f75942db64804eb50acde94696f4bf5 +SIZE (libnids-1.21.tar.gz) = 140138 |