Wed Dec 19 16:00:21 2012 UTC ()
Make sure that mc's editor looks in the right directory for the Syntax
file. Bump revision.


(joerg)
diff -r1.91 -r1.92 pkgsrc/sysutils/mc/Makefile
diff -r1.21 -r1.22 pkgsrc/sysutils/mc/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/mc/patches/patch-src_editor_syntax.c
cvs diff -r1.91 -r1.92 pkgsrc/sysutils/mc/Makefile (switch to unified diff)

--- pkgsrc/sysutils/mc/Makefile 2012/10/23 19:51:11 1.91
+++ pkgsrc/sysutils/mc/Makefile 2012/12/19 16:00:21 1.92
@@ -1,69 +1,69 @@ @@ -1,69 +1,69 @@
1# $NetBSD: Makefile,v 1.91 2012/10/23 19:51:11 asau Exp $ 1# $NetBSD: Makefile,v 1.92 2012/12/19 16:00:21 joerg Exp $
2 2
3DISTNAME= mc-4.7.0.10 3DISTNAME= mc-4.7.0.10
4PKGREVISION= 9 4PKGREVISION= 10
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://www.midnight-commander.org/downloads/ 6MASTER_SITES= http://www.midnight-commander.org/downloads/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= cheusov@NetBSD.org 9MAINTAINER= cheusov@NetBSD.org
10HOMEPAGE= http://www.midnight-commander.org/ 10HOMEPAGE= http://www.midnight-commander.org/
11COMMENT= User-friendly file manager and visual shell 11COMMENT= User-friendly file manager and visual shell
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
16USE_TOOLS+= pkg-config unzip:run 16USE_TOOLS+= pkg-config unzip:run
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
18USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
19 19
20CHECK_INTERPRETER_SKIP= libexec/mc/extfs.d/s3+ 20CHECK_INTERPRETER_SKIP= libexec/mc/extfs.d/s3+
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24.if ${OPSYS} == "Linux" 24.if ${OPSYS} == "Linux"
25PLIST_SRC+= ${PKGDIR}/PLIST.cons.saver 25PLIST_SRC+= ${PKGDIR}/PLIST.cons.saver
26.endif 26.endif
27 27
28# we need working e2fsprogs and gpm packages first 28# we need working e2fsprogs and gpm packages first
29CONFIGURE_ARGS+= --without-ext2undel 29CONFIGURE_ARGS+= --without-ext2undel
30CONFIGURE_ARGS+= --without-gpm-mouse 30CONFIGURE_ARGS+= --without-gpm-mouse
31CONFIGURE_ARGS+= UNZIP=${TOOLS_PATH.unzip} ZIP=${TOOLS_PATH.zip} 31CONFIGURE_ARGS+= UNZIP=${TOOLS_PATH.unzip} ZIP=${TOOLS_PATH.zip}
32 32
33PLIST_SRC+= ${PKGDIR}/PLIST 33PLIST_SRC+= ${PKGDIR}/PLIST
34 34
35.include "options.mk" 35.include "options.mk"
36 36
37EGDIR= ${PREFIX}/share/examples/mc 37EGDIR= ${PREFIX}/share/examples/mc
38 38
39CONFFILES= cedit.menu edit.indent.rc edit.spell.rc filehighlight.ini \ 39CONFFILES= cedit.menu edit.indent.rc edit.spell.rc filehighlight.ini \
40 mc.ext mc.keymap mc.keymap.default mc.keymap.emacs mc.lib \ 40 mc.ext mc.keymap mc.keymap.default mc.keymap.emacs mc.lib \
41 mc.menu mc.menu.sr 41 mc.menu mc.menu.sr
42 42
43.if !empty(PKG_OPTIONS:Mmc-edit) 43.if !empty(PKG_OPTIONS:Mmc-edit)
44CONFFILES+= syntax/Syntax 44CONFFILES+= syntax/Syntax
45.endif 45.endif
46 46
47.if !empty(PKG_OPTIONS:Mmc-vfs) 47.if !empty(PKG_OPTIONS:Mmc-vfs)
48CONFFILES+= sfs.ini 48CONFFILES+= sfs.ini
49.endif 49.endif
50 50
51.if !empty(PKG_OPTIONS:Mmc-charset) 51.if !empty(PKG_OPTIONS:Mmc-charset)
52CONFFILES+= mc.charsets 52CONFFILES+= mc.charsets
53.endif 53.endif
54 54
55OWN_DIRS+= ${PKG_SYSCONFDIR}/mc ${PKG_SYSCONFDIR}/mc/syntax 55OWN_DIRS+= ${PKG_SYSCONFDIR}/mc ${PKG_SYSCONFDIR}/mc/syntax
56 56
57.for i in ${CONFFILES} 57.for i in ${CONFFILES}
58CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/mc/${i} 58CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/mc/${i}
59.endfor 59.endfor
60 60
61INSTALLATION_DIRS+= ${EGDIR} ${EGDIR}/syntax 61INSTALLATION_DIRS+= ${EGDIR} ${EGDIR}/syntax
62 62
63post-install: 63post-install:
64# remove dir if no extensions were installed there 64# remove dir if no extensions were installed there
65 rmdir ${DESTDIR}${PREFIX}/lib/mc 2>/dev/null || ${TRUE} 65 rmdir ${DESTDIR}${PREFIX}/lib/mc 2>/dev/null || ${TRUE}
66 66
67.include "../../devel/gettext-lib/buildlink3.mk" 67.include "../../devel/gettext-lib/buildlink3.mk"
68.include "../../devel/glib2/buildlink3.mk" 68.include "../../devel/glib2/buildlink3.mk"
69.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/sysutils/mc/distinfo (switch to unified diff)

--- pkgsrc/sysutils/mc/distinfo 2011/04/08 22:48:04 1.21
+++ pkgsrc/sysutils/mc/distinfo 2012/12/19 16:00:21 1.22
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.21 2011/04/08 22:48:04 wiz Exp $ 1$NetBSD: distinfo,v 1.22 2012/12/19 16:00:21 joerg Exp $
2 2
3SHA1 (mc-4.7.0.10.tar.bz2) = 2bc13f963780eaddac2f675b9145656d759f974e 3SHA1 (mc-4.7.0.10.tar.bz2) = 2bc13f963780eaddac2f675b9145656d759f974e
4RMD160 (mc-4.7.0.10.tar.bz2) = 83a527a94a81f886eb7f80b8965554bf927cad65 4RMD160 (mc-4.7.0.10.tar.bz2) = 83a527a94a81f886eb7f80b8965554bf927cad65
5Size (mc-4.7.0.10.tar.bz2) = 2862849 bytes 5Size (mc-4.7.0.10.tar.bz2) = 2862849 bytes
6SHA1 (patch-aa) = bf11aa2e9c6bd4b057b3af33c7d831e3e1e7fe02 6SHA1 (patch-aa) = bf11aa2e9c6bd4b057b3af33c7d831e3e1e7fe02
7SHA1 (patch-ab) = 570977e37c54084d946d5871822e5ea24b0ed253 7SHA1 (patch-ab) = 570977e37c54084d946d5871822e5ea24b0ed253
8SHA1 (patch-ac) = 04ee1f389ef7015d4976544404d8b9245839bf7b 8SHA1 (patch-ac) = 04ee1f389ef7015d4976544404d8b9245839bf7b
9SHA1 (patch-ad) = 4484b91511cf5bac73f4ae940988d46239e2cd95 9SHA1 (patch-ad) = 4484b91511cf5bac73f4ae940988d46239e2cd95
10SHA1 (patch-ae) = b25734f82e46a92eb2a6d6590b0f7524f63040b3 10SHA1 (patch-ae) = b25734f82e46a92eb2a6d6590b0f7524f63040b3
11SHA1 (patch-af) = cff069eb20a5df7095805e800a141f8bb1d94c7d 11SHA1 (patch-af) = cff069eb20a5df7095805e800a141f8bb1d94c7d
12SHA1 (patch-lib_fs.h) = 89bb61541e0312c4e74d48a8668583d0925d8b7a 12SHA1 (patch-lib_fs.h) = 89bb61541e0312c4e74d48a8668583d0925d8b7a
 13SHA1 (patch-src_editor_syntax.c) = 7e07b88df9c270f650268265bd599d781991a695
File Added: pkgsrc/sysutils/mc/patches/Attic/patch-src_editor_syntax.c
$NetBSD: patch-src_editor_syntax.c,v 1.1 2012/12/19 16:00:21 joerg Exp $

--- src/editor/syntax.c.orig	2012-12-19 14:04:18.000000000 +0000
+++ src/editor/syntax.c
@@ -1079,7 +1079,7 @@ edit_read_syntax_file (WEdit * edit, cha
 
     f = fopen (syntax_file, "r");
     if (!f){
-	lib_file = concat_dir_and_file (mc_home, "Syntax");
+	lib_file = concat_dir_and_file (mc_home, "syntax" PATH_SEP_STR "Syntax");
 	f = fopen (lib_file, "r");
 	g_free (lib_file);
 	if (!f)