Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Feb 2014 08:30:24 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344839 - head/deskutils/cal
Message-ID:  <201402180830.s1I8UO6u019746@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ehaupt
Date: Tue Feb 18 08:30:23 2014
New Revision: 344839
URL: http://svnweb.freebsd.org/changeset/ports/344839
QAT: https://qat.redports.org/buildarchive/r344839/

Log:
  Support staging

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

Modified: head/deskutils/cal/Makefile
==============================================================================
--- head/deskutils/cal/Makefile	Tue Feb 18 08:13:45 2014	(r344838)
+++ head/deskutils/cal/Makefile	Tue Feb 18 08:30:23 2014	(r344839)
@@ -13,17 +13,19 @@ COMMENT=	Enhanced color version of stand
 WRKSRC=		${WRKDIR}/cal-3.5/source
 MAKEFILE=	makefile.unx
 ALL_TARGET=	cal
-MAN1=		cal.1
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cal ${PREFIX}/bin/cal
+	${INSTALL_PROGRAM} ${WRKSRC}/cal ${STAGEDIR}${PREFIX}/bin/cal
 	${MV} ${WRKSRC}/cal.1 ${WRKSRC}/cal.1.orig
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/cal.1.orig > ${WRKSRC}/cal.1
-	${INSTALL_MAN}  ${WRKSRC}/cal.1 ${PREFIX}/man/man1/cal.1
-	@${MKDIR} ${PREFIX}/etc/cal
-	@${CHMOD} 0755  ${PREFIX}/etc/cal
-	if [ ! -f ${PREFIX}/etc/cal/calcol ]; then ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${PREFIX}/etc/cal/calcol; fi
-	if [ ! -f ${PREFIX}/etc/cal/caldat ]; then ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${PREFIX}/etc/cal/caldat; fi
+	${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
 
 .include <bsd.port.mk>

Modified: head/deskutils/cal/pkg-plist
==============================================================================
--- head/deskutils/cal/pkg-plist	Tue Feb 18 08:13:45 2014	(r344838)
+++ head/deskutils/cal/pkg-plist	Tue Feb 18 08:30:23 2014	(r344839)
@@ -1,4 +1,5 @@
 bin/cal
-etc/cal/calcol
-etc/cal/caldat
-@dirrm etc/cal
+%%ETCDIR%%/calcol
+%%ETCDIR%%/caldat
+man/man1/cal.1.gz
+@dirrm %%ETCDIR%%



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