Attachment 215056 Details for Bug 246586 – alternate patch for xvile-9.8u

[patch] alternate patch for xvile-9.8u

xvile-9.8u.diff (text/plain), 6.80 KB, created by Thomas E. Dickey on 2020-05-30 14:06:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas E. Dickey

Created: 2020-05-30 14:06:57 UTC

Size: 6.80 KB

patch

obsolete

>diff -Naru xvile/Makefile xvile-9.8u/Makefile
>--- xvile/Makefile	2019-11-05 10:48:40.000000000 -0500
>+++ xvile-9.8u/Makefile	2020-05-19 18:24:40.000000000 -0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/editors/xvile/Makefile 516802 2019-11-05 15:48:40Z zeising $
> 
> PORTNAME=	vile
>-PORTVERSION=	9.8t
>+PORTVERSION=	9.8u
> CATEGORIES=	editors
> MASTER_SITES=	ftp://dickey.his.com/vile/current/ \
> 		ftp://ftp.invisible-island.net/vile/current/ \
>@@ -80,9 +80,6 @@
> 		 s|$$(datadir)/html|$$(docdir)/html| ; \
> 		 s|$$$(DOCDIR)$ $$$(MANDIR)$|\1 $$(HTMLDIR) \2|' \
> 		${WRKSRC}/makefile.in
>-	@${REINPLACE_CMD} -e \
>-		'/^Categories/s|Application;||' \
>-		${WRKSRC}/macros/*.desktop
> 
> post-install:
> 	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \
>diff -Naru xvile/distinfo xvile-9.8u/distinfo
>--- xvile/distinfo	2018-12-31 13:39:46.000000000 -0500
>+++ xvile-9.8u/distinfo	2020-05-18 19:33:02.000000000 -0400
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1546254826
>-SHA256 (vile-9.8t.tgz) = 60b288432cfd32b7149c4cd662844e2694c5ab92bc469b282f33ded5110f6ded
>-SIZE (vile-9.8t.tgz) = 2352119
>+TIMESTAMP = 1589844782
>+SHA256 (vile-9.8u.tgz) = 31a82833fe4fef5a60043bcc3278d1a875a1028b1b2577c9e0fa3a179cff165e
>+SIZE (vile-9.8u.tgz) = 2375989
>diff -Naru xvile/files/patch-configure xvile-9.8u/files/patch-configure
>--- xvile/files/patch-configure	1969-12-31 19:00:00.000000000 -0500
>+++ xvile-9.8u/files/patch-configure	2020-05-19 17:11:34.000000000 -0400
>@@ -0,0 +1,11 @@
>+--- 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 -Naru xvile/files/patch-x11menu.c xvile-9.8u/files/patch-x11menu.c
>--- xvile/files/patch-x11menu.c	2015-10-09 18:07:50.000000000 -0400
>+++ xvile-9.8u/files/patch-x11menu.c	2020-05-19 18:15:56.000000000 -0400
>@@ -1,6 +1,6 @@
> --- x11menu.c.orig	2013-12-07 16:26:12 UTC
> +++ x11menu.c
>-@@ -29,12 +29,21 @@
>+@@ -29,11 +29,20 @@
>  #endif
>  
>  #if ATHENA_WIDGETS
>@@ -17,8 +17,7 @@
>  #include <X11/Xaw/MenuButton.h>
>  #include <X11/Xaw/SmeLine.h>
>  #include <X11/Xaw/SmeBSB.h>
>- #endif
> +#endif
>+ #endif
>  
>  #define Nval(name,value) name, (XtArgVal)(value)
>- #define Sval(name,value) name, (value)
>diff -Naru xvile/files/patch-x11vile.h xvile-9.8u/files/patch-x11vile.h
>--- xvile/files/patch-x11vile.h	2015-10-09 18:07:50.000000000 -0400
>+++ xvile-9.8u/files/patch-x11vile.h	2020-05-19 18:15:56.000000000 -0400
>@@ -1,6 +1,6 @@
> --- x11vile.h.orig	2013-04-14 19:09:08 UTC
> +++ x11vile.h
>-@@ -282,11 +282,19 @@
>+@@ -282,10 +282,18 @@
>  
>  #if OPT_MENUS
>  #if ATHENA_WIDGETS
>@@ -15,8 +15,7 @@
>  #include <X11/Xaw/Box.h>
>  #include <X11/Xaw/Form.h>
>  #include <X11/Xaw/Paned.h>
>- #endif
> +#endif
>+ #endif
>  #if MOTIF_WIDGETS
>  #include <Xm/RowColumn.h>
>- #endif
>diff -Naru xvile/pkg-plist xvile-9.8u/pkg-plist
>--- xvile/pkg-plist	2018-12-31 13:39:46.000000000 -0500
>+++ xvile-9.8u/pkg-plist	2020-05-18 19:58:41.000000000 -0400
>@@ -54,9 +54,11 @@
> 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%%
>@@ -82,6 +84,7 @@
> 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%%
>@@ -157,6 +160,7 @@
> %%DATADIR%%/fdl.keywords
> %%DATADIR%%/filters.rc
> %%DATADIR%%/gnugpg.rc
>+%%DATADIR%%/go.keywords
> %%DATADIR%%/hs.keywords
> %%DATADIR%%/html.keywords
> %%DATADIR%%/imake.keywords
>@@ -180,40 +184,15 @@
> %%DATADIR%%/midl.keywords
> %%DATADIR%%/modes.rc
> %%DATADIR%%/mvn.keywords
>+%%DATADIR%%/nmake.keywords
> %%DATADIR%%/nr.keywords
> %%DATADIR%%/nsis.keywords
> %%DATADIR%%/objc.keywords
> %%DATADIR%%/palettes.rc
> %%DATADIR%%/pas.keywords
> %%DATADIR%%/pc.keywords
>-%%DATADIR%%/rust.keywords
>-%%DATADIR%%/vcproj.keywords
>-%%DATADIR%%/vcxproj.keywords
>-%%DATADIR%%/yaml.keywords
>-%%PERL%%%%DATADIR%%/perl/Breadcrumbs.pm
>-%%PERL%%%%DATADIR%%/perl/CaptHook.pm
>-%%PERL%%%%DATADIR%%/perl/Glob2re.pm
>-%%PERL%%%%DATADIR%%/perl/Help.pm
>-%%PERL%%%%DATADIR%%/perl/Vile/Exporter.pm
>-%%PERL%%%%DATADIR%%/perl/Vile/Manual.pm
>-%%PERL%%%%DATADIR%%/perl/Vile.pm
>-%%PERL%%%%DATADIR%%/perl/Vileserv.pm
>-%%PERL%%%%DATADIR%%/perl/Visit.pm
>-%%PERL%%%%DATADIR%%/perl/capture.pm
>-%%PERL%%%%DATADIR%%/perl/dict.pm
>-%%PERL%%%%DATADIR%%/perl/directory.pm
>-%%PERL%%%%DATADIR%%/perl/dirlist.pm
>-%%PERL%%%%DATADIR%%/perl/gdb.pm
>-%%PERL%%%%DATADIR%%/perl/hgrep.pm
>-%%PERL%%%%DATADIR%%/perl/lock.pm
>-%%PERL%%%%DATADIR%%/perl/man.pm
>-%%PERL%%%%DATADIR%%/perl/mime.pl
>-%%PERL%%%%DATADIR%%/perl/plugins.pl
>-%%PERL%%%%DATADIR%%/perl/search.pm
>-%%PERL%%%%DATADIR%%/perl/shell.pm
>-%%PERL%%%%DATADIR%%/perl/spell.pm
>-%%PERL%%%%DATADIR%%/perl/winops.pm
> %%DATADIR%%/perl.keywords
>+%%DATADIR%%/perl6.keywords
> %%DATADIR%%/php.keywords
> %%DATADIR%%/pictmode.rc
> %%DATADIR%%/pot.keywords
>@@ -228,6 +207,7 @@
> %%DATADIR%%/rpm.keywords
> %%DATADIR%%/rtf.keywords
> %%DATADIR%%/ruby.keywords
>+%%DATADIR%%/rust.keywords
> %%DATADIR%%/sccs.keywords
> %%DATADIR%%/scheme.keywords
> %%DATADIR%%/search.rc
>@@ -245,9 +225,13 @@
> %%DATADIR%%/tex.keywords
> %%DATADIR%%/texi.keywords
> %%DATADIR%%/ti.keywords
>+%%DATADIR%%/tpu.keywords
>+%%DATADIR%%/ts.keywords
> %%DATADIR%%/vb.keywords
> %%DATADIR%%/vb6.keywords
> %%DATADIR%%/vbs.keywords
>+%%DATADIR%%/vcproj.keywords
>+%%DATADIR%%/vcxproj.keywords
> %%DATADIR%%/vile.hlp
> %%DATADIR%%/vile.keywords
> %%DATADIR%%/vileinit.rc
>@@ -263,4 +247,28 @@
> %%DATADIR%%/xs.keywords
> %%DATADIR%%/xsl.keywords
> %%DATADIR%%/yacc.keywords
>+%%DATADIR%%/yaml.keywords
> %%DATADIR%%/zsh.keywords
>+%%PERL%%%%DATADIR%%/perl/Breadcrumbs.pm
>+%%PERL%%%%DATADIR%%/perl/CaptHook.pm
>+%%PERL%%%%DATADIR%%/perl/Glob2re.pm
>+%%PERL%%%%DATADIR%%/perl/Help.pm
>+%%PERL%%%%DATADIR%%/perl/Vile.pm
>+%%PERL%%%%DATADIR%%/perl/Vile/Exporter.pm
>+%%PERL%%%%DATADIR%%/perl/Vile/Manual.pm
>+%%PERL%%%%DATADIR%%/perl/Vileserv.pm
>+%%PERL%%%%DATADIR%%/perl/Visit.pm
>+%%PERL%%%%DATADIR%%/perl/capture.pm
>+%%PERL%%%%DATADIR%%/perl/dict.pm
>+%%PERL%%%%DATADIR%%/perl/directory.pm
>+%%PERL%%%%DATADIR%%/perl/dirlist.pm
>+%%PERL%%%%DATADIR%%/perl/gdb.pm
>+%%PERL%%%%DATADIR%%/perl/hgrep.pm
>+%%PERL%%%%DATADIR%%/perl/lock.pm
>+%%PERL%%%%DATADIR%%/perl/man.pm
>+%%PERL%%%%DATADIR%%/perl/mime.pl
>+%%PERL%%%%DATADIR%%/perl/plugins.pl
>+%%PERL%%%%DATADIR%%/perl/search.pm
>+%%PERL%%%%DATADIR%%/perl/shell.pm
>+%%PERL%%%%DATADIR%%/perl/spell.pm
>+%%PERL%%%%DATADIR%%/perl/winops.pm

Actions: View | Diff

Attachments on bug 246586: 214668 | 215055 | 215056