From owner-svn-ports-all@freebsd.org Sat Mar 24 09:15:15 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFF44F58868; Sat, 24 Mar 2018 09:15:14 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A46BA82187; Sat, 24 Mar 2018 09:15:14 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B25D526A; Sat, 24 Mar 2018 09:15:14 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2O9FEIs008945; Sat, 24 Mar 2018 09:15:14 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2O9FErH008942; Sat, 24 Mar 2018 09:15:14 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201803240915.w2O9FErH008942@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sat, 24 Mar 2018 09:15:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465440 - in head/sysutils/conky: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/sysutils/conky: . files X-SVN-Commit-Revision: 465440 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Mar 2018 09:15:15 -0000 Author: madpilot Date: Sat Mar 24 09:15:14 2018 New Revision: 465440 URL: https://svnweb.freebsd.org/changeset/ports/465440 Log: Import upstream patch to fix OSS (sound mixer) support. While here, fix malformed line in patch causing build time warning. Reported by: pong (via IRC) Obtained from: https://github.com/brndnmtthws/conky/commit/6b386589c0822bdaf5ed38d5f388cf902e0e749e Added: head/sysutils/conky/files/patch-cmake_ConkyPlatformChecks.cmake (contents, props changed) Modified: head/sysutils/conky/Makefile head/sysutils/conky/files/patch-src_bsdapm.cc Modified: head/sysutils/conky/Makefile ============================================================================== --- head/sysutils/conky/Makefile Sat Mar 24 09:12:29 2018 (r465439) +++ head/sysutils/conky/Makefile Sat Mar 24 09:15:14 2018 (r465440) @@ -4,6 +4,7 @@ PORTNAME= conky PORTVERSION= 1.10.8 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org Added: head/sysutils/conky/files/patch-cmake_ConkyPlatformChecks.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/conky/files/patch-cmake_ConkyPlatformChecks.cmake Sat Mar 24 09:15:14 2018 (r465440) @@ -0,0 +1,30 @@ +diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake +index 334b4690..ce5c109b 100644 +--- cmake/ConkyPlatformChecks.cmake ++++ cmake/ConkyPlatformChecks.cmake +@@ -30,8 +30,6 @@ check_include_files(sys/statfs.h HAVE_SYS_STATFS_H) + check_include_files(sys/param.h HAVE_SYS_PARAM_H) + check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H) + check_include_files(dirent.h HAVE_DIRENT_H) +-check_include_files("soundcard.h;sys/soundcard.h;linux/soundcard.h" HAVE_SOME_SOUNDCARD_H) +-check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H) + + # Check for some functions + check_function_exists(strndup HAVE_STRNDUP) +@@ -88,6 +86,16 @@ if(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY + endif(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY + AND NOT OS_SOLARIS AND NOT OS_HAIKU) + ++# Check for soundcard header ++if(OS_LINUX) ++ check_include_files("linux/soundcard.h" HAVE_SOME_SOUNDCARD_H) ++ check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H) ++elseif(OS_OPENBSD) ++ check_include_files("soundcard.h" HAVE_SOME_SOUNDCARD_H) ++else(OS_LINUX) ++ check_include_files("sys/soundcard.h" HAVE_SOME_SOUNDCARD_H) ++endif(OS_LINUX) ++ + if(BUILD_I18N AND OS_DRAGONFLY) + set(conky_libs ${conky_libs} -lintl) + endif(BUILD_I18N AND OS_DRAGONFLY) Modified: head/sysutils/conky/files/patch-src_bsdapm.cc ============================================================================== --- head/sysutils/conky/files/patch-src_bsdapm.cc Sat Mar 24 09:12:29 2018 (r465439) +++ head/sysutils/conky/files/patch-src_bsdapm.cc Sat Mar 24 09:15:14 2018 (r465440) @@ -5,7 +5,7 @@ * */ + -+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ ++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ + || defined(__DragonFly__) \ + || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__)) #include "config.h"