From 4519f238167e25ef211c52a42bc11270dbd7d349 Mon Sep 17 00:00:00 2001
From: bsam <bsam@FreeBSD.org>
Date: Mon, 27 May 2013 10:23:45 +0000
Subject: . add LICENSE=GPLv2; . bump PORTREVISION; . trim Makefile headers; .
 use one command REINPLACE_CMD instead of two commands SED and MV; . do not
 hard code gcc at the source Makefile, build with the   default compiler and
 allow a compiler to be redefined; . NOPORTDOCS -> PORT_OPTIONS:MDOCS; . use
 ${PORTDOCS:S,^,${WRKDOC}/,} trick to install PORTDOCS; . convert pkg-message
 to use SUB_FILES; . fix the directory of additional documentation at
 pkg-message.

---
 sysutils/jailuser/Makefile             | 39 +++++++++++++++++-----------------
 sysutils/jailuser/files/pkg-message.in |  5 +++++
 sysutils/jailuser/pkg-message          |  5 -----
 sysutils/jailuser/pkg-plist            |  9 --------
 4 files changed, 24 insertions(+), 34 deletions(-)
 create mode 100644 sysutils/jailuser/files/pkg-message.in
 delete mode 100644 sysutils/jailuser/pkg-message

(limited to 'sysutils')

diff --git a/sysutils/jailuser/Makefile b/sysutils/jailuser/Makefile
index d906917ece21..c94ce4f6c198 100644
--- a/sysutils/jailuser/Makefile
+++ b/sysutils/jailuser/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	jailuser
-# Date created:				10 Jun 2004
-# Whom:					Vaida Bogdan <vaida.bogdan@gmail.com>
-#
+# Created by: Vaida Bogdan <vaida.bogdan@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	jailuser
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/jail/jail/version%20${PORTVERSION}
 DISTNAME=	jail_${PORTVERSION}
@@ -15,26 +11,29 @@ DISTNAME=	jail_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Builds a chrooted environment
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/jail_1-9_stable/src
+WRKDOC=		${WRKDIR}/jail_1-9_stable/doc
 USE_PERL5=	yes
 
+OPTIONS_DEFINE=	DOCS
+PORTDOCS=	CHANGELOG INSTALL README SECURITY VERSION \
+		download features intro
+
+SUB_FILES=	pkg-message
+
 post-patch:
-	@${SED} -e 's!/usr/bin/perl!${PERL}!g' ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.tmp
-	@${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!' \
+		-e 's!gcc!$(CC)!' ${WRKSRC}/Makefile
+
+.include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/CHANGELOG ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/INSTALL ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/SECURITY ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/VERSION ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/download ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/features ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/intro ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKDOC}/,} ${DOCSDIR}
 .endif
-
-	@${SED} -e 's!PREFIX!${PREFIX}!g' ${.CURDIR}/pkg-message
+	@${ECHO_MSG} ; ${CAT} ${PKGMESSAGE} ; ${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/sysutils/jailuser/files/pkg-message.in b/sysutils/jailuser/files/pkg-message.in
new file mode 100644
index 000000000000..832346e56512
--- /dev/null
+++ b/sysutils/jailuser/files/pkg-message.in
@@ -0,0 +1,5 @@
+
+#############################################################################
+  Installed additional documentation in: %%PREFIX%%/share/doc/jailuser
+  Copy %%PREFIX%%/etc/jail.conf.sample to %%PREFIX%%/etc/jail.conf
+#############################################################################
diff --git a/sysutils/jailuser/pkg-message b/sysutils/jailuser/pkg-message
deleted file mode 100644
index 3625ffa59240..000000000000
--- a/sysutils/jailuser/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#############################################################################
-  Installed additional documentation in: PREFIX/share/doc/jail
-  Copy PREFIX/etc/jail.conf.sample to PREFIX/etc/jail.conf
-#############################################################################
diff --git a/sysutils/jailuser/pkg-plist b/sysutils/jailuser/pkg-plist
index 4738aebb2e02..cd4bad4996b8 100644
--- a/sysutils/jailuser/pkg-plist
+++ b/sysutils/jailuser/pkg-plist
@@ -20,12 +20,3 @@ lib/arch/solaris/functions
 @dirrm lib/arch/irix
 @dirrm lib/arch/solaris
 @dirrm lib/arch
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/SECURITY
-%%PORTDOCS%%%%DOCSDIR%%/VERSION
-%%PORTDOCS%%%%DOCSDIR%%/download
-%%PORTDOCS%%%%DOCSDIR%%/features
-%%PORTDOCS%%%%DOCSDIR%%/intro
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit