Fixed pkglint warnings.

8 files changed, 42 insertions, 43 deletions

diff --git a/lang/mzscheme/Makefile b/lang/mzscheme/Makefile
index 33820d7ac84..8fb3ed48245 100644
--- a/lang/mzscheme/Makefile
+++ b/lang/mzscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:26 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/10/01 14:47:43 rillig Exp $
 
 DISTNAME=		mzscheme-205.src.unix
 PKGNAME=		mzscheme-205
@@ -11,8 +11,9 @@ COMMENT=		R5RS-compliant scheme
 
 CONFLICTS+=		drscheme-[0-9]*
 
-WRKSRC=			${WRKDIR}/plt/src
+WRKSRC=			${WRKDIR}/plt
 GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		src
 CONFIGURE_SCRIPT=	./configure
 EXTRACT_USING=		pax
 
@@ -20,25 +21,25 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386
 ONLY_FOR_PLATFORM+=	Linux-*-i386
 ONLY_FOR_PLATFORM+=	SunOS-*-*
 
-INSTALLATION_DIRS=	man/man1
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
-post-patch:
-	@for patchee in ${WRKDIR}/plt/man/man1/mzscheme.1 \
-			${WRKDIR}/plt/man/man1/help-desk.1 \
-			${WRKDIR}/plt/collects/make/setup-extension.ss \
-			${WRKDIR}/plt/collects/slibinit/init.ss ; do \
-		${MV} -f $$patchee ${WRKSRC}/foo ; \
-		${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo \
-			> $$patchee ; \
-	done
-	@${RM} -f ${WRKSRC}/foo
+# setup-extension.ss is classified as precompiled, which it isn't.
+_SUBST_IS_TEXT_FILE=	true
+
+SUBST_CLASSES+=		mz
+SUBST_STAGE.mz=		pre-configure
+SUBST_MESSAGE.mz=	Adjusting installation prefix.
+SUBST_FILES.mz=		man/man1/mzscheme.1 man/man1/help-desk.1
+SUBST_FILES.mz+=	collects/make/setup-extension.ss
+SUBST_FILES.mz+=	collects/slibinit/init.ss
+SUBST_SED.mz=		-e 's@XXXPREFIXXXX@${PREFIX}@g'
 
 do-install:
-	@(cd ${WRKDIR}/plt/src/mzscheme ; ${MAKE} normal-install)
-	@${INSTALL_DATA_DIR} ${PREFIX}/include/mzscheme
-	@${INSTALL_DATA} ${WRKDIR}/plt/include/*.h ${PREFIX}/include/mzscheme
-	@${INSTALL_MAN} ${WRKDIR}/plt/man/man1/mzscheme.1 ${PREFIX}/man/man1
-	@([ -d ${PREFIX}/lib/plt ] || ${INSTALL_DATA_DIR} ${PREFIX}/lib/plt)
-	@${CP} -R ${WRKDIR}/plt/collects ${PREFIX}/lib/plt
+	cd ${WRKDIR}/plt/src/mzscheme && ${MAKE} normal-install
+	${INSTALL_DATA_DIR} ${PREFIX}/include/mzscheme
+	${INSTALL_DATA} ${WRKDIR}/plt/include/*.h ${PREFIX}/include/mzscheme
+	${INSTALL_MAN} ${WRKDIR}/plt/man/man1/mzscheme.1 ${PREFIX}/${PKGMANDIR}/man1
+	[ -d ${PREFIX}/lib/plt ] || ${INSTALL_DATA_DIR} ${PREFIX}/lib/plt
+	cd ${WRKDIR}/plt && ${PAX} -wr -s ',.*\.orig$$,,' collects ${PREFIX}/lib/plt
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mzscheme/PLIST b/lang/mzscheme/PLIST
index 59fc2e8fcb4..d162bccfb53 100644
--- a/lang/mzscheme/PLIST
+++ b/lang/mzscheme/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/23 23:57:16 pooka Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/10/01 14:47:43 rillig Exp $
 bin/mzscheme
 include/mzscheme/escheme.h
 include/mzscheme/scheme.h
@@ -136,7 +136,6 @@ lib/plt/collects/make/make-sig.ss
 lib/plt/collects/make/make-unit.ss
 lib/plt/collects/make/make.ss
 lib/plt/collects/make/setup-extension.ss
-lib/plt/collects/make/setup-extension.ss.orig
 lib/plt/collects/mred/doc.txt
 lib/plt/collects/mred/edit-main.ss
 lib/plt/collects/mred/edit.ss
@@ -337,7 +336,6 @@ lib/plt/collects/setup/winstall.ss
 lib/plt/collects/setup/winvers.ss
 lib/plt/collects/slibinit/doc.txt
 lib/plt/collects/slibinit/init.ss
-lib/plt/collects/slibinit/init.ss.orig
 lib/plt/collects/slibinit/load.ss
 lib/plt/collects/srfi/1.ss
 lib/plt/collects/srfi/1/alist.ss
diff --git a/lang/mzscheme/distinfo b/lang/mzscheme/distinfo
index 2ce1ca5ed94..ec22155b387 100644
--- a/lang/mzscheme/distinfo
+++ b/lang/mzscheme/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:09 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/10/01 14:47:43 rillig Exp $
 
 SHA1 (mzscheme-205.src.unix.tar.gz) = b64d70fe756cd2567d8dcdbccf01c954aa230a26
 RMD160 (mzscheme-205.src.unix.tar.gz) = 9d36f9f5e5136e9a1a70fdcaa11264b5cfaa5a1f
 Size (mzscheme-205.src.unix.tar.gz) = 3249057 bytes
-SHA1 (patch-aa) = dbd42db2a5db10aff1a1af233004c785c52ddc80
-SHA1 (patch-ab) = 2b32df4c5ee422e03c5fc8717295b9c492e80b58
-SHA1 (patch-ac) = 2a771cc2e44c99e8711540672eca6a83cdd119e7
-SHA1 (patch-ah) = fbc2e897d34d073842da5c73b982613458a8f9b5
-SHA1 (patch-aj) = 5032995196330e3816bc39ef7c424f5c2640be13
+SHA1 (patch-aa) = 1f0bf705dc15d1a7a254b0822263d4bda398d546
+SHA1 (patch-ab) = 5980e1673b0da3bde5d5e2f93303e837d7b6f2c6
+SHA1 (patch-ac) = d1345c272e920d834bef643b9c3f82e7e132a4e8
+SHA1 (patch-ah) = ebc1e18376c8ec3e99bf038ce2f5c8e85d6f4b14
+SHA1 (patch-aj) = 0d90f0af961905c4dfdc9e675dbfa8af06653e1d
diff --git a/lang/mzscheme/patches/patch-aa b/lang/mzscheme/patches/patch-aa
index 50f53a960cf..3c0efba9c88 100644
--- a/lang/mzscheme/patches/patch-aa
+++ b/lang/mzscheme/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2003/12/23 23:57:16 pooka Exp $
+$NetBSD: patch-aa,v 1.5 2006/10/01 14:47:43 rillig Exp $
 
---- mzscheme/Makefile.in.orig	2003-06-21 04:19:52.000000000 +0300
-+++ mzscheme/Makefile.in	2003-12-24 01:41:08.000000000 +0200
+--- src/mzscheme/Makefile.in.orig	2003-06-21 04:19:52.000000000 +0300
++++ src/mzscheme/Makefile.in	2003-12-24 01:41:08.000000000 +0200
 @@ -240,12 +240,6 @@
  	cd ..; cp mzscheme/mzdyn.o $(LIBIDIR)/mzdyn.o
  	cd ..; $(ICP) mzscheme/libmzgc.@LIBSFX@ $(LIBIDIR)/libmzgc.@LIBSFX@
diff --git a/lang/mzscheme/patches/patch-ab b/lang/mzscheme/patches/patch-ab
index 03e54442a85..d59b9863da9 100644
--- a/lang/mzscheme/patches/patch-ab
+++ b/lang/mzscheme/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2003/12/23 23:57:16 pooka Exp $
+$NetBSD: patch-ab,v 1.4 2006/10/01 14:47:43 rillig Exp $
 
---- ../collects/make/setup-extension.ss.orig	2003-12-21 20:57:42.000000000 +0100
-+++ ../collects/make/setup-extension.ss
+--- collects/make/setup-extension.ss.orig	2003-12-21 20:57:42.000000000 +0100
++++ collects/make/setup-extension.ss
 @@ -76,12 +76,7 @@
  	       (path-list-string->path-list v (list default-lib-dir))
  	       (list default-lib-dir)))
diff --git a/lang/mzscheme/patches/patch-ac b/lang/mzscheme/patches/patch-ac
index 6f3267c9bda..c591d2540d5 100644
--- a/lang/mzscheme/patches/patch-ac
+++ b/lang/mzscheme/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2003/12/23 23:57:16 pooka Exp $
+$NetBSD: patch-ac,v 1.4 2006/10/01 14:47:43 rillig Exp $
 
---- ../man/man1/help-desk.1.orig	2003-12-21 21:03:34.000000000 +0100
-+++ ../man/man1/help-desk.1
+--- man/man1/help-desk.1.orig	2003-12-21 21:03:34.000000000 +0100
++++ man/man1/help-desk.1
 @@ -22,7 +22,7 @@ http://www.drscheme.org/
  looks for its libraries using the environment variables
  PLTHOME and PLTCOLLECTS.  If this variable is not defined,
diff --git a/lang/mzscheme/patches/patch-ah b/lang/mzscheme/patches/patch-ah
index bb00761b0b2..f6ecd21b85c 100644
--- a/lang/mzscheme/patches/patch-ah
+++ b/lang/mzscheme/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.3 2003/12/23 23:57:16 pooka Exp $
+$NetBSD: patch-ah,v 1.4 2006/10/01 14:47:43 rillig Exp $
 
---- ../man/man1/mzscheme.1.orig	2003-12-21 21:04:20.000000000 +0100
-+++ ../man/man1/mzscheme.1
+--- man/man1/mzscheme.1.orig	2003-12-21 21:04:20.000000000 +0100
++++ man/man1/mzscheme.1
 @@ -315,7 +315,7 @@ environment variable containing a file w
  invoked (usually "mzscheme") are checked. Links and parent directories
  are followed as in the first case.
diff --git a/lang/mzscheme/patches/patch-aj b/lang/mzscheme/patches/patch-aj
index bd84ff77d66..c08c506efc8 100644
--- a/lang/mzscheme/patches/patch-aj
+++ b/lang/mzscheme/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.3 2003/12/23 23:57:16 pooka Exp $
+$NetBSD: patch-aj,v 1.4 2006/10/01 14:47:43 rillig Exp $
 
---- ../collects/slibinit/init.ss.orig	2003-12-21 21:02:43.000000000 +0100
-+++ ../collects/slibinit/init.ss
+--- collects/slibinit/init.ss.orig	2003-12-21 21:02:43.000000000 +0100
++++ collects/slibinit/init.ss
 @@ -55,7 +55,7 @@
  			       [(base name dir?) (split-path base)])
  		   (and (string? base) base))))