Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Apr 2015 11:18:42 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r384100 - head/net/tcpdump
Message-ID:  <201504161118.t3GBIgGX096588@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: garga
Date: Thu Apr 16 11:18:41 2015
New Revision: 384100
URL: https://svnweb.freebsd.org/changeset/ports/384100

Log:
  - Modernize OPTIONS
  - Remove old CONFIGURE_ARGS that are now invalid

Modified:
  head/net/tcpdump/Makefile

Modified: head/net/tcpdump/Makefile
==============================================================================
--- head/net/tcpdump/Makefile	Thu Apr 16 11:09:04 2015	(r384099)
+++ head/net/tcpdump/Makefile	Thu Apr 16 11:18:41 2015	(r384100)
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
 USES=		gmake
 
 UNPRIV_USER?=	nobody
@@ -31,49 +31,23 @@ SMI_DESC=	Allow MIBs to be loaded on the
 USER_DESC=	Drop privileges to nobody
 CHROOT_DESC=	Chroot to /var/run/tcpdump (set CHROOTDIR to change)
 
-.include <bsd.port.options.mk>
-
-CONFIGURE_ARGS+=	--enable-pcap_setdirection --with-pcap_setdirection
-
-# The --without-crypto flag needs to be explicitly specified. The
-# configure script gets confused if you specify --with-crypto and
-# thinks this means you *don't* want crypto.
-#
-.if ${PORT_OPTIONS:MCRYPTO}
-USE_OPENSSL=	yes
-.else
-CONFIGURE_ARGS+=	--without-crypto
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-.if empty(PORT_OPTIONS:MSMB)
-CONFIGURE_ARGS+=	--disable-smb
-.endif
-
-.if ${PORT_OPTIONS:MSMI}
-LIB_DEPENDS+=		libsmi.so:${PORTSDIR}/net-mgmt/libsmi
-.else
-CONFIGURE_ARGS+=	--disable-smi
-.endif
-
-.if ${PORT_OPTIONS:MUSER}
-CONFIGURE_ARGS+=	--with-user=${UNPRIV_USER}
-.endif
-
-.if ${PORT_OPTIONS:MCHROOT}
-CONFIGURE_ARGS+=	--with-chroot=${CHROOTDIR}
-.endif
-
-.include <bsd.port.pre.mk>
+CRYPTO_USE=		OPENSSL=yes
+CRYPTO_CONFIGURE_WITH=	crypto
+IPV6_CONFIGURE_ENABLE=	ipv6
+SMB_CONFIGURE_ENABLE=	smb
+SMI_CONFIGURE_WITH=	smi
+SMI_LIB_DEPENDS=	libsmi.so:${PORTSDIR}/net-mgmt/libsmi
+USER_CONFIGURE_ON=	--with-user=${UNPRIV_USER}
+CHROOT_CONFIGURE_ON=	--with-chroot=${CHROOTDIR}
 
 PLIST_FILES=	sbin/tcpdump \
 		man/man1/tcpdump.1.gz
 
+.include <bsd.port.pre.mk>
+
 post-configure:
-	@${REINPLACE_CMD} -e "s,\./\.\./${LIBPCAP_FORCE_VER}/libpcap\.a,${LOCALBASE}/lib/libpcap.so.1," ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s,\./\.\./${LIBPCAP_FORCE_VER}/libpcap\.a,${LOCALBASE}/lib/libpcap.so.1," \
+		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpdump ${STAGEDIR}/${PREFIX}/sbin



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504161118.t3GBIgGX096588>