From b646d1dad69fefde3c0c03cb188ca621fc6b6c07 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 22 Dec 2000 19:00:17 +0000
Subject: Make this pass pkglint, create ${PREFIX}/libexec/cgi-bin if it
 doesn't already exist, and remove any empty directories after uninstalling.

---
 time/pcal/Makefile  | 39 ++++++++++++++++++++-------------------
 time/pcal/pkg/PLIST |  4 +++-
 2 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'time/pcal')

diff --git a/time/pcal/Makefile b/time/pcal/Makefile
index fe597f1ed81..229b3a7d387 100644
--- a/time/pcal/Makefile
+++ b/time/pcal/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/21 06:20:53 kei Exp $
+# $NetBSD: Makefile,v 1.2 2000/12/22 19:00:17 jlam Exp $
 #
 
 DISTNAME=	pcal_4_7_tar_Z
 PKGNAME=	pcal-4.7
+WRKSRC=		${WRKDIR}/pcal.4.7
 CATEGORIES=	time
 MASTER_SITES=	http://www.geocities.com/SunsetStrip/Palms/5555/PS/
 EXTRACT_SUFX=	.txt
@@ -13,9 +14,8 @@ HOMEPAGE=	http://www.geocities.com/SunsetStrip/Palms/5555/PS/index.html
 UUDECODE?=	uudecode -p
 EXTRACT_CMD=	${CAT} ${DOWNLOADED_DISTFILE} | ${UUDECODE} | ${PAX} -rz
 
-WRKSRC=		${WRKDIR}/pcal.4.7
-
 HTDOCS=		${PREFIX}/share/httpd/htdocs
+CGIBINDIR=	${PREFIX}/libexec/cgi-bin
 WWWSERVER!=	hostname
 
 .include "../../mk/bsd.prefs.mk"	# for PAPERSIZE
@@ -26,23 +26,24 @@ MAKE_ENV+=	CC="${CC}" HOST_CC="${HOST_CC}"
 ALL_TARGET=	pcal
 
 pre-install:
-		${MV} ${WRKSRC}/pcal.cgi ${WRKSRC}/pcal.cgi.tmp
-		${SED} -e 's|@@PREFIX@@|${PREFIX}|' \
-			< ${WRKSRC}/pcal.cgi.tmp > ${WRKSRC}/pcal.cgi
-		${MV} ${WRKSRC}/pcal.html ${WRKSRC}/pcal.html.tmp
-		${SED} -e 's|@@WWWSERVER@@|${WWWSERVER}|' \
-			< ${WRKSRC}/pcal.html.tmp > ${WRKSRC}/pcal.html
-		${MV} ${WRKSRC}/pcalw.html ${WRKSRC}/pcalw.html.tmp
-		${SED} -e 's|@@WWWSERVER@@|${WWWSERVER}|' \
-			< ${WRKSRC}/pcalw.html.tmp > ${WRKSRC}/pcalw.html
+	${MV} ${WRKSRC}/pcal.cgi ${WRKSRC}/pcal.cgi.tmp
+	${SED} -e 's|@@PREFIX@@|${PREFIX}|' \
+		< ${WRKSRC}/pcal.cgi.tmp > ${WRKSRC}/pcal.cgi
+	${MV} ${WRKSRC}/pcal.html ${WRKSRC}/pcal.html.tmp
+	${SED} -e 's|@@WWWSERVER@@|${WWWSERVER}|' \
+		< ${WRKSRC}/pcal.html.tmp > ${WRKSRC}/pcal.html
+	${MV} ${WRKSRC}/pcalw.html ${WRKSRC}/pcalw.html.tmp
+	${SED} -e 's|@@WWWSERVER@@|${WWWSERVER}|' \
+		< ${WRKSRC}/pcalw.html.tmp > ${WRKSRC}/pcalw.html
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/pcal ${PREFIX}/bin
-		${INSTALL_SCRIPT} ${WRKSRC}/pcal.cgi ${PREFIX}/libexec/cgi-bin
-		${INSTALL_MAN} ${WRKSRC}/pcal.man ${PREFIX}/man/man1/pcal.1
-		${INSTALL_DATA} ${WRKSRC}/ReadMe ${PREFIX}/share/doc/ReadMe.pcal
-		${INSTALL_DATA_DIR} ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/pcal.html ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/pcalw.html ${HTDOCS}
+	${INSTALL_PROGRAM} ${WRKSRC}/pcal ${PREFIX}/bin
+	${INSTALL_SCRIPT_DIR} ${CGIBINDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/pcal.cgi ${CGIBINDIR}
+	${INSTALL_MAN} ${WRKSRC}/pcal.man ${PREFIX}/man/man1/pcal.1
+	${INSTALL_DATA} ${WRKSRC}/ReadMe ${PREFIX}/share/doc/ReadMe.pcal
+	${INSTALL_DATA_DIR} ${HTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/pcal.html ${HTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/pcalw.html ${HTDOCS}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/pcal/pkg/PLIST b/time/pcal/pkg/PLIST
index bff7bbb68f4..ac1387b718e 100644
--- a/time/pcal/pkg/PLIST
+++ b/time/pcal/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/21 06:20:53 kei Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/22 19:00:17 jlam Exp $
 bin/pcal
 libexec/cgi-bin/pcal.cgi
 man/man1/pcal.1
 share/doc/ReadMe.pcal
 share/httpd/htdocs/pcal.html
 share/httpd/htdocs/pcalw.html
+@unexec rmdir -p %D/share/httpd/htdocs 2>/dev/null || true
+@unexec rmdir -p %D/libexec/cgi-bin 2>/dev/null || true
-- 
cgit v1.2.3