From owner-svn-ports-head@freebsd.org Sat Feb 27 08:09:31 2021 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 7CD6C55F643; Sat, 27 Feb 2021 08:09:31 +0000 (UTC) (envelope-from tobik@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DnfLz2yd8z4YxQ; Sat, 27 Feb 2021 08:09:31 +0000 (UTC) (envelope-from tobik@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 549271A1ED; Sat, 27 Feb 2021 08:09:31 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11R89VYM061890; Sat, 27 Feb 2021 08:09:31 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11R89U8Y061886; Sat, 27 Feb 2021 08:09:30 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202102270809.11R89U8Y061886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 27 Feb 2021 08:09:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566675 - in head: devel/idutils devel/idutils/files sysutils/coreutils X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: devel/idutils devel/idutils/files sysutils/coreutils X-SVN-Commit-Revision: 566675 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.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: Sat, 27 Feb 2021 08:09:31 -0000 Author: tobik Date: Sat Feb 27 08:09:29 2021 New Revision: 566675 URL: https://svnweb.freebsd.org/changeset/ports/566675 Log: devel/idutils: Resolve conflict with coreutils pkg-static: idutils-4.6_2 conflicts with coreutils-8.28 (installs files into the same place). Problematic file: /usr/local/bin/gid For lack of a better solution resolve this by prefixing gid with a g. It is now installed as ggid. linux-gid and sh-utils no longer seem to exist in the tree, so drop CONFLICTS completely. PR: 224985 Submitted by: Trond.Endrestol@ximalas.info Approved by: peterj (maintainer timeout, 3 years) Added: head/devel/idutils/files/patch-lisp_idutils.el (contents, props changed) head/devel/idutils/pkg-message (contents, props changed) Modified: head/devel/idutils/Makefile head/devel/idutils/pkg-plist head/sysutils/coreutils/Makefile Modified: head/devel/idutils/Makefile ============================================================================== --- head/devel/idutils/Makefile Sat Feb 27 07:59:28 2021 (r566674) +++ head/devel/idutils/Makefile Sat Feb 27 08:09:29 2021 (r566675) @@ -3,20 +3,23 @@ PORTNAME= idutils PORTVERSION= 4.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= GNU MAINTAINER= peterjeremy@acm.org COMMENT= The classic Berkeley gid/lid tools for looking up variables in code -CONFLICTS= coreutils-[0-9]* linux-gid-[0-9]* sh-utils-[0-9]* - LICENSE= GPLv3 OPTIONS_DEFINE= NLS -USES= charsetfix tar:xz +USES= charsetfix tar:xz uniquefiles +# Also see files/patch-lisp_idutils.el +UNIQUE_PREFIX= g +UNIQUE_PREFIX_FILES= bin/gid \ + man/man1/gid.1 + GNU_CONFIGURE= yes CONFIGURE_ENV= EMACS='no' CPPFLAGS+= -I${LOCALBASE}/include Added: head/devel/idutils/files/patch-lisp_idutils.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/idutils/files/patch-lisp_idutils.el Sat Feb 27 08:09:29 2021 (r566675) @@ -0,0 +1,11 @@ +--- lisp/idutils.el.orig 2021-02-27 07:27:26 UTC ++++ lisp/idutils.el +@@ -32,7 +32,7 @@ + (require 'compile) + (require 'thingatpt) + +-(defvar gid-command "gid" "The command run by the gid function.") ++(defvar gid-command "ggid" "The command run by the gid function.") + + (defvar gid-mode-font-lock-keywords + '(("^\\(Compilation\\|Gid\\) \\(started\\|finished\\).*" Added: head/devel/idutils/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/idutils/pkg-message Sat Feb 27 08:09:29 2021 (r566675) @@ -0,0 +1,5 @@ +[ +{ type: install + message: "gid is installed as ggid to avoid conflicts with coreutils." +} +] Modified: head/devel/idutils/pkg-plist ============================================================================== --- head/devel/idutils/pkg-plist Sat Feb 27 07:59:28 2021 (r566674) +++ head/devel/idutils/pkg-plist Sat Feb 27 08:09:29 2021 (r566675) @@ -3,7 +3,7 @@ bin/defid bin/eid bin/fid bin/fnid -bin/gid +bin/ggid bin/lid bin/mkid bin/xtokid @@ -12,7 +12,7 @@ man/man1/defid.1.gz man/man1/eid.1.gz man/man1/fid.1.gz man/man1/fnid.1.gz -man/man1/gid.1.gz +man/man1/ggid.1.gz man/man1/lid.1.gz man/man1/mkid.1.gz man/man1/xtokid.1.gz Modified: head/sysutils/coreutils/Makefile ============================================================================== --- head/sysutils/coreutils/Makefile Sat Feb 27 07:59:28 2021 (r566674) +++ head/sysutils/coreutils/Makefile Sat Feb 27 08:09:29 2021 (r566675) @@ -33,8 +33,6 @@ GMP_CONFIGURE_WITH= gmp NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -CONFLICTS= idutils-[0-9]* - CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib