svn commit: r349958 - in head/misc/mc: . files

Wed Apr 2 22:30:30 UTC 2014

Author: nemysis
Date: Wed Apr  2 22:30:28 2014
New Revision: 349958
URL: http://svnweb.freebsd.org/changeset/ports/349958
QAT: https://qat.redports.org/buildarchive/r349958/

Log:
  - Update to 4.8.12, announce message is here:
  
  http://www.midnight-commander.org/wiki/NEWS-4.8.12
  
  - Change master sites, add icon
  - Use tar:xz instead of USE_XZ=yes
  - Add USES shebangfix and SHEBANG_FILES
  - Add USE_PYTHON=yes and USE_RUBY=yes
  - Add pkg-message, information to reinstall if problems and for Screen
    Option
  - Remove TODO from DOCS
  - Add REINPLACE, fix deprecated messages
  - Add Desktop entry file
  - Remove obsolete patches, changed by upstream

Added:
  head/misc/mc/files/mc.desktop   (contents, props changed)
  head/misc/mc/files/pkg-message.in   (contents, props changed)
Deleted:
  head/misc/mc/files/patch-lib__tty__key.c
  head/misc/mc/files/patch-lib__tty__tty-ncurses.c
Modified:
  head/misc/mc/Makefile
  head/misc/mc/distinfo
  head/misc/mc/pkg-plist

Modified: head/misc/mc/Makefile
==============================================================================

--- head/misc/mc/Makefile	Wed Apr  2 22:19:50 2014	(r349957)
+++ head/misc/mc/Makefile	Wed Apr  2 22:30:28 2014	(r349958)
@@ -2,10 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	mc
-PORTVERSION=	4.8.11
-PORTREVISION=	0
+PORTVERSION=	4.8.12
 CATEGORIES=	misc shells
-MASTER_SITES=	http://ftp.osuosl.org/pub/midnightcommander/
+MASTER_SITES=	http://ftp.midnight-commander.org/ \
+		http://ftp.osuosl.org/pub/midnightcommander/ \
+		SF/nemysisfreebsdp/misc/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	Midnight Commander, a free Norton Commander Clone
@@ -16,9 +20,11 @@ LIB_DEPENDS=	libssh2.so:${PORTSDIR}/secu
 
 CONFLICTS=	mc-light-4*
 
-USE_XZ=		yes
-USES=		gmake perl5 pkgconfig
+USES=		gmake shebangfix perl5 pkgconfig tar:xz
+SHEBANG_FILES=	misc/mcedit.menu configure configure.ac
 USE_GNOME=	glib20
+USE_PYTHON=	yes
+USE_RUBY=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ZIP=${UNZIP_CMD} UNZIP=${UNZIP_CMD}
 USE_AUTOTOOLS=	libtool
@@ -53,6 +59,8 @@ SUBSHELL_CONFIGURE_WITH=	subshell
 
 X11_CONFIGURE_ENABLE=	x
 
+SUB_FILES=	pkg-message
+
 PORTDOCS=	*
 
 DOCSRCDIR1=	${WRKSRC}
@@ -60,7 +68,7 @@ DOC_FILES1=	AUTHORS NEWS README
 
 DOCSRCDIR2=	${WRKSRC}/doc
 DOCSDIR2=	${DOCSDIR}/doc
-DOC_FILES2=	FAQ HACKING MAINTAINERS *.txt TODO
+DOC_FILES2=	FAQ HACKING MAINTAINERS *.txt
 
 .include <bsd.port.options.mk>
 
@@ -82,9 +90,16 @@ CONFIGURE_ARGS+=--with-screen=ncurses
 .endif
 
 post-patch:
+	${REINPLACE_CMD} -e 's|missing-parameter-type|unused-variable|; \
+		s|but-set-variable|variable|' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|SUBDIRS = intl|SUBDIRS =|' ${WRKSRC}/Makefile.in
 
 post-install:
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR2}

Modified: head/misc/mc/distinfo
==============================================================================
--- head/misc/mc/distinfo	Wed Apr  2 22:19:50 2014	(r349957)
+++ head/misc/mc/distinfo	Wed Apr  2 22:30:28 2014	(r349958)
@@ -1,2 +1,4 @@
-SHA256 (mc-4.8.11.tar.xz) = 1877ea844f9d71e133b9e03ca3bebcd7b10b9ba5b419b8d268e255816fe1993a
-SIZE (mc-4.8.11.tar.xz) = 2211144
+SHA256 (mc-4.8.12.tar.xz) = 5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe
+SIZE (mc-4.8.12.tar.xz) = 2237892
+SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe
+SIZE (mc.png) = 6466

Added: head/misc/mc/files/mc.desktop
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/mc/files/mc.desktop	Wed Apr  2 22:30:28 2014	(r349958)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Midnight Commander
+GenericName=Midnight Commander
+Comment=Midnight Commander, a free Norton Commander Clone
+Icon=mc
+Exec=mc
+Categories=System;Utility;Core;FileTools;FileManager;
+Terminal=true

Added: head/misc/mc/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/mc/files/pkg-message.in	Wed Apr  2 22:30:28 2014	(r349958)
@@ -0,0 +1,14 @@
+===============================================================================
+
+Midnight Commander has been installed.
+
+If you have problems, please reinstall Midnight Commander
+
+cd /usr/ports/misc/mc && make deinstall clean reinstall
+
+For Screen it is best to use the default Option SLANG, with NCURSES
+you can have worse graphics.
+
+Have fun!
+
+===============================================================================

Modified: head/misc/mc/pkg-plist
==============================================================================
--- head/misc/mc/pkg-plist	Wed Apr  2 22:19:50 2014	(r349957)
+++ head/misc/mc/pkg-plist	Wed Apr  2 22:30:28 2014	(r349958)
@@ -86,6 +86,7 @@ man/man1/mcview.1.gz
 %%NLS%%man/pl/man1/mc.1.gz
 %%NLS%%man/ru/man1/mc.1.gz
 %%NLS%%man/sr/man1/mc.1.gz
+share/applications/mc.desktop
 %%NLS%%share/locale/az/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/be/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/mc.mo
@@ -95,12 +96,14 @@ man/man1/mcview.1.gz
 %%NLS%%share/locale/de/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/de_CH/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/el/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/es/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/et/LC_MESSAGES/mc.mo
 %%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/gl/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/mc.mo
@@ -159,6 +162,7 @@ man/man1/mcview.1.gz
 %%NLS%%%%DATADIR%%/hints/mc.hint.de
 %%NLS%%%%DATADIR%%/hints/mc.hint.de_CH
 %%NLS%%%%DATADIR%%/hints/mc.hint.el
+%%NLS%%%%DATADIR%%/hints/mc.hint.en_GB
 %%NLS%%%%DATADIR%%/hints/mc.hint.eo
 %%NLS%%%%DATADIR%%/hints/mc.hint.es
 %%NLS%%%%DATADIR%%/hints/mc.hint.et
@@ -172,6 +176,7 @@ man/man1/mcview.1.gz
 %%NLS%%%%DATADIR%%/hints/mc.hint.ia
 %%NLS%%%%DATADIR%%/hints/mc.hint.id
 %%NLS%%%%DATADIR%%/hints/mc.hint.it
+%%NLS%%%%DATADIR%%/hints/mc.hint.it_IT
 %%NLS%%%%DATADIR%%/hints/mc.hint.ja
 %%NLS%%%%DATADIR%%/hints/mc.hint.ka
 %%NLS%%%%DATADIR%%/hints/mc.hint.kk
@@ -289,6 +294,7 @@ man/man1/mcview.1.gz
 %%EDITOR%%%%DATADIR%%/syntax/xml.syntax
 %%EDITOR%%%%DATADIR%%/syntax/yum-repo.syntax
 %%EDITOR%%%%DATADIR%%/syntax/yxx.syntax
+share/pixmaps/mc.png
 %%EDITOR%%@dirrm %%DATADIR%%/syntax
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/hints
@@ -304,8 +310,22 @@ man/man1/mcview.1.gz
 %%NLS%%@dirrmtry share/locale/kk
 %%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ia
+%%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi_FI
 %%NLS%%@dirrmtry share/locale/de_CH/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/de_CH
+%%NLS%%@dirrmtry man/sr/man1
+%%NLS%%@dirrmtry man/sr
+%%NLS%%@dirrmtry man/ru/man1
+%%NLS%%@dirrmtry man/ru
+%%NLS%%@dirrmtry man/pl/man1
+%%NLS%%@dirrmtry man/pl
+%%NLS%%@dirrmtry man/it/man1
+%%NLS%%@dirrmtry man/it
+%%NLS%%@dirrmtry man/hu/man1
+%%NLS%%@dirrmtry man/hu
+%%NLS%%@dirrmtry man/es/man1
+%%NLS%%@dirrmtry man/es
 @dirrm libexec/mc/fish
 @dirrm libexec/mc/extfs.d
 @dirrm libexec/mc/ext.d
