[Frugalware-darcs] frugalware-current: mc-4.6.1-1-x86_64-i686
Christian Hamar alias krix
krics at linuxforum.hu
Thu Jul 28 20:59:40 CEST 2005
Thu Jul 28 12:48:01 CEST 2005 Christian Hamar alias krix <krics at linuxforum.hu>
* mc-4.6.1-1-x86_64-i686
* Version bump (need to fix up2date)
* Added some patches for usability from fedora. (uglydir, promptfix)
* Added sambaconfig patch (no /etc/smb.conf, use /etc/samba/smb.conf)
* Added --with-mcfs and --with-samba options
* Renamed and rediffed old patches for 4.6.1 (no hunk succseeds :) )
diff -rN -u old-frugalware-current-3/source/apps/mc/00-mc-4.6.0-fpm.patch new-frugalware-current/source/apps/mc/00-mc-4.6.0-fpm.patch
--- old-frugalware-current-3/source/apps/mc/00-mc-4.6.0-fpm.patch 2005-07-28 20:58:51.000000000 +0200
+++ new-frugalware-current/source/apps/mc/00-mc-4.6.0-fpm.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-diff -Naur mc-4.6.0.orig/lib/mc.ext.in mc-4.6.0/lib/mc.ext.in
---- mc-4.6.0.orig/lib/mc.ext.in 2003-01-30 16:48:33.000000000 +0100
-+++ mc-4.6.0/lib/mc.ext.in 2004-08-08 00:18:54.000000000 +0200
-@@ -379,8 +379,8 @@
-
- ### Archives ###
-
--# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z
--regex/\.t([gp]?z|ar\.g?[zZ])$
-+# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .fpm, .fdb
-+regex/\.(t([gp]?z|ar\.g?[zZ])|f(pm|db))$
- Open=%cd %p#utar
- View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
-
diff -rN -u old-frugalware-current-3/source/apps/mc/00-mc-4.6.1-fpm.patch new-frugalware-current/source/apps/mc/00-mc-4.6.1-fpm.patch
--- old-frugalware-current-3/source/apps/mc/00-mc-4.6.1-fpm.patch 1970-01-01 01:00:00.000000000 +0100
+++ new-frugalware-current/source/apps/mc/00-mc-4.6.1-fpm.patch 2005-07-28 20:59:29.000000000 +0200
@@ -0,0 +1,14 @@
+diff -Naur mc-4.6.0.orig/lib/mc.ext.in mc-4.6.0/lib/mc.ext.in
+--- mc-4.6.0.orig/lib/mc.ext.in 2003-01-30 16:48:33.000000000 +0100
++++ mc-4.6.0/lib/mc.ext.in 2004-08-08 00:18:54.000000000 +0200
+@@ -379,8 +379,8 @@
+
+ ### Archives ###
+
+-# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z
+-regex/\.t([gp]?z|ar\.g?[zZ])$
++# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .fpm, .fdb
++regex/\.(t([gp]?z|ar\.g?[zZ])|f(pm|db))$
+ Open=%cd %p#utar
+ View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
+
Binary files old-frugalware-current-3/source/apps/mc/01-mc-4.6.1-uglydir.patch.gz and new-frugalware-current/source/apps/mc/01-mc-4.6.1-uglydir.patch.gz differ
diff -rN -u old-frugalware-current-3/source/apps/mc/02-mc-4.6.1-sambaconfpath.patch new-frugalware-current/source/apps/mc/02-mc-4.6.1-sambaconfpath.patch
--- old-frugalware-current-3/source/apps/mc/02-mc-4.6.1-sambaconfpath.patch 1970-01-01 01:00:00.000000000 +0100
+++ new-frugalware-current/source/apps/mc/02-mc-4.6.1-sambaconfpath.patch 2005-07-28 12:51:51.000000000 +0200
@@ -0,0 +1,12 @@
+diff -Naur mc-4.6.1.orig/vfs/smbfs.c mc-4.6.1/vfs/smbfs.c
+--- mc-4.6.1.orig/vfs/smbfs.c 2005-07-28 12:12:27.000000000 +0200
++++ mc-4.6.1/vfs/smbfs.c 2005-07-28 12:23:52.000000000 +0200
+@@ -283,7 +283,7 @@
+ static int
+ smbfs_init (struct vfs_class * me)
+ {
+- const char *servicesf = CONFIGDIR PATH_SEP_STR "smb.conf";
++ const char *servicesf = CONFIGDIR PATH_SEP_STR "samba/smb.conf";
+
+ /* DEBUGLEVEL = 4; */
+
diff -rN -u old-frugalware-current-3/source/apps/mc/03-mc-4.6.1-pre4a-xterm-title.patch new-frugalware-current/source/apps/mc/03-mc-4.6.1-pre4a-xterm-title.patch
--- old-frugalware-current-3/source/apps/mc/03-mc-4.6.1-pre4a-xterm-title.patch 2005-07-28 20:58:51.000000000 +0200
+++ new-frugalware-current/source/apps/mc/03-mc-4.6.1-pre4a-xterm-title.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-diff -Naur mc-4.6.1-pre4a.old/src/main.c mc-4.6.1-pre4a/src/main.c
---- mc-4.6.1-pre4a.old/src/main.c 2005-03-21 16:30:59.000000000 +0100
-+++ mc-4.6.1-pre4a/src/main.c 2005-03-21 16:33:19.000000000 +0100
-@@ -1606,7 +1606,7 @@
- void
- update_xterm_title_path (void)
- {
-- unsigned char *p, *s;
-+ unsigned char *p, *s, *tmp;
-
- if (xterm_flag && xterm_title) {
- p = s = g_strdup (strip_home_and_password (current_panel->cwd));
-@@ -1614,8 +1614,15 @@
- if (!is_printable (*s))
- *s = '?';
- } while (*++s);
-+#ifdef HAVE_SLANG
-+ SLtt_set_alt_char_set (0);
-+ tmp = g_strdup_printf("\33]0;mc - %s\7", p);
-+ SLtt_write_string(tmp);
-+ g_free(tmp);
-+#else
- fprintf (stdout, "\33]0;mc - %s\7", p);
- fflush (stdout);
-+#endif
- g_free (p);
- }
- }
diff -rN -u old-frugalware-current-3/source/apps/mc/03-mc-4.6.1-xterm-title.patch new-frugalware-current/source/apps/mc/03-mc-4.6.1-xterm-title.patch
--- old-frugalware-current-3/source/apps/mc/03-mc-4.6.1-xterm-title.patch 1970-01-01 01:00:00.000000000 +0100
+++ new-frugalware-current/source/apps/mc/03-mc-4.6.1-xterm-title.patch 2005-07-28 20:59:29.000000000 +0200
@@ -0,0 +1,28 @@
+diff -Naur mc-4.6.1-pre4a.old/src/main.c mc-4.6.1-pre4a/src/main.c
+--- mc-4.6.1-pre4a.old/src/main.c 2005-03-21 16:30:59.000000000 +0100
++++ mc-4.6.1-pre4a/src/main.c 2005-03-21 16:33:19.000000000 +0100
+@@ -1606,7 +1606,7 @@
+ void
+ update_xterm_title_path (void)
+ {
+- unsigned char *p, *s;
++ unsigned char *p, *s, *tmp;
+
+ if (xterm_flag && xterm_title) {
+ p = s = g_strdup (strip_home_and_password (current_panel->cwd));
+@@ -1614,8 +1614,15 @@
+ if (!is_printable (*s))
+ *s = '?';
+ } while (*++s);
++#ifdef HAVE_SLANG
++ SLtt_set_alt_char_set (0);
++ tmp = g_strdup_printf("\33]0;mc - %s\7", p);
++ SLtt_write_string(tmp);
++ g_free(tmp);
++#else
+ fprintf (stdout, "\33]0;mc - %s\7", p);
+ fflush (stdout);
++#endif
+ g_free (p);
+ }
+ }
Binary files old-frugalware-current-3/source/apps/mc/04-mc-4.6.1-promptfix.patch.gz and new-frugalware-current/source/apps/mc/04-mc-4.6.1-promptfix.patch.gz differ
diff -rN -u old-frugalware-current-3/source/apps/mc/FrugalBuild new-frugalware-current/source/apps/mc/FrugalBuild
--- old-frugalware-current-3/source/apps/mc/FrugalBuild 2005-07-28 20:58:51.000000000 +0200
+++ new-frugalware-current/source/apps/mc/FrugalBuild 2005-07-28 20:59:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Last modified: Mon, 27 Jun 2005 13:20:44 +0200
+# Last modified: Thu, 28 Jul 2005 12:40:45 +0200
# Compiling time: ~1 minute
# Maintainer: zleho <zleho at index.hu>
# Contributor: VMiklos <mamajom at axelero.hu>
@@ -6,26 +6,31 @@
# Christian Hamar <krics at linuxforum.hu>
pkgname=mc
-pkgver=4.6.1_pre4
-realver=4.6.1-pre4
+pkgver=4.6.1
+realver=4.6.1
pkgrel=1
pkgdesc="The GNU Midnight Commander is a CLI-based file manager"
url="http://www.ibiblio.org/pub/Linux/utils/file/managers/mc"
depends=('glib2' 'e2fsprogs' 'slang')
groups=('apps')
archs=('i686' 'x86_64')
-up2date="lynx -dump 'http://pavelsh.pp.ru/mc/?C=M;O=D'|grep tar.gz|sed -n 's/.*-\(.*-.*\).t.*/\1/;s/-/_/;1 p'"
-source=(http://pavelsh.pp.ru/$pkgname/$pkgname-$realver.tar.bz2 \
- 00-$pkgname-4.6.0-fpm.patch \
- 03-$pkgname-4.6.1-pre4a-xterm-title.patch)
-md5sums=('88a97b2ef25e6bc20a5aa9e5f87ac7bd' \
- '0b003834f595693bd1e471bd21e99f5b' \
- 'ed60d1b306cf30a832116c10827016a1')
+up2date="lynx -dump '$url/'|grep mc-[0-9.\] | tail -n 1 |sed -n 's/.*-\(.*-.*\).t.*/\1/;s/-/_/;1 p'"
+source=($url/$pkgname-$realver.tar.gz \
+ 00-$pkgname-4.6.1-fpm.patch \
+ 01-mc-4.6.1-uglydir.patch.gz \
+ 02-mc-4.6.1-sambaconfpath.patch \
+ 03-$pkgname-4.6.1-xterm-title.patch \
+ 04-mc-4.6.1-promptfix.patch.gz)
+md5sums=('18b20db6e40480a53bac2870c56fc3c4' '8e497d9f6c6696c4bd46f583ef0705e9'\
+ 'b630c51c8a9b12de7bd851745a6f03c0' 'eb67c5639b1d0d0b0b4e7ff25a948667'\
+ 'f449a1d570726272c7e130ccc9b8421b' '4b213ae2675d3f90cf1aa237598e692b')
build() {
Fcd $pkgname-$realver
- Fbuild --sysconfdir=/etc --localstatedir=/var \
- --enable-charset --without-gpm-mouse --with-x=no || return 1
+ Fbuild --enable-charset --without-gpm-mouse --with-x=no \
+ --with-mcfs --with-samba
}
# vim: ft=sh
+
+# optimalization OK
More information about the Frugalware-darcs
mailing list