Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Sep 2015 22:19:58 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397775 - head/editors/diakonos
Message-ID:  <201509242219.t8OMJw77071256@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Sep 24 22:19:58 2015
New Revision: 397775
URL: https://svnweb.freebsd.org/changeset/ports/397775

Log:
  Convert to @sample
  While here, use option helper

Modified:
  head/editors/diakonos/Makefile
  head/editors/diakonos/pkg-plist

Modified: head/editors/diakonos/Makefile
==============================================================================
--- head/editors/diakonos/Makefile	Thu Sep 24 22:12:09 2015	(r397774)
+++ head/editors/diakonos/Makefile	Thu Sep 24 22:19:58 2015	(r397775)
@@ -3,6 +3,7 @@
 
 PORTNAME=	diakonos
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	editors ruby
 MASTER_SITES=	http://diakonos.pist0s.ca/archives/
 
@@ -29,10 +30,12 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/installation.rb \
 		${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/diakonos.conf \
-		${STAGEDIR}${PREFIX}/etc/diakonos.conf.dist
+		${STAGEDIR}${PREFIX}/etc/diakonos.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/diakonos-256-colour.conf \
-		${STAGEDIR}${PREFIX}/etc/diakonos-256-colour.conf.dist
+		${STAGEDIR}${PREFIX}/etc/diakonos-256-colour.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/help
+
+post-install-DOCS-on:
 	(cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG LICENCE README.rdoc \
 		${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/help/*.dhf ${STAGEDIR}${DOCSDIR}/help

Modified: head/editors/diakonos/pkg-plist
==============================================================================
--- head/editors/diakonos/pkg-plist	Thu Sep 24 22:12:09 2015	(r397774)
+++ head/editors/diakonos/pkg-plist	Thu Sep 24 22:19:58 2015	(r397775)
@@ -1,10 +1,6 @@
 bin/diakonos
-@unexec if cmp -s %D/etc/diakonos.conf.dist %D/etc/diakonos.conf; then rm -f %D/etc/diakonos.conf; fi
-etc/diakonos.conf.dist
-@exec if [ ! -f %B/diakonos.conf ]; then cp -p %D/%F %B/diakonos.conf; fi
-@unexec if cmp -s %D/etc/diakonos-256-colour.conf.dist %D/etc/diakonos-256-colour.conf; then rm -f %D/etc/diakonos-256-colour.conf; fi
-etc/diakonos-256-colour.conf.dist
-@exec if [ ! -f %B/diakonos-256-colour.conf ]; then cp -p %D/%F %B/diakonos-256-colour.conf; fi
+@sample etc/diakonos.conf.sample
+@sample etc/diakonos-256-colour.conf.sample
 %%RUBY_SITELIBDIR%%/diakonos.rb
 %%RUBY_SITELIBDIR%%/diakonos/about.rb
 %%RUBY_SITELIBDIR%%/diakonos/bookmark.rb



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