Find the distfile again and portlint while I'm here.

PR:		7545
Submitted by:	Daniel O'Connor <doconnor@gsoft.com.au>

3 files changed, 118 insertions, 10 deletions

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 95fbd8ee1258..d40fdef8f81c 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -3,28 +3,33 @@
 # Date created:         Sat Nov  5 17:11:01 PST 1994
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.11 1996/11/18 14:03:15 asami Exp $
+# $Id: Makefile,v 1.12 1998/02/01 22:46:18 fenner Exp $
 #
 
 DISTNAME=       scm
 PKGNAME=	scm-4e1
 CATEGORIES=	lang
-MASTER_SITES=   ftp://swiss-ftp.ai.mit.edu/pub/scm/ \
+MASTER_SITES=	ftp://ftp.swiss.ai.mit.edu/archive/scm/OLD/ \
+		ftp://swiss-ftp.ai.mit.edu/pub/scm/ \
 		ftp://swiss-ftp.ai.mit.edu/pub/scm/OLD/
 DISTFILES=      scm4e1.tar.gz \
 		slib.info.tar.gz slib2a2.tar.gz slib-psd1-3.tar.gz \
 		scmconfig4e1.tar.gz
 
+MAINTAINER=	ports@FreeBSD.org
+
 GNU_CONFIGURE=	yes
-USE_GMAKE=
+USE_GMAKE=	yes
 MAKE_FLAGS=	CFLAGS=-O2 LDFLAGS=-s defines="-DSICP -DHAVE_CONFIG_H -DFLOATS -DIO_EXTENSIONS -DMEMOIZE_LOCALS -DGC_FREE_SEGMENTS" -f
 MAN1=		scm.1
 
 pre-install:
-	${CP} -rp ${WRKDIR}/slib ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/lib/slib/psd
+	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${PREFIX}/lib/slib
+	${INSTALL_DATA} ${WRKDIR}/slib/psd/*.scm ${PREFIX}/lib/slib/psd
 	(cd ${WRKDIR}/slib; \
 		makeinfo slib.texi; \
 		${INSTALL_MAN} slib.info slib.info-1 slib.info-2 \
-				  slib.info-3 slib.info-4 /usr/local/info)
+			  slib.info-3 slib.info-4 ${PREFIX}/info)
 
 .include <bsd.port.mk>
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index 298fc3a750ad..17229c3cc24d 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,5 +1,5 @@
 MD5 (scm4e1.tar.gz) = ddd7a5d3571a41a26c931e25cca2614b
 MD5 (slib.info.tar.gz) = 812b9d507f5ccd5a4e08fa7355bd17ae
 MD5 (slib2a2.tar.gz) = 26833ea7198b4f60d52b87f4f9b74d65
-MD5 (slib-psd1-3.tar.gz) = 60b8f5356cffddb93272f9bbd535b663
-MD5 (scmconfig4e1.tar.gz) = ae6bd81fa4232cf82baf0f82328c9318
+MD5 (slib-psd1-3.tar.gz) = 81f5d0b2cb4cc1bf51ad4ed3e40b6769
+MD5 (scmconfig4e1.tar.gz) = 9720e35c47b372676247cf572bbb49ac
diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist
index 69fd91daa68b..e09003ba29ed 100644
--- a/lang/scm/pkg-plist
+++ b/lang/scm/pkg-plist
@@ -1,9 +1,112 @@
 bin/scm
-man/man1/scm.1.gz
-lib/scm
-lib/slib
+@unexec install-info --delete %D/info/slib.info %D/info/dir
 info/slib.info
 info/slib.info-1
 info/slib.info-2
 info/slib.info-3
 info/slib.info-4
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/slib.info %D/info/dir
+lib/scm/COPYING
+lib/scm/Init.scm
+lib/scm/Transcen.scm
+lib/slib/Template.scm
+lib/slib/alist.scm
+lib/slib/alistab.scm
+lib/slib/array.scm
+lib/slib/arraymap.scm
+lib/slib/chap.scm
+lib/slib/charplot.scm
+lib/slib/cltime.scm
+lib/slib/collect.scm
+lib/slib/comlist.scm
+lib/slib/debug.scm
+lib/slib/defmacex.scm
+lib/slib/dwindtst.scm
+lib/slib/dynamic.scm
+lib/slib/dynwind.scm
+lib/slib/fluidlet.scm
+lib/slib/format.scm
+lib/slib/formatst.scm
+lib/slib/genwrite.scm
+lib/slib/getopt.scm
+lib/slib/hash.scm
+lib/slib/hashtab.scm
+lib/slib/lineio.scm
+lib/slib/logical.scm
+lib/slib/macrotst.scm
+lib/slib/macwork.scm
+lib/slib/mbe.scm
+lib/slib/modular.scm
+lib/slib/mulapply.scm
+lib/slib/mularg.scm
+lib/slib/mwdenote.scm
+lib/slib/mwexpand.scm
+lib/slib/mwsynrul.scm
+lib/slib/mwtest.scm
+lib/slib/obj2str.scm
+lib/slib/object.scm
+lib/slib/plottest.scm
+lib/slib/pp.scm
+lib/slib/ppfile.scm
+lib/slib/prime.scm
+lib/slib/priorque.scm
+lib/slib/process.scm
+lib/slib/promise.scm
+lib/slib/queue.scm
+lib/slib/r4rsyn.scm
+lib/slib/randinex.scm
+lib/slib/random.scm
+lib/slib/ratize.scm
+lib/slib/rbtest.scm
+lib/slib/rbtree.scm
+lib/slib/rdms.scm
+lib/slib/recobj.scm
+lib/slib/record.scm
+lib/slib/repl.scm
+lib/slib/require.scm
+lib/slib/sc2.scm
+lib/slib/sc3.scm
+lib/slib/sc4opt.scm
+lib/slib/sc4sc3.scm
+lib/slib/scaexpp.scm
+lib/slib/scaglob.scm
+lib/slib/scainit.scm
+lib/slib/scamacr.scm
+lib/slib/scanf.scm
+lib/slib/scaoutp.scm
+lib/slib/scmacro.scm
+lib/slib/scmactst.scm
+lib/slib/sierpinski.scm
+lib/slib/sort.scm
+lib/slib/soundex.scm
+lib/slib/stdio.scm
+lib/slib/strcase.scm
+lib/slib/strport.scm
+lib/slib/struct.scm
+lib/slib/structst.scm
+lib/slib/structure.scm
+lib/slib/synchk.scm
+lib/slib/synclo.scm
+lib/slib/synrul.scm
+lib/slib/tek40.scm
+lib/slib/tek41.scm
+lib/slib/test.scm
+lib/slib/time.scm
+lib/slib/trace.scm
+lib/slib/tree.scm
+lib/slib/trnscrpt.scm
+lib/slib/values.scm
+lib/slib/withfile.scm
+lib/slib/yasyn.scm
+lib/slib/psd/instrum.scm
+lib/slib/psd/pexpr.scm
+lib/slib/psd/primitives.scm
+lib/slib/psd/psd-slib.scm
+lib/slib/psd/read.scm
+lib/slib/psd/runtime.scm
+lib/slib/psd/version.scm
+man/man1/scm.1.gz
+@dirrm lib/scm
+@dirrm lib/slib/psd
+@dirrm lib/slib