head 1.13; access; symbols pkgsrc-2023Q4:1.13.0.48 pkgsrc-2023Q4-base:1.13 pkgsrc-2023Q3:1.13.0.46 pkgsrc-2023Q3-base:1.13 pkgsrc-2023Q2:1.13.0.44 pkgsrc-2023Q2-base:1.13 pkgsrc-2023Q1:1.13.0.42 pkgsrc-2023Q1-base:1.13 pkgsrc-2022Q4:1.13.0.40 pkgsrc-2022Q4-base:1.13 pkgsrc-2022Q3:1.13.0.38 pkgsrc-2022Q3-base:1.13 pkgsrc-2022Q2:1.13.0.36 pkgsrc-2022Q2-base:1.13 pkgsrc-2022Q1:1.13.0.34 pkgsrc-2022Q1-base:1.13 pkgsrc-2021Q4:1.13.0.32 pkgsrc-2021Q4-base:1.13 pkgsrc-2021Q3:1.13.0.30 pkgsrc-2021Q3-base:1.13 pkgsrc-2021Q2:1.13.0.28 pkgsrc-2021Q2-base:1.13 pkgsrc-2021Q1:1.13.0.26 pkgsrc-2021Q1-base:1.13 pkgsrc-2020Q4:1.13.0.24 pkgsrc-2020Q4-base:1.13 pkgsrc-2020Q3:1.13.0.22 pkgsrc-2020Q3-base:1.13 pkgsrc-2020Q2:1.13.0.20 pkgsrc-2020Q2-base:1.13 pkgsrc-2020Q1:1.13.0.16 pkgsrc-2020Q1-base:1.13 pkgsrc-2019Q4:1.13.0.18 pkgsrc-2019Q4-base:1.13 pkgsrc-2019Q3:1.13.0.14 pkgsrc-2019Q3-base:1.13 pkgsrc-2019Q2:1.13.0.12 pkgsrc-2019Q2-base:1.13 pkgsrc-2019Q1:1.13.0.10 pkgsrc-2019Q1-base:1.13 pkgsrc-2018Q4:1.13.0.8 pkgsrc-2018Q4-base:1.13 pkgsrc-2018Q3:1.13.0.6 pkgsrc-2018Q3-base:1.13 pkgsrc-2018Q2:1.13.0.4 pkgsrc-2018Q2-base:1.13 pkgsrc-2018Q1:1.13.0.2 pkgsrc-2018Q1-base:1.13 pkgsrc-2017Q4:1.12.0.20 pkgsrc-2017Q4-base:1.12 pkgsrc-2017Q3:1.12.0.18 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.14 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.12 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.10 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.8 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.6 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.4 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.2 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.11.0.52 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.11.0.50 pkgsrc-2015Q2-base:1.11 pkgsrc-2015Q1:1.11.0.48 pkgsrc-2015Q1-base:1.11 pkgsrc-2014Q4:1.11.0.46 pkgsrc-2014Q4-base:1.11 pkgsrc-2014Q3:1.11.0.44 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.42 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.40 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.38 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.36 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.34 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.32 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.30 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.28 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.26 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.24 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.22 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.20 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.18 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.16 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.14 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.12 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.10 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.11.0.8 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.6 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.4 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.2 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.10.0.2 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.9.0.24 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.22 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.20 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.18 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.16 pkgsrc-2008Q1:1.9.0.14 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.12 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.10 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.8 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.6 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.4 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.2 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.7.0.2 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.5.0.8 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.6 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.4 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.2 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.4.0.4 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.2 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.3.0.2 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2; locks; strict; comment @# @; 1.13 date 2018.01.07.13.04.35; author rillig; state Exp; branches; next 1.12; commitid dlppcM1x04atAWlA; 1.12 date 2015.11.25.12.53.42; author jperkin; state Exp; branches; next 1.11; commitid YuFePpCZROhqqtKy; 1.11 date 2009.06.14.22.58.09; author joerg; state Exp; branches; next 1.10; 1.10 date 2009.03.20.19.25.34; author joerg; state Exp; branches; next 1.9; 1.9 date 2006.07.08.23.11.11; author jlam; state Exp; branches; next 1.8; 1.8 date 2006.07.08.22.39.42; author jlam; state Exp; branches; next 1.7; 1.7 date 2006.04.12.10.27.38; author rillig; state Exp; branches; next 1.6; 1.6 date 2006.04.06.06.22.52; author reed; state Exp; branches; next 1.5; 1.5 date 2005.03.26.16.54.51; author jmmv; state Exp; branches; next 1.4; 1.4 date 2004.10.09.23.16.14; author reed; state Exp; branches; next 1.3; 1.3 date 2004.09.02.11.38.07; author jmmv; state Exp; branches; next 1.2; 1.2 date 2004.03.05.19.25.41; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.02.01.10.11.39; author jlam; state Exp; branches; next ; desc @@ 1.13 log @Fix indentation in buildlink3.mk files. The actual fix as been done by "pkglint -F */*/buildlink3.mk", and was reviewed manually. There are some .include lines that still are indented with zero spaces although the surrounding .if is indented. This is existing practice. @ text @# $NetBSD: buildlink3.mk,v 1.12 2015/11/25 12:53:42 jperkin Exp $ # # This Makefile fragment is included by packages that use xmlcatmgr. # # The following variables are automatically defined for free use in packages: # XMLCATMGR - Path to the xmlcatmgr program. # SGML_DEFAULT_CATALOG - Path to the system-wide (tunable) SGML catalog. # XML_DEFAULT_CATALOG - Path to the system-wide (tunable) XML catalog. # # Packages that recognize a system-wide catalog file should be configured # to use SGML_DEFAULT_CATALOG or XML_DEFAULT_CATALOG, depending on the # type of tool they are. # BUILDLINK_TREE+= xmlcatmgr .if !defined(XMLCATMGR_BUILDLINK3_MK) XMLCATMGR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1 BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr # Location of the xmlcatmgr binary program. XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr # System-wide configurable catalogs. .if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr) SGML_DEFAULT_CATALOG= ${PKG_SYSCONFDIR.xmlcatmgr}/sgml/catalog XML_DEFAULT_CATALOG= ${PKG_SYSCONFDIR.xmlcatmgr}/xml/catalog .else SGML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/sgml/catalog XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/xml/catalog .endif .endif # XMLCATMGR_BUILDLINK3_MK BUILDLINK_TREE+= -xmlcatmgr @ 1.12 log @Remove mk/find-prefix.mk usage from the textproc category. The find-prefix infrastructure was required in a pkgviews world where packages installed from pkgsrc could have different installation prefixes, and this was a way for a dependency prefix to be determined. Now that pkgviews has been removed there is no longer any need for the overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the dependency is coming from pkgsrc. Provides a reasonable performance win due to the reduction of `pkg_info -qp` calls, some of which were redundant anyway as they were duplicating the same information provided by BUILDLINK_PREFIX.pkg. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:09 joerg Exp $ d20 1 a20 1 BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1 @ 1.11 log @Remove @@dirrm related logic. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:34 joerg Exp $ d24 1 a24 3 EVAL_PREFIX+= XMLCATMGR_PREFIX=xmlcatmgr XMLCATMGR_PREFIX_DEFAULT= ${LOCALBASE} XMLCATMGR= ${XMLCATMGR_PREFIX}/bin/xmlcatmgr @ 1.10 log @Simply and speed up buildlink3.mk files and processing. This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:11 jlam Exp $ a36 2 PRINT_PLIST_AWK+= /^@@dirrm share\/(sgml|xml)$$/ \ { print "@@comment in xmlcatmgr: " $$0; next } @ 1.9 log @Change the format of BUILDLINK_ORDER to contain depth information as well, and add a new helper target and script, "show-buildlink3", that outputs a listing of the buildlink3.mk files included as well as the depth at which they are included. For example, "make show-buildlink3" in fonts/Xft2 displays: zlib fontconfig iconv zlib freetype2 expat freetype2 Xrender renderproto @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:42 jlam Exp $ d15 1 a15 2 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XMLCATMGR_BUILDLINK3_MK:= ${XMLCATMGR_BUILDLINK3_MK}+ d17 2 a18 7 .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= xmlcatmgr .endif BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlcatmgr} BUILDLINK_PACKAGES+= xmlcatmgr BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmlcatmgr a19 1 .if !empty(XMLCATMGR_BUILDLINK3_MK:M+) d39 1 d41 1 a41 3 .endif # XMLCATMGR_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.8 log @Track information in a new variable BUILDLINK_ORDER that informs us of the order in which buildlink3.mk files are (recursively) included by a package Makefile. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:38 rillig Exp $ d24 1 a24 1 BUILDLINK_ORDER+= xmlcatmgr @ 1.7 log @Aligned the last line of the buildlink3.mk files with the first line, so that they look nicer. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:52 reed Exp $ d24 1 @ 1.6 log @Over 1200 files touched but no revisions bumped :) RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day). @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.5 2005/03/26 16:54:51 jmmv Exp $ d48 1 a48 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.5 log @Use EVAL_PREFIX to determine where xmlcatmgr is installed (instead of BUILDLINK_PREFIX.xmlcatmgr), and set the XMLCATMGR variable accordingly. This is to let packages setting NO_BUILD to still be able to use this variable (such as docbook-xml). Fixes PR pkg/29789 by chris@@. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.4 2004/10/09 23:16:14 reed Exp $ d26 1 a26 1 BUILDLINK_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1 @ 1.4 log @Increase BUILDLINK_DEPENDS.xmlcatmgr to xmlcatmgr>=2.0beta1 which was the BUILDLINK_RECOMMENDED.xmlcatmgr. (Okay'ed by jmmv.) I had noticed that old xmlcatmgr on my system (using IGNORE_RECOMMENDED) was not good enough The xmlcatmgr changes for 2.0alpha2 said that command line usage changed in some scenarios. Also remove BUILDLINK_RECOMMENDED.xmlcatmgr because now it was the same (and is redundant for now). I am not bumping in PKGREVISIONs because of this. This happened last January and is too late now and maybe I am the only person to notice. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.3 2004/09/02 11:38:07 jmmv Exp $ d30 3 a32 1 XMLCATMGR= ${BUILDLINK_PREFIX.xmlcatmgr}/bin/xmlcatmgr @ 1.3 log @Some PRINT_PLIST_AWK magic for share/sgml and share/xml. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ d26 1 a26 2 BUILDLINK_DEPENDS.xmlcatmgr+= xmlcatmgr>=0.2 BUILDLINK_RECOMMENDED.xmlcatmgr+= xmlcatmgr>=2.0beta1 @ 1.2 log @Reorder location and setting of BUILDLINK_PACKAGES to match template buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1 2004/02/01 10:11:39 jlam Exp $ d42 3 @ 1.1 log @Add a buildlink3.mk file for xmlcatmgr and teach catalogs.mk to use the buildlink3.mk file if USE_BUILDLINK3 is "yes". @ text @d1 1 a1 1 # $NetBSD$ d15 1 a15 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ d22 3 a25 1 BUILDLINK_PACKAGES+= xmlcatmgr d34 1 a34 1 . if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr) d37 1 a37 1 . else d40 3 a42 2 . endif .endif # XMLCATMGR_BUILDLINK3_MK @