From owner-svn-ports-all@freebsd.org Thu Jul 30 09:54:28 2020 Return-Path: Delivered-To: svn-ports-all@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 CFA2E37F4B9; Thu, 30 Jul 2020 09:54:28 +0000 (UTC) (envelope-from sunpoet@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BHQjw56bzz47cR; Thu, 30 Jul 2020 09:54:28 +0000 (UTC) (envelope-from sunpoet@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 8C930F320; Thu, 30 Jul 2020 09:54:28 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06U9sSBJ084601; Thu, 30 Jul 2020 09:54:28 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06U9sS61084600; Thu, 30 Jul 2020 09:54:28 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202007300954.06U9sS61084600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 30 Jul 2020 09:54:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543782 - head/misc/patchutils X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/misc/patchutils X-SVN-Commit-Revision: 543782 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.33 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: Thu, 30 Jul 2020 09:54:29 -0000 Author: sunpoet Date: Thu Jul 30 09:54:27 2020 New Revision: 543782 URL: https://svnweb.freebsd.org/changeset/ports/543782 Log: Remove CONFLICTS by renaming svndiff to svndiff.patchutils - Bump PORTREVISION for package change PR: 248293 Submitted by: swills Modified: head/misc/patchutils/Makefile head/misc/patchutils/pkg-plist Modified: head/misc/patchutils/Makefile ============================================================================== --- head/misc/patchutils/Makefile Thu Jul 30 09:54:22 2020 (r543781) +++ head/misc/patchutils/Makefile Thu Jul 30 09:54:27 2020 (r543782) @@ -3,6 +3,7 @@ PORTNAME= patchutils PORTVERSION= 0.4.2 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://cyberelk.net/tim/data/patchutils/stable/ @@ -19,9 +20,8 @@ SHEBANG_FILES= patchview/gitdiff scripts/*.in GNU_CONFIGURE= yes -CONFLICTS= devel/subversion - post-install: + ${MV} ${STAGEDIR}${PREFIX}/bin/svndiff ${STAGEDIR}${PREFIX}/bin/svndiff.patchutils ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include Modified: head/misc/patchutils/pkg-plist ============================================================================== --- head/misc/patchutils/pkg-plist Thu Jul 30 09:54:22 2020 (r543781) +++ head/misc/patchutils/pkg-plist Thu Jul 30 09:54:27 2020 (r543782) @@ -14,7 +14,7 @@ bin/patchview bin/recountdiff bin/rediff bin/splitdiff -bin/svndiff +bin/svndiff.patchutils bin/svndiffview bin/unwrapdiff share/man/man1/combinediff.1.gz