Attachment 230221 Details for Bug 260382 – git format-patch for 9.8v

[patch] git format-patch for 9.8v

0001-updates-for-vile-9.8v.patch (text/plain), 13.83 KB, created by Thomas E. Dickey on 2021-12-18 17:16:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas E. Dickey

Created: 2021-12-18 17:16:09 UTC

Size: 13.83 KB

patch

obsolete

>From b894bea13e29424c0c2d75c608351ef596b5b2e2 Mon Sep 17 00:00:00 2001
>From: "Thomas E. Dickey" <dickey@invisible-island.net>
>Date: Sat, 18 Dec 2021 12:10:41 -0500
>Subject: [PATCH] updates for vile-9.8v
>
>Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
>---
> editors/vile/Makefile               |   7 +-
> editors/vile/distinfo               |   6 +-
> editors/vile/files/patch-configure  |  11 --
> editors/xvile/Makefile              |  26 +++--
> editors/xvile/distinfo              |   6 +-
> editors/xvile/files/patch-configure |  11 --
> editors/xvile/files/patch-x11menu.c |  23 ----
> editors/xvile/files/patch-x11vile.h |  21 ----
> editors/xvile/pkg-plist             | 174 ++++++++++++++--------------
> 9 files changed, 113 insertions(+), 172 deletions(-)
> delete mode 100644 editors/vile/files/patch-configure
> delete mode 100644 editors/xvile/files/patch-configure
> delete mode 100644 editors/xvile/files/patch-x11menu.c
> delete mode 100644 editors/xvile/files/patch-x11vile.h
>
>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
>diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
>index 938e2b326461..0a2167f6c3c2 100644
>--- a/editors/xvile/Makefile
>+++ b/editors/xvile/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/
> PKGNAMEPREFIX=	x
> 
>@@ -15,7 +14,6 @@ MAINTAINER=	dickey@invisible-island.net
> COMMENT=	VI Like Emacs -- X11 version
> 
> LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BUILD_DEPENDS=	reflex:textproc/reflex
> 
>@@ -29,13 +27,14 @@ CONFIGURE_ARGS=	--disable-imake \
> 		--enable-fontset \
> 		--with-icon-theme \
> 		--with-xpm \
>+		--datarootdir=${PREFIX}/share/xvile \
> 		--with-icondir=${PREFIX}/share/icons \
>-		--with-pixmapdir=${PREFIX}/share/pixmaps
>+		--with-libdir-path=${PREFIX}/lib/xvile \
>+		--with-pixmapdir=${PREFIX}/share/pixmaps \
>+		--with-startup-path=${PREFIX}/share/xvile
> MAKEFILE=	makefile
> INSTALL_TARGET=	install install-doc install-html
> 
>-CONFLICTS_INSTALL=	vile
>-
> OPTIONS_DEFINE=		DOCS FILTERS ICONV PERL
> OPTIONS_RADIO=		MENUS
> OPTIONS_RADIO_MENUS=	MOTIF XAW XAW3D
>@@ -62,6 +61,10 @@ XAW3D_CONFIGURE_ON=	--enable-colored-menus \
> 			--with-Xaw3d \
> 			--with-screen=xaw3d
> 
>+# fixes to make this not conflict with the "vile" port
>+DATADIR=		${PREFIX}/share/xvile
>+DOCSDIR=		${PREFIX}/share/doc/xvile
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MFILTERS}
>@@ -76,10 +79,17 @@ CONFIGURE_ARGS+=	--with-screen=x11
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's|$$(datadir)/doc|@datadir@/doc/vile| ; \
>+		's|$$(datadir)/doc|@prefix@/share/doc/xvile| ; \
>+		 s|^$datadir[ 	]*=[ 	]*$@datadir@.*|\1@datarootdir@| ; \
>+		 s|@datadir@/doc/vile|@datarootdir@/doc/xvile| ; \
> 		 s|$$(datadir)/html|$$(docdir)/html| ; \
>+		 s|$$(datadir)/perl|@datadir@/perl| ; \
>+		 s|$$(BINDIR)/vileget|$$(BINDIR)/xvileget| ; \
> 		 s|$$$(DOCDIR)$ $$$(MANDIR)$|\1 $$(HTMLDIR) \2|' \
> 		${WRKSRC}/makefile.in
>+	@${REINPLACE_CMD} -e \
>+		's|^$datadir[ 	]*=[ 	]*$@datadir@.*|\1@datarootdir@|' \
>+		${WRKSRC}/filters/makefile.in
> 
> post-install:
> 	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \
>diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
>index d715b66f6acd..d4db70cb27ae 100644
>--- a/editors/xvile/distinfo
>+++ b/editors/xvile/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1589844782
>-SHA256 (vile-9.8u.tgz) = 31a82833fe4fef5a60043bcc3278d1a875a1028b1b2577c9e0fa3a179cff165e
>-SIZE (vile-9.8u.tgz) = 2375989
>+TIMESTAMP = 1639846563
>+SHA256 (vile-9.8v.tgz) = 240edec7bbf3d9df48b3042754bf9854d9a233d371d50bba236ec0edd708eed5
>+SIZE (vile-9.8v.tgz) = 2405398
>diff --git a/editors/xvile/files/patch-configure b/editors/xvile/files/patch-configure
>deleted file mode 100644
>index 2629cabfd82b..000000000000
>--- a/editors/xvile/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
>diff --git a/editors/xvile/files/patch-x11menu.c b/editors/xvile/files/patch-x11menu.c
>deleted file mode 100644
>index 02e9e35fc407..000000000000
>--- a/editors/xvile/files/patch-x11menu.c
>+++ /dev/null
>@@ -1,23 +0,0 @@
>---- x11menu.c.orig	2013-12-07 16:26:12 UTC
>-+++ x11menu.c
>-@@ -29,11 +29,20 @@
>- #endif
>- 
>- #if ATHENA_WIDGETS
>-+#ifdef HAVE_LIB_XAW3D
>-+#include <X11/Xaw3d/Form.h>
>-+#include <X11/Xaw3d/SimpleMenu.h>
>-+#include <X11/Xaw3d/MenuButton.h>
>-+#include <X11/Xaw3d/SmeLine.h>
>-+#include <X11/Xaw3d/SmeBSB.h>
>-+#endif
>-+#ifdef HAVE_LIB_XAW
>- #include <X11/Xaw/Form.h>
>- #include <X11/Xaw/SimpleMenu.h>
>- #include <X11/Xaw/MenuButton.h>
>- #include <X11/Xaw/SmeLine.h>
>- #include <X11/Xaw/SmeBSB.h>
>-+#endif
>- #endif
>- 
>- #define Nval(name,value) name, (XtArgVal)(value)
>diff --git a/editors/xvile/files/patch-x11vile.h b/editors/xvile/files/patch-x11vile.h
>deleted file mode 100644
>index 602c3ededc52..000000000000
>--- a/editors/xvile/files/patch-x11vile.h
>+++ /dev/null
>@@ -1,21 +0,0 @@
>---- x11vile.h.orig	2013-04-14 19:09:08 UTC
>-+++ x11vile.h
>-@@ -282,10 +282,18 @@
>- 
>- #if OPT_MENUS
>- #if ATHENA_WIDGETS
>-+#ifdef HAVE_LIB_XAW3D
>-+#include <X11/Xaw3d/SimpleMenu.h>
>-+#include <X11/Xaw3d/Box.h>
>-+#include <X11/Xaw3d/Form.h>
>-+#include <X11/Xaw3d/Paned.h>
>-+#endif
>-+#ifdef HAVE_LIB_XAW
>- #include <X11/Xaw/SimpleMenu.h>
>- #include <X11/Xaw/Box.h>
>- #include <X11/Xaw/Form.h>
>- #include <X11/Xaw/Paned.h>
>-+#endif
>- #endif
>- #if MOTIF_WIDGETS
>- #include <Xm/RowColumn.h>
>diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist
>index 429bee112568..ec991d617500 100644
>--- a/editors/xvile/pkg-plist
>+++ b/editors/xvile/pkg-plist
>@@ -1,7 +1,7 @@
> bin/lxvile
> bin/lxvile-fonts
> bin/uxvile
>-%%PERL%%bin/vileget
>+%%PERL%%bin/xvileget
> bin/xshell.sh
> bin/xvile
> bin/xvile-libdir-path
>@@ -9,92 +9,92 @@ bin/xvile-pager
> bin/xvile-to-html
> lib/X11/app-defaults/UXVile
> lib/X11/app-defaults/XVile
>-lib/vile/atr2ansi
>-lib/vile/atr2html
>-lib/vile/atr2text
>-lib/vile/vile-ada-filt%%SO_EXT%%
>-lib/vile/vile-as-filt%%SO_EXT%%
>-lib/vile/vile-asm-filt%%SO_EXT%%
>-lib/vile/vile-au3-filt%%SO_EXT%%
>-lib/vile/vile-awk-filt%%SO_EXT%%
>-lib/vile/vile-basic-filt%%SO_EXT%%
>-lib/vile/vile-bat-filt%%SO_EXT%%
>-lib/vile/vile-bnf-filt%%SO_EXT%%
>-lib/vile/vile-c-filt%%SO_EXT%%
>-lib/vile/vile-cfg-filt%%SO_EXT%%
>-lib/vile/vile-conf-filt%%SO_EXT%%
>-lib/vile/vile-crypt
>-lib/vile/vile-css-filt%%SO_EXT%%
>-lib/vile/vile-cweb-filt%%SO_EXT%%
>-lib/vile/vile-dcl-filt%%SO_EXT%%
>-lib/vile/vile-def-filt%%SO_EXT%%
>-lib/vile/vile-diff-filt%%SO_EXT%%
>-lib/vile/vile-ecl-filt%%SO_EXT%%
>-lib/vile/vile-erl-filt%%SO_EXT%%
>-lib/vile/vile-esql-filt%%SO_EXT%%
>-lib/vile/vile-est-filt%%SO_EXT%%
>-lib/vile/vile-fdl-filt%%SO_EXT%%
>-lib/vile/vile-hs-filt%%SO_EXT%%
>-lib/vile/vile-html-filt%%SO_EXT%%
>-lib/vile/vile-imake-filt%%SO_EXT%%
>-lib/vile/vile-info-filt%%SO_EXT%%
>-lib/vile/vile-ini-filt%%SO_EXT%%
>-lib/vile/vile-iss-filt%%SO_EXT%%
>-lib/vile/vile-json-filt%%SO_EXT%%
>-lib/vile/vile-key-filt%%SO_EXT%%
>-lib/vile/vile-latex-filt%%SO_EXT%%
>-lib/vile/vile-lex-filt%%SO_EXT%%
>-lib/vile/vile-lisp-filt%%SO_EXT%%
>-lib/vile/vile-lua-filt%%SO_EXT%%
>-lib/vile/vile-m4-filt%%SO_EXT%%
>-lib/vile/vile-mail-filt%%SO_EXT%%
>-lib/vile/vile-mailcap-filt%%SO_EXT%%
>-lib/vile/vile-make-filt%%SO_EXT%%
>-lib/vile/vile-manfilt
>-lib/vile/vile-mcrl-filt%%SO_EXT%%
>-lib/vile/vile-midl-filt%%SO_EXT%%
>-lib/vile/vile-mms-filt%%SO_EXT%%
>-lib/vile/vile-nmake-filt%%SO_EXT%%
>-lib/vile/vile-nr-filt%%SO_EXT%%
>-lib/vile/vile-pas-filt%%SO_EXT%%
>-lib/vile/vile-perl-filt%%SO_EXT%%
>-lib/vile/vile-perl6-filt%%SO_EXT%%
>-lib/vile/vile-php-filt%%SO_EXT%%
>-lib/vile/vile-pot-filt%%SO_EXT%%
>-lib/vile/vile-ps-filt%%SO_EXT%%
>-lib/vile/vile-ps1-filt%%SO_EXT%%
>-lib/vile/vile-py-filt%%SO_EXT%%
>-lib/vile/vile-rc-filt%%SO_EXT%%
>-lib/vile/vile-rcs-filt%%SO_EXT%%
>-lib/vile/vile-rexx-filt%%SO_EXT%%
>-lib/vile/vile-rpm-filt%%SO_EXT%%
>-lib/vile/vile-rtf-filt%%SO_EXT%%
>-lib/vile/vile-ruby-filt%%SO_EXT%%
>-lib/vile/vile-rust-filt%%SO_EXT%%
>-lib/vile/vile-sccs-filt%%SO_EXT%%
>-lib/vile/vile-scheme-filt%%SO_EXT%%
>-lib/vile/vile-sed-filt%%SO_EXT%%
>-lib/vile/vile-sh-filt%%SO_EXT%%
>-lib/vile/vile-sml-filt%%SO_EXT%%
>-lib/vile/vile-spell-filt%%SO_EXT%%
>-lib/vile/vile-sql-filt%%SO_EXT%%
>-lib/vile/vile-tags-filt%%SO_EXT%%
>-lib/vile/vile-tbl-filt%%SO_EXT%%
>-lib/vile/vile-tc-filt%%SO_EXT%%
>-lib/vile/vile-tcl-filt%%SO_EXT%%
>-lib/vile/vile-texi-filt%%SO_EXT%%
>-lib/vile/vile-ti-filt%%SO_EXT%%
>-lib/vile/vile-tpu-filt%%SO_EXT%%
>-lib/vile/vile-txt-filt%%SO_EXT%%
>-lib/vile/vile-vile-filt%%SO_EXT%%
>-lib/vile/vile-vlog-filt%%SO_EXT%%
>-lib/vile/vile-wbt-filt%%SO_EXT%%
>-lib/vile/vile-xml-filt%%SO_EXT%%
>-lib/vile/vile-xq-filt%%SO_EXT%%
>-lib/vile/vile-xres-filt%%SO_EXT%%
>-lib/vile/vile-xs-filt%%SO_EXT%%
>-lib/vile/vile-yacc-filt%%SO_EXT%%
>-lib/vile/vile-yaml-filt%%SO_EXT%%
>+lib/xvile/atr2ansi
>+lib/xvile/atr2html
>+lib/xvile/atr2text
>+lib/xvile/vile-ada-filt%%SO_EXT%%
>+lib/xvile/vile-as-filt%%SO_EXT%%
>+lib/xvile/vile-asm-filt%%SO_EXT%%
>+lib/xvile/vile-au3-filt%%SO_EXT%%
>+lib/xvile/vile-awk-filt%%SO_EXT%%
>+lib/xvile/vile-basic-filt%%SO_EXT%%
>+lib/xvile/vile-bat-filt%%SO_EXT%%
>+lib/xvile/vile-bnf-filt%%SO_EXT%%
>+lib/xvile/vile-c-filt%%SO_EXT%%
>+lib/xvile/vile-cfg-filt%%SO_EXT%%
>+lib/xvile/vile-conf-filt%%SO_EXT%%
>+lib/xvile/vile-crypt
>+lib/xvile/vile-css-filt%%SO_EXT%%
>+lib/xvile/vile-cweb-filt%%SO_EXT%%
>+lib/xvile/vile-dcl-filt%%SO_EXT%%
>+lib/xvile/vile-def-filt%%SO_EXT%%
>+lib/xvile/vile-diff-filt%%SO_EXT%%
>+lib/xvile/vile-ecl-filt%%SO_EXT%%
>+lib/xvile/vile-erl-filt%%SO_EXT%%
>+lib/xvile/vile-esql-filt%%SO_EXT%%
>+lib/xvile/vile-est-filt%%SO_EXT%%
>+lib/xvile/vile-fdl-filt%%SO_EXT%%
>+lib/xvile/vile-hs-filt%%SO_EXT%%
>+lib/xvile/vile-html-filt%%SO_EXT%%
>+lib/xvile/vile-imake-filt%%SO_EXT%%
>+lib/xvile/vile-info-filt%%SO_EXT%%
>+lib/xvile/vile-ini-filt%%SO_EXT%%
>+lib/xvile/vile-iss-filt%%SO_EXT%%
>+lib/xvile/vile-json-filt%%SO_EXT%%
>+lib/xvile/vile-key-filt%%SO_EXT%%
>+lib/xvile/vile-latex-filt%%SO_EXT%%
>+lib/xvile/vile-lex-filt%%SO_EXT%%
>+lib/xvile/vile-lisp-filt%%SO_EXT%%
>+lib/xvile/vile-lua-filt%%SO_EXT%%
>+lib/xvile/vile-m4-filt%%SO_EXT%%
>+lib/xvile/vile-mail-filt%%SO_EXT%%
>+lib/xvile/vile-mailcap-filt%%SO_EXT%%
>+lib/xvile/vile-make-filt%%SO_EXT%%
>+lib/xvile/vile-manfilt
>+lib/xvile/vile-mcrl-filt%%SO_EXT%%
>+lib/xvile/vile-midl-filt%%SO_EXT%%
>+lib/xvile/vile-mms-filt%%SO_EXT%%
>+lib/xvile/vile-nmake-filt%%SO_EXT%%
>+lib/xvile/vile-nr-filt%%SO_EXT%%
>+lib/xvile/vile-pas-filt%%SO_EXT%%
>+lib/xvile/vile-perl-filt%%SO_EXT%%
>+lib/xvile/vile-perl6-filt%%SO_EXT%%
>+lib/xvile/vile-php-filt%%SO_EXT%%
>+lib/xvile/vile-pot-filt%%SO_EXT%%
>+lib/xvile/vile-ps-filt%%SO_EXT%%
>+lib/xvile/vile-ps1-filt%%SO_EXT%%
>+lib/xvile/vile-py-filt%%SO_EXT%%
>+lib/xvile/vile-rc-filt%%SO_EXT%%
>+lib/xvile/vile-rcs-filt%%SO_EXT%%
>+lib/xvile/vile-rexx-filt%%SO_EXT%%
>+lib/xvile/vile-rpm-filt%%SO_EXT%%
>+lib/xvile/vile-rtf-filt%%SO_EXT%%
>+lib/xvile/vile-ruby-filt%%SO_EXT%%
>+lib/xvile/vile-rust-filt%%SO_EXT%%
>+lib/xvile/vile-sccs-filt%%SO_EXT%%
>+lib/xvile/vile-scheme-filt%%SO_EXT%%
>+lib/xvile/vile-sed-filt%%SO_EXT%%
>+lib/xvile/vile-sh-filt%%SO_EXT%%
>+lib/xvile/vile-sml-filt%%SO_EXT%%
>+lib/xvile/vile-spell-filt%%SO_EXT%%
>+lib/xvile/vile-sql-filt%%SO_EXT%%
>+lib/xvile/vile-tags-filt%%SO_EXT%%
>+lib/xvile/vile-tbl-filt%%SO_EXT%%
>+lib/xvile/vile-tc-filt%%SO_EXT%%
>+lib/xvile/vile-tcl-filt%%SO_EXT%%
>+lib/xvile/vile-texi-filt%%SO_EXT%%
>+lib/xvile/vile-ti-filt%%SO_EXT%%
>+lib/xvile/vile-tpu-filt%%SO_EXT%%
>+lib/xvile/vile-txt-filt%%SO_EXT%%
>+lib/xvile/vile-vile-filt%%SO_EXT%%
>+lib/xvile/vile-vlog-filt%%SO_EXT%%
>+lib/xvile/vile-wbt-filt%%SO_EXT%%
>+lib/xvile/vile-xml-filt%%SO_EXT%%
>+lib/xvile/vile-xq-filt%%SO_EXT%%
>+lib/xvile/vile-xres-filt%%SO_EXT%%
>+lib/xvile/vile-xs-filt%%SO_EXT%%
>+lib/xvile/vile-yacc-filt%%SO_EXT%%
>+lib/xvile/vile-yaml-filt%%SO_EXT%%
> man/man1/xvile.1.gz
> man/man1/xvile-libdir-path.1.gz
> man/man1/xvile-pager.1.gz
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 260382: 230169 | 230170 | 230220 | 230221