Wed Apr 29 23:07:37 2020 UTC ()
bulk-small: remove pkg-config

it conflicts with pkgconf that you will build as one of the dependencies.


(maya)
diff -r1.26 -r1.27 pkgsrc/meta-pkgs/bulk-small/Makefile
cvs diff -r1.26 -r1.27 pkgsrc/meta-pkgs/bulk-small/Makefile (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/bulk-small/Makefile 2020/04/29 21:41:24 1.26
+++ pkgsrc/meta-pkgs/bulk-small/Makefile 2020/04/29 23:07:37 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.26 2020/04/29 21:41:24 maya Exp $ 1# $NetBSD: Makefile,v 1.27 2020/04/29 23:07:37 maya Exp $
2 2
3DISTNAME= bulk-small-20180101 3DISTNAME= bulk-small-20180101
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= meta-pkgs 5CATEGORIES= meta-pkgs
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= dholland@NetBSD.org 9MAINTAINER= dholland@NetBSD.org
10COMMENT= Meta-package for a standard short limited bulk build 10COMMENT= Meta-package for a standard short limited bulk build
11 11
12META_PACKAGE= yes 12META_PACKAGE= yes
13 13
14RESTRICTED= Just for test build purpose 14RESTRICTED= Just for test build purpose
@@ -100,27 +100,26 @@ BUILD_DEPENDS+= python27-[0-9]*:../../la @@ -100,27 +100,26 @@ BUILD_DEPENDS+= python27-[0-9]*:../../la
100BUILD_DEPENDS+= bsdtar-[0-9]*:../../archivers/bsdtar 100BUILD_DEPENDS+= bsdtar-[0-9]*:../../archivers/bsdtar
101BUILD_DEPENDS+= bzip2-[0-9]*:../../archivers/bzip2 101BUILD_DEPENDS+= bzip2-[0-9]*:../../archivers/bzip2
102BUILD_DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base 102BUILD_DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base
103BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip 103BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
104BUILD_DEPENDS+= xz-[0-9]*:../../archivers/xz 104BUILD_DEPENDS+= xz-[0-9]*:../../archivers/xz
105BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip 105BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
106BUILD_DEPENDS+= autoconf-[0-9]*:../../devel/autoconf 106BUILD_DEPENDS+= autoconf-[0-9]*:../../devel/autoconf
107BUILD_DEPENDS+= automake-[0-9]*:../../devel/automake 107BUILD_DEPENDS+= automake-[0-9]*:../../devel/automake
108BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison 108BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
109BUILD_DEPENDS+= flex-[0-9]*:../../devel/flex 109BUILD_DEPENDS+= flex-[0-9]*:../../devel/flex
110BUILD_DEPENDS+= gmake-[0-9]*:../../devel/gmake 110BUILD_DEPENDS+= gmake-[0-9]*:../../devel/gmake
111BUILD_DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base 111BUILD_DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
112BUILD_DEPENDS+= m4-[0-9]*:../../devel/m4 112BUILD_DEPENDS+= m4-[0-9]*:../../devel/m4
113BUILD_DEPENDS+= pkg-config-[0-9]*:../../devel/pkg-config 
114#BUILD_DEPENDS+= osabi-[0-9]*:../../pkgtools/osabi 113#BUILD_DEPENDS+= osabi-[0-9]*:../../pkgtools/osabi
115BUILD_DEPENDS+= pkg_tarup-[0-9]*:../../pkgtools/pkg_tarup 114BUILD_DEPENDS+= pkg_tarup-[0-9]*:../../pkgtools/pkg_tarup
116 115
117.include "../../mk/bsd.prefs.mk" 116.include "../../mk/bsd.prefs.mk"
118 117
119.if ${X11_TYPE} == "native" 118.if ${X11_TYPE} == "native"
120BUILD_DEPENDS+= x11-links-[0-9]*:../../pkgtools/x11-links 119BUILD_DEPENDS+= x11-links-[0-9]*:../../pkgtools/x11-links
121.endif 120.endif
122 121
123# 122#
124# 4. Core widely-used libraries. 123# 4. Core widely-used libraries.
125# 124#
126BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv 125BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv