head 1.4; access; symbols pkgsrc-2020Q3:1.3.0.8 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.6 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.2 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.4 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.2.0.108 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.106 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.104 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.102 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.100 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.98 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.96 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.94 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.92 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.88 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.86 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.84 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.82 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.80 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.78 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.76 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.74 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.72 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.70 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.68 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.66 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.64 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.62 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.60 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.58 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.56 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.54 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.50 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.48 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.46 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.44 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.42 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.40 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.38 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.36 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.34 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.32 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.30 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.28 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.26 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.24 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.22 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.20 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.18 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.16 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.14 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.12 pkgsrc-2008Q1:1.2.0.10 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.8 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.4 date 2020.11.21.13.01.23; author nia; state dead; branches; next 1.3; commitid UycIV5k1C0cTRKwC; 1.3 date 2019.10.27.19.31.40; author maya; state Exp; branches; next 1.2; commitid ryS9mgtunVeKAxIB; 1.2 date 2007.02.19.19.50.48; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.10.05.02.53.55; author rillig; state Exp; branches; next ; desc @@ 1.4 log @Remove torsmo, older version of sysutils/conky that seems to no longer work @ text @$NetBSD: patch-ad,v 1.3 2019/10/27 19:31:40 maya Exp $ Add dragonflybsd. fix shell portability issues (= vs. ==) switch xft-config to pkg-config. --- configure.orig 2004-12-21 21:57:05.000000000 +0000 +++ configure @@@@ -795,11 +795,15 @@@@ fi uname=`uname` +if test "$uname" = "DragonFly"; then + LIBS="$LIBS -lkinfo" +fi + case $uname in Linux*) WANT_SYSINFO=yes ;; - FreeBSD*) + FreeBSD*|DragonFly*) WANT_KVM=yes ;; NetBSD*) @@@@ -839,7 +843,7 @@@@ else fi -if test x$uname = xFreeBSD; then +if test x$uname = xFreeBSD || test x$uname = xDragonFly; then BUILD_FREEBSD_TRUE= BUILD_FREEBSD_FALSE='#' else @@@@ -924,14 +928,14 @@@@ fi -if test x$want_seti == xyes; then +if test x$want_seti = xyes; then BUILD_SETI_TRUE= BUILD_SETI_FALSE='#' else BUILD_SETI_TRUE='#' BUILD_SETI_FALSE= fi -if test x$want_seti == xyes; then +if test x$want_seti = xyes; then cat >> confdefs.h <<\EOF #define SETI 1 EOF @@@@ -949,14 +953,14 @@@@ fi -if test x$want_nvctrl == xyes; then +if test x$want_nvctrl = xyes; then BUILD_NVCTRL_TRUE= BUILD_NVCTRL_FALSE='#' else BUILD_NVCTRL_TRUE='#' BUILD_NVCTRL_FALSE= fi -if test x$want_nvctrl == xyes; then +if test x$want_nvctrl = xyes; then cat >> confdefs.h <<\EOF #define NVCTRL 1 EOF @@@@ -1643,17 +1647,13 @@@@ else echo "$ac_t""no" 1>&6 fi - if test x$XFTCONFIG != x; then cat >> confdefs.h <<\EOF #define XFT 1 EOF - CFLAGS="$CFLAGS `$XFTCONFIG --cflags`" - XFT_LIBS=`$XFTCONFIG --libs` - else - want_xft=no - fi + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xft`" + XFT_LIBS=`$PKG_CONFIG --libs xft` fi @ 1.3 log @torsmo: add xft support Don't expect xft-config to exist. Use pkg-config instead. Bump PKGREVISION Partially from ptiJo in PR pkg/36685. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2007/02/19 19:50:48 joerg Exp $ @ 1.2 log @Modular Xorg and DragonFly support. @ text @d1 5 a5 1 $NetBSD$ d69 20 @ 1.1 log @Fixed "test ==". @ text @d3 29 a31 3 --- configure.orig 2006-10-05 04:52:34.000000000 +0200 +++ configure 2006-10-05 04:53:06.000000000 +0200 @@@@ -924,14 +924,14 @@@@ fi d48 1 a48 1 @@@@ -949,14 +949,14 @@@@ fi @