From owner-svn-ports-head@freebsd.org Thu Dec 31 20:45:18 2020 Return-Path: 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 AB1BA4CF2E1; Thu, 31 Dec 2020 20:45:18 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6Ksp4PZHz3q6w; Thu, 31 Dec 2020 20:45:18 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 844B82254C; Thu, 31 Dec 2020 20:45:18 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f181.google.com with SMTP id b64so17116066qkc.12; Thu, 31 Dec 2020 12:45:18 -0800 (PST) X-Gm-Message-State: AOAM531TYH9y8orf7FKitCwXe2rMvVlRo1VQXMBDapJJVGGtB5oMwBNw kWXMgfb9RR6dyruZzG4aHZOJxL1k90FpHFYD3Zg= X-Google-Smtp-Source: ABdhPJxauAlL3CNoeHnoxrf4+FBB2/q9x/RVi0zSOPBu4OUsmQh9X+2MHTeir+l2y6PyiDAlaMoR1wzZFauPFH7MXCA= X-Received: by 2002:a37:6713:: with SMTP id b19mr56441160qkc.493.1609447518096; Thu, 31 Dec 2020 12:45:18 -0800 (PST) MIME-Version: 1.0 References: <202012312021.0BVKLqLI084717@repo.freebsd.org> In-Reply-To: <202012312021.0BVKLqLI084717@repo.freebsd.org> From: Kyle Evans Date: Thu, 31 Dec 2020 14:45:04 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r559774 - in head: editors/xcoral lang/scm lang/scm/files To: Mikhail Teterin Cc: ports-committers , svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 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: Thu, 31 Dec 2020 20:45:18 -0000 On Thu, Dec 31, 2020 at 2:21 PM Mikhail Teterin wrote: > > Author: mi > Date: Thu Dec 31 20:21:52 2020 > New Revision: 559774 > URL: https://svnweb.freebsd.org/changeset/ports/559774 > > Log: > Start searching for headers and libraries under ${LOCALBASE}/ -- > in case newer implementations of anything are installed there. > > When compiling on 13.x or above, insist on libgnuregex version above > 5 -- earlier FreeBSD releases came with libgnuregex.so.5, but that's > now gone and replaced by the devel/libgnuregex port, which currently > installs libgnuregex.so.6. > > [... snip ...] > > Modified: head/lang/scm/Makefile > ============================================================================== > --- head/lang/scm/Makefile Thu Dec 31 20:12:18 2020 (r559773) > +++ head/lang/scm/Makefile Thu Dec 31 20:21:52 2020 (r559774) > @@ -56,6 +56,10 @@ SCM_MODULES_X11=x.so > > .include > > +.if ${OSVERSION} > 1300000 > +LIB_DEPENDS+= libgnuregex.so.[6-9]:devel/libgnuregex > +.endif > + > .if ${PORT_OPTIONS:MX11} > SCM_MODULES+= ${SCM_MODULES_X11} > SCM_DATA+= ${SCM_DATA_X11} > You should go ahead and drop the soversion suffix if you're going to do it this way. It's only necessary at all if you're going to let older FreeBSD versions use the non-broken version.