From 982ec9eb9f43a18ad53e2af9e9bdfa64998cea7a Mon Sep 17 00:00:00 2001
From: maya <maya@pkgsrc.org>
Date: Tue, 6 Aug 2019 14:13:25 +0000
Subject: gcc7, gcc7-libs: revert previous change to wrong branch. Suggested by
 joerg.

---
 lang/gcc7-libs/Makefile | 4 ++--
 lang/gcc7/Makefile      | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lang/gcc7-libs/Makefile b/lang/gcc7-libs/Makefile
index b03c4131fd7..77f7a162c76 100644
--- a/lang/gcc7-libs/Makefile
+++ b/lang/gcc7-libs/Makefile
@@ -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_VERSION}
 ## 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
diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile
index 46b2d64628d..aa627d4a6ca 100644
--- a/lang/gcc7/Makefile
+++ b/lang/gcc7/Makefile
@@ -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_VERSION}
 ## 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"
-- 
cgit v1.2.3