From owner-svn-ports-head@FreeBSD.ORG Mon Jul 14 17:47:56 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 04E103F3; Mon, 14 Jul 2014 17:47:56 +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 D9F2020CB; Mon, 14 Jul 2014 17:47:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6EHltAg095094; Mon, 14 Jul 2014 17:47:55 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6EHltcU095092; Mon, 14 Jul 2014 17:47:55 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201407141747.s6EHltcU095092@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 14 Jul 2014 17:47:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361804 - head/net-mgmt/ettercap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2014 17:47:56 -0000 Author: sunpoet Date: Mon Jul 14 17:47:55 2014 New Revision: 361804 URL: http://svnweb.freebsd.org/changeset/ports/361804 QAT: https://qat.redports.org/buildarchive/r361804/ Log: - Fix PLIST - Use @sample - Convert to new options helper - Simplify Makefile - Bump PORTREVISION for package change Modified: head/net-mgmt/ettercap/Makefile head/net-mgmt/ettercap/pkg-plist Modified: head/net-mgmt/ettercap/Makefile ============================================================================== --- head/net-mgmt/ettercap/Makefile Mon Jul 14 17:21:45 2014 (r361803) +++ head/net-mgmt/ettercap/Makefile Mon Jul 14 17:47:55 2014 (r361804) @@ -3,7 +3,7 @@ PORTNAME= ettercap PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-mgmt security @@ -26,6 +26,7 @@ CMAKE_ARGS= -DBUNDLED_LIBS=OFF \ -DHAVE_LIBNET=${LOCALBASE}/lib/libnet11 \ -DHAVE_PCAP=${LIBDIR} \ -DHAVE_RESOLV=${LIBDIR} \ + -DINSTALL_SYSCONFDIR=${PREFIX}/etc \ -DLIBNET_INCLUDE_DIR=${LOCALBASE}/include/libnet11 \ -DLIBNET_LIB_DIR=${LOCALBASE}/lib/libnet11 \ -DLIBNET_LIBRARY=${LOCALBASE}/lib/libnet11 \ @@ -61,9 +62,10 @@ PCRE_CMAKE_OFF= -DHAVE_PCRE=OFF PCRE_CMAKE_ON= -DHAVE_PCRE=ON PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PLUGINS_BUILD_DEPENDS= curl>=7.26.0:${PORTSDIR}/ftp/curl -PLUGINS_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl PLUGINS_CMAKE_OFF= -DENABLE_PLUGINS=OFF PLUGINS_CMAKE_ON= -DENABLE_PLUGINS=ON +PLUGINS_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +PLUGINS_USE_OFF= LDCONFIG=yes SSL_CMAKE_OFF= -DENABLE_SSL=OFF SSL_CMAKE_ON= -DENABLE_SSL=ON SSL_USE= OPENSSL=yes @@ -77,18 +79,11 @@ UTF8_USES= iconv .if ${PORT_OPTIONS:MPLUGINS} USE_LDCONFIG= ${PREFIX}/lib/ettercap DOCS+= doc/plugins -.else -USE_LDCONFIG= yes .endif post-install: ${INSTALL_DATA} ${WRKSRC}/share/etter.conf ${STAGEDIR}${PREFIX}/etc/etter.conf.sample -.if !exists(${PREFIX}/etc/etter.conf) - ${INSTALL_DATA} ${WRKSRC}/share/etter.conf ${STAGEDIR}${PREFIX}/etc/etter.conf -.endif -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ -.endif .include Modified: head/net-mgmt/ettercap/pkg-plist ============================================================================== --- head/net-mgmt/ettercap/pkg-plist Mon Jul 14 17:21:45 2014 (r361803) +++ head/net-mgmt/ettercap/pkg-plist Mon Jul 14 17:47:55 2014 (r361804) @@ -2,9 +2,11 @@ bin/ettercap %%DESKTOP%%bin/ettercap-pkexec bin/etterfilter bin/etterlog -@unexec if cmp -s %D/etc/etter.conf.sample %D/etc/etter.conf; then rm -f %D/etc/etter.conf; else echo "If permanently deleting this package, %D/etc/etter.conf must be removed manually."; fi -etc/etter.conf.sample -@exec [ -f %B/etter.conf ] || cp %B/%f %B/etter.conf +@sample etc/etter.conf.sample +%%ETCDIR%%/etter.conf +%%ETCDIR%%/etter.dns +%%ETCDIR%%/etter.mdns +%%ETCDIR%%/etter.nbns %%PLUGINS%%lib/ettercap/ec_arp_cop.so %%PLUGINS%%lib/ettercap/ec_autoadd.so %%PLUGINS%%lib/ettercap/ec_chk_poison.so @@ -84,3 +86,4 @@ man/man8/etterlog.8.gz @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PLUGINS%%@dirrm lib/ettercap +@dirrm %%ETCDIR%%