From owner-svn-ports-all@FreeBSD.ORG  Mon Jul  7 19:07:45 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8F2EFFC8;
 Mon,  7 Jul 2014 19:07:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62A502641;
 Mon,  7 Jul 2014 19:07:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s67J7jkl047873;
 Mon, 7 Jul 2014 19:07:45 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s67J7jAE047871;
 Mon, 7 Jul 2014 19:07:45 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201407071907.s67J7jAE047871@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Mon, 7 Jul 2014 19:07:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r361120 - head/security/super
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Jul 2014 19:07:45 -0000

Author: pawel
Date: Mon Jul  7 19:07:44 2014
New Revision: 361120
URL: http://svnweb.freebsd.org/changeset/ports/361120
QAT: https://qat.redports.org/buildarchive/r361120/

Log:
  - Add staging support
  - Use @sample for config file

Modified:
  head/security/super/Makefile
  head/security/super/pkg-plist

Modified: head/security/super/Makefile
==============================================================================
--- head/security/super/Makefile	Mon Jul  7 19:04:10 2014	(r361119)
+++ head/security/super/Makefile	Mon Jul  7 19:07:44 2014	(r361120)
@@ -3,6 +3,7 @@
 
 PORTNAME=	super
 PORTVERSION=	3.30.0
+PORTREVISION=	1
 CATEGORIES=	security sysutils
 MASTER_SITES=	ftp://ftp.ucolick.org/pub/users/will/ \
 		http://www.ucolick.org/~will/RUE/super/
@@ -16,30 +17,19 @@ LICENSE_COMB=	dual
 
 GNU_CONFIGURE=	yes
 
-MAN1=		super.1 setuid.1
-MAN5=		super.5
-
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-patch:
-	@${REINPLACE_CMD} 's|\.\/mkdir_p -p755|mkdir -p -m 755|g' \
+	@${REINPLACE_CMD} -e 's|\.\/mkdir_p -p755|mkdir -p -m 755|g' \
+		-e '/sysconfdir/ s|super\.tab|&.sample|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/super ${PREFIX}/bin/setuid
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/sample.tab ${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/sample.cdmount ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/barebones.tab ${EXAMPLESDIR}
-.endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/super ${STAGEDIR}${PREFIX}/bin/setuid
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/sample.tab ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/sample.cdmount ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/security/super/pkg-plist
==============================================================================
--- head/security/super/pkg-plist	Mon Jul  7 19:04:10 2014	(r361119)
+++ head/security/super/pkg-plist	Mon Jul  7 19:07:44 2014	(r361120)
@@ -1,8 +1,10 @@
 bin/setuid
 bin/super
-%%PORTEXAMPLES%%@unexec if cmp -s %D/etc/super.tab %D/%%EXAMPLESDIR%%/barebones.tab; then rm -f %D/etc/super.tab; fi
+@sample etc/super.tab.sample
+man/man1/setuid.1.gz
+man/man1/super.1.gz
+man/man5/super.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/barebones.tab
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.cdmount
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.tab
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%