From c303a1462828b6678ab83f17f17b5c64f7b1314e Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 31 Dec 2015 01:17:13 +0000
Subject: - Add LICENSE - Switch to USES=tar - Switch to options helpers -
 Simplify installation - Simplify pkg-message handling

---
 net-mgmt/ipaudit/Makefile             | 19 +++++++++----------
 net-mgmt/ipaudit/files/pkg-message.in | 13 +++++++++++++
 net-mgmt/ipaudit/pkg-message          | 11 -----------
 3 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 net-mgmt/ipaudit/files/pkg-message.in
 delete mode 100644 net-mgmt/ipaudit/pkg-message

(limited to 'net-mgmt')

diff --git a/net-mgmt/ipaudit/Makefile b/net-mgmt/ipaudit/Makefile
index 299095e6f633..5f95d2bf5be4 100644
--- a/net-mgmt/ipaudit/Makefile
+++ b/net-mgmt/ipaudit/Makefile
@@ -5,30 +5,29 @@ PORTNAME=	ipaudit
 PORTVERSION=	0.95
 CATEGORIES=	net-mgmt sysutils
 MASTER_SITES=	http://ipaudit.sourceforge.net/download/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IP traffic summarizer
 
-MANPAGE=	ipaudit.1 ipstrings.1 total.1
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BIN=		ipaudit ipstrings total
-
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+USES=		tar:tgz
+SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-.for f in ${BIN}
+.for f in ipaudit ipstrings total
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.for f in ${MANPAGE}
+.for f in ipaudit.1 ipstrings.1 total.1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/src/ipaudit.conf.sample ${STAGEDIR}${PREFIX}/etc
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ipaudit/files/pkg-message.in b/net-mgmt/ipaudit/files/pkg-message.in
new file mode 100644
index 000000000000..616080bc828f
--- /dev/null
+++ b/net-mgmt/ipaudit/files/pkg-message.in
@@ -0,0 +1,13 @@
+***********************************************************
+ 
+Please copy %%PREFIX%%/etc/ipaudit.conf.sample to
+%%PREFIX%%/etc/ipaudit.conf by yourself and modify it,
+then start ipaudit with
+
+    ipaudit -g %%PREFIX%%/etc/ipaudit.conf
+
+command.
+
+Thanks.
+
+***********************************************************
diff --git a/net-mgmt/ipaudit/pkg-message b/net-mgmt/ipaudit/pkg-message
deleted file mode 100644
index e3befb17c329..000000000000
--- a/net-mgmt/ipaudit/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-***********************************************************
- 
-	Please copy %%PREFIX%%/etc/ipaudit.conf.sample to
-	%%PREFIX%%/etc/ipaudit.conf by yourself and modify it,
-	then start ipaudit with
-
-	'ipaudit -g %%PREFIX%%/etc/ipaudit.conf' command.
-
-	Thanks.
-
-***********************************************************
-- 
cgit v1.2.3