From owner-svn-ports-head@freebsd.org Fri Mar 8 02:15:51 2019 Return-Path: Delivered-To: svn-ports-head@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 B9038152F0A7; Fri, 8 Mar 2019 02:15:51 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5617C85E49; Fri, 8 Mar 2019 02:15:51 +0000 (UTC) (envelope-from linimon@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 498D5249E4; Fri, 8 Mar 2019 02:15:51 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x282FpuR033761; Fri, 8 Mar 2019 02:15:51 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x282FoT7033759; Fri, 8 Mar 2019 02:15:50 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201903080215.x282FoT7033759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Fri, 8 Mar 2019 02:15:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495008 - in head/sysutils/conky: . files X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in head/sysutils/conky: . files X-SVN-Commit-Revision: 495008 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5617C85E49 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Mar 2019 02:15:51 -0000 Author: linimon Date: Fri Mar 8 02:15:50 2019 New Revision: 495008 URL: https://svnweb.freebsd.org/changeset/ports/495008 Log: Fix build on non-x86 archs by disabling apm. Approved by: portmgr (tier-2 blanket) Added: head/sysutils/conky/files/extra-patch-src_CMakeLists.txt (contents, props changed) Modified: head/sysutils/conky/Makefile Modified: head/sysutils/conky/Makefile ============================================================================== --- head/sysutils/conky/Makefile Fri Mar 8 00:40:58 2019 (r495007) +++ head/sysutils/conky/Makefile Fri Mar 8 02:15:50 2019 (r495008) @@ -123,6 +123,11 @@ XOAP_USE= gnome=libxml2 PLIST_FILES+= lib/conky/libcairo_imlib2_helper.so .endif +# disable apm on non-x86 archs +.if ${ARCH} != amd64 && ${ARCH} != i386 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_CMakeLists.txt +.endif + post-patch: @${REINPLACE_CMD} -e 's/^#\(set(RELEASE true\)/\1/' \ -e 's/-D_POSIX_C_SOURCE=200809L/& -D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700/' \ Added: head/sysutils/conky/files/extra-patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/conky/files/extra-patch-src_CMakeLists.txt Fri Mar 8 02:15:50 2019 (r495008) @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2019-02-23 02:12:15 UTC ++++ src/CMakeLists.txt +@@ -124,7 +124,7 @@ if(OS_LINUX) + endif(OS_LINUX) + + if(OS_FREEBSD) +- set(freebsd freebsd.cc freebsd.h bsdapm.cc bsdapm.h) ++ set(freebsd freebsd.cc freebsd.h) + set(optional_sources ${optional_sources} ${freebsd}) + endif(OS_FREEBSD) +