svn commit: r319204 - in head/sysutils/jailuser: . files

[Boris Samorodov]

Author: bsam
Date: Mon May 27 10:23:45 2013
New Revision: 319204
URL: http://svnweb.freebsd.org/changeset/ports/319204

Log:
  . 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.

Added:
  head/sysutils/jailuser/files/pkg-message.in
     - copied, changed from r319031, head/sysutils/jailuser/pkg-message
Deleted:
  head/sysutils/jailuser/pkg-message
Modified:
  head/sysutils/jailuser/Makefile
  head/sysutils/jailuser/pkg-plist

Modified: head/sysutils/jailuser/Makefile
==============================================================================
--- head/sysutils/jailuser/Makefile	Mon May 27 10:23:39 2013	(r319203)
+++ head/sysutils/jailuser/Makefile	Mon May 27 10:23:45 2013	(r319204)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	jailuser
-# Date created:				10 Jun 2004
-# Whom:					Vaida Bogdan <vaida.bogdan at gmail.com>
-#
+# Created by: Vaida Bogdan <vaida.bogdan at 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 at 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>

Copied and modified: head/sysutils/jailuser/files/pkg-message.in (from r319031, head/sysutils/jailuser/pkg-message)
==============================================================================
--- head/sysutils/jailuser/pkg-message	Sat May 25 07:46:10 2013	(r319031, copy source)
+++ head/sysutils/jailuser/files/pkg-message.in	Mon May 27 10:23:45 2013	(r319204)
@@ -1,5 +1,5 @@
 
 #############################################################################
-  Installed additional documentation in: PREFIX/share/doc/jail
-  Copy PREFIX/etc/jail.conf.sample to PREFIX/etc/jail.conf
+  Installed additional documentation in: %%PREFIX%%/share/doc/jailuser
+  Copy %%PREFIX%%/etc/jail.conf.sample to %%PREFIX%%/etc/jail.conf
 #############################################################################

Modified: head/sysutils/jailuser/pkg-plist
==============================================================================
--- head/sysutils/jailuser/pkg-plist	Mon May 27 10:23:39 2013	(r319203)
+++ head/sysutils/jailuser/pkg-plist	Mon May 27 10:23:45 2013	(r319204)
@@ -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%%