Attachment #163396 for bug #204724

Lines 2-9 Link Here

(-)misc/mc/Makefile (-24 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mc	4	PORTNAME= mc
5	PORTVERSION= 4.8.14	5	PORTVERSION= 4.8.15
6	PORTREVISION= 1
7	CATEGORIES= misc shells	6	CATEGORIES= misc shells
8	MASTER_SITES= http://ftp.midnight-commander.org/ \	7	MASTER_SITES= http://ftp.midnight-commander.org/ \
9	http://ftp.osuosl.org/pub/midnightcommander/ \	8	http://ftp.osuosl.org/pub/midnightcommander/ \
Lines 48-65 Link Here
48	ICONV_USES= iconv	47	ICONV_USES= iconv
49	ICONV_CONFIGURE_ENABLE= charset	48	ICONV_CONFIGURE_ENABLE= charset
50		49
		50	NCURSES_CONFIGURE_ON= --with-screen=ncurses
		51
51	NLS_CONFIGURE_ENABLE= nls	52	NLS_CONFIGURE_ENABLE= nls
52	NLS_USES= gettext	53	NLS_USES= gettext
		54	NLS_CPPFLAGS= -I${LOCALBASE}/include
		55	NLS_LDFLAGS= -L${LOCALBASE}/lib
53		56
54	SLANG_LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2	57	SLANG_LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2
		58	SLANG_CONFIGURE_ON= --with-screen=slang --with-slang-includes=${LOCALBASE}/include
55		59
56	SMB_CONFIGURE_ENABLE= vfs-smb	60	SMB_CONFIGURE_ENABLE= vfs-smb
57	SMB_CONFIGURE_ON= --with-smb-configdir=${LOCALBASE}/etc \	61	SMB_CONFIGURE_WITH= smb-configdir=${LOCALBASE}/etc \
58	--with-smb-codepagedir=${LOCALBASE}/etc/codepages	62	smb-codepagedir=${LOCALBASE}/etc/codepages
59		63
60	SUBSHELL_CONFIGURE_WITH= subshell	64	SUBSHELL_CONFIGURE_WITH=subshell
61		65
62	X11_CONFIGURE_ENABLE= x	66	X11_CONFIGURE_ENABLE= x
		67	X11_USE= xorg=x11,xext
63		68
64	PORTDOCS= *	69	PORTDOCS= *
65		70
Lines 70-94 Link Here
70	DOCSDIR2= ${DOCSDIR}/doc	75	DOCSDIR2= ${DOCSDIR}/doc
71	DOC_FILES2= FAQ HACKING MAINTAINERS *.txt	76	DOC_FILES2= FAQ HACKING MAINTAINERS *.txt
72		77
73	.include <bsd.port.options.mk>
74
75	.if ${PORT_OPTIONS:MNLS}
76	CPPFLAGS+= -I${LOCALBASE}/include
77	LDFLAGS+= -L${LOCALBASE}/lib
78	.endif
79
80	.if${PORT_OPTIONS:MX11}
81	USE_XORG= x11 xext
82	.endif
83
84	.if ${PORT_OPTIONS:MSLANG}
85	CONFIGURE_ARGS+=--with-screen=slang --with-slang-includes=${LOCALBASE}/include
86	.endif
87
88	.if ${PORT_OPTIONS:MNCURSES}
89	CONFIGURE_ARGS+=--with-screen=ncurses
90	.endif
91
92	post-patch:	78	post-patch:
93	${REINPLACE_CMD} -e 's\|missing-parameter-type\|unused-variable\|; \	79	${REINPLACE_CMD} -e 's\|missing-parameter-type\|unused-variable\|; \
94	s\|but-set-variable\|variable\|' \	80	s\|but-set-variable\|variable\|' \

Lines 1-4 Link Here

(-)misc/mc/distinfo (-2 / +2 lines)
1	SHA256 (mc-4.8.14.tar.xz) = 6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6	1	SHA256 (mc-4.8.15.tar.xz) = cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16
2	SIZE (mc-4.8.14.tar.xz) = 2305788	2	SIZE (mc-4.8.15.tar.xz) = 2304812
3	SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe	3	SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe
4	SIZE (mc.png) = 6466	4	SIZE (mc.png) = 6466

Lines 1-11 Link Here

(-)misc/mc/files/patch-lib_utilunix.c (-11 lines)
1	--- lib/utilunix.c.orig 2015-04-12 03:04:27 UTC
2	+++ lib/utilunix.c
3	@@ -528,7 +528,7 @@ mc_popen (const char command, GError *
4	goto ret_err;
5	}
6
7	- if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL,
8	+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD \| G_SPAWN_SEARCH_PATH, NULL, NULL,
9	&p->child_pid, NULL, &p->out.fd, &p->err.fd, error))
10	{
11	mc_replace_error (error, MC_PIPE_ERROR_CREATE_PIPE_STREAM, "%s",




%%NLS%%share/locale/eu/LC_MESSAGES/mc.mo
%%NLS%%share/locale/fa/LC_MESSAGES/mc.mo
%%NLS%%share/locale/fi/LC_MESSAGES/mc.mo
%%NLS%%share/locale/fi_FI/LC_MESSAGES/mc.mo
%%NLS%%share/locale/fr/LC_MESSAGES/mc.mo
%%NLS%%share/locale/fr_CA/LC_MESSAGES/mc.mo
%%NLS%%share/locale/gl/LC_MESSAGES/mc.mo
%%NLS%%share/locale/hr/LC_MESSAGES/mc.mo
%%NLS%%share/locale/hu/LC_MESSAGES/mc.mo

%%NLS%%share/locale/sl/LC_MESSAGES/mc.mo
%%NLS%%share/locale/sr/LC_MESSAGES/mc.mo
%%NLS%%share/locale/sv/LC_MESSAGES/mc.mo
%%NLS%%share/locale/sv_SE/LC_MESSAGES/mc.mo
%%NLS%%share/locale/szl/LC_MESSAGES/mc.mo
%%NLS%%share/locale/ta/LC_MESSAGES/mc.mo
%%NLS%%share/locale/te/LC_MESSAGES/mc.mo
%%NLS%%share/locale/tr/LC_MESSAGES/mc.mo
%%NLS%%share/locale/uk/LC_MESSAGES/mc.mo
%%NLS%%share/locale/vi/LC_MESSAGES/mc.mo

%%NLS%%%%DATADIR%%/help/mc.hlp.ru
%%NLS%%%%DATADIR%%/help/mc.hlp.sr
%%DATADIR%%/hints/mc.hint
%%NLS%%%%DATADIR%%/hints/mc.hint.ar
%%NLS%%%%DATADIR%%/hints/mc.hint.az
%%NLS%%%%DATADIR%%/hints/mc.hint.be
%%NLS%%%%DATADIR%%/hints/mc.hint.bg

Return to bug 204724

Lines 103-110 Link Here

(-)misc/mc/pkg-plist (-2 / +3 lines)
103	%%NLS%%share/locale/eu/LC_MESSAGES/mc.mo	103	%%NLS%%share/locale/eu/LC_MESSAGES/mc.mo
104	%%NLS%%share/locale/fa/LC_MESSAGES/mc.mo	104	%%NLS%%share/locale/fa/LC_MESSAGES/mc.mo
105	%%NLS%%share/locale/fi/LC_MESSAGES/mc.mo	105	%%NLS%%share/locale/fi/LC_MESSAGES/mc.mo
106	%%NLS%%share/locale/fi_FI/LC_MESSAGES/mc.mo
107	%%NLS%%share/locale/fr/LC_MESSAGES/mc.mo	106	%%NLS%%share/locale/fr/LC_MESSAGES/mc.mo
		107	%%NLS%%share/locale/fr_CA/LC_MESSAGES/mc.mo
108	%%NLS%%share/locale/gl/LC_MESSAGES/mc.mo	108	%%NLS%%share/locale/gl/LC_MESSAGES/mc.mo
109	%%NLS%%share/locale/hr/LC_MESSAGES/mc.mo	109	%%NLS%%share/locale/hr/LC_MESSAGES/mc.mo
110	%%NLS%%share/locale/hu/LC_MESSAGES/mc.mo	110	%%NLS%%share/locale/hu/LC_MESSAGES/mc.mo
Lines 129-137 Link Here
129	%%NLS%%share/locale/sl/LC_MESSAGES/mc.mo	129	%%NLS%%share/locale/sl/LC_MESSAGES/mc.mo
130	%%NLS%%share/locale/sr/LC_MESSAGES/mc.mo	130	%%NLS%%share/locale/sr/LC_MESSAGES/mc.mo
131	%%NLS%%share/locale/sv/LC_MESSAGES/mc.mo	131	%%NLS%%share/locale/sv/LC_MESSAGES/mc.mo
132	%%NLS%%share/locale/sv_SE/LC_MESSAGES/mc.mo
133	%%NLS%%share/locale/szl/LC_MESSAGES/mc.mo	132	%%NLS%%share/locale/szl/LC_MESSAGES/mc.mo
134	%%NLS%%share/locale/ta/LC_MESSAGES/mc.mo	133	%%NLS%%share/locale/ta/LC_MESSAGES/mc.mo
		134	%%NLS%%share/locale/te/LC_MESSAGES/mc.mo
135	%%NLS%%share/locale/tr/LC_MESSAGES/mc.mo	135	%%NLS%%share/locale/tr/LC_MESSAGES/mc.mo
136	%%NLS%%share/locale/uk/LC_MESSAGES/mc.mo	136	%%NLS%%share/locale/uk/LC_MESSAGES/mc.mo
137	%%NLS%%share/locale/vi/LC_MESSAGES/mc.mo	137	%%NLS%%share/locale/vi/LC_MESSAGES/mc.mo
Lines 153-158 Link Here
153	%%NLS%%%%DATADIR%%/help/mc.hlp.ru	153	%%NLS%%%%DATADIR%%/help/mc.hlp.ru
154	%%NLS%%%%DATADIR%%/help/mc.hlp.sr	154	%%NLS%%%%DATADIR%%/help/mc.hlp.sr
155	%%DATADIR%%/hints/mc.hint	155	%%DATADIR%%/hints/mc.hint
		156	%%NLS%%%%DATADIR%%/hints/mc.hint.ar
156	%%NLS%%%%DATADIR%%/hints/mc.hint.az	157	%%NLS%%%%DATADIR%%/hints/mc.hint.az
157	%%NLS%%%%DATADIR%%/hints/mc.hint.be	158	%%NLS%%%%DATADIR%%/hints/mc.hint.be
158	%%NLS%%%%DATADIR%%/hints/mc.hint.bg	159	%%NLS%%%%DATADIR%%/hints/mc.hint.bg