View | Details | Raw Unified | Return to bug 281057
Collapse All | Expand All

(-)b/misc/mc/Makefile (-20 / +11 lines)
Lines 1-5 Link Here
1
PORTNAME=	mc
1
PORTNAME=	mc
2
PORTVERSION=	4.8.31
2
DISTVERSION=	4.8.32
3
CATEGORIES=	misc shells
3
CATEGORIES=	misc shells
4
MASTER_SITES=	http://ftp.midnight-commander.org/ \
4
MASTER_SITES=	http://ftp.midnight-commander.org/ \
5
		https://ftp.osuosl.org/pub/midnightcommander/
5
		https://ftp.osuosl.org/pub/midnightcommander/
Lines 13-33 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
13
13
14
RUN_DEPENDS=	zip:archivers/zip
14
RUN_DEPENDS=	zip:archivers/zip
15
15
16
.if ${:!diff --version 2>/dev/null | grep -c GNU\ diffutils || :!} < 1
17
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_diffviewer_ydiff.c
18
RUN_DEPENDS+=	gdiff:textproc/diffutils
19
.endif
20
21
USES=		gmake gnome libtool perl5 pkgconfig python shebangfix tar:xz
16
USES=		gmake gnome libtool perl5 pkgconfig python shebangfix tar:xz
17
USE_GNOME=	glib20
18
22
SHEBANG_FILES=	${WRKSRC}/src/vfs/extfs/helpers/s3+.in \
19
SHEBANG_FILES=	${WRKSRC}/src/vfs/extfs/helpers/s3+.in \
23
		${WRKSRC}/src/vfs/extfs/helpers/uc1541
20
		${WRKSRC}/src/vfs/extfs/helpers/uc1541
24
python_OLD_CMD=	@PYTHON@
21
python_OLD_CMD=	@PYTHON@
25
USE_GNOME=	glib20
22
26
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
28
CONFIGURE_ENV=	ZIP=${LOCALBASE}/bin/zip UNZIP=${UNZIP_NATIVE_CMD}
24
CONFIGURE_ENV=	ZIP=${LOCALBASE}/bin/zip UNZIP=${UNZIP_NATIVE_CMD}
29
25
30
PORTDOCS=	AUTHORS FAQ HACKING MAINTAINERS NEWS README TODO
26
.if ${:!diff --version 2>/dev/null | grep -c GNU\ diffutils || :!} < 1
27
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_diffviewer_ydiff.c
28
RUN_DEPENDS+=	gdiff:textproc/diffutils
29
.endif
30
31
PORTDOCS=	COPYING FAQ HACKING INSTALL NEWS README TODO
31
32
32
OPTIONS_DEFINE=	ASPELL DOCS EDITOR EXTATTR ICONV NLS PCRE2 SFTP SUBSHELL X11
33
OPTIONS_DEFINE=	ASPELL DOCS EDITOR EXTATTR ICONV NLS PCRE2 SFTP SUBSHELL X11
33
OPTIONS_DEFAULT=	EDITOR ICONV SFTP SLANG SUBSHELL X11
34
OPTIONS_DEFAULT=	EDITOR ICONV SFTP SLANG SUBSHELL X11
Lines 47-79 X11_DESC= X11 events support (if available) Link Here
47
ASPELL_BUILD_DEPENDS=	${LOCALBASE}/include/aspell.h:textproc/aspell
48
ASPELL_BUILD_DEPENDS=	${LOCALBASE}/include/aspell.h:textproc/aspell
48
ASPELL_RUN_DEPENDS=	${LOCALBASE}/share/aspell/en.multi:textproc/en-aspell
49
ASPELL_RUN_DEPENDS=	${LOCALBASE}/share/aspell/en.multi:textproc/en-aspell
49
ASPELL_CONFIGURE_ENABLE=aspell
50
ASPELL_CONFIGURE_ENABLE=aspell
50
51
EDITOR_CONFIGURE_WITH=	internal-edit
51
EDITOR_CONFIGURE_WITH=	internal-edit
52
53
EXTATTR_LIB_DEPENDS=	libe2p.so:sysutils/e2fsprogs-core
52
EXTATTR_LIB_DEPENDS=	libe2p.so:sysutils/e2fsprogs-core
54
55
ICONV_USES=		iconv
53
ICONV_USES=		iconv
56
ICONV_CONFIGURE_ENABLE=	charset
54
ICONV_CONFIGURE_ENABLE=	charset
57
58
NCURSES_CONFIGURE_ON=	--with-screen=ncurses
55
NCURSES_CONFIGURE_ON=	--with-screen=ncurses
59
NCURSES_CFLAGS+=	-DNCURSES_WIDECHAR
56
NCURSES_CFLAGS+=	-DNCURSES_WIDECHAR
60
57
NLS_USES=		gettext
61
NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
58
NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
62
NLS_CONFIGURE_OFF=	--disable-nls
59
NLS_CONFIGURE_OFF=	--disable-nls
63
NLS_USES=		gettext
64
65
PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
60
PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
66
PCRE2_CONFIGURE_ON=	--with-search-engine=pcre2
61
PCRE2_CONFIGURE_ON=	--with-search-engine=pcre2
67
68
SFTP_LIB_DEPENDS=	libssh2.so:security/libssh2
62
SFTP_LIB_DEPENDS=	libssh2.so:security/libssh2
69
SFTP_CONFIGURE_ENABLE=	vfs-sftp
63
SFTP_CONFIGURE_ENABLE=	vfs-sftp
70
71
SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
64
SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
72
SLANG_CONFIGURE_ON=	--with-screen=slang
65
SLANG_CONFIGURE_ON=	--with-screen=slang
73
74
SUBSHELL_CONFIGURE_WITH=subshell
66
SUBSHELL_CONFIGURE_WITH=subshell
75
SUBSHELL_SUB_FILES=	pkg-message
67
SUBSHELL_SUB_FILES=	pkg-message
76
77
X11_BUILD_DEPENDS=	${LOCALBASE}/include/X11/Xlib.h:x11/libX11
68
X11_BUILD_DEPENDS=	${LOCALBASE}/include/X11/Xlib.h:x11/libX11
78
X11_CONFIGURE_WITH=	x
69
X11_CONFIGURE_WITH=	x
79
70
(-)b/misc/mc/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1706345345
1
TIMESTAMP = 1724587269
2
SHA256 (mc-4.8.31.tar.xz) = 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a
2
SHA256 (mc-4.8.32.tar.xz) = 4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe
3
SIZE (mc-4.8.31.tar.xz) = 2385632
3
SIZE (mc-4.8.32.tar.xz) = 2385648
(-)b/misc/mc/files/extra-patch-src_diffviewer_ydiff.c (-4 / +4 lines)
Lines 1-9 Link Here
1
--- src/diffviewer/ydiff.c.orig	2017-03-04 20:51:38 UTC
1
--- src/diffviewer/ydiff.c.orig	2024-08-08 07:49:18 UTC
2
+++ src/diffviewer/ydiff.c
2
+++ src/diffviewer/ydiff.c
3
@@ -816,7 +816,7 @@ dff_execute (const char *args, const char *extra, cons
3
@@ -821,7 +821,7 @@ dff_execute (const char *args, const char *extra, cons
4
     /* escape potential $ to avoid shell variable substitutions in popen() */
4
     /* escape potential $ to avoid shell variable substitutions in popen() */
5
     file1_esc = strutils_shell_escape (file1);
5
     file1_esc = str_shell_escape (file1);
6
     file2_esc = strutils_shell_escape (file2);
6
     file2_esc = str_shell_escape (file2);
7
-    cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
7
-    cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
8
+    cmd = g_strdup_printf ("gdiff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
8
+    cmd = g_strdup_printf ("gdiff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
9
     g_free (file1_esc);
9
     g_free (file1_esc);
(-)b/misc/mc/pkg-plist (-1 / +12 lines)
Lines 143-148 libexec/mc/shell/utime Link Here
143
%%NLS%%share/man/hu/man1/mc.1.gz
143
%%NLS%%share/man/hu/man1/mc.1.gz
144
%%NLS%%share/man/it/man1/mc.1.gz
144
%%NLS%%share/man/it/man1/mc.1.gz
145
share/man/man1/mc.1.gz
145
share/man/man1/mc.1.gz
146
share/man/man1/mcdiff.1.gz
146
share/man/man1/mcedit.1.gz
147
share/man/man1/mcedit.1.gz
147
share/man/man1/mcview.1.gz
148
share/man/man1/mcview.1.gz
148
%%NLS%%share/man/pl/man1/mc.1.gz
149
%%NLS%%share/man/pl/man1/mc.1.gz
Lines 212-225 share/man/man1/mcview.1.gz Link Here
212
%%DATADIR%%/skins/gray-green-purple256.ini
213
%%DATADIR%%/skins/gray-green-purple256.ini
213
%%DATADIR%%/skins/gray-orange-blue256.ini
214
%%DATADIR%%/skins/gray-orange-blue256.ini
214
%%DATADIR%%/skins/julia256.ini
215
%%DATADIR%%/skins/julia256.ini
216
%%DATADIR%%/skins/julia256root.ini
215
%%DATADIR%%/skins/mc46.ini
217
%%DATADIR%%/skins/mc46.ini
218
%%DATADIR%%/skins/modarcon16-defbg-thin.ini
216
%%DATADIR%%/skins/modarcon16-defbg.ini
219
%%DATADIR%%/skins/modarcon16-defbg.ini
220
%%DATADIR%%/skins/modarcon16-thin.ini
217
%%DATADIR%%/skins/modarcon16.ini
221
%%DATADIR%%/skins/modarcon16.ini
222
%%DATADIR%%/skins/modarcon16root-defbg-thin.ini
218
%%DATADIR%%/skins/modarcon16root-defbg.ini
223
%%DATADIR%%/skins/modarcon16root-defbg.ini
224
%%DATADIR%%/skins/modarcon16root-thin.ini
219
%%DATADIR%%/skins/modarcon16root.ini
225
%%DATADIR%%/skins/modarcon16root.ini
226
%%DATADIR%%/skins/modarin256-defbg-thin.ini
220
%%DATADIR%%/skins/modarin256-defbg.ini
227
%%DATADIR%%/skins/modarin256-defbg.ini
228
%%DATADIR%%/skins/modarin256-thin.ini
221
%%DATADIR%%/skins/modarin256.ini
229
%%DATADIR%%/skins/modarin256.ini
230
%%DATADIR%%/skins/modarin256root-defbg-thin.ini
222
%%DATADIR%%/skins/modarin256root-defbg.ini
231
%%DATADIR%%/skins/modarin256root-defbg.ini
232
%%DATADIR%%/skins/modarin256root-thin.ini
223
%%DATADIR%%/skins/modarin256root.ini
233
%%DATADIR%%/skins/modarin256root.ini
224
%%DATADIR%%/skins/nicedark.ini
234
%%DATADIR%%/skins/nicedark.ini
225
%%DATADIR%%/skins/sand256.ini
235
%%DATADIR%%/skins/sand256.ini
Lines 227-233 share/man/man1/mcview.1.gz Link Here
227
%%DATADIR%%/skins/seasons-spring16M.ini
237
%%DATADIR%%/skins/seasons-spring16M.ini
228
%%DATADIR%%/skins/seasons-summer16M.ini
238
%%DATADIR%%/skins/seasons-summer16M.ini
229
%%DATADIR%%/skins/seasons-winter16M.ini
239
%%DATADIR%%/skins/seasons-winter16M.ini
240
%%DATADIR%%/skins/xoria256-thin.ini
230
%%DATADIR%%/skins/xoria256.ini
241
%%DATADIR%%/skins/xoria256.ini
242
%%DATADIR%%/skins/xoria256root-thin.ini
231
%%DATADIR%%/skins/yadt256-defbg.ini
243
%%DATADIR%%/skins/yadt256-defbg.ini
232
%%DATADIR%%/skins/yadt256.ini
244
%%DATADIR%%/skins/yadt256.ini
233
%%EDITOR%%%%DATADIR%%/syntax/PKGBUILD.syntax
245
%%EDITOR%%%%DATADIR%%/syntax/PKGBUILD.syntax
234
- 

Return to bug 281057