From bfbe7ead6d7c76cee9f0f7c8f5e61d8e8c174f66 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Sun, 5 Feb 2006 00:13:19 +0000
Subject: Converted to the SUBST framework. Fixed almost all pkglint warnings.

---
 time/cardboard-schedule/Makefile | 28 ++++++++++++++++------------
 time/cardboard-schedule/PLIST    |  8 ++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'time')

diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile
index f91ac9bbdec..07be72a9154 100644
--- a/time/cardboard-schedule/Makefile
+++ b/time/cardboard-schedule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/04 23:47:56 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 00:13:19 rillig Exp $
 #
 
 DISTNAME=	cs113ins
@@ -13,17 +13,18 @@ COMMENT=	Project and resource management software implemented in Java/Swing
 
 USE_X11BASE=	yes
 
-RESTRICTED=	"License prohibits redistribution on CDROM"
+RESTRICTED=	License prohibits redistribution on CDROM
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_TOOLS+=	gtar unzip
 
-EXTRACT_CMD=	cd ${WRKDIR} && {					\
+WRKSRC=		${WRKDIR}
+EXTRACT_CMD=	cd ${WRKDIR:Q} && {					\
 			${UNZIP_CMD} -x ${DOWNLOADED_DISTFILE}		\
 			|| ${TEST} -f InstallerData/Installer.zip;	\
 		}
-WRKSRC=		${WRKDIR}
+NO_BUILD=	yes
 
 CSFILES=	cs/images/Logo2.gif \
 		cs/images/Logo.gif \
@@ -35,18 +36,21 @@ CSFILES=	cs/images/Logo2.gif \
 
 INSTALLATION_DIRS=	bin
 
+SUBST_CLASSES+=		cs
+SUBST_STAGE.cs=		do-configure
+SUBST_FILES.cs=		csched.sh
+SUBST_SED.cs+=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.cs+=		-e 's,@LOCALBASE@,${LOCALBASE},g'
+SUBST_SED.cs+=		-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
+
 post-extract:
 	cd ${WRKDIR} && ${UNZIP_CMD} -x InstallerData/Installer.zip
-
-do-build:
-	${SED} -e s,@PREFIX@,${PREFIX},g < ${FILESDIR}/csched.sh > ${WRKDIR}/csched.tmp
-	${SED} -e s,@LOCALBASE@,${LOCALBASE},g < ${WRKDIR}/csched.tmp > ${WRKDIR}/csched.tmp2
-	${SED} -e s,@JAVA_HOME@,${PKG_JAVA_HOME},g < ${WRKDIR}/csched.tmp2 > ${WRKDIR}/csched
+	${CP} ${FILESDIR:Q}/csched.sh ${WRKDIR:Q}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/cardboard-schedule
-	@(cd ${WRKDIR}/C:/projects && ${GTAR} cf - ${CSFILES} | (cd ${PREFIX}/lib/cardboard-schedule && ${GTAR} xvf -))
-	${INSTALL_SCRIPT} ${WRKDIR}/csched ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/cardboard-schedule
+	cd ${WRKDIR:Q}/C:/projects && ${PAX} -rw ${CSFILES} ${PREFIX:Q}/lib/cardboard-schedule
+	${INSTALL_SCRIPT} ${WRKDIR:Q}/csched.sh ${PREFIX:Q}/bin/csched
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/cardboard-schedule/PLIST b/time/cardboard-schedule/PLIST
index 0bf621db15f..d5da95d5a54 100644
--- a/time/cardboard-schedule/PLIST
+++ b/time/cardboard-schedule/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:19:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/05 00:13:19 rillig Exp $
 bin/csched
-lib/cardboard-schedule/cs/images/Logo2.gif
 lib/cardboard-schedule/cs/images/Logo.gif
+lib/cardboard-schedule/cs/images/Logo2.gif
+lib/cardboard-schedule/stage/CsHelp.jar
 lib/cardboard-schedule/stage/cs.jar
-lib/cardboard-schedule/stage/readme.txt
 lib/cardboard-schedule/stage/jhbasic.jar
 lib/cardboard-schedule/stage/license.txt
-lib/cardboard-schedule/stage/CsHelp.jar
+lib/cardboard-schedule/stage/readme.txt
 @dirrm lib/cardboard-schedule/stage
 @dirrm lib/cardboard-schedule/cs/images
 @dirrm lib/cardboard-schedule/cs
-- 
cgit v1.2.3