Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 9B0081A9239 for ; Sun, 14 Nov 2021 21:53:17 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BA99C84D50; Sun, 14 Nov 2021 21:53:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F24E184D1D for ; Sun, 14 Nov 2021 21:53:15 +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 30yfZOkzbGta for ; Sun, 14 Nov 2021 21:53:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4480284CE3 for ; Sun, 14 Nov 2021 21:53:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 339C4FAEC; Sun, 14 Nov 2021 21:53:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1636926795178370" MIME-Version: 1.0 Date: Sun, 14 Nov 2021 21:53:15 +0000 From: "matthew green" Subject: CVS commit: pkgsrc/shells/standalone-tcsh To: pkgsrc-changes@NetBSD.org Reply-To: mrg@netbsd.org X-Mailer: log_accum Message-Id: <20211114215315.339C4FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1636926795178370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mrg Date: Sun Nov 14 21:53:15 UTC 2021 Modified Files: pkgsrc/shells/standalone-tcsh: Makefile Log Message: revert back to rev 1.29. the 'make package' step fails with 1.31. add a note that this should use tcsh/Makefile.common, not just the main Makefile directly. ok: kim@ To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/shells/standalone-tcsh/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1636926795178370 Content-Disposition: inline Content-Length: 1223 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/shells/standalone-tcsh/Makefile diff -u pkgsrc/shells/standalone-tcsh/Makefile:1.31 pkgsrc/shells/standalone-tcsh/Makefile:1.32 --- pkgsrc/shells/standalone-tcsh/Makefile:1.31 Sat Nov 13 06:53:10 2021 +++ pkgsrc/shells/standalone-tcsh/Makefile Sun Nov 14 21:53:15 2021 @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.31 2021/11/13 06:53:10 kim Exp $ +# $NetBSD: Makefile,v 1.32 2021/11/14 21:53:15 mrg Exp $ # -.include "../../shells/tcsh/Makefile.common" - # FIXME: This is because of PREFIX=/ below. CHECK_FILES_SUPPORTED= no NOT_FOR_UNPRIVILEGED= yes PKGNAME= standalone-${DISTNAME} +PKGREVISION= 0 # ALWAYS needs to be set; 0 if none. WRKSRC= ${WRKDIR}/${DISTNAME} PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches @@ -23,7 +22,9 @@ ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-* NOT_FOR_PLATFORM+= SunOS-*-* .endif -INSTALLATION_DIRS+= bin ++# XXX This should use Makefile.common, not Makefile +.include "../../shells/tcsh/Makefile" + INSTALLATION_DIRS+= usr/share/man/man1 COMMENT:= Standalone version of the Extended C-shell @@ -43,5 +44,3 @@ DISTINFO_FILE= ${.CURDIR}/../../shells/ .if ${OPSYS} != "SunOS" LDFLAGS+= -static .endif - -.include "../../mk/bsd.pkg.mk" --_----------=_1636926795178370--