Received: by mail.netbsd.org (Postfix, from userid 605) id 02EF384D61; Tue, 6 Aug 2019 14:13:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8009684CDA for ; Tue, 6 Aug 2019 14:13:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id MkV5y3zANy_F for ; Tue, 6 Aug 2019 14:13:26 +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 0113484C81 for ; Tue, 6 Aug 2019 14:13:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EEC3BFBF4; Tue, 6 Aug 2019 14:13:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1565100805154220" MIME-Version: 1.0 Date: Tue, 6 Aug 2019 14:13:25 +0000 From: "Maya Rashish" Subject: CVS commit: [pkgsrc-2018Q3] pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20190806141325.EEC3BFBF4@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. --_----------=_1565100805154220 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Tue Aug 6 14:13:25 UTC 2019 Modified Files: pkgsrc/lang/gcc7 [pkgsrc-2018Q3]: Makefile pkgsrc/lang/gcc7-libs [pkgsrc-2018Q3]: Makefile Log Message: gcc7, gcc7-libs: revert previous change to wrong branch. Suggested by joerg. To generate a diff of this commit: cvs rdiff -u -r1.20.2.1 -r1.20.2.2 pkgsrc/lang/gcc7/Makefile cvs rdiff -u -r1.3.2.1 -r1.3.2.2 pkgsrc/lang/gcc7-libs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1565100805154220 Content-Disposition: inline Content-Length: 2177 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/gcc7/Makefile diff -u pkgsrc/lang/gcc7/Makefile:1.20.2.1 pkgsrc/lang/gcc7/Makefile:1.20.2.2 --- pkgsrc/lang/gcc7/Makefile:1.20.2.1 Tue Aug 6 13:56:20 2019 +++ pkgsrc/lang/gcc7/Makefile Tue Aug 6 14:13:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20.2.1 2019/08/06 13:56:20 maya Exp $ +# $NetBSD: Makefile,v 1.20.2.2 2019/08/06 14:13:25 maya Exp $ GCC_PKGNAME= gcc7 .include "version.mk" @@ -8,7 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC7_DIST_VERS ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc7-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! -PKGREVISION= 5 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/} EXTRACT_SUFX= .tar.xz @@ -37,7 +37,6 @@ GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} INFO_FILES= yes CONFIGURE_ARGS+= --disable-libstdcxx-pch -CONFIGURE_ARGS+= --with-system-zlib UNLIMIT_RESOURCES+= datasize UNLIMIT_RESOURCES+= stacksize @@ -200,7 +199,6 @@ GENERATE_PLIST+= \ cd ${DESTDIR}${PREFIX} && \ ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; -.include "../../devel/zlib/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/gcc7-libs/Makefile diff -u pkgsrc/lang/gcc7-libs/Makefile:1.3.2.1 pkgsrc/lang/gcc7-libs/Makefile:1.3.2.2 --- pkgsrc/lang/gcc7-libs/Makefile:1.3.2.1 Tue Aug 6 13:56:20 2019 +++ pkgsrc/lang/gcc7-libs/Makefile Tue Aug 6 14:13:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3.2.1 2019/08/06 13:56:20 maya Exp $ +# $NetBSD: Makefile,v 1.3.2.2 2019/08/06 14:13:25 maya Exp $ GCC_PKGNAME= gcc7 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -9,7 +9,7 @@ PKGNAME= ${GCC_PKGNAME}-libs-${GCC7_DIST ## The PKGREVISION of this package needs to be at least 1 more than the ## PKGREVISION of the lang/gcc7 package so that with the dependence pattern ## '{gcc7,gcc7-libs}>=7.3.*' pkg_add will choose gcc7-libs over gcc7. -PKGREVISION= 6 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= # empty --_----------=_1565100805154220--