View | Details | Raw Unified | Return to bug 260382 | Differences between
and this patch

Collapse All | Expand All

(-)xvile/Makefile (-9 / +19 lines)
Lines 1-11 Link Here
1
# Created by: pgf
1
# Created by: pgf
2
# $FreeBSD: tags/RELEASE_13_0_0/editors/xvile/Makefile 537120 2020-05-31 06:17:41Z tagattie $
2
# $FreeBSD: head/editors/xvile/Makefile 516802 2019-11-05 15:48:40Z zeising $
3
3
4
PORTNAME=	vile
4
PORTNAME=	vile
5
PORTVERSION=	9.8u
5
PORTVERSION=	9.8v
6
CATEGORIES=	editors
6
CATEGORIES=	editors
7
MASTER_SITES=	ftp://dickey.his.com/vile/current/ \
7
MASTER_SITES=	ftp://ftp.invisible-island.net/pub/vile/current/ \
8
		ftp://ftp.invisible-island.net/vile/current/ \
9
		https://invisible-mirror.net/archives/vile/current/
8
		https://invisible-mirror.net/archives/vile/current/
10
PKGNAMEPREFIX=	x
9
PKGNAMEPREFIX=	x
11
10
Lines 16-22 Link Here
16
COMMENT=	VI Like Emacs -- X11 version
15
COMMENT=	VI Like Emacs -- X11 version
17
16
18
LICENSE=	GPLv2
17
LICENSE=	GPLv2
19
LICENSE_FILE=	${WRKSRC}/COPYING
20
18
21
BUILD_DEPENDS=	reflex:textproc/reflex
19
BUILD_DEPENDS=	reflex:textproc/reflex
22
20
Lines 30-42 Link Here
30
		--enable-fontset \
28
		--enable-fontset \
31
		--with-icon-theme \
29
		--with-icon-theme \
32
		--with-xpm \
30
		--with-xpm \
31
		--datarootdir=${PREFIX}/share/xvile \
33
		--with-icondir=${PREFIX}/share/icons \
32
		--with-icondir=${PREFIX}/share/icons \
34
		--with-pixmapdir=${PREFIX}/share/pixmaps
33
		--with-libdir-path=${PREFIX}/lib/xvile \
34
		--with-pixmapdir=${PREFIX}/share/pixmaps \
35
		--with-startup-path=${PREFIX}/share/xvile
35
MAKEFILE=	makefile
36
MAKEFILE=	makefile
36
INSTALL_TARGET=	install install-doc install-html
37
INSTALL_TARGET=	install install-doc install-html
37
38
38
CONFLICTS_INSTALL=	vile-[0-9]*
39
40
OPTIONS_DEFINE=		DOCS FILTERS ICONV PERL
39
OPTIONS_DEFINE=		DOCS FILTERS ICONV PERL
41
OPTIONS_RADIO=		MENUS
40
OPTIONS_RADIO=		MENUS
42
OPTIONS_RADIO_MENUS=	MOTIF XAW XAW3D
41
OPTIONS_RADIO_MENUS=	MOTIF XAW XAW3D
Lines 63-68 Link Here
63
			--with-Xaw3d \
62
			--with-Xaw3d \
64
			--with-screen=xaw3d
63
			--with-screen=xaw3d
65
64
65
# fixes to make this not conflict with the "vile" port
66
DATADIR=		${PREFIX}/share/xvile
67
DOCSDIR=		${PREFIX}/share/doc/xvile
68
66
.include <bsd.port.options.mk>
69
.include <bsd.port.options.mk>
67
70
68
.if ${PORT_OPTIONS:MFILTERS}
71
.if ${PORT_OPTIONS:MFILTERS}
Lines 77-86 Link Here
77
80
78
post-patch:
81
post-patch:
79
	@${REINPLACE_CMD} -e \
82
	@${REINPLACE_CMD} -e \
80
		's|$$(datadir)/doc|@datadir@/doc/vile| ; \
83
		's|$$(datadir)/doc|@prefix@/share/doc/xvile| ; \
84
		 s|^\(datadir[ 	]*=[ 	]*\)@datadir@.*|\1@datarootdir@| ; \
85
		 s|@datadir@/doc/vile|@datarootdir@/doc/xvile| ; \
81
		 s|$$(datadir)/html|$$(docdir)/html| ; \
86
		 s|$$(datadir)/html|$$(docdir)/html| ; \
87
		 s|$$(datadir)/perl|@datadir@/perl| ; \
88
		 s|$$(BINDIR)/vileget|$$(BINDIR)/xvileget| ; \
82
		 s|\($$(DOCDIR)\) \($$(MANDIR)\)|\1 $$(HTMLDIR) \2|' \
89
		 s|\($$(DOCDIR)\) \($$(MANDIR)\)|\1 $$(HTMLDIR) \2|' \
83
		${WRKSRC}/makefile.in
90
		${WRKSRC}/makefile.in
91
	@${REINPLACE_CMD} -e \
92
		's|^\(datadir[ 	]*=[ 	]*\)@datadir@.*|\1@datarootdir@|' \
93
		${WRKSRC}/filters/makefile.in
84
94
85
post-install:
95
post-install:
86
	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \
96
	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \
(-)xvile/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1589844782
1
TIMESTAMP = 1639644847
2
SHA256 (vile-9.8u.tgz) = 31a82833fe4fef5a60043bcc3278d1a875a1028b1b2577c9e0fa3a179cff165e
2
SHA256 (vile-9.8v.tgz) = 240edec7bbf3d9df48b3042754bf9854d9a233d371d50bba236ec0edd708eed5
3
SIZE (vile-9.8u.tgz) = 2375989
3
SIZE (vile-9.8v.tgz) = 2405398
(-)xvile/files/patch-configure (-11 lines)
Lines 1-11 Link Here
1
--- configure.orig	2020-03-29 21:46:05 UTC
2
+++ configure
3
@@ -32100,7 +32100,7 @@ if test "x$CLANG_COMPILER" = "xyes"
4
 then
5
 	{ echo "$as_me:32101: WARNING: clang only pretends to honor gcc -rdynamic option" >&5
6
 echo "$as_me: WARNING: clang only pretends to honor gcc -rdynamic option" >&2;}
7
-	cf_cv_gcc_opt_rdynamic=no
8
+	# cf_cv_gcc_opt_rdynamic=no
9
 else
10
 
11
 echo "$as_me:32106: checking if $CC has -rdynamic option" >&5
(-)xvile/files/patch-x11menu.c (-23 lines)
Lines 1-23 Link Here
1
--- x11menu.c.orig	2013-12-07 16:26:12 UTC
2
+++ x11menu.c
3
@@ -29,11 +29,20 @@
4
 #endif
5
 
6
 #if ATHENA_WIDGETS
7
+#ifdef HAVE_LIB_XAW3D
8
+#include <X11/Xaw3d/Form.h>
9
+#include <X11/Xaw3d/SimpleMenu.h>
10
+#include <X11/Xaw3d/MenuButton.h>
11
+#include <X11/Xaw3d/SmeLine.h>
12
+#include <X11/Xaw3d/SmeBSB.h>
13
+#endif
14
+#ifdef HAVE_LIB_XAW
15
 #include <X11/Xaw/Form.h>
16
 #include <X11/Xaw/SimpleMenu.h>
17
 #include <X11/Xaw/MenuButton.h>
18
 #include <X11/Xaw/SmeLine.h>
19
 #include <X11/Xaw/SmeBSB.h>
20
+#endif
21
 #endif
22
 
23
 #define Nval(name,value) name, (XtArgVal)(value)
(-)xvile/files/patch-x11vile.h (-21 lines)
Lines 1-21 Link Here
1
--- x11vile.h.orig	2013-04-14 19:09:08 UTC
2
+++ x11vile.h
3
@@ -282,10 +282,18 @@
4
 
5
 #if OPT_MENUS
6
 #if ATHENA_WIDGETS
7
+#ifdef HAVE_LIB_XAW3D
8
+#include <X11/Xaw3d/SimpleMenu.h>
9
+#include <X11/Xaw3d/Box.h>
10
+#include <X11/Xaw3d/Form.h>
11
+#include <X11/Xaw3d/Paned.h>
12
+#endif
13
+#ifdef HAVE_LIB_XAW
14
 #include <X11/Xaw/SimpleMenu.h>
15
 #include <X11/Xaw/Box.h>
16
 #include <X11/Xaw/Form.h>
17
 #include <X11/Xaw/Paned.h>
18
+#endif
19
 #endif
20
 #if MOTIF_WIDGETS
21
 #include <Xm/RowColumn.h>
(-)xvile/pkg-plist (-87 / +87 lines)
Lines 1-7 Link Here
1
bin/lxvile
1
bin/lxvile
2
bin/lxvile-fonts
2
bin/lxvile-fonts
3
bin/uxvile
3
bin/uxvile
4
%%PERL%%bin/vileget
4
%%PERL%%bin/xvileget
5
bin/xshell.sh
5
bin/xshell.sh
6
bin/xvile
6
bin/xvile
7
bin/xvile-libdir-path
7
bin/xvile-libdir-path
Lines 9-100 Link Here
9
bin/xvile-to-html
9
bin/xvile-to-html
10
lib/X11/app-defaults/UXVile
10
lib/X11/app-defaults/UXVile
11
lib/X11/app-defaults/XVile
11
lib/X11/app-defaults/XVile
12
lib/vile/atr2ansi
12
lib/xvile/atr2ansi
13
lib/vile/atr2html
13
lib/xvile/atr2html
14
lib/vile/atr2text
14
lib/xvile/atr2text
15
lib/vile/vile-ada-filt%%SO_EXT%%
15
lib/xvile/vile-ada-filt%%SO_EXT%%
16
lib/vile/vile-as-filt%%SO_EXT%%
16
lib/xvile/vile-as-filt%%SO_EXT%%
17
lib/vile/vile-asm-filt%%SO_EXT%%
17
lib/xvile/vile-asm-filt%%SO_EXT%%
18
lib/vile/vile-au3-filt%%SO_EXT%%
18
lib/xvile/vile-au3-filt%%SO_EXT%%
19
lib/vile/vile-awk-filt%%SO_EXT%%
19
lib/xvile/vile-awk-filt%%SO_EXT%%
20
lib/vile/vile-basic-filt%%SO_EXT%%
20
lib/xvile/vile-basic-filt%%SO_EXT%%
21
lib/vile/vile-bat-filt%%SO_EXT%%
21
lib/xvile/vile-bat-filt%%SO_EXT%%
22
lib/vile/vile-bnf-filt%%SO_EXT%%
22
lib/xvile/vile-bnf-filt%%SO_EXT%%
23
lib/vile/vile-c-filt%%SO_EXT%%
23
lib/xvile/vile-c-filt%%SO_EXT%%
24
lib/vile/vile-cfg-filt%%SO_EXT%%
24
lib/xvile/vile-cfg-filt%%SO_EXT%%
25
lib/vile/vile-conf-filt%%SO_EXT%%
25
lib/xvile/vile-conf-filt%%SO_EXT%%
26
lib/vile/vile-crypt
26
lib/xvile/vile-crypt
27
lib/vile/vile-css-filt%%SO_EXT%%
27
lib/xvile/vile-css-filt%%SO_EXT%%
28
lib/vile/vile-cweb-filt%%SO_EXT%%
28
lib/xvile/vile-cweb-filt%%SO_EXT%%
29
lib/vile/vile-dcl-filt%%SO_EXT%%
29
lib/xvile/vile-dcl-filt%%SO_EXT%%
30
lib/vile/vile-def-filt%%SO_EXT%%
30
lib/xvile/vile-def-filt%%SO_EXT%%
31
lib/vile/vile-diff-filt%%SO_EXT%%
31
lib/xvile/vile-diff-filt%%SO_EXT%%
32
lib/vile/vile-ecl-filt%%SO_EXT%%
32
lib/xvile/vile-ecl-filt%%SO_EXT%%
33
lib/vile/vile-erl-filt%%SO_EXT%%
33
lib/xvile/vile-erl-filt%%SO_EXT%%
34
lib/vile/vile-esql-filt%%SO_EXT%%
34
lib/xvile/vile-esql-filt%%SO_EXT%%
35
lib/vile/vile-est-filt%%SO_EXT%%
35
lib/xvile/vile-est-filt%%SO_EXT%%
36
lib/vile/vile-fdl-filt%%SO_EXT%%
36
lib/xvile/vile-fdl-filt%%SO_EXT%%
37
lib/vile/vile-hs-filt%%SO_EXT%%
37
lib/xvile/vile-hs-filt%%SO_EXT%%
38
lib/vile/vile-html-filt%%SO_EXT%%
38
lib/xvile/vile-html-filt%%SO_EXT%%
39
lib/vile/vile-imake-filt%%SO_EXT%%
39
lib/xvile/vile-imake-filt%%SO_EXT%%
40
lib/vile/vile-info-filt%%SO_EXT%%
40
lib/xvile/vile-info-filt%%SO_EXT%%
41
lib/vile/vile-ini-filt%%SO_EXT%%
41
lib/xvile/vile-ini-filt%%SO_EXT%%
42
lib/vile/vile-iss-filt%%SO_EXT%%
42
lib/xvile/vile-iss-filt%%SO_EXT%%
43
lib/vile/vile-json-filt%%SO_EXT%%
43
lib/xvile/vile-json-filt%%SO_EXT%%
44
lib/vile/vile-key-filt%%SO_EXT%%
44
lib/xvile/vile-key-filt%%SO_EXT%%
45
lib/vile/vile-latex-filt%%SO_EXT%%
45
lib/xvile/vile-latex-filt%%SO_EXT%%
46
lib/vile/vile-lex-filt%%SO_EXT%%
46
lib/xvile/vile-lex-filt%%SO_EXT%%
47
lib/vile/vile-lisp-filt%%SO_EXT%%
47
lib/xvile/vile-lisp-filt%%SO_EXT%%
48
lib/vile/vile-lua-filt%%SO_EXT%%
48
lib/xvile/vile-lua-filt%%SO_EXT%%
49
lib/vile/vile-m4-filt%%SO_EXT%%
49
lib/xvile/vile-m4-filt%%SO_EXT%%
50
lib/vile/vile-mail-filt%%SO_EXT%%
50
lib/xvile/vile-mail-filt%%SO_EXT%%
51
lib/vile/vile-mailcap-filt%%SO_EXT%%
51
lib/xvile/vile-mailcap-filt%%SO_EXT%%
52
lib/vile/vile-make-filt%%SO_EXT%%
52
lib/xvile/vile-make-filt%%SO_EXT%%
53
lib/vile/vile-manfilt
53
lib/xvile/vile-manfilt
54
lib/vile/vile-mcrl-filt%%SO_EXT%%
54
lib/xvile/vile-mcrl-filt%%SO_EXT%%
55
lib/vile/vile-midl-filt%%SO_EXT%%
55
lib/xvile/vile-midl-filt%%SO_EXT%%
56
lib/vile/vile-mms-filt%%SO_EXT%%
56
lib/xvile/vile-mms-filt%%SO_EXT%%
57
lib/vile/vile-nmake-filt%%SO_EXT%%
57
lib/xvile/vile-nmake-filt%%SO_EXT%%
58
lib/vile/vile-nr-filt%%SO_EXT%%
58
lib/xvile/vile-nr-filt%%SO_EXT%%
59
lib/vile/vile-pas-filt%%SO_EXT%%
59
lib/xvile/vile-pas-filt%%SO_EXT%%
60
lib/vile/vile-perl-filt%%SO_EXT%%
60
lib/xvile/vile-perl-filt%%SO_EXT%%
61
lib/vile/vile-perl6-filt%%SO_EXT%%
61
lib/xvile/vile-perl6-filt%%SO_EXT%%
62
lib/vile/vile-php-filt%%SO_EXT%%
62
lib/xvile/vile-php-filt%%SO_EXT%%
63
lib/vile/vile-pot-filt%%SO_EXT%%
63
lib/xvile/vile-pot-filt%%SO_EXT%%
64
lib/vile/vile-ps-filt%%SO_EXT%%
64
lib/xvile/vile-ps-filt%%SO_EXT%%
65
lib/vile/vile-ps1-filt%%SO_EXT%%
65
lib/xvile/vile-ps1-filt%%SO_EXT%%
66
lib/vile/vile-py-filt%%SO_EXT%%
66
lib/xvile/vile-py-filt%%SO_EXT%%
67
lib/vile/vile-rc-filt%%SO_EXT%%
67
lib/xvile/vile-rc-filt%%SO_EXT%%
68
lib/vile/vile-rcs-filt%%SO_EXT%%
68
lib/xvile/vile-rcs-filt%%SO_EXT%%
69
lib/vile/vile-rexx-filt%%SO_EXT%%
69
lib/xvile/vile-rexx-filt%%SO_EXT%%
70
lib/vile/vile-rpm-filt%%SO_EXT%%
70
lib/xvile/vile-rpm-filt%%SO_EXT%%
71
lib/vile/vile-rtf-filt%%SO_EXT%%
71
lib/xvile/vile-rtf-filt%%SO_EXT%%
72
lib/vile/vile-ruby-filt%%SO_EXT%%
72
lib/xvile/vile-ruby-filt%%SO_EXT%%
73
lib/vile/vile-rust-filt%%SO_EXT%%
73
lib/xvile/vile-rust-filt%%SO_EXT%%
74
lib/vile/vile-sccs-filt%%SO_EXT%%
74
lib/xvile/vile-sccs-filt%%SO_EXT%%
75
lib/vile/vile-scheme-filt%%SO_EXT%%
75
lib/xvile/vile-scheme-filt%%SO_EXT%%
76
lib/vile/vile-sed-filt%%SO_EXT%%
76
lib/xvile/vile-sed-filt%%SO_EXT%%
77
lib/vile/vile-sh-filt%%SO_EXT%%
77
lib/xvile/vile-sh-filt%%SO_EXT%%
78
lib/vile/vile-sml-filt%%SO_EXT%%
78
lib/xvile/vile-sml-filt%%SO_EXT%%
79
lib/vile/vile-spell-filt%%SO_EXT%%
79
lib/xvile/vile-spell-filt%%SO_EXT%%
80
lib/vile/vile-sql-filt%%SO_EXT%%
80
lib/xvile/vile-sql-filt%%SO_EXT%%
81
lib/vile/vile-tags-filt%%SO_EXT%%
81
lib/xvile/vile-tags-filt%%SO_EXT%%
82
lib/vile/vile-tbl-filt%%SO_EXT%%
82
lib/xvile/vile-tbl-filt%%SO_EXT%%
83
lib/vile/vile-tc-filt%%SO_EXT%%
83
lib/xvile/vile-tc-filt%%SO_EXT%%
84
lib/vile/vile-tcl-filt%%SO_EXT%%
84
lib/xvile/vile-tcl-filt%%SO_EXT%%
85
lib/vile/vile-texi-filt%%SO_EXT%%
85
lib/xvile/vile-texi-filt%%SO_EXT%%
86
lib/vile/vile-ti-filt%%SO_EXT%%
86
lib/xvile/vile-ti-filt%%SO_EXT%%
87
lib/vile/vile-tpu-filt%%SO_EXT%%
87
lib/xvile/vile-tpu-filt%%SO_EXT%%
88
lib/vile/vile-txt-filt%%SO_EXT%%
88
lib/xvile/vile-txt-filt%%SO_EXT%%
89
lib/vile/vile-vile-filt%%SO_EXT%%
89
lib/xvile/vile-vile-filt%%SO_EXT%%
90
lib/vile/vile-vlog-filt%%SO_EXT%%
90
lib/xvile/vile-vlog-filt%%SO_EXT%%
91
lib/vile/vile-wbt-filt%%SO_EXT%%
91
lib/xvile/vile-wbt-filt%%SO_EXT%%
92
lib/vile/vile-xml-filt%%SO_EXT%%
92
lib/xvile/vile-xml-filt%%SO_EXT%%
93
lib/vile/vile-xq-filt%%SO_EXT%%
93
lib/xvile/vile-xq-filt%%SO_EXT%%
94
lib/vile/vile-xres-filt%%SO_EXT%%
94
lib/xvile/vile-xres-filt%%SO_EXT%%
95
lib/vile/vile-xs-filt%%SO_EXT%%
95
lib/xvile/vile-xs-filt%%SO_EXT%%
96
lib/vile/vile-yacc-filt%%SO_EXT%%
96
lib/xvile/vile-yacc-filt%%SO_EXT%%
97
lib/vile/vile-yaml-filt%%SO_EXT%%
97
lib/xvile/vile-yaml-filt%%SO_EXT%%
98
man/man1/xvile.1.gz
98
man/man1/xvile.1.gz
99
man/man1/xvile-libdir-path.1.gz
99
man/man1/xvile-libdir-path.1.gz
100
man/man1/xvile-pager.1.gz
100
man/man1/xvile-pager.1.gz

Return to bug 260382