Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Nov 2015 11:34:46 +0000 (UTC)
From:      Bartek Rutkowski <robak@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402392 - head/misc/mc
Message-ID:  <201511251134.tAPBYkfo061002@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: robak
Date: Wed Nov 25 11:34:46 2015
New Revision: 402392
URL: https://svnweb.freebsd.org/changeset/ports/402392

Log:
  misc/mc: update 4.8.14 -> 4.8.15
  
  - Rewrite port options code
  
  PR:		204724
  Submitted by:	Ben Woods <woodsb02@gmail.com> (maintainer)

Modified:
  head/misc/mc/Makefile
  head/misc/mc/distinfo
  head/misc/mc/pkg-plist

Modified: head/misc/mc/Makefile
==============================================================================
--- head/misc/mc/Makefile	Wed Nov 25 10:18:01 2015	(r402391)
+++ head/misc/mc/Makefile	Wed Nov 25 11:34:46 2015	(r402392)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mc
-PORTVERSION=	4.8.14
-PORTREVISION=	1
+PORTVERSION=	4.8.15
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		http://ftp.osuosl.org/pub/midnightcommander/ \
@@ -48,18 +47,24 @@ EDITOR_CONFIGURE_WITH=	internal-edit
 ICONV_USES=		iconv
 ICONV_CONFIGURE_ENABLE=	charset
 
+NCURSES_CONFIGURE_ON=	--with-screen=ncurses
+
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
+NLS_CPPFLAGS=		-I${LOCALBASE}/include
+NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
 SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_CONFIGURE_ON=	--with-screen=slang --with-slang-includes=${LOCALBASE}/include
 
 SMB_CONFIGURE_ENABLE=	vfs-smb
-SMB_CONFIGURE_ON=	--with-smb-configdir=${LOCALBASE}/etc \
-			--with-smb-codepagedir=${LOCALBASE}/etc/codepages
+SMB_CONFIGURE_WITH=	smb-configdir=${LOCALBASE}/etc \
+			smb-codepagedir=${LOCALBASE}/etc/codepages
 
-SUBSHELL_CONFIGURE_WITH=	subshell
+SUBSHELL_CONFIGURE_WITH=subshell
 
 X11_CONFIGURE_ENABLE=	x
+X11_USE=		xorg=x11,xext
 
 PORTDOCS=	*
 
@@ -70,25 +75,6 @@ DOCSRCDIR2=	${WRKSRC}/doc
 DOCSDIR2=	${DOCSDIR}/doc
 DOC_FILES2=	FAQ HACKING MAINTAINERS *.txt
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
-
-.if${PORT_OPTIONS:MX11}
-USE_XORG=	x11 xext
-.endif
-
-.if ${PORT_OPTIONS:MSLANG}
-CONFIGURE_ARGS+=--with-screen=slang --with-slang-includes=${LOCALBASE}/include
-.endif
-
-.if ${PORT_OPTIONS:MNCURSES}
-CONFIGURE_ARGS+=--with-screen=ncurses
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|missing-parameter-type|unused-variable|; \
 		s|but-set-variable|variable|' \

Modified: head/misc/mc/distinfo
==============================================================================
--- head/misc/mc/distinfo	Wed Nov 25 10:18:01 2015	(r402391)
+++ head/misc/mc/distinfo	Wed Nov 25 11:34:46 2015	(r402392)
@@ -1,4 +1,4 @@
-SHA256 (mc-4.8.14.tar.xz) = 6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6
-SIZE (mc-4.8.14.tar.xz) = 2305788
+SHA256 (mc-4.8.15.tar.xz) = cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16
+SIZE (mc-4.8.15.tar.xz) = 2304812
 SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe
 SIZE (mc.png) = 6466

Modified: head/misc/mc/pkg-plist
==============================================================================
--- head/misc/mc/pkg-plist	Wed Nov 25 10:18:01 2015	(r402391)
+++ head/misc/mc/pkg-plist	Wed Nov 25 11:34:46 2015	(r402392)
@@ -103,8 +103,8 @@ share/applications/mc.desktop
 %%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
@@ -129,9 +129,9 @@ share/applications/mc.desktop
 %%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
@@ -153,6 +153,7 @@ share/applications/mc.desktop
 %%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511251134.tAPBYkfo061002>