head 1.22; access; symbols pkgsrc-2023Q4:1.21.0.4 pkgsrc-2023Q4-base:1.21 pkgsrc-2023Q3:1.21.0.2 pkgsrc-2023Q3-base:1.21 pkgsrc-2023Q2:1.20.0.4 pkgsrc-2023Q2-base:1.20 pkgsrc-2023Q1:1.20.0.2 pkgsrc-2023Q1-base:1.20 pkgsrc-2022Q4:1.19.0.26 pkgsrc-2022Q4-base:1.19 pkgsrc-2022Q3:1.19.0.24 pkgsrc-2022Q3-base:1.19 pkgsrc-2022Q2:1.19.0.22 pkgsrc-2022Q2-base:1.19 pkgsrc-2022Q1:1.19.0.20 pkgsrc-2022Q1-base:1.19 pkgsrc-2021Q4:1.19.0.18 pkgsrc-2021Q4-base:1.19 pkgsrc-2021Q3:1.19.0.16 pkgsrc-2021Q3-base:1.19 pkgsrc-2021Q2:1.19.0.14 pkgsrc-2021Q2-base:1.19 pkgsrc-2021Q1:1.19.0.12 pkgsrc-2021Q1-base:1.19 pkgsrc-2020Q4:1.19.0.10 pkgsrc-2020Q4-base:1.19 pkgsrc-2020Q3:1.19.0.8 pkgsrc-2020Q3-base:1.19 pkgsrc-2020Q2:1.19.0.6 pkgsrc-2020Q2-base:1.19 pkgsrc-2020Q1:1.19.0.2 pkgsrc-2020Q1-base:1.19 pkgsrc-2019Q4:1.19.0.4 pkgsrc-2019Q4-base:1.19 pkgsrc-2019Q3:1.18.0.12 pkgsrc-2019Q3-base:1.18 pkgsrc-2019Q2:1.18.0.10 pkgsrc-2019Q2-base:1.18 pkgsrc-2019Q1:1.18.0.8 pkgsrc-2019Q1-base:1.18 pkgsrc-2018Q4:1.18.0.6 pkgsrc-2018Q4-base:1.18 pkgsrc-2018Q3:1.18.0.4 pkgsrc-2018Q3-base:1.18 pkgsrc-2018Q2:1.18.0.2 pkgsrc-2018Q2-base:1.18 pkgsrc-2018Q1:1.17.0.2 pkgsrc-2018Q1-base:1.17 pkgsrc-2017Q4:1.16.0.16 pkgsrc-2017Q4-base:1.16 pkgsrc-2017Q3:1.16.0.14 pkgsrc-2017Q3-base:1.16 pkgsrc-2017Q2:1.16.0.10 pkgsrc-2017Q2-base:1.16 pkgsrc-2017Q1:1.16.0.8 pkgsrc-2017Q1-base:1.16 pkgsrc-2016Q4:1.16.0.6 pkgsrc-2016Q4-base:1.16 pkgsrc-2016Q3:1.16.0.4 pkgsrc-2016Q3-base:1.16 pkgsrc-2016Q2:1.16.0.2 pkgsrc-2016Q2-base:1.16 pkgsrc-2016Q1:1.15.0.10 pkgsrc-2016Q1-base:1.15 pkgsrc-2015Q4:1.15.0.8 pkgsrc-2015Q4-base:1.15 pkgsrc-2015Q3:1.15.0.6 pkgsrc-2015Q3-base:1.15 pkgsrc-2015Q2:1.15.0.4 pkgsrc-2015Q2-base:1.15 pkgsrc-2015Q1:1.15.0.2 pkgsrc-2015Q1-base:1.15 pkgsrc-2014Q4:1.14.0.8 pkgsrc-2014Q4-base:1.14 pkgsrc-2014Q3:1.14.0.6 pkgsrc-2014Q3-base:1.14 pkgsrc-2014Q2:1.14.0.4 pkgsrc-2014Q2-base:1.14 pkgsrc-2014Q1:1.14.0.2 pkgsrc-2014Q1-base:1.14 pkgsrc-2013Q4:1.13.0.16 pkgsrc-2013Q4-base:1.13 pkgsrc-2013Q3:1.13.0.14 pkgsrc-2013Q3-base:1.13 pkgsrc-2013Q2:1.13.0.12 pkgsrc-2013Q2-base:1.13 pkgsrc-2013Q1:1.13.0.10 pkgsrc-2013Q1-base:1.13 pkgsrc-2012Q4:1.13.0.8 pkgsrc-2012Q4-base:1.13 pkgsrc-2012Q3:1.13.0.6 pkgsrc-2012Q3-base:1.13 pkgsrc-2012Q2:1.13.0.4 pkgsrc-2012Q2-base:1.13 pkgsrc-2012Q1:1.13.0.2 pkgsrc-2012Q1-base:1.13 pkgsrc-2011Q4:1.12.0.26 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.24 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.12.0.22 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.20 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.18 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.16 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.14 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.12 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.10 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.8 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.12.0.6 pkgsrc-2009Q2-base:1.12 pkgsrc-2009Q1:1.12.0.4 pkgsrc-2009Q1-base:1.12 pkgsrc-2008Q4:1.12.0.2 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.11.0.8 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.6 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.4 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.2 pkgsrc-2008Q1:1.9.0.16 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.14 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.12 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.10 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.8 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.6 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.4 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.2 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.7.0.8 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.6 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.4 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.2 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.22 date 2024.01.13.20.07.33; author riastradh; state Exp; branches; next 1.21; commitid tXCKNfIoMbcmkkUE; 1.21 date 2023.06.27.08.52.57; author adam; state Exp; branches; next 1.20; commitid vzpBbgN3uP2r1zuE; 1.20 date 2023.02.09.19.49.45; author wiz; state Exp; branches; next 1.19; commitid MHH2EksOU56S5TcE; 1.19 date 2019.11.02.22.37.56; author rillig; state Exp; branches; next 1.18; commitid amORVXK58QMYqkJB; 1.18 date 2018.05.04.08.40.11; author adam; state Exp; branches; next 1.17; commitid 84icljuyptoCnXAA; 1.17 date 2018.01.14.14.58.38; author rillig; state Exp; branches; next 1.16; commitid kGVXnu3u3GOw0RmA; 1.16 date 2016.04.07.10.02.13; author adam; state Exp; branches; next 1.15; commitid Tc6gzXQdhOVvaG1z; 1.15 date 2015.02.18.09.53.27; author wiz; state Exp; branches; next 1.14; commitid 81OBctvGz8Jjqtay; 1.14 date 2014.03.24.15.29.54; author tron; state Exp; branches; next 1.13; commitid bdWLf4SYzbiAVXtx; 1.13 date 2012.03.19.12.34.14; author joerg; state Exp; branches; next 1.12; 1.12 date 2008.10.05.21.36.35; author cube; state Exp; branches; next 1.11; 1.11 date 2008.04.24.11.18.13; author tron; state Exp; branches 1.11.6.1; next 1.10; 1.10 date 2008.04.24.01.11.15; author jnemeth; state Exp; branches; next 1.9; 1.9 date 2006.04.06.06.22.02; author reed; state Exp; branches; next 1.8; 1.8 date 2006.03.30.18.06.17; author jlam; state Exp; branches; next 1.7; 1.7 date 2005.06.03.19.12.49; author jlam; state Exp; branches; next 1.6; 1.6 date 2005.06.03.17.02.36; author jlam; state Exp; branches; next 1.5; 1.5 date 2005.06.03.16.03.09; author jlam; state Exp; branches; next 1.4; 1.4 date 2005.06.01.18.33.02; author jlam; state Exp; branches; next 1.3; 1.3 date 2005.06.01.18.02.55; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.03.29.05.43.31; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.03.10.17.57.14; author jlam; state Exp; branches; next ; 1.11.6.1 date 2008.09.26.19.59.46; author cube; state Exp; branches; next ; desc @@ 1.22 log @*/builtin.mk: Use ${_CROSS_DESTDIR:U} for build-time file checks. These are questions about the target system, whose files at build-time are all relative to ${_CROSS_DESTDIR} if it is defined, i.e., if USE_CROSS_COMPILE is set to yes. No change to native builds because ${_CROSS_DESTDIR:U} is empty in them. (Possible minor change by adding :Q to ${H_FOO} in command lines, but if this makes a difference it likely fixes problems.) @ text @# $NetBSD: builtin.mk,v 1.21 2023/06/27 08:52:57 adam Exp $ BUILTIN_PKG:= freetype2 BUILTIN_FIND_FILES_VAR:= H_FREETYPE2 H_FREETYPE2_NEW BUILTIN_FIND_FILES.H_FREETYPE2= ${X11BASE}/include/freetype2/freetype/freetype.h BUILTIN_FIND_FILES.H_FREETYPE2_NEW= ${X11BASE}/include/freetype2/freetype.h .include "../../mk/buildlink3/bsd.builtin.mk" ### ### Determine if there is a built-in implementation of the package and ### set IS_BUILTIN. appropriately ("yes" or "no"). ### .if !defined(IS_BUILTIN.freetype2) . if empty(H_FREETYPE2:M__nonexistent__) IS_BUILTIN.freetype2= yes . elif empty(H_FREETYPE2_NEW:M__nonexistent__) IS_BUILTIN.freetype2= yes H_FREETYPE2:= ${H_FREETYPE2_NEW} . else IS_BUILTIN.freetype2= no . endif .endif MAKEVARS+= IS_BUILTIN.freetype2 ### ### If there is a built-in implementation, then set BUILTIN_PKG. to ### a package name to represent the built-in package. ### .if !defined(BUILTIN_PKG.freetype2) && \ ${IS_BUILTIN.freetype2:tl} == yes && \ empty(H_FREETYPE2:M__nonexistent__) BUILTIN_VERSION.freetype2!= \ ${AWK} 'BEGIN { p = ".0" } \ /\#define[ ]*FREETYPE_MAJOR/ { M = $$3 } \ /\#define[ ]*FREETYPE_MINOR/ { m = "."$$3 } \ /\#define[ ]*FREETYPE_PATCH/ { p = "."$$3 } \ END { printf "%s%s%s\n", M, m, p }' \ ${_CROSS_DESTDIR:U:Q}${H_FREETYPE2:Q} BUILTIN_PKG.freetype2= freetype2-${BUILTIN_VERSION.freetype2} .endif MAKEVARS+= BUILTIN_PKG.freetype2 ### ### Determine whether we should use the built-in implementation if it ### exists, and set USE_BUILTIN. appropriate ("yes" or "no"). ### .if !defined(USE_BUILTIN.freetype2) . if ${PREFER.freetype2} == "pkgsrc" USE_BUILTIN.freetype2= no . else USE_BUILTIN.freetype2= ${IS_BUILTIN.freetype2} . if defined(BUILTIN_PKG.freetype2) && \ ${IS_BUILTIN.freetype2:tl} == yes USE_BUILTIN.freetype2= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.freetype2} . if ${USE_BUILTIN.freetype2:tl} == yes USE_BUILTIN.freetype2!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi . endif . endfor . endif . endif # PREFER.freetype2 .endif MAKEVARS+= USE_BUILTIN.freetype2 ### ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. ### .include "../../mk/x11.builtin.mk" CHECK_BUILTIN.freetype2?= no .if ${CHECK_BUILTIN.freetype2:tl} == no . if ${USE_BUILTIN.freetype2:tl} == no BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3 . else . if ${MACHINE_PLATFORM:MNetBSD-[67].*-*} && \ (("${BUILTIN_VERSION.freetype2}" == "2.4.5") || \ ("${BUILTIN_VERSION.freetype2}" == "2.5.3")) _FT2_VER_MAP.2.5.3= 17.2.11 _FT2_VER_MAP.2.4.5= 13.0.7 SUBST_CLASSES+= fx-ft2-pc-version SUBST_STAGE.fx-ft2-pc-version= post-wrapper SUBST_MESSAGE.fx-ft2-pc-version= Fixes wrong module version in freetype2.pc SUBST_FILES.fx-ft2-pc-version= ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc SUBST_SED.fx-ft2-pc-version= -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|' . endif . endif .endif # CHECK_BUILTIN.freetype2 @ 1.21 log @freetype2: updated to 2.13.1 FreeType 2.13.1 This is a maintenance release with only minor changes, for example, a new load flag FT_LOAD_NO_SVG to ignore glyphs in an SVG SFNT table, or a new function FT_Get_Default_Named_Instance to get the index of the default named instance of an OpenType Variation Font. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.20 2023/02/09 19:49:45 wiz Exp $ d40 1 a40 1 ${H_FREETYPE2} @ 1.20 log @freetype2: pkglint autofixes @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.19 2019/11/02 22:37:56 rillig Exp $ d85 1 a85 1 . if !empty(MACHINE_PLATFORM:MNetBSD-[67].*-*) && \ @ 1.19 log @graphics: align variable assignments pkglint -Wall -F --only aligned --only indent -r No manual corrections. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.18 2018/05/04 08:40:11 adam Exp $ d32 1 a32 1 !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) && \ d55 1 a55 1 !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) d58 1 a58 1 . if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) d80 1 a80 1 .if !empty(CHECK_BUILTIN.freetype2:M[nN][oO]) d82 1 a82 1 . if !empty(USE_BUILTIN.freetype2:M[nN][oO]) @ 1.18 log @freetype2: updated to 2.9.1 CHANGES BETWEEN 2.9 and 2.9.1 I. IMPORTANT BUG FIXES - Type 1 fonts containing flex features were not rendered correctly (bug introduced in version 2.9). - CVE-2018-6942: Older FreeType versions can crash with certain malformed variation fonts. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6942 II. MISCELLANEOUS - Bug fix: Multiple calls to `FT_Get_MM_Var' returned garbage. - The base extensions `ftlcdfil' and `ftfntfmt' are now part of the base module (and thus no longer configurable in file `modules.cfg'). - Emboldening of bitmaps didn't work correctly sometimes, showing various artifacts (bug introduced in version 2.8.1). - Use of the `freetype-config' script to get compilation and linking options is deprecated since it doesn't support cross-compiling, among other deficiencies. Instead, you should use the `pkg-config' interface. The `configure' script no longer installs `freetype-config' by default. For backwards compatibility, a new configure option `--enable-freetype-config' is provided that reverts this decision. - The auto-hinter script ranges have been updated for Unicode 11. No support for new scripts have been added, however, with the exception of Georgian Mtavruli. - Support for cmake has been improved. - The next release will remove support for Position Independent Code as needed by systems that prohibit automatic address fixups, such as BREW. [Compilation with modern compilers that use flags like `-fPIC' or `-fPIE' is not affected.] @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.17 2018/01/14 14:58:38 rillig Exp $ d43 1 a43 1 MAKEVARS+= BUILTIN_PKG.freetype2 d70 1 a70 1 MAKEVARS+= USE_BUILTIN.freetype2 d88 7 a94 7 _FT2_VER_MAP.2.5.3=17.2.11 _FT2_VER_MAP.2.4.5=13.0.7 SUBST_CLASSES+= fx-ft2-pc-version SUBST_STAGE.fx-ft2-pc-version= post-wrapper SUBST_MESSAGE.fx-ft2-pc-version=Fixes wrong module version in freetype2.pc SUBST_FILES.fx-ft2-pc-version= ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc SUBST_SED.fx-ft2-pc-version= -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|' @ 1.17 log @graphics/*: remove redundant :Q modifiers pkgsrc doesn't support PREFIX with spaces or other special characters. Therefore it is not necessary to add the :Q modifier to this variable and several others. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.16 2016/04/07 10:02:13 adam Exp $ d92 1 a92 2 SUBST_MESSAGE.fx-ft2-pc-version=\ Fixes wrong module version in freetype2.pc d94 1 a94 2 SUBST_SED.fx-ft2-pc-version= \ -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|' @ 1.16 log @CHANGES BETWEEN 2.6.2 and 2.6.3 I. IMPORTANT CHANGES - Khmer, Myanmar, Bengali, and Kannada script support has been added to the auto-hinter. II. MISCELLANEOUS - Better support of Indic scripts like Devanagari by using a top-to-bottom hinting flow. - All FreeType macros starting with two underscores have been renamed to avoid a violation of both the C and C++ standards. Example: Header macros of the form `__FOO_H__' are now called `FOO_H_'. In most cases, this should be completely transparent to the user. The exception to this is `__FTERRORS_H__', which must be sometimes undefined by the user to get FreeType error strings: Both this form and the new `FTERRORS_H_' macro are accepted for backwards compatibility. - Minor improvements mainly to the Type 1 driver. - The new CFF engine now supports all Type 2 operators except `random'. - The macro `_STANDALONE_', used for compiling the B/W and smooth rasterizers as stand-alone modules, has been renamed to `STANDALONE_', since macro names starting with an underscore and followed by an uppercase letter are reserved in both C and C++. - Function `FT_Library_SetLcdFilterWeights' now also activates custom LCD filter weights (instead of just adjusting them). - Support for `unpatented hinting' has been completely removed: Consequently, the two functions `FT_Face_CheckTrueTypePatents' and `FT_Face_SetUnpatentedHinting' now return always false, doing nothing. - The `ftgamma' demo program has been modernized; the gamma grid display has been moved from `ftview' to this program. - It is now possible to cycle through the available LCD fitlering modes. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.15 2015/02/18 09:53:27 wiz Exp $ d60 1 a60 1 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2:Q}; then \ @ 1.15 log @Add magic to fix freetype pc files on NetBSD 6 and 7 which had outdated information in the installed pc file. Remove local hack in fonts/harfbuzz. From Leonardo Taccari in private email. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.14 2014/03/24 15:29:54 tron Exp $ d25 1 a25 1 MAKEVARS+= IS_BUILTIN.freetype2 d90 2 a91 2 SUBST_CLASSES+= fx-ft2-pc-version SUBST_STAGE.fx-ft2-pc-version= post-wrapper d94 1 a94 1 SUBST_FILES.fx-ft2-pc-version= ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc @ 1.14 log @Correctly detect modern versions of "freetype2" e.g. under recent versions of NetBSD-current. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.13 2012/03/19 12:34:14 joerg Exp $ d84 14 @ 1.13 log @Drop imake-check logic from X11 components' builtin.mk. Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge. Always install man pages, not cat pages when using imake. Unify the various imake PLIST variables in preparation for dropping. Adjust xbattbar for the new expectations. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.12 2008/10/05 21:36:35 cube Exp $ d5 3 a7 2 BUILTIN_FIND_FILES_VAR:= H_FREETYPE2 BUILTIN_FIND_FILES.H_FREETYPE2= ${X11BASE}/include/freetype2/freetype/freetype.h d18 3 @ 1.12 log @Merge cube-native-xorg, so that pkgsrc-current can be used with the native X.Org found in NetBSD-current. Thanks a lot to all who helped, especially Matthias Scheler who did repeated tests on Mac OS X and older versions of NetBSD to make sure the support for those platforms wouldn't be broken (or at least, not fatally, as I would still expect a few hiccups here and there, because there is only so much one can test in such limited time). On the infrastructure side, this branch brings pkgconfig-builtin.mk, in order to write very easily new builtin.mk files. It can actually handle more than just pkgconfig files, but it will provide a version if it finds such a file. x11.builtin.mk has also been made more useful and now all existing (and future!) native-X11-related builtin.mk files should include it. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.11 2008/04/24 11:18:13 tron Exp $ d15 3 a18 4 . if empty(H_FREETYPE2:M__nonexistent__) BUILTIN_IMAKE_CHECK:= freetype2:BuildFreetype2Library . include "../../mk/buildlink3/imake-check.mk" IS_BUILTIN.freetype2= ${BUILTIN_IMAKE_CHECK.freetype2} @ 1.11 log @Backout last change. It breaks the build on system which use a builtin "freetype2" and provide a "freetype2.pc" (e.g. Mac OS X Leopard or any uptodate Linux distribution). @ text @d1 1 a1 1 # $NetBSD$ d73 3 a82 6 . if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) BUILDLINK_PREFIX.freetype2= ${X11BASE} . include "../../mk/x11.buildlink3.mk" . include "../../mk/x11.builtin.mk" . endif @ 1.11.6.1 log @Adapt to new x11.builtin.mk. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.11 2008/04/24 11:18:13 tron Exp $ a72 3 .include "../../mk/x11.builtin.mk" d80 6 @ 1.10 log @fake up a freetype2.pc file for configure scripts that want it @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.9 2006/04/06 06:22:02 reed Exp $ a83 29 . if !empty(USE_TOOLS:C/:.*//:Mpkg-config) do-configure-pre-hook: override-freetype2-pkgconfig BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig FREETYPE2_PKGCFGF= freetype2.pc override-freetype2-pkgconfig: override-message-freetype2-pkgconfig override-message-freetype2-pkgconfig: @@${STEP_MSG} "Installing freetype2.pc." override-freetype2-pkgconfig: ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ ${MKDIR} ${BLKDIR_PKGCFG}; \ { \ ${ECHO} "prefix=${X11BASE}"; \ ${ECHO} "exec_prefix=\$${prefix}"; \ ${ECHO} "libdir=\$${exec_prefix}/lib"; \ ${ECHO} "includedir=\$${prefix}/include"; \ ${ECHO} ""; \ ${ECHO} "Name: Freetype 2"; \ ${ECHO} "Description: A free, high-quality, and portable font engine."; \ ${ECHO} "Version: ${BUILTIN_VERSION.freetype2}"; \ ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lfreetype -lz"; \ ${ECHO} "Cflags: -I\$${includedir}/freetype2 -I\$${includedir}"; \ } >> ${BLKDIR_PKGCFG}/${FREETYPE2_PKGCFGF}; . endif # pkg-config @ 1.9 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: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $ d84 29 @ 1.8 log @Avoid extra stat() calls by not repeatedly checking whether a file exists on the disk -- we can just check whether a variable defined by find-files.mk is "__nonexistent__" or not. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.7 2005/06/03 19:12:49 jlam Exp $ d54 1 a54 1 . for _dep_ in ${BUILDLINK_DEPENDS.freetype2} d77 1 a77 1 BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3 @ 1.7 log @Coalesce the common makefile code in the builtin.mk file that inspect the X11 distribution using imake into mk/buildlink3/imake-check.mk. imake-check.mk calls out to a helper shell script mk/buildlink3/imake-check that generates the required Imakefiles and runs imake. Remove the now extraneous builtin-imake.mk files as the builtin.mk files can now contain the name of the imake symbol to check. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.6 2005/06/03 17:02:36 jlam Exp $ d16 1 a16 1 . if exists(${H_FREETYPE2}) d30 1 a30 1 exists(${H_FREETYPE2}) @ 1.6 log @Only check for the existence of the first word of ${IMAKE} since it may contain a command plus arguments. We use the standard idiom to extract the first word of a list stored in a make variable: VAR_CMD= ${VAR:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} XXX This can be replaced with a more succinct use of variable modifiers XXX when we update the bootstrap bmake to match the latest NetBSD make XXX sources, i.e.: XXX XXX VAR_CMD= ${VAR:[1]} @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $ d17 3 a19 12 PKGSRC_USE_TOOLS+= imake # XXX IMAKE?= ${X11BASE}/bin/imake # XXX _BUILTIN_IMAKE_CMD= ${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} . if exists(${_BUILTIN_IMAKE_CMD}) IS_BUILTIN.freetype2!= \ dir=`cd ${BUILDLINK_PKGSRCDIR.freetype2} && ${PWD_CMD}`; \ cd ${TMPDIR:U/tmp:Q} && \ ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c \ -s - | \ ${IMAKE_MAKE} -f - builtin-test . endif @ 1.5 log @Don't require a read-write pkgsrc tree when invoking imake. We avoid this requirement by using TMPDIR as the read-write location demanded by using imake. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.4 2005/06/01 18:33:02 jlam Exp $ d19 2 a20 1 . if defined(IMAKE) && exists(${IMAKE}) @ 1.4 log @Use IMAKE_MAKE instead of MAKE to process the makefile generated by imake. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:55 jlam Exp $ d21 2 d24 1 a24 1 -f ${BUILDLINK_PKGSRCDIR.freetype2}/builtin-imake.mk \ @ 1.3 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: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $ d24 1 a24 1 ${MAKE} -f - builtin-test @ 1.2 log @Match the template builtin.mk file in bsd.builtin.mk, and make the two packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links) use the new format correctly. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $ d3 1 a3 2 _FREETYPE2_FREETYPE_H= ${X11BASE}/include/freetype2/freetype/freetype.h _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl d5 9 d16 4 a19 1 . if exists(${_FREETYPE2_FREETYPE_H}) && exists(${_X11_TMPL}) d21 4 a24 21 if ${GREP} -q BuildFreetype2Library ${_X11_TMPL}; then \ ${ECHO} "yes"; \ else \ ${ECHO} "no"; \ fi . if !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) # # Create an appropriate package name for the built-in freetype2 distributed # with the system. This package name can be used to check against # BUILDLINK_DEPENDS. to see if we need to install the pkgsrc version # or if the built-in one is sufficient. # _FREETYPE2_MAJOR!= \ ${AWK} '/\#define[ ]*FREETYPE_MAJOR/ { print $$3 }' ${_FREETYPE2_FREETYPE_H} _FREETYPE2_MINOR!= \ ${AWK} '/\#define[ ]*FREETYPE_MINOR/ { print "."$$3 }' ${_FREETYPE2_FREETYPE_H} _FREETYPE2_PATCH!= \ ${AWK} 'BEGIN { patch=0; } /\#define[ ]*FREETYPE_PATCH/ { patch=$$3; } END { print "."patch; }' ${_FREETYPE2_FREETYPE_H} _FREETYPE2_VERSION= ${_FREETYPE2_MAJOR}${_FREETYPE2_MINOR}${_FREETYPE2_PATCH} BUILTIN_PKG.freetype2= freetype2-${_FREETYPE2_VERSION} BUILDLINK_VARS+= BUILTIN_PKG.freetype2 d27 20 a46 2 BUILDLINK_VARS+= IS_BUILTIN.freetype2 .endif # IS_BUILTIN.freetype2 d48 4 d53 6 a58 3 USE_BUILTIN.freetype2?= ${IS_BUILTIN.freetype2} . if defined(BUILTIN_PKG.freetype2) d60 5 a64 5 . for _depend_ in ${BUILDLINK_DEPENDS.freetype2} . if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) USE_BUILTIN.freetype2!= \ if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.freetype2}; then \ ${ECHO} "yes"; \ d66 1 a66 1 ${ECHO} "no"; \ d68 6 a73 4 . endif . endfor . endif .endif # USE_BUILTIN.freetype2 d75 4 d82 1 a82 1 .if !empty(USE_BUILTIN.freetype2:M[nN][oO]) d84 1 a84 1 .endif d86 1 a86 1 .if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) d88 3 a90 2 USE_X11= yes .endif @ 1.1 log @Split out the code that deals with checking whether the software is built-in or not into a separate builtin.mk file. The code to deal checking for built-in software is much simpler to deal with in pkgsrc. The buildlink3.mk file for a package will be of the usual format regardless of the package, which makes it simpler for packagers to update a package. The builtin.mk file for a package must define a single yes/no variable USE_BUILTIN. that is used by bsd.buildlink3.mk to decide whether to use the built-in software or to use the pkgsrc software. @ text @d1 1 a1 1 # $NetBSD$ d30 1 a30 1 MAKEFLAGS+= BUILTIN_PKG.freetype2=${BUILTIN_PKG.freetype2} d33 2 a34 7 MAKEFLAGS+= IS_BUILTIN.freetype2=${IS_BUILTIN.freetype2} .endif CHECK_BUILTIN.freetype2?= no .if !empty(CHECK_BUILTIN.freetype2:M[yY][eE][sS]) USE_BUILTIN.freetype2= yes .endif d54 3 d65 2 @