[pkgsrc/pkgsrc-2018Q3]: pkgsrc/lang gcc7, gcc7-libs: revert previous change t...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/434187e60539
branches:  pkgsrc-2018Q3
changeset: 338437:434187e60539
user:      maya <maya%pkgsrc.org@localhost>
date:      Tue Aug 06 14:13:25 2019 +0000

description:
gcc7, gcc7-libs: revert previous change to wrong branch.
Suggested by joerg.

diffstat:

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

diffs (52 lines):

diff -r 137ed712e9c2 -r 434187e60539 lang/gcc7-libs/Makefile
--- a/lang/gcc7-libs/Makefile   Tue Aug 06 13:56:20 2019 +0000
+++ b/lang/gcc7-libs/Makefile   Tue Aug 06 14:13:25 2019 +0000
@@ -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 @@
 ## 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 -r 137ed712e9c2 -r 434187e60539 lang/gcc7/Makefile
--- a/lang/gcc7/Makefile        Tue Aug 06 13:56:20 2019 +0000
+++ b/lang/gcc7/Makefile        Tue Aug 06 14:13:25 2019 +0000
@@ -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 @@
 ## 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 @@
 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 @@
        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"