aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2014-07-29 23:44:43 +0800
committeradamw <adamw@FreeBSD.org>2014-07-29 23:44:43 +0800
commit8bb99f61bfb98d563d7221efce77cf81f74e3bd9 (patch)
treeac20b72851cba4a2a3a4af1eeedb334584c0a307 /www
parentca941f1ad65e155e328b02a4836bd87cdad35885 (diff)
downloadfreebsd-ports-gnome-8bb99f61bfb98d563d7221efce77cf81f74e3bd9.tar.gz
freebsd-ports-gnome-8bb99f61bfb98d563d7221efce77cf81f74e3bd9.tar.zst
freebsd-ports-gnome-8bb99f61bfb98d563d7221efce77cf81f74e3bd9.zip
@sample instead of checking whether conf files exist in STAGEDIR (they don't).
Diffstat (limited to 'www')
-rw-r--r--www/analog/Makefile10
-rw-r--r--www/analog/pkg-plist4
2 files changed, 3 insertions, 11 deletions
diff --git a/www/analog/Makefile b/www/analog/Makefile
index d8e9095a9541..f9d73bcb0475 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -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>
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 31e81150751a..f96e6aee6380 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -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