head 1.4; access; symbols pkgsrc-2019Q4:1.3.0.14 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.10 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.8 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.6 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.4 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.2 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.2.0.104 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.102 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.100 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.98 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.94 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.92 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.90 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.88 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.86 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.84 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.82 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.80 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.78 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.76 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.74 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.72 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.70 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.68 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.66 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.64 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.62 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.60 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.58 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.56 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.54 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.52 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.48 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.46 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.44 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.42 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.40 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.38 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.36 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.34 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.32 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.30 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.28 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.26 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.24 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.22 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.20 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.18 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2; locks; strict; comment @# @; 1.4 date 2020.03.12.18.52.58; author wiz; state dead; branches; next 1.3; commitid 8a7VwTfybmAFY80C; 1.3 date 2018.07.04.13.40.27; author jperkin; state Exp; branches; next 1.2; commitid NnIyRkdX3Lbg3PIA; 1.2 date 2006.05.14.21.10.01; author schwarz; state Exp; branches; next 1.1; 1.1 date 2006.05.01.00.19.45; author schwarz; state Exp; branches; next ; desc @@ 1.4 log @ORBit: remove Long replaced by ORBit2 @ text @# $NetBSD: hacks.mk,v 1.3 2018/07/04 13:40:27 jperkin Exp $ .if !defined(ORBIT_HACKS_MK) ORBIT_HACKS_MK= # defined ### [Sun Apr 30 22:45:25 CDT 2006 : schwarz] ### Make sure ORBit does not define socklen_t if it has already been ### typedef'd in devel/pth's pthread.h. ### This works around the problem reported in pkg/27009. ### .if exists(${LOCALBASE}/include/pthread.h) _SOCKLEN_T_TYPEDEFD!= ${GREP} -c '^typedef\ .*\ socklen_t;$$' ${LOCALBASE}/include/pthread.h || ${TRUE} . if ${_SOCKLEN_T_TYPEDEFD} == "1" PKG_HACKS+= socklen_t-already-typedefd-in-pthread.h SUBST_CLASSES+= socklen_t SUBST_FILES.socklen_t= configure SUBST_STAGE.socklen_t= pre-configure SUBST_SED.socklen_t= -e 's/^\#define\ socklen_t\ size_t$$//' # remark: \ before # needed to prevent make from interpreting # remainder of line as a comment . endif .endif .endif @ 1.3 log @*: Move SUBST_STAGE from post-patch to pre-configure Performing substitutions during post-patch breaks tools such as mkpatches, making it very difficult to regenerate correct patches after making changes, and often leading to substituted string replacements being committed. @ text @d1 1 a1 1 # $NetBSD: hacks.mk,v 1.2 2006/05/14 21:10:01 schwarz Exp $ @ 1.2 log @ small modification to also match for end of line ($) with the grep and sed expressions of that hack @ text @d1 1 a1 1 # $NetBSD: hacks.mk,v 1.1 2006/05/01 00:19:45 schwarz Exp $ d17 1 a17 1 SUBST_STAGE.socklen_t= post-patch @ 1.1 log @ added a hack that makes sure that configure does not define socklen_t if it has already been typedef'd in pthread.h. This addresses the issue reported in pkg/27009 (closing that PR). @ text @d1 1 a1 1 # $NetBSD$ d12 2 a13 2 _SOCKLEN_T_TYPEDEFD!= ${GREP} -c '^typedef\ .*\ socklen_t;' ${LOCALBASE}/include/pthread.h || ${TRUE} .if ${_SOCKLEN_T_TYPEDEFD} == "1" d18 1 a18 1 SUBST_SED.socklen_t= -e 's/^\#define\ socklen_t\ size_t//' d21 1 a21 1 .endif @