diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2011-03-21 18:25:33 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2011-03-21 18:25:33 +0000 |
| commit | 0153ccc9199990770020109e3655a991f642d6f4 (patch) | |
| tree | acf522389a782ca1d551c398b478df98a47eccc1 /misc/mc | |
| parent | 5ff25c0bf121f448cb55f9a6aeaa8e9e28ac700f (diff) | |
| download | ports-0153ccc9199990770020109e3655a991f642d6f4.tar.gz ports-0153ccc9199990770020109e3655a991f642d6f4.zip | |
- Fix build with iconv support turned off [1]
- Fix pkg-plist when built without NLS support
Submitted by: Dimitry Andric [1]
Notes
Notes:
svn path=/head/; revision=271412
Diffstat (limited to 'misc/mc')
| -rw-r--r-- | misc/mc/Makefile | 2 | ||||
| -rw-r--r-- | misc/mc/files/patch-src-editor-edit.c | 38 | ||||
| -rw-r--r-- | misc/mc/files/patch-without-nls | 25 |
3 files changed, 65 insertions, 0 deletions
diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 073e3890a5c8..e127e285bcb0 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -7,6 +7,7 @@ PORTNAME= mc PORTVERSION= 4.7.5 +PORTREVISION= 1 CATEGORIES= misc shells MASTER_SITES= http://www.midnight-commander.org/downloads/ \ ${MASTER_SITE_SUNSITE} @@ -28,6 +29,7 @@ USE_PERL5= yes USE_XZ= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ZIP=${LOCALBASE}/bin/zip UNZIP=${LOCALBASE}/bin/unzip +USE_AUTOTOOLS= autoconf automake OPTIONS= SLANG "Build with SLang library" on \ ICONV "Build with iconv recoding" on \ diff --git a/misc/mc/files/patch-src-editor-edit.c b/misc/mc/files/patch-src-editor-edit.c new file mode 100644 index 000000000000..c2e4eb7b748f --- /dev/null +++ b/misc/mc/files/patch-src-editor-edit.c @@ -0,0 +1,38 @@ +Index: src/editor/edit.c +=================================================================== +--- src/editor/edit.c (revision bd3025e7a9ec490bc6adabc34cd0392e93ecd050) ++++ src/editor/edit.c (revision 4f4876abb4acb812747d1050c4b3be01da87780a) +@@ -2840,8 +2840,5 @@ + { + int c, orig_c; +- int utf_ch = 0; +-#ifdef HAVE_CHARSET +- int cw = 1; +-#endif ++ + if (cols != -10) + { +@@ -2851,8 +2848,13 @@ + return p - 1; + } ++ + orig_c = c = edit_get_byte (edit, p); ++ + #ifdef HAVE_CHARSET + if (edit->utf8) + { ++ int utf_ch; ++ int cw = 1; ++ + utf_ch = edit_get_utf (edit, p, &cw); + if (utf8_display) +@@ -2866,6 +2868,8 @@ + col -= cw - 1; + } ++ ++ c = convert_to_display_c (c); + #endif +- c = convert_to_display_c (c); ++ + if (c == '\t') + col += TAB_SIZE - col % TAB_SIZE; diff --git a/misc/mc/files/patch-without-nls b/misc/mc/files/patch-without-nls new file mode 100644 index 000000000000..4e37f9b1ea2e --- /dev/null +++ b/misc/mc/files/patch-without-nls @@ -0,0 +1,25 @@ +--- doc/hints/Makefile.am.orig 2011-03-22 00:02:49.000000000 +0600 ++++ doc/hints/Makefile.am 2011-03-22 00:03:11.000000000 +0600 +@@ -1,7 +1,11 @@ + HINTFILES = \ +- mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it \ ++ mc.hint ++if USE_NLS ++HINTFILES += \ ++ mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it \ + mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.sr mc.hint.uk \ + mc.hint.zh ++endif + + hintdir = $(pkgdatadir)/hints + hint_DATA = $(HINTFILES) +--- configure.ac.orig 2011-03-21 23:58:52.000000000 +0600 ++++ configure.ac 2011-03-22 00:01:04.000000000 +0600 +@@ -504,6 +504,7 @@ + AM_CONDITIONAL(USE_SCREEN_SLANG, [test x"$with_screen" = xslang]) + AM_CONDITIONAL(USE_EDIT, [test -n "$use_edit"]) + AM_CONDITIONAL(USE_DIFF, [test -n "$use_diff"]) ++AM_CONDITIONAL(USE_NLS, [test x"$USE_NLS" = xyes]) + AM_CONDITIONAL(CHARSET, [test -n "$have_charset"]) + AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"]) + |