From nobody Mon Dec 20 05:41:54 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ADAEE1909F26; Mon, 20 Dec 2021 05:41:54 +0000 (UTC) (envelope-from git@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 4JHT4233GDz4sJ5; Mon, 20 Dec 2021 05:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 48B7110DBE; Mon, 20 Dec 2021 05:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BK5fsq9073042; Mon, 20 Dec 2021 05:41:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BK5fsRr073041; Mon, 20 Dec 2021 05:41:54 GMT (envelope-from git) Date: Mon, 20 Dec 2021 05:41:54 GMT Message-Id: <202112200541.1BK5fsRr073041@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: f96d43f530b9 - main - editors/vile: update to 9.8v List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f96d43f530b9d0f311bc55cec4009455f13a8a10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639978914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/4UbSYmlO5nI06KKxzVhDTzpDgRE/Bf5+euhditlCw=; b=g2dQTHvPRJ68mr+bJ6fhqaiAx+9FkRtGxEzXw3B4gl/g8+vounRPHORFCXYB37SIhyqhd6 6oTfU7DaD/eDMpE5qzhLLtX2l/BWgDm6f/Wm8fpveYTPZJefmWNZLVcF4sRAgLqitu+Iz7 P9Z/rYbu0ItCnm9Yr7Fww5X68OXj8bM/giz/CEdEy+oODKMrh1bwEV2Iwlcm0ISyIb4kYV Tlj14ogSxrCZOPpSmPJh9fSyQGXWNH1t9EABi5SNXmYPiVJCvf4WelIyxMDTmle3qaA59C 1gsQMeMKlmfLgarFDUZ8PLDieAWVPyMn5yzdB/xNS5o8xpF5ujRby77qo0nonQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639978914; a=rsa-sha256; cv=none; b=JJcwe5SALJTnGzlDOQjM/tJRIrJACg7Noj5CUq7agVgvl1Z/36ebUoRm9ljKcf4m35rigJ 0OFBWjZ/v2dxNn58sWKtJ1V/VVcngbOjl2+WErphrvJ4N8R4xmfzABOyxJkXGJaaoLNof4 xrivZsx18Ymwm7wq5Obe//q2P1Bbb+p0oGeEszRWUM4Q8PPrrbfqHkdwlLNPySdTW0Di1p xyy8XyY+btj4GESP3VMVcDoIdbV4K03r7Paw2NqkSGBM7ByDvcT1EERf/ve2dOa/hiayvo 7CHw2LpqoN9eVIXvLwIJI0Kkex0BnMW7tsJnXLZLnnjcR6SZnnouR4+mBe/Vyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=f96d43f530b9d0f311bc55cec4009455f13a8a10 commit f96d43f530b9d0f311bc55cec4009455f13a8a10 Author: Thomas E. Dickey AuthorDate: 2021-12-20 05:29:24 +0000 Commit: Hiroki Tagato CommitDate: 2021-12-20 05:41:37 +0000 editors/vile: update to 9.8v While here, remove CONFLICTS_INSTALL. In 9.8v, the sources include updated makefiles which make the two ports nonconflicting. That is done by using sed-scripts within the makefiles to rename files owned by xvile (along with some updates to the latter's plist file). Changelog: https://invisible-island.net/vile/CHANGES.html#v9_8v PR: 260382 Reported by: Thomas E. Dickey (maintainer) --- editors/vile/Makefile | 7 ++----- editors/vile/distinfo | 6 +++--- editors/vile/files/patch-configure | 11 ----------- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/editors/vile/Makefile b/editors/vile/Makefile index 406ac2119b81..16bda43ef60e 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -1,10 +1,9 @@ # Created by: pgf PORTNAME= vile -PORTVERSION= 9.8u +PORTVERSION= 9.8v CATEGORIES= editors -MASTER_SITES= ftp://dickey.his.com/vile/current/ \ - ftp://ftp.invisible-island.net/vile/current/ \ +MASTER_SITES= ftp://ftp.invisible-island.net/pub/vile/current/ \ https://invisible-mirror.net/archives/vile/current/ PATCH_SITES= ${MASTER_SITES:S,vile/current/,vile/patches/,g} @@ -25,8 +24,6 @@ CONFIGURE_ENV= cf_cv_crypt_works=yes MAKEFILE= makefile INSTALL_TARGET= install install-doc install-html -CONFLICTS_INSTALL= xvile - OPTIONS_DEFINE= DOCS FILTERS ICONV PERL OPTIONS_SUB= yes diff --git a/editors/vile/distinfo b/editors/vile/distinfo index d715b66f6acd..2365cf3b20f4 100644 --- a/editors/vile/distinfo +++ b/editors/vile/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1589844782 -SHA256 (vile-9.8u.tgz) = 31a82833fe4fef5a60043bcc3278d1a875a1028b1b2577c9e0fa3a179cff165e -SIZE (vile-9.8u.tgz) = 2375989 +TIMESTAMP = 1639846551 +SHA256 (vile-9.8v.tgz) = 240edec7bbf3d9df48b3042754bf9854d9a233d371d50bba236ec0edd708eed5 +SIZE (vile-9.8v.tgz) = 2405398 diff --git a/editors/vile/files/patch-configure b/editors/vile/files/patch-configure deleted file mode 100644 index 2629cabfd82b..000000000000 --- a/editors/vile/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2020-03-29 21:46:05 UTC -+++ configure -@@ -32100,7 +32100,7 @@ if test "x$CLANG_COMPILER" = "xyes" - then - { echo "$as_me:32101: WARNING: clang only pretends to honor gcc -rdynamic option" >&5 - echo "$as_me: WARNING: clang only pretends to honor gcc -rdynamic option" >&2;} -- cf_cv_gcc_opt_rdynamic=no -+ # cf_cv_gcc_opt_rdynamic=no - else - - echo "$as_me:32106: checking if $CC has -rdynamic option" >&5