Received: by mail.netbsd.org (Postfix, from userid 605) id C61A484E07; Sun, 27 Oct 2019 19:31:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4D54784C8B for ; Sun, 27 Oct 2019 19:31:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 8Hi4HB6R4O6g for ; Sun, 27 Oct 2019 19:31:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A891F84D27 for ; Sun, 27 Oct 2019 19:31:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 97A0AFA8D; Sun, 27 Oct 2019 19:31:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1572204700158390" MIME-Version: 1.0 Date: Sun, 27 Oct 2019 19:31:40 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/sysutils/torsmo To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20191027193140.97A0AFA8D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1572204700158390 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sun Oct 27 19:31:40 UTC 2019 Modified Files: pkgsrc/sysutils/torsmo: Makefile distinfo pkgsrc/sysutils/torsmo/patches: patch-ad Log Message: torsmo: add xft support Don't expect xft-config to exist. Use pkg-config instead. Bump PKGREVISION Partially from ptiJo in PR pkg/36685. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/torsmo/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/torsmo/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/torsmo/patches/patch-ad Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1572204700158390 Content-Disposition: inline Content-Length: 3100 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/torsmo/Makefile diff -u pkgsrc/sysutils/torsmo/Makefile:1.12 pkgsrc/sysutils/torsmo/Makefile:1.13 --- pkgsrc/sysutils/torsmo/Makefile:1.12 Sun Jan 4 04:29:27 2015 +++ pkgsrc/sysutils/torsmo/Makefile Sun Oct 27 19:31:40 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2015/01/04 04:29:27 dholland Exp $ +# $NetBSD: Makefile,v 1.13 2019/10/27 19:31:40 maya Exp $ DISTNAME= torsmo-0.18 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=torsmo/} @@ -11,7 +11,10 @@ COMMENT= Tyopoytaorvelo System Monitor BROKEN_ON_PLATFORM= Darwin-*-* +USE_TOOLS+= pkg-config GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-xft +CONFIGURE_ENV+= XFTCONFIG=pkg-config EGDIR= ${PREFIX}/share/examples/torsmo DOCDIR= ${PREFIX}/share/doc/torsmo @@ -43,4 +46,5 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/torsmo/distinfo diff -u pkgsrc/sysutils/torsmo/distinfo:1.7 pkgsrc/sysutils/torsmo/distinfo:1.8 --- pkgsrc/sysutils/torsmo/distinfo:1.7 Fri Jun 23 19:02:07 2017 +++ pkgsrc/sysutils/torsmo/distinfo Sun Oct 27 19:31:40 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2017/06/23 19:02:07 kamil Exp $ +$NetBSD: distinfo,v 1.8 2019/10/27 19:31:40 maya Exp $ SHA1 (torsmo-0.18.tar.gz) = 01e6737b3971daa3a7c9cb6dd1961f61bc39bdae RMD160 (torsmo-0.18.tar.gz) = f1d8b3c4679155596569f9116970e7ba8a01eb6e @@ -7,5 +7,5 @@ Size (torsmo-0.18.tar.gz) = 84020 bytes SHA1 (patch-aa) = 8c515d3b0925aeaaea928ad8abd89ab5ccbfceab SHA1 (patch-ab) = 858d0f4d4a694e667465ed6519f034c07f13e535 SHA1 (patch-ac) = 5b342d09ff0fcc3982aa855e2cc660823ed53e11 -SHA1 (patch-ad) = 87fa39455dc2d5190c419142d5e4d0768914841e +SHA1 (patch-ad) = 977da3272ee309b41d0dc30ea6b2d7f1a5e2a3c7 SHA1 (patch-ae) = 5888d6cf538a9d95006ab1d2cdd01eabfafa10ed Index: pkgsrc/sysutils/torsmo/patches/patch-ad diff -u pkgsrc/sysutils/torsmo/patches/patch-ad:1.2 pkgsrc/sysutils/torsmo/patches/patch-ad:1.3 --- pkgsrc/sysutils/torsmo/patches/patch-ad:1.2 Mon Feb 19 19:50:48 2007 +++ pkgsrc/sysutils/torsmo/patches/patch-ad Sun Oct 27 19:31:40 2019 @@ -1,4 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2007/02/19 19:50:48 joerg Exp $ +$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 @@ -62,3 +66,23 @@ $NetBSD: patch-ad,v 1.2 2007/02/19 19:50 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 + + --_----------=_1572204700158390--