From owner-svn-ports-all@FreeBSD.ORG Thu Apr 16 11:18:42 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D89E206; Thu, 16 Apr 2015 11:18:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0C7A0A; Thu, 16 Apr 2015 11:18:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GBIgW6096589; Thu, 16 Apr 2015 11:18:42 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GBIgGX096588; Thu, 16 Apr 2015 11:18:42 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201504161118.t3GBIgGX096588@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Thu, 16 Apr 2015 11:18:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384100 - head/net/tcpdump X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2015 11:18:42 -0000 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 - -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 +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 + 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