- register CONLICTS between security/srm and security/secure_delete for bin/srm

- reset maintainer: Vaida Bogdan no longer uses FreeBSD. Thank you for maintaining the ports so far!
- nuke some small plists while here

PR:		ports/125698
Submitted by:	Andrew Stuart

7 files changed, 12 insertions, 15 deletions

diff --git a/net-mgmt/netleak/Makefile b/net-mgmt/netleak/Makefile
index 3d234198f3d5..78259f0d8af9 100644
--- a/net-mgmt/netleak/Makefile
+++ b/net-mgmt/netleak/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	vaida.bogdan@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to detect connectivity between network segments
 
 RUN_DEPENDS=	${SITE_PERL}/Net/PcapUtils.pm:${PORTSDIR}/net/p5-Net-PcapUtils \
@@ -29,6 +29,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PERL5_RUN=	yes
 MAN8=		netleak.8 netleakd.8
 
+PLIST_FILES=	etc/netleak.conf etc/netleakd.conf sbin/netleak sbin/netleakd
 PORTDOCS=	BUGS README TODO
 
 post-install:
diff --git a/net-mgmt/netleak/pkg-plist b/net-mgmt/netleak/pkg-plist
deleted file mode 100644
index 074b24270c09..000000000000
--- a/net-mgmt/netleak/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/netleak.conf
-etc/netleakd.conf
-sbin/netleak
-sbin/netleakd
diff --git a/security/manipulate_data/Makefile b/security/manipulate_data/Makefile
index a71f24770777..16c1b1dd3a71 100644
--- a/security/manipulate_data/Makefile
+++ b/security/manipulate_data/Makefile
@@ -10,9 +10,12 @@ PORTVERSION=	1.3
 CATEGORIES=	security
 MASTER_SITES=	http://packetstormsecurity.org/groups/thc/
 
-MAINTAINER=	vaida.bogdan@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Search/extract/write raw data
 
+PLIST_FILES=	sbin/read_data sbin/replace_data sbin/search_data sbin/write_data
+PORTDOCS=	CHANGES README
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/read_data ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/write_data ${PREFIX}/sbin
diff --git a/security/manipulate_data/pkg-plist b/security/manipulate_data/pkg-plist
deleted file mode 100644
index 320abdb149e1..000000000000
--- a/security/manipulate_data/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-sbin/read_data
-sbin/replace_data
-sbin/search_data
-sbin/write_data
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/secure_delete/Makefile b/security/secure_delete/Makefile
index ef7220d3c161..93d87dc96e26 100644
--- a/security/secure_delete/Makefile
+++ b/security/secure_delete/Makefile
@@ -10,9 +10,11 @@ PORTVERSION=	3.1
 CATEGORIES=	security
 MASTER_SITES=	http://packetstormsecurity.org/groups/thc/
 
-MAINTAINER=	vaida.bogdan@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Secure data deletion toolkit
 
+CONFLICTS=	srm-[0-9]*
+
 MANCOMPRESSED=	no
 MAN1=		srm.1 sfill.1 sswap.1 smem.1
 
diff --git a/security/srm/Makefile b/security/srm/Makefile
index 81bf612dc841..92576a29d6bf 100644
--- a/security/srm/Makefile
+++ b/security/srm/Makefile
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR=	srm
 MAINTAINER=	kjones@antihackertoolkit.com
 COMMENT=	Secure rm, a utility which destroys file contents before unlinking
 
+CONFLICTS=	secure_delete-[0-9]*
+
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/sysutils/jailuser/Makefile b/sysutils/jailuser/Makefile
index 9a3880f2abd4..450d39666434 100644
--- a/sysutils/jailuser/Makefile
+++ b/sysutils/jailuser/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jail
 DISTNAME=	jail_${PORTVERSION}
 
-MAINTAINER=	vaida.bogdan@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Builds a chrooted environment
 
 WRKSRC=		${WRKDIR}/jail_1-9_stable/src