svn commit: r422769 - in head/security/secure_delete: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Mon Sep 26 09:01:42 2016
New Revision: 422769
URL: https://svnweb.freebsd.org/changeset/ports/422769

Log:
  - Add LICENSE
  - Simplify installation
  - Switch to options helpers

Modified:
  head/security/secure_delete/Makefile
  head/security/secure_delete/files/patch-Makefile

Modified: head/security/secure_delete/Makefile
==============================================================================
--- head/security/secure_delete/Makefile	Mon Sep 26 07:57:03 2016	(r422768)
+++ head/security/secure_delete/Makefile	Mon Sep 26 09:01:42 2016	(r422769)
@@ -11,6 +11,8 @@ MASTER_SITES=	PACKETSTORM/groups/thc \
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Secure data deletion toolkit
 
+LICENSE=	GPLv2 # mentioned in manpages
+
 CONFLICTS=	srm-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
@@ -22,9 +24,6 @@ PLIST_FILES=	bin/sdel bin/sfill bin/smem
 		bin/the_cleaner.sh man/man1/sfill.1.gz man/man1/smem.1.gz \
 		man/man1/srm.1.gz man/man1/sswap.1.gz
 
-BIN_PROGRAMS=	srm sfill sswap smem
-BIN_SCRIPTS=	the_cleaner.sh
-
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
@@ -37,14 +36,14 @@ post-patch:
 		 /strip/s|^|#|' ${WRKSRC}/Makefile
 
 do-install:
-.for i in ${BIN_PROGRAMS}
+.for i in srm sfill sswap smem
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${i}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .endfor
-.for i in ${BIN_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
-.endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/the_cleaner.sh ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf srm ${STAGEDIR}${PREFIX}/bin/sdel
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}

Modified: head/security/secure_delete/files/patch-Makefile
==============================================================================
--- head/security/secure_delete/files/patch-Makefile	Mon Sep 26 07:57:03 2016	(r422768)
+++ head/security/secure_delete/files/patch-Makefile	Mon Sep 26 09:01:42 2016	(r422769)
@@ -1,4 +1,4 @@
---- Makefile.orig
+--- Makefile.orig	2003-10-29 21:07:06 UTC
 +++ Makefile
 @@ -1,13 +1,12 @@
 -CC=gcc
@@ -19,7 +19,7 @@
  	@echo
  	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
  	@echo "having fun."
-@@ -47,7 +46,7 @@
+@@ -47,7 +46,7 @@ install: all
  	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
  	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
  	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}