Received: by mail.netbsd.org (Postfix, from userid 605) id 4AE0184D56; Wed, 23 Aug 2017 17:52:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CFC4E84D56 for ; Wed, 23 Aug 2017 17:52:47 +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 s7NBdYq2_wRI for ; Wed, 23 Aug 2017 17:52:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 525A784C86 for ; Wed, 23 Aug 2017 17:52:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 508DCFA85; Wed, 23 Aug 2017 17:52:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1503510767235280" MIME-Version: 1.0 Date: Wed, 23 Aug 2017 17:52:47 +0000 From: "Johnny C. Lam" Subject: CVS commit: pkgsrc/shells To: pkgsrc-changes@NetBSD.org Reply-To: jlam@netbsd.org X-Mailer: log_accum Message-Id: <20170823175247.508DCFA85@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1503510767235280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jlam Date: Wed Aug 23 17:52:47 UTC 2017 Modified Files: pkgsrc/shells/standalone-tcsh: Makefile pkgsrc/shells/static-tcsh: Makefile pkgsrc/shells/tcsh: Makefile Log Message: shells/{,static-,standalone}tcsh: Fix PKGREVISION & MAINTAINER. The tcsh package Makefile is included directly by the static-tcsh and standalone-tcsh Makefiles. Modify some of the variables that really need to be package-specific to be set with ?= in tcsh/Makefile and document the package Makefiles that directly include it. Set PKGREVISION directly in static-tcsh and standalone-tcsh now that they can have independent PKGREVISION values. Bump the PKGREVISION of static-tcsh due to the MAINTAINER now correctly being listed as agc@ due to this change. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/shells/standalone-tcsh/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/shells/static-tcsh/Makefile cvs rdiff -u -r1.85 -r1.86 pkgsrc/shells/tcsh/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1503510767235280 Content-Disposition: inline Content-Length: 2384 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.27 pkgsrc/shells/standalone-tcsh/Makefile:1.28 --- pkgsrc/shells/standalone-tcsh/Makefile:1.27 Wed Sep 7 21:03:21 2016 +++ pkgsrc/shells/standalone-tcsh/Makefile Wed Aug 23 17:52:47 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2016/09/07 21:03:21 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2017/08/23 17:52:47 jlam Exp $ # # FIXME: This is because of PREFIX=/ below. @@ -6,6 +6,7 @@ CHECK_FILES_SUPPORTED= no NOT_FOR_UNPRIVILEGED= yes PKGNAME= standalone-${DISTNAME} +PKGREVISION= 2 # ALWAYS needs to be set; 0 if none. WRKSRC= ${WRKDIR}/${DISTNAME} PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches Index: pkgsrc/shells/static-tcsh/Makefile diff -u pkgsrc/shells/static-tcsh/Makefile:1.8 pkgsrc/shells/static-tcsh/Makefile:1.9 --- pkgsrc/shells/static-tcsh/Makefile:1.8 Sat Jul 21 15:56:42 2012 +++ pkgsrc/shells/static-tcsh/Makefile Wed Aug 23 17:52:47 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/07/21 15:56:42 dholland Exp $ +# $NetBSD: Makefile,v 1.9 2017/08/23 17:52:47 jlam Exp $ # MAINTAINER= agc@NetBSD.org @@ -11,6 +11,7 @@ DESCR_SRC= ${.CURDIR}/../../shells/tcsh CONFLICTS= tcsh-[0-9]* PKGNAME= static-${DISTNAME} +PKGREVISION= 3 # ALWAYS needs to be set; 0 if none. .include "../../shells/tcsh/Makefile" Index: pkgsrc/shells/tcsh/Makefile diff -u pkgsrc/shells/tcsh/Makefile:1.85 pkgsrc/shells/tcsh/Makefile:1.86 --- pkgsrc/shells/tcsh/Makefile:1.85 Fri Feb 17 19:21:44 2017 +++ pkgsrc/shells/tcsh/Makefile Wed Aug 23 17:52:47 2017 @@ -1,17 +1,20 @@ -# $NetBSD: Makefile,v 1.85 2017/02/17 19:21:44 he Exp $ +# $NetBSD: Makefile,v 1.86 2017/08/23 17:52:47 jlam Exp $ +# +# used by shells/standalone-tcsh/Makefile +# used by shells/static-tcsh/Makefile DISTNAME= tcsh-6.20.00 -PKGREVISION= 2 +PKGREVISION?= 2 # use ?= to allow for overrides. CATEGORIES= shells MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ MASTER_SITES+= ftp://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/ -MAINTAINER= kimmo@suominen.com +MAINTAINER?= kimmo@suominen.com # use ?= to allow for overrides. HOMEPAGE= http://www.tcsh.org/ COMMENT= Extended C-shell with many useful features LICENSE= original-bsd -CONFLICTS?= static-tcsh-[0-9]* +CONFLICTS?= static-tcsh-[0-9]* # use ?= to allow for overrides. GNU_CONFIGURE= yes --_----------=_1503510767235280--