From owner-svn-ports-head@FreeBSD.ORG  Tue Jul 29 15:44:44 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 885AFEF8;
 Tue, 29 Jul 2014 15:44:44 +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 5BE1B2F8D;
 Tue, 29 Jul 2014 15:44:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6TFii3j051547;
 Tue, 29 Jul 2014 15:44:44 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6TFiiUd051545;
 Tue, 29 Jul 2014 15:44:44 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407291544.s6TFiiUd051545@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 29 Jul 2014 15:44:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363344 - head/www/analog
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jul 2014 15:44:44 -0000

Author: adamw
Date: Tue Jul 29 15:44:43 2014
New Revision: 363344
URL: http://svnweb.freebsd.org/changeset/ports/363344
QAT: https://qat.redports.org/buildarchive/r363344/

Log:
  @sample instead of checking whether conf files exist in STAGEDIR (they don't).

Modified:
  head/www/analog/Makefile
  head/www/analog/pkg-plist

Modified: head/www/analog/Makefile
==============================================================================
--- head/www/analog/Makefile	Tue Jul 29 15:40:17 2014	(r363343)
+++ head/www/analog/Makefile	Tue Jul 29 15:44:43 2014	(r363344)
@@ -33,12 +33,10 @@ PLIST_SUB=	IMGDIR="${LIMGDIR}"
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.pre.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/analog ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/analog.man ${STAGEDIR}${MANPREFIX}/man/man1/analog.1
-	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${STAGEDIR}${PREFIX}/etc/analog.cfg-dist
+	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${STAGEDIR}${PREFIX}/etc/analog.cfg.sample
 	${MKDIR} ${STAGEDIR}${DATADIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/lang/* ${STAGEDIR}${DATADIR}/lang
 	${MKDIR} ${STAGEDIR}${IMGDIR}
@@ -55,8 +53,4 @@ do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/css/jreeves
 	${INSTALL_DATA} ${WRKSRC}/examples/css/jreeves/* ${STAGEDIR}${EXAMPLESDIR}/css/jreeves
 
-.if !exists(${STAGEDIR}${PREFIX}/etc/analog.cfg)
-	@cd ${STAGEDIR}${PREFIX}/etc && ${CP} -f analog.cfg-dist analog.cfg
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/analog/pkg-plist
==============================================================================
--- head/www/analog/pkg-plist	Tue Jul 29 15:40:17 2014	(r363343)
+++ head/www/analog/pkg-plist	Tue Jul 29 15:44:43 2014	(r363344)
@@ -1,7 +1,5 @@
 bin/analog
-@unexec [ -f %D/etc/analog.cfg ] && cmp -s %D/etc/analog.cfg %D/etc/analog.cfg-dist && rm -f %D/etc/analog.cfg
-etc/analog.cfg-dist
-@exec if [ ! -f %D/etc/analog.cfg ] ; then cp -p %D/%F %B/analog.cfg; fi
+@sample etc/analog.cfg.sample
 %%DATADIR%%/lang/README.txt
 %%DATADIR%%/lang/am.lng
 %%DATADIR%%/lang/amdom.tab