From owner-svn-ports-head@FreeBSD.ORG  Tue Feb 18 08:30:24 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9870F2E3;
 Tue, 18 Feb 2014 08:30:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6AA5819FE;
 Tue, 18 Feb 2014 08:30:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1I8UOCp019748;
 Tue, 18 Feb 2014 08:30:24 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1I8UO6u019746;
 Tue, 18 Feb 2014 08:30:24 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201402180830.s1I8UO6u019746@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Tue, 18 Feb 2014 08:30:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344839 - head/deskutils/cal
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Feb 2014 08:30:24 -0000

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%%