svn commit: r363193 - head/deskutils/cal

[Adam Weinberger]

Author: adamw
Date: Mon Jul 28 16:02:19 2014
New Revision: 363193
URL: http://svnweb.freebsd.org/changeset/ports/363193
QAT: https://qat.redports.org/buildarchive/r363193/

Log:
  Rather than checking whether pre-existing conf files exist in
  STAGEDIR (they don't), use @sample.

Modified:
  head/deskutils/cal/Makefile
  head/deskutils/cal/pkg-plist

Modified: head/deskutils/cal/Makefile
==============================================================================
--- head/deskutils/cal/Makefile	Mon Jul 28 15:53:40 2014	(r363192)
+++ head/deskutils/cal/Makefile	Mon Jul 28 16:02:19 2014	(r363193)
@@ -3,6 +3,7 @@
 
 PORTNAME=		cal
 PORTVERSION=		3.5
+PORTREVISION=		1
 CATEGORIES=		deskutils
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/shell
@@ -21,11 +22,7 @@ do-install:
 	${INSTALL_MAN}  ${WRKSRC}/cal.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/cal
 	@${CHMOD} 0755  ${STAGEDIR}${PREFIX}/etc/cal
-.if !exists(${STAGEDIR}${ETCDIR}/calcol)
-	${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${STAGEDIR}${ETCDIR}/calcol
-.endif
-.if !exists(${STAGEDIR}${ETCDIR}/caldat)
-	${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${STAGEDIR}${ETCDIR}/caldat
-.endif
+	${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${STAGEDIR}${ETCDIR}/calcol.sample
+	${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${STAGEDIR}${ETCDIR}/caldat.sample
 
 .include <bsd.port.mk>

Modified: head/deskutils/cal/pkg-plist
==============================================================================
--- head/deskutils/cal/pkg-plist	Mon Jul 28 15:53:40 2014	(r363192)
+++ head/deskutils/cal/pkg-plist	Mon Jul 28 16:02:19 2014	(r363193)
@@ -1,5 +1,5 @@
 bin/cal
-%%ETCDIR%%/calcol
-%%ETCDIR%%/caldat
+ at sample %%ETCDIR%%/calcol.sample
+ at sample %%ETCDIR%%/caldat.sample
 man/man1/cal.1.gz
 @dirrm %%ETCDIR%%