svn commit: r361804 - head/net-mgmt/ettercap

[Sunpoet Po-Chuan Hsieh]

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 <bsd.port.mk>

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
- at 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
- at exec [ -f %B/etter.conf ] || cp %B/%f %B/etter.conf
+ at 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
+ at dirrm %%ETCDIR%%