From owner-svn-ports-head@freebsd.org  Fri Dec 27 16:28:42 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 131141EFF46;
 Fri, 27 Dec 2019 16:28:42 +0000 (UTC)
 (envelope-from bapt@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 47kshT6WMQz4GPq;
 Fri, 27 Dec 2019 16:28:41 +0000 (UTC)
 (envelope-from bapt@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 DAE381B806;
 Fri, 27 Dec 2019 16:28:41 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBRGSfiT093686;
 Fri, 27 Dec 2019 16:28:41 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBRGSfOi093685;
 Fri, 27 Dec 2019 16:28:41 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201912271628.xBRGSfOi093685@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 27 Dec 2019 16:28:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r521008 - head/sysutils/dvtm/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/sysutils/dvtm/files
X-SVN-Commit-Revision: 521008
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2019 16:28:42 -0000

Author: bapt
Date: Fri Dec 27 16:28:41 2019
New Revision: 521008
URL: https://svnweb.freebsd.org/changeset/ports/521008

Log:
  Ensure to be able to build with only one libncurses

Modified:
  head/sysutils/dvtm/files/patch-config.mk

Modified: head/sysutils/dvtm/files/patch-config.mk
==============================================================================
--- head/sysutils/dvtm/files/patch-config.mk	Fri Dec 27 16:16:40 2019	(r521007)
+++ head/sysutils/dvtm/files/patch-config.mk	Fri Dec 27 16:28:41 2019	(r521008)
@@ -1,6 +1,6 @@
 --- config.mk.orig	2016-01-09 11:40:56 UTC
 +++ config.mk
-@@ -4,14 +4,14 @@ VERSION = 0.15
+@@ -4,14 +4,19 @@ VERSION = 0.15
  # Customize below to fit your system
  
  PREFIX ?= /usr/local
@@ -11,8 +11,14 @@
  TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
  
  INCS = -I.
- LIBS = -lc -lutil -lncursesw
+-LIBS = -lc -lutil -lncursesw
 -CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++LIBS = -lc -lutil
++.if exists(/usr/lib/libncursesw.so)
++LIBS += -lncursesw
++.else
++LIBS += -lncurses
++.endif
 +CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE
  CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
  LDFLAGS += ${LIBS}