[csw-devel] SF.net SVN: gar:[19685] csw/mgar/pkg/mc/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Nov 13 13:43:09 CET 2012
Revision: 19685
http://gar.svn.sourceforge.net/gar/?rev=19685&view=rev
Author: wahwah
Date: 2012-11-13 12:43:09 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
mc/trunk: version bump
Modified Paths:
--------------
csw/mgar/pkg/mc/trunk/Makefile
csw/mgar/pkg/mc/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/mc/trunk/files/0001-Honour-HAVE_STDINT_H.patch
csw/mgar/pkg/mc/trunk/files/0001-Ticket-2643-4.8.0-can-t-compile-on-OpenIndiana-Solar.patch
Modified: csw/mgar/pkg/mc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mc/trunk/Makefile 2012-11-13 10:37:51 UTC (rev 19684)
+++ csw/mgar/pkg/mc/trunk/Makefile 2012-11-13 12:43:09 UTC (rev 19685)
@@ -1,6 +1,6 @@
# $Id$
NAME = mc
-VERSION = 4.8.0
+VERSION = 4.8.6
GARTYPE = v2
DESCRIPTION = A curses-based visual shell and file manager
@@ -14,18 +14,19 @@
MASTER_SITES = http://www.midnight-commander.org/downloads/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = 0001-Ticket-2643-4.8.0-can-t-compile-on-OpenIndiana-Solar.patch
-
EXTRA_LDFLAGS= -lsocket
+RUNTIME_DEP_PKGS_CSWmc += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWmc += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWmc += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWmc += CSWslang
-RUNTIME_DEP_PKGS_CSWmc += CSWglib2
+RUNTIME_DEP_PKGS_CSWmc += CSWlibslang2
+RUNTIME_DEP_PKGS_CSWmc += CSWlibssh2-1
CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/etc/opt/csw/mc/mc.menu
CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/etc/opt/csw/mc/mc.menu.sr
CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/opt/csw/libexec/mc/extfs.d/README
CHECKPKG_OVERRIDES_CSWmc += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/opt/csw/libexec/mc/extfs.d/ulib
CONFIGURE_ARGS = $(DIRPATHS)
Modified: csw/mgar/pkg/mc/trunk/checksums
===================================================================
--- csw/mgar/pkg/mc/trunk/checksums 2012-11-13 10:37:51 UTC (rev 19684)
+++ csw/mgar/pkg/mc/trunk/checksums 2012-11-13 12:43:09 UTC (rev 19685)
@@ -1 +1 @@
-592478c3edfa2ad64c8cd165b9bec446 mc-4.8.0.tar.bz2
+323706aa5e77698bed7b0b6faa7c1530 mc-4.8.6.tar.bz2
Deleted: csw/mgar/pkg/mc/trunk/files/0001-Honour-HAVE_STDINT_H.patch
===================================================================
--- csw/mgar/pkg/mc/trunk/files/0001-Honour-HAVE_STDINT_H.patch 2012-11-13 10:37:51 UTC (rev 19684)
+++ csw/mgar/pkg/mc/trunk/files/0001-Honour-HAVE_STDINT_H.patch 2012-11-13 12:43:09 UTC (rev 19685)
@@ -1,68 +0,0 @@
-From 0bad1a848932b074637ea76251f3da1a655ff3ea Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 25 Nov 2010 12:42:22 +0100
-Subject: [PATCH] Honour HAVE_STDINT_H
-
----
- lib/vfs/mc-vfs/direntry.c | 6 ++++++
- lib/vfs/mc-vfs/fish.c | 6 ++++++
- lib/vfs/mc-vfs/ftpfs.c | 6 ++++++
- 3 files changed, 18 insertions(+), 0 deletions(-)
-
-diff --git a/lib/vfs/mc-vfs/direntry.c b/lib/vfs/mc-vfs/direntry.c
-index 055b1e7..311c715 100644
---- a/lib/vfs/mc-vfs/direntry.c
-+++ b/lib/vfs/mc-vfs/direntry.c
-@@ -35,7 +35,13 @@
- /* includes fcntl.h see IEEE Std 1003.1-2008 */
- #include <time.h>
- #include <sys/time.h> /* gettimeofday() */
-+#ifdef HAVE_STDINT_H_WITH_UINTMAX
- #include <stdint.h> /* uintmax_t */
-+#else
-+#ifdef HAVE_INTTYPES_H_WITH_UINTMAX
-+#include <inttypes.h> /* uintmax_t */
-+#endif
-+#endif
-
- #include "lib/global.h"
-
-diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c
-index 6502549..e9d0406 100644
---- a/lib/vfs/mc-vfs/fish.c
-+++ b/lib/vfs/mc-vfs/fish.c
-@@ -54,7 +54,13 @@
- #include <sys/time.h> /* gettimeofday() */
- #include <stdlib.h>
- #include <string.h>
-+#ifdef HAVE_STDINT_H_WITH_UINTMAX
- #include <stdint.h> /* uintmax_t */
-+#else
-+#ifdef HAVE_INTTYPES_H_WITH_UINTMAX
-+#include <inttypes.h> /* uintmax_t */
-+#endif
-+#endif
-
- #include "lib/global.h"
- #include "lib/fs.h"
-diff --git a/lib/vfs/mc-vfs/ftpfs.c b/lib/vfs/mc-vfs/ftpfs.c
-index 7c35749..d607dd1 100644
---- a/lib/vfs/mc-vfs/ftpfs.c
-+++ b/lib/vfs/mc-vfs/ftpfs.c
-@@ -84,7 +84,13 @@ What to do with this?
- #include <ctype.h>
- #include <fcntl.h>
- #include <sys/time.h> /* gettimeofday() */
-+#ifdef HAVE_STDINT_H_WITH_UINTMAX
- #include <stdint.h> /* uintmax_t */
-+#else
-+#ifdef HAVE_INTTYPES_H_WITH_UINTMAX
-+#include <inttypes.h> /* uintmax_t */
-+#endif
-+#endif
-
- #include "lib/global.h"
-
---
-1.7.3
-
Deleted: csw/mgar/pkg/mc/trunk/files/0001-Ticket-2643-4.8.0-can-t-compile-on-OpenIndiana-Solar.patch
===================================================================
--- csw/mgar/pkg/mc/trunk/files/0001-Ticket-2643-4.8.0-can-t-compile-on-OpenIndiana-Solar.patch 2012-11-13 10:37:51 UTC (rev 19684)
+++ csw/mgar/pkg/mc/trunk/files/0001-Ticket-2643-4.8.0-can-t-compile-on-OpenIndiana-Solar.patch 2012-11-13 12:43:09 UTC (rev 19685)
@@ -1,28 +0,0 @@
-From 27041586cabe71426cf12095f76a0a8621e4894a Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin at vmail.ru>
-Date: Sun, 23 Oct 2011 14:52:39 +0400
-Subject: [PATCH] Ticket #2643: 4.8.0 can't compile on OpenIndiana (Solaris)
-
-lib/vfs/parse_ls_vga.c: added #include "lib/unixcompat.h" where makedev
-macro is defined.
-
-Signed-off-by: Andrew Borodin <aborodin at vmail.ru>
----
- lib/vfs/parse_ls_vga.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/lib/vfs/parse_ls_vga.c b/lib/vfs/parse_ls_vga.c
-index 8091c14..994c744 100644
---- a/lib/vfs/parse_ls_vga.c
-+++ b/lib/vfs/parse_ls_vga.c
-@@ -41,6 +41,7 @@
- #include <stdlib.h>
-
- #include "lib/global.h"
-+#include "lib/unixcompat.h" /* makedev */
- #include "lib/widget.h" /* message() */
-
- #include "utilvfs.h"
---
-1.7.3.5
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list