Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Jul 2014 15:44:43 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r363344 - head/www/analog
Message-ID:  <201407291544.s6TFiiUd051545@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407291544.s6TFiiUd051545>