pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

klh10: installs now a TOPS-20 Panda distribution.



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Mon Jan 3 23:11:51 2022 +0100
Changeset:	c6024b41a71dc4f8e1016d7e3965274ee69f6d24

Modified Files:
	klh10/Makefile
	klh10/PLIST
	klh10/TODO
	klh10/distinfo

Log Message:
klh10: installs now a TOPS-20 Panda distribution.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c6024b41a71dc4f8e1016d7e3965274ee69f6d24

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 klh10/Makefile | 42 ++++++++++++++++++++++++++++++++----------
 klh10/PLIST    | 24 +++++++++++++++++++++++-
 klh10/TODO     |  1 +
 klh10/distinfo |  3 +++
 4 files changed, 59 insertions(+), 11 deletions(-)

diffs:
diff --git a/klh10/Makefile b/klh10/Makefile
index 5f721194e5..5f23897452 100644
--- a/klh10/Makefile
+++ b/klh10/Makefile
@@ -7,9 +7,13 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=PDP-10/}
 GITHUB_PROJECT=	klh10
 GITHUB_TAG=	c92bb5f10426f24cdeadd27651c5d068ef7a4230
 
-# TODO: also fetch this file
-#DISTFILES+=	panda-dist.tar.gz
-#MASTER_SITE.panda-dist.tar.gz=	http://panda.trailing-edge.com/
+# Also fetch this file.
+DISTFILES+=			${DEFAULT_DISTFILES}	# from github
+DISTFILES+=			panda-dist.tar.gz
+SITES.panda-dist.tar.gz=	http://panda.trailing-edge.com/
+# Store it in subdir klh10-2.0h because the previous package did so.
+# TODO but this doesn't work...
+DIST_SUBDIR.panda-dist.tar.gz=	klh10-2.0h
 
 MAINTAINER=	rhialto%NetBSD.org@localhost
 HOMEPAGE=	http://panda.trailing-edge.com/
@@ -17,7 +21,7 @@ COMMENT=	PDP-10 KS10/KL10B CPU model emulator
 #LICENSE=	# KLH10 Free-Fork License
 
 USE_TOOLS+=	automake autoconf autoheader
-USE_TOOLS+=	pax
+USE_TOOLS+=	pax gzip
 GNU_CONFIGURE=	yes
 
 CONFIGURE_DIRS=		${WRKSRC}/build
@@ -28,22 +32,40 @@ CONFIGURE_ARGS+=	--with-vde=no		# no pkg for this
 
 BUILD_DIRS=	build
 
-KLH10_HOME=	${DESTDIR}${PREFIX}/libexec/klh10
+KLH10_HOME=	${PREFIX}/libexec/klh10
+KLH10_SHARE=	${PREFIX}/share/klh10
+PANDA=		${KLH10_SHARE}/panda
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
-	mkdir ${CONFIGURE_DIRS}
+	cd ${WRKSRC} && mkdir ${CONFIGURE_DIRS}
 
 do-install:
 .for emu in kl ks ks-its
-	cd ${WRKSRC}/build/bld-${emu} && env KLH10_HOME=${KLH10_HOME}/home-${emu} make install
-	rmdir ${KLH10_HOME}/home-${emu}/flushed
+	cd ${WRKSRC}/build/bld-${emu} && env KLH10_HOME=${DESTDIR}${KLH10_HOME}/home-${emu} make install
+	rm -rf ${DESTDIR}${KLH10_HOME}/home-${emu}/flushed
 .endfor
 	cd ${WRKSRC}/run; ${FIND} . -type f \! -name '*.orig' -print | \
 		pax -rw ${DESTDIR}${PREFIX}/share/klh10
 	cd ${WRKSRC}/doc; ${FIND} . -type f \! -name '*.orig' -print | \
 		pax -rw ${DESTDIR}${PREFIX}/share/klh10
-# TODO: also install Panda TOPS-20 disk image and related files
-#       if not present already
+# TODO: install Panda TOPS-20 disk image and related files
+#       but ONLY IF NOT PRESENT ALREADY.
+	cd ${WRKDIR}/panda-dist; \
+	    ${MKDIR} ${DESTDIR}${PANDA}; \
+	    gzip -k RH20.RP07.1; \
+	    ${INSTALL_DATA} RH20.RP07.1.gz ${DESTDIR}${PANDA}/; \
+	    ${INSTALL_DATA} CPYRIGHT PandaPanel.jpg README* ${DESTDIR}${PANDA}/; \
+	    ${INSTALL_SCRIPT} inst-klt20* klt20* ${DESTDIR}${PANDA}/
+	cd ${DESTDIR}${PANDA}; \
+	    for f in boot.sav mtboot.sav; \
+	    do \
+	        ln -s ${KLH10_SHARE}/klt20/$$f .; \
+	    done; \
+	    for f in dpni20 dprpxx dptm03 enaddr kn10-kl tapedd udlconv \
+	             uexbconv vdkfmt wfconv wxtest; \
+	    do \
+	        ln -s ${KLH10_HOME}/home-kl/$$f .; \
+	    done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/klh10/PLIST b/klh10/PLIST
index 6f35707adb..3f158135e6 100644
--- a/klh10/PLIST
+++ b/klh10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/10/17 15:41:09 ryoon Exp $
+@comment $NetBSD$
 libexec/klh10/home-kl/dpni20
 libexec/klh10/home-kl/dprpxx
 libexec/klh10/home-kl/dptm03
@@ -98,6 +98,28 @@ share/klh10/kst20/kst20.ini
 share/klh10/kst20/smboot-k.sav
 share/klh10/kst20/smmtbt-k.sav
 share/klh10/news.txt
+share/klh10/panda/CPYRIGHT
+share/klh10/panda/PandaPanel.jpg
+share/klh10/panda/README
+share/klh10/panda/README-MULTIUNIT-RP07
+share/klh10/panda/RH20.RP07.1.gz
+share/klh10/panda/boot.sav
+share/klh10/panda/dpni20
+share/klh10/panda/dprpxx
+share/klh10/panda/dptm03
+share/klh10/panda/enaddr
+share/klh10/panda/inst-klt20
+share/klh10/panda/inst-klt20.ini
+share/klh10/panda/klt20
+share/klh10/panda/klt20.ini
+share/klh10/panda/kn10-kl
+share/klh10/panda/mtboot.sav
+share/klh10/panda/tapedd
+share/klh10/panda/udlconv
+share/klh10/panda/uexbconv
+share/klh10/panda/vdkfmt
+share/klh10/panda/wfconv
+share/klh10/panda/wxtest
 share/klh10/usage.txt
 share/klh10/utils.txt
 share/klh10/vtape.txt
diff --git a/klh10/TODO b/klh10/TODO
index a8cde04bb3..0db51a814e 100644
--- a/klh10/TODO
+++ b/klh10/TODO
@@ -1,4 +1,5 @@
 * How to fetch multiple distfiles, from github and from a normal URL?
+  [I found a way, but is it the best one?]
 * The executables in libexec/ are ugly
 * Where to put instructions on using the emulator (which requires its helper
   programs linked into the current directory when running).
diff --git a/klh10/distinfo b/klh10/distinfo
index 806c9b5391..7c599fca0c 100644
--- a/klh10/distinfo
+++ b/klh10/distinfo
@@ -3,3 +3,6 @@ $NetBSD: distinfo,v 1.5 2021/10/26 10:23:53 nia Exp $
 BLAKE2s (klh10-2.0-c92bb5f10426f24cdeadd27651c5d068ef7a4230.tar.gz) = 377e5cfbe662884eb54f0b8b11b724c787e930626a2512f7c416840eeaa691a7
 SHA512 (klh10-2.0-c92bb5f10426f24cdeadd27651c5d068ef7a4230.tar.gz) = 98fbdfba7f9264d04b0f5e3b979b5a8aba93bd5fa6bdadd2af610843237e3304600c692c377a60032208f47b8209224b5bcc386bcb6c24ad45678e30900458ec
 Size (klh10-2.0-c92bb5f10426f24cdeadd27651c5d068ef7a4230.tar.gz) = 2355010 bytes
+BLAKE2s (panda-dist.tar.gz) = bf7a631959980b92abc25a0003fa2864106d9d019d42424fd454944c1869d60d
+SHA512 (panda-dist.tar.gz) = bef02ed5c8b7aa78e82222bcd5afd2ef39061f358128d504bc3b5ff37c10afe4f9d60cc890bb4b3c2de1f1b9524c359aae9d47196f2f58d92498af659e2f3dbb
+Size (panda-dist.tar.gz) = 221145391 bytes


Home | Main Index | Thread Index | Old Index