From owner-svn-ports-all@freebsd.org  Thu Sep 24 22:43:30 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02B7AA08A17;
 Thu, 24 Sep 2015 22:43:30 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 E7E271C48;
 Thu, 24 Sep 2015 22:43:29 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8OMhTAJ083522;
 Thu, 24 Sep 2015 22:43:29 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8OMhTg8083520;
 Thu, 24 Sep 2015 22:43:29 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201509242243.t8OMhTg8083520@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 24 Sep 2015 22:43:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397779 - head/net/queso
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Sep 2015 22:43:30 -0000

Author: bapt
Date: Thu Sep 24 22:43:28 2015
New Revision: 397779
URL: https://svnweb.freebsd.org/changeset/ports/397779

Log:
  Convert @sample which fixes a bad @exec line
  Convert to options helpers

Modified:
  head/net/queso/Makefile
  head/net/queso/pkg-plist

Modified: head/net/queso/Makefile
==============================================================================
--- head/net/queso/Makefile	Thu Sep 24 22:41:13 2015	(r397778)
+++ head/net/queso/Makefile	Thu Sep 24 22:43:28 2015	(r397779)
@@ -3,7 +3,7 @@
 
 PORTNAME=	queso
 PORTVERSION=	980922
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net security
 MASTER_SITES=	PACKETSTORM/UNIX/scanners
 
@@ -25,6 +25,8 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/queso ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/queso.conf.sample ${STAGEDIR}${PREFIX}/etc
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Documentation.txt ${STAGEDIR}${DOCSDIR}
 

Modified: head/net/queso/pkg-plist
==============================================================================
--- head/net/queso/pkg-plist	Thu Sep 24 22:41:13 2015	(r397778)
+++ head/net/queso/pkg-plist	Thu Sep 24 22:43:28 2015	(r397779)
@@ -1,5 +1,3 @@
 sbin/queso
-@unexec if cmp -s %D/etc/etc/queso.conf %D/etc/etc/queso.conf.sample; then rm -f %D/etc/queso.conf.sample; fi
-etc/queso.conf.sample
-@exec [ -f %B/queso.conf.sample ] || cp %B/%f %B/queso.conf.sample
+@sample etc/queso.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/Documentation.txt