head 1.7; access; symbols pkgsrc-2023Q4:1.7.0.66 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.64 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.62 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.60 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.58 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.56 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.54 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.52 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.50 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.48 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.46 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.44 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.42 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.40 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.36 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.16 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.38 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.34 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.32 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.30 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.28 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.26 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.24 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.22 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.20 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.18 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.14 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.12 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.10 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.8 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.6 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.4 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.2 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.6.0.22 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.20 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.18 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.16 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.14 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.12 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.10 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.8 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.6 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.4 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.2 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.5.0.54 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.52 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.50 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.48 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.46 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.44 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.42 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.40 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.38 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.36 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.34 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.32 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.30 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.28 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.26 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.24 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.22 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.20 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.18 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.16 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.14 pkgsrc-2008Q1:1.5.0.12 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.10 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.8 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.6 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.4 pkgsrc-2007Q1-base:1.5 jlam-pkgviews:1.5.0.2 jlam-pkgviews-base:1.5 pkgsrc-2006Q4:1.4.0.2 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.3.0.12 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.10 pkgsrc-2006Q2-base:1.3 tv-derecurse-eol:1.1 pkgsrc-2006Q1:1.3.0.8 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.6 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.4 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 tv-derecurse-merge:1.1 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 tv-derecurse:1.1.0.6 tv-derecurse-base:1.1 pkgsrc-2004Q3:1.1.0.4 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.7 date 2015.10.14.20.17.27; author wiz; state Exp; branches; next 1.6; commitid 2Gl8uNEDDULae7Fy; 1.6 date 2013.01.15.16.21.34; author morr; state Exp; branches; next 1.5; 1.5 date 2007.03.09.02.04.04; author rillig; state Exp; branches; next 1.4; 1.4 date 2006.11.06.10.51.51; author joerg; state Exp; branches; next 1.3; 1.3 date 2005.06.02.19.33.56; author wiz; state Exp; branches; next 1.2; 1.2 date 2005.06.01.18.03.06; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.04.11.23.35.16; author xtraeme; state Exp; branches 1.1.6.1; next ; 1.1.6.1 date 2006.06.07.15.25.39; author tv; state dead; branches; next ; desc @@ 1.7 log @Switch from x11/Xaw3d to newer x11/libXaw3d. Adapt some packages so they build with that. Bump their PKGREVISIONs. @ text @# $NetBSD: xaw.buildlink3.mk,v 1.6 2013/01/15 16:21:34 morr Exp $ # # This file selects the X Athena Widgets (Xaw) implementation. # # User-settable variables: # # XAW_TYPE # The Xaw type to be selected. # # Possible: 3d neXtaw standard xpm # Default: standard # .if !defined(XAW_BUILDLINK3_MK) XAW_BUILDLINK3_MK= # defined .include "../../mk/bsd.prefs.mk" BUILD_DEFS+= XAW_TYPE .if ${XAW_TYPE} == "xpm" . include "../../x11/Xaw-Xpm/buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw-Xpm} .elif ${XAW_TYPE} == "3d" . include "../../x11/libXaw3d/buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw3d} .elif ${XAW_TYPE} == "neXtaw" . include "../../x11/neXtaw/buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw} .elif ${XAW_TYPE} == "standard" . if ${X11_TYPE} == "modular" . include "../../x11/libXaw/buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.libXaw} . else . include "../../mk/x11.buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${X11BASE} . endif .else PKG_FAIL_REASON+= "[xaw.buildlink3.mk] Invalid value ${XAW_TYPE} for XAW_TYPE." .endif .endif # XAW_BUILDLINK3_MK @ 1.6 log @Clean up libXaw handling. [1/2] - remove LIBXAW variable. It is handled by buildlink3.mk now - simplify patches and Makefile in packages using libXaw - in some cases force use of Xaw3d (won't build with Xaw) - replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk In next part: - replace more includes with mk/xaw.buildlink3.mk @ text @d1 1 a1 1 # $NetBSD: xaw.buildlink3.mk,v 1.5 2007/03/09 02:04:04 rillig Exp $ d25 1 a25 1 . include "../../x11/Xaw3d/buildlink3.mk" @ 1.5 log @Added documentation and error checking. @ text @d1 1 a1 1 # $NetBSD: xaw.buildlink3.mk,v 1.4 2006/11/06 10:51:51 joerg Exp $ a41 2 MAKE_ENV+= LIBXAW=${LIBXAW:Q} @ 1.4 log @Add case for modular Xorg. @ text @d1 12 a12 1 # $NetBSD: xaw.buildlink3.mk,v 1.3 2005/06/02 19:33:56 wiz Exp $ d17 1 a17 2 # Pull in setting for XAW_TYPE. XAW_TYPE?= standard d19 1 a19 1 .include "../../mk/bsd.prefs.mk" d30 3 a32 2 .elif ${X11_TYPE} == "modular" .include "../../x11/libXaw/buildlink3.mk" d34 4 d39 1 a39 2 . include "../../mk/x11.buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${X11BASE} @ 1.3 log @Improve quoting. @ text @d1 1 a1 1 # $NetBSD: xaw.buildlink3.mk,v 1.2 2005/06/01 18:03:06 jlam Exp $ d20 3 @ 1.2 log @Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc. Several changes are involved since they are all interrelated. These changes affect about 1000 files. The first major change is rewriting bsd.builtin.mk as well as all of the builtin.mk files to follow the new example in bsd.builtin.mk. The loop to include all of the builtin.mk files needed by the package is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk is now included by each of the individual builtin.mk files and provides some common logic for all of the builtin.mk files. Currently, this includes the computation for whether the native or pkgsrc version of the package is preferred. This causes USE_BUILTIN.* to be correctly set when one builtin.mk file includes another. The second major change is teach the builtin.mk files to consider files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most of the builtin.mk files test for the presence of built-in software by checking for the existence of certain files, e.g. , and we now assume that if that file is under ${LOCALBASE}, then it must be from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The exceptions to this new check are the X11 distribution packages, which are handled specially as noted below. The third major change is providing builtin.mk and version.mk files for each of the X11 distribution packages in pkgsrc. The builtin.mk file can detect whether the native X11 distribution is the same as the one provided by pkgsrc, and the version.mk file computes the version of the X11 distribution package, whether it's built-in or not. The fourth major change is that the buildlink3.mk files for X11 packages that install parts which are part of X11 distribution packages, e.g. Xpm, Xcursor, etc., now use imake to query the X11 distribution for whether the software is already provided by the X11 distribution. This is more accurate than grepping for a symbol name in the imake config files. Using imake required sprinkling various builtin-imake.mk helper files into pkgsrc directories. These files are used as input to imake since imake can't use stdin for that purpose. The fifth major change is in how packages note that they use X11. Instead of setting USE_X11, package Makefiles should now include x11.buildlink3.mk instead. This causes the X11 package buildlink3 and builtin logic to be executed at the correct place for buildlink3.mk and builtin.mk files that previously set USE_X11, and fixes packages that relied on buildlink3.mk files to implicitly note that X11 is needed. Package buildlink3.mk should also include x11.buildlink3.mk when linking against the package libraries requires also linking against the X11 libraries. Where it was obvious, redundant inclusions of x11.buildlink3.mk have been removed. @ text @d1 1 a1 1 # $NetBSD: xaw.buildlink3.mk,v 1.1 2004/04/11 23:35:16 xtraeme Exp $ d25 1 a25 1 MAKE_ENV+= LIBXAW="${LIBXAW}" @ 1.1 log @xaw for buildlink3. @ text @d1 1 a1 1 # $NetBSD$ d21 1 @ 1.1.6.1 log @EOL the tv-derecurse branch; it has become too outdated. The last live revision can be fetched at the tv-derecurse-eol tag. @ text @d1 1 a1 1 # $NetBSD: xaw.buildlink3.mk,v 1.1 2004/04/11 23:35:16 xtraeme Exp $ @