From 6d128c6d71705092a38733ba514f3d458e3b2de8 Mon Sep 17 00:00:00 2001 From: shadchin Date: Wed, 2 Jan 2013 07:18:46 +0000 Subject: [PATCH] Update to 4.8.1.7. ok benoit@, robert@ (maintainer) --- misc/mc/Makefile | 5 +- misc/mc/distinfo | 7 +-- misc/mc/patches/patch-configure | 58 ++----------------- .../patches/patch-src_filemanager_mountlist_c | 27 --------- misc/mc/pkg/PLIST | 12 +++- 5 files changed, 20 insertions(+), 89 deletions(-) delete mode 100644 misc/mc/patches/patch-src_filemanager_mountlist_c diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 1e40bcb4e65..a250ec971cb 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile,v 1.45 2012/09/01 14:36:57 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.46 2013/01/02 07:18:46 shadchin Exp $ COMMENT= free Norton Commander clone with many useful features -DISTNAME= mc-4.8.1.1 +DISTNAME= mc-4.8.1.7 CATEGORIES= misc HOMEPAGE= http://www.midnight-commander.org/ MASTER_SITES= ${HOMEPAGE}downloads/ MAINTAINER= Robert Nagy -REVISION= 0 EXTRACT_SUFX= .tar.bz2 diff --git a/misc/mc/distinfo b/misc/mc/distinfo index 98dba87ebce..693b10f82d5 100644 --- a/misc/mc/distinfo +++ b/misc/mc/distinfo @@ -1,5 +1,2 @@ -MD5 (mc-4.8.1.1.tar.bz2) = v5txnYjoaq0syVy3qbzUpA== -RMD160 (mc-4.8.1.1.tar.bz2) = Xp7h8gYp9Z+2skPAGwZ9VmgrPKo= -SHA1 (mc-4.8.1.1.tar.bz2) = 2X2QlTB0Am+Pn6rP84Gv0gqBwVk= -SHA256 (mc-4.8.1.1.tar.bz2) = lX+Qt1bsrzgj/JMr1fd80i3YGQhs132kmtC0ah6Rxh0= -SIZE (mc-4.8.1.1.tar.bz2) = 2746134 +SHA256 (mc-4.8.1.7.tar.bz2) = MiYlugue/Yygt+uQMBYKigCzc5J7ZwypSwkDj4ANYqo= +SIZE (mc-4.8.1.7.tar.bz2) = 2838495 diff --git a/misc/mc/patches/patch-configure b/misc/mc/patches/patch-configure index 065db4cb066..c55dfded79a 100644 --- a/misc/mc/patches/patch-configure +++ b/misc/mc/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.8 2012/04/13 13:42:21 robert Exp $ ---- configure.orig Wed Apr 11 08:32:30 2012 -+++ configure Wed Apr 11 08:33:33 2012 -@@ -22455,7 +22455,7 @@ done +$OpenBSD: patch-configure,v 1.9 2013/01/02 07:18:46 shadchin Exp $ +--- configure.orig Fri Dec 28 15:27:29 2012 ++++ configure Tue Jan 1 23:52:16 2013 +@@ -22952,7 +22952,7 @@ done done IFS=$as_save_IFS @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2012/04/13 13:42:21 robert Exp $ ;; esac fi -@@ -22496,7 +22496,7 @@ done +@@ -22993,7 +22993,7 @@ done done IFS=$as_save_IFS @@ -19,51 +19,3 @@ $OpenBSD: patch-configure,v 1.8 2012/04/13 13:42:21 robert Exp $ ;; esac fi -@@ -23919,7 +23919,6 @@ fi - fi - - if test x"$mc_cv_slang_termcap" = x"yes"; then -- saved_CPPFLAGS="-ltermcap $saved_CPPFLAGS " - saved_LDFLAGS="-ltermcap $saved_LDFLAGS" - fi - -@@ -24370,7 +24369,6 @@ fi - fi - - if test x"$mc_cv_slang_termcap" = x"yes"; then -- saved_CPPFLAGS="-ltermcap $saved_CPPFLAGS " - saved_LDFLAGS="-ltermcap $saved_LDFLAGS" - fi - -@@ -24744,7 +24742,6 @@ fi - fi - - if test x"$mc_cv_slang_termcap" = x"yes"; then -- saved_CPPFLAGS="-ltermcap $saved_CPPFLAGS " - saved_LDFLAGS="-ltermcap $saved_LDFLAGS" - fi - -@@ -25690,7 +25687,6 @@ fi - fi - - if test x"$mc_cv_slang_termcap" = x"yes"; then -- saved_CPPFLAGS="-ltermcap $saved_CPPFLAGS " - saved_LDFLAGS="-ltermcap $saved_LDFLAGS" - fi - -@@ -26141,7 +26137,6 @@ fi - fi - - if test x"$mc_cv_slang_termcap" = x"yes"; then -- saved_CPPFLAGS="-ltermcap $saved_CPPFLAGS " - saved_LDFLAGS="-ltermcap $saved_LDFLAGS" - fi - -@@ -26515,7 +26510,6 @@ fi - fi - - if test x"$mc_cv_slang_termcap" = x"yes"; then -- saved_CPPFLAGS="-ltermcap $saved_CPPFLAGS " - saved_LDFLAGS="-ltermcap $saved_LDFLAGS" - fi - diff --git a/misc/mc/patches/patch-src_filemanager_mountlist_c b/misc/mc/patches/patch-src_filemanager_mountlist_c deleted file mode 100644 index 8ca8f265891..00000000000 --- a/misc/mc/patches/patch-src_filemanager_mountlist_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-src_filemanager_mountlist_c,v 1.1 2012/04/13 13:44:15 robert Exp $ ---- src/filemanager/mountlist.c.orig Wed Apr 11 08:34:49 2012 -+++ src/filemanager/mountlist.c Wed Apr 11 08:35:17 2012 -@@ -38,6 +38,11 @@ - - #include - -+/* This header needs to be included before sys/mount.h on *BSD */ -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+ - #if defined STAT_STATVFS || defined STAT_STATVFS64 /* POSIX 1003.1-2001 (and later) with XSI */ - #include - #else -@@ -46,11 +51,6 @@ - #include - #include - #include -- --/* This header needs to be included before sys/mount.h on *BSD */ --#ifdef HAVE_SYS_PARAM_H --#include --#endif - - #ifdef MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ - #ifdef HAVE_SYS_UCRED_H diff --git a/misc/mc/pkg/PLIST b/misc/mc/pkg/PLIST index 8836e285ee3..cc8fa10496c 100644 --- a/misc/mc/pkg/PLIST +++ b/misc/mc/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2012/04/13 13:42:21 robert Exp $ +@comment $OpenBSD: PLIST,v 1.15 2013/01/02 07:18:46 shadchin Exp $ @bin bin/mc bin/mcdiff bin/mcedit @@ -116,16 +116,24 @@ share/locale/ca/LC_MESSAGES/mc.mo share/locale/cs/LC_MESSAGES/mc.mo share/locale/da/LC_MESSAGES/mc.mo share/locale/de/LC_MESSAGES/mc.mo +share/locale/de_CH/ +share/locale/de_CH/LC_MESSAGES/ +share/locale/de_CH/LC_MESSAGES/mc.mo share/locale/el/LC_MESSAGES/mc.mo share/locale/eo/LC_MESSAGES/mc.mo share/locale/es/LC_MESSAGES/mc.mo +share/locale/et/LC_MESSAGES/mc.mo share/locale/eu/LC_MESSAGES/mc.mo +share/locale/fa/ +share/locale/fa/LC_MESSAGES/ +share/locale/fa/LC_MESSAGES/mc.mo share/locale/fi/LC_MESSAGES/mc.mo share/locale/fi_FI/ share/locale/fi_FI/LC_MESSAGES/ share/locale/fi_FI/LC_MESSAGES/mc.mo share/locale/fr/LC_MESSAGES/mc.mo share/locale/gl/LC_MESSAGES/mc.mo +share/locale/hr/LC_MESSAGES/mc.mo share/locale/hu/LC_MESSAGES/mc.mo share/locale/ia/ share/locale/ia/LC_MESSAGES/ @@ -226,6 +234,7 @@ share/mc/syntax/awk.syntax share/mc/syntax/c.syntax share/mc/syntax/cabal.syntax share/mc/syntax/changelog.syntax +share/mc/syntax/cmake.syntax share/mc/syntax/cs.syntax share/mc/syntax/css.syntax share/mc/syntax/cxx.syntax @@ -236,6 +245,7 @@ share/mc/syntax/debian-control.syntax share/mc/syntax/debian-description.syntax share/mc/syntax/debian-sources-list.syntax share/mc/syntax/diff.syntax +share/mc/syntax/dlink.syntax share/mc/syntax/dos.syntax share/mc/syntax/ebuild.syntax share/mc/syntax/eiffel.syntax