Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id A1FB67A3D6 for ; Sun, 3 Jul 2016 19:26:38 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 1EC6685EA4; Sun, 3 Jul 2016 19:26:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A58D985E99 for ; Sun, 3 Jul 2016 19:26:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id gvLGhGK5DJzF for ; Sun, 3 Jul 2016 19:26:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DD03D85E25 for ; Sun, 3 Jul 2016 19:26:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1D928FBB5; Sun, 3 Jul 2016 19:26:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146757399647040" MIME-Version: 1.0 Date: Sun, 3 Jul 2016 19:26:36 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20160703192636.1D928FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146757399647040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dholland Date: Sun Jul 3 19:26:36 UTC 2016 Modified Files: pkgsrc/lang/smlnj: Makefile distinfo pkgsrc/lang/smlnj11072: Makefile distinfo Added Files: pkgsrc/lang/smlnj/files: mk.ppc-netbsd mk.sparc-netbsd pkgsrc/lang/smlnj11072/files: mk.ppc-netbsd mk.sparc-netbsd Removed Files: pkgsrc/lang/smlnj/patches: patch-ab patch-ag pkgsrc/lang/smlnj11072/patches: patch-ab patch-ag Log Message: Store brand new configs in ${FILESDIR}, not as patches. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/smlnj/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/smlnj/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/lang/smlnj/files/mk.ppc-netbsd \ pkgsrc/lang/smlnj/files/mk.sparc-netbsd cvs rdiff -u -r1.3 -r0 pkgsrc/lang/smlnj/patches/patch-ab \ pkgsrc/lang/smlnj/patches/patch-ag cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/smlnj11072/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/smlnj11072/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/lang/smlnj11072/files/mk.ppc-netbsd \ pkgsrc/lang/smlnj11072/files/mk.sparc-netbsd cvs rdiff -u -r1.2 -r0 pkgsrc/lang/smlnj11072/patches/patch-ab \ pkgsrc/lang/smlnj11072/patches/patch-ag Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146757399647040 Content-Disposition: inline Content-Length: 8003 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/smlnj/Makefile diff -u pkgsrc/lang/smlnj/Makefile:1.31 pkgsrc/lang/smlnj/Makefile:1.32 --- pkgsrc/lang/smlnj/Makefile:1.31 Sun Jul 3 19:21:44 2016 +++ pkgsrc/lang/smlnj/Makefile Sun Jul 3 19:26:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2016/07/03 19:21:44 dholland Exp $ +# $NetBSD: Makefile,v 1.32 2016/07/03 19:26:35 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -79,8 +79,10 @@ do-extract: cd ${WRKDIR}/src; ${EXTRACT_CMD} # symlink the rest of the distfiles +# also copy in new configs post-extract: cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* . + cp ${FILESDIR}/mk.* ${WRKDIR}/src/runtime/objs/ # make the necessary copy of the runtime, _after_ patching src post-patch: Index: pkgsrc/lang/smlnj/distinfo diff -u pkgsrc/lang/smlnj/distinfo:1.21 pkgsrc/lang/smlnj/distinfo:1.22 --- pkgsrc/lang/smlnj/distinfo:1.21 Sun Jul 3 19:18:46 2016 +++ pkgsrc/lang/smlnj/distinfo Sun Jul 3 19:26:35 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2016/07/03 19:18:46 dholland Exp $ +$NetBSD: distinfo,v 1.22 2016/07/03 19:26:35 dholland Exp $ SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9 RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb @@ -81,11 +81,9 @@ RMD160 (smlnj-110.73/trace-debug-profile SHA512 (smlnj-110.73/trace-debug-profile.tgz) = f806a36a2d9d500af0975f8d2ebb38b8189fc9732f3163ad3bc3c7b7fd13cba965ab41754b4e37ef576005b2733b41cf291fb2d4ae5c47ec2a51a751507b911f Size (smlnj-110.73/trace-debug-profile.tgz) = 3899 bytes SHA1 (patch-aa) = f738a6284236158b6b95928768fe1213cc77fc20 -SHA1 (patch-ab) = 2c9a448c8566d87a2d01528cf6e38ed0dfd9328b SHA1 (patch-ad) = 67802bbdf42408c60bbce4087f20d000a3445677 SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b -SHA1 (patch-ag) = 1dd473bf9b21cd6218945c119fb08230dcd3c4bf SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393 SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e Index: pkgsrc/lang/smlnj11072/Makefile diff -u pkgsrc/lang/smlnj11072/Makefile:1.7 pkgsrc/lang/smlnj11072/Makefile:1.8 --- pkgsrc/lang/smlnj11072/Makefile:1.7 Sun Jul 3 19:21:44 2016 +++ pkgsrc/lang/smlnj11072/Makefile Sun Jul 3 19:26:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/07/03 19:21:44 dholland Exp $ +# $NetBSD: Makefile,v 1.8 2016/07/03 19:26:35 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -78,8 +78,10 @@ do-extract: cd ${WRKDIR}/src; ${EXTRACT_CMD} # symlink the rest of the distfiles +# also copy in new configs post-extract: cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* . + cp ${FILESDIR}/mk.* ${WRKDIR}/src/runtime/objs/ # make the necessary copy of the runtime, _after_ patching src post-patch: Index: pkgsrc/lang/smlnj11072/distinfo diff -u pkgsrc/lang/smlnj11072/distinfo:1.6 pkgsrc/lang/smlnj11072/distinfo:1.7 --- pkgsrc/lang/smlnj11072/distinfo:1.6 Sun Jul 3 19:18:47 2016 +++ pkgsrc/lang/smlnj11072/distinfo Sun Jul 3 19:26:35 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2016/07/03 19:18:47 dholland Exp $ +$NetBSD: distinfo,v 1.7 2016/07/03 19:26:35 dholland Exp $ SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb @@ -61,11 +61,9 @@ SHA1 (smlnj-110.72/trace-debug-profile.t RMD160 (smlnj-110.72/trace-debug-profile.tgz) = 6c85734aefd0672a645497550dacf56f503dd726 Size (smlnj-110.72/trace-debug-profile.tgz) = 3905 bytes SHA1 (patch-aa) = f738a6284236158b6b95928768fe1213cc77fc20 -SHA1 (patch-ab) = 2c9a448c8566d87a2d01528cf6e38ed0dfd9328b SHA1 (patch-ad) = 67802bbdf42408c60bbce4087f20d000a3445677 SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b -SHA1 (patch-ag) = 1dd473bf9b21cd6218945c119fb08230dcd3c4bf SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393 SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e Added files: Index: pkgsrc/lang/smlnj/files/mk.ppc-netbsd diff -u /dev/null pkgsrc/lang/smlnj/files/mk.ppc-netbsd:1.1 --- /dev/null Sun Jul 3 19:26:36 2016 +++ pkgsrc/lang/smlnj/files/mk.ppc-netbsd Sun Jul 3 19:26:35 2016 @@ -0,0 +1,25 @@ +# mk.ppc-netbsd +# $NetBSD: mk.ppc-netbsd,v 1.1 2016/07/03 19:26:35 dholland Exp $ +# + +SHELL = /bin/sh + +MAKE = gmake +GCC = gcc +ARFLAGS = Trcv +CFLAGS = @CFLAGS@ +LDFLAGS= +CPP = $(GCC) -x c -E -P + +#XOBJS = xmonitor.o +#LD_LIBS = -lX11 +#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG +XOBJS = +XLIBS = +DEFS = $(BASE_DEFS) -DHOST_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD +TARGET = PPC +VERSION = v-ppc-netbsd +RUNTIME = run.ppc-netbsd + +all: + ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) Index: pkgsrc/lang/smlnj/files/mk.sparc-netbsd diff -u /dev/null pkgsrc/lang/smlnj/files/mk.sparc-netbsd:1.1 --- /dev/null Sun Jul 3 19:26:36 2016 +++ pkgsrc/lang/smlnj/files/mk.sparc-netbsd Sun Jul 3 19:26:35 2016 @@ -0,0 +1,25 @@ +# mk.sparc-netbsd +# $NetBSD: mk.sparc-netbsd,v 1.1 2016/07/03 19:26:35 dholland Exp $ +# + +SHELL = /bin/sh + +MAKE = gmake +GCC = gcc +ARFLAGS = Trcv +CFLAGS = @CFLAGS@ +LDFLAGS= +CPP = $(GCC) -x c -E -P + +#XOBJS = xmonitor.o +#LD_LIBS = -lX11 +#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG +XOBJS = +XLIBS = +DEFS = $(BASE_DEFS) -DHOST_SPARC -DTARGET_SPARC -DOPSYS_UNIX -DOPSYS_NETBSD -DCALLEESAVE=3 -DUNBOXEDFLOAT=1 +TARGET = SPARC +VERSION = v-sparc-netbsd +RUNTIME = run.sparc-netbsd + +all: + ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) Index: pkgsrc/lang/smlnj11072/files/mk.ppc-netbsd diff -u /dev/null pkgsrc/lang/smlnj11072/files/mk.ppc-netbsd:1.1 --- /dev/null Sun Jul 3 19:26:36 2016 +++ pkgsrc/lang/smlnj11072/files/mk.ppc-netbsd Sun Jul 3 19:26:35 2016 @@ -0,0 +1,25 @@ +# mk.ppc-netbsd +# $NetBSD: mk.ppc-netbsd,v 1.1 2016/07/03 19:26:35 dholland Exp $ +# + +SHELL = /bin/sh + +MAKE = gmake +GCC = gcc +ARFLAGS = Trcv +CFLAGS = @CFLAGS@ +LDFLAGS= +CPP = $(GCC) -x c -E -P + +#XOBJS = xmonitor.o +#LD_LIBS = -lX11 +#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG +XOBJS = +XLIBS = +DEFS = $(BASE_DEFS) -DHOST_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD +TARGET = PPC +VERSION = v-ppc-netbsd +RUNTIME = run.ppc-netbsd + +all: + ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) Index: pkgsrc/lang/smlnj11072/files/mk.sparc-netbsd diff -u /dev/null pkgsrc/lang/smlnj11072/files/mk.sparc-netbsd:1.1 --- /dev/null Sun Jul 3 19:26:36 2016 +++ pkgsrc/lang/smlnj11072/files/mk.sparc-netbsd Sun Jul 3 19:26:35 2016 @@ -0,0 +1,25 @@ +# mk.sparc-netbsd +# $NetBSD: mk.sparc-netbsd,v 1.1 2016/07/03 19:26:35 dholland Exp $ +# + +SHELL = /bin/sh + +MAKE = gmake +GCC = gcc +ARFLAGS = Trcv +CFLAGS = @CFLAGS@ +LDFLAGS= +CPP = $(GCC) -x c -E -P + +#XOBJS = xmonitor.o +#LD_LIBS = -lX11 +#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG +XOBJS = +XLIBS = +DEFS = $(BASE_DEFS) -DHOST_SPARC -DTARGET_SPARC -DOPSYS_UNIX -DOPSYS_NETBSD -DCALLEESAVE=3 -DUNBOXEDFLOAT=1 +TARGET = SPARC +VERSION = v-sparc-netbsd +RUNTIME = run.sparc-netbsd + +all: + ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) --_----------=_146757399647040--