Date: Tue, 15 May 2007 21:29:53 +0300 (EEST) From: "Vlad V. Teterya" <vlad@vlad.uz.ua> To: FreeBSD-gnats-submit@FreeBSD.org Cc: fjoe@FreeBSD.org Subject: ports/112690: [PATCH] misc/mc: fixed pkg-plist; WITH_NLS variable added to OPTIONS Message-ID: <20070515182953.93BE878E85@lynx.bereg.net.ua> Resent-Message-ID: <200705151850.l4FIo4sx045864@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112690
>Category: ports
>Synopsis: [PATCH] misc/mc: fixed pkg-plist; WITH_NLS variable added to OPTIONS
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 15 18:50:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Vlad V. Teterya <vlad@vlad.uz.ua>
>Release: FreeBSD 6.2-RELEASE-p2 i386
>Organization:
TrioSoft
>Environment:
System: FreeBSD lynx 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Tue Mar 6 15:52:28 EET 2007 ot@lynx:/usr/obj/usr/src/sys/LYNX i386
>Description:
- fixed errors in pkg-plist with undefined WITH_EDIT variable
- WITH_NLS variable was added to OPTIONS
- some minor changes in pkg-plist ()
Port maintainer (fjoe@FreeBSD.org) is cc'd.
>How-To-Repeat:
>Fix:
--- mc.diff begins here ---
diff -ruN mc.old/Makefile mc/Makefile
--- mc.old/Makefile Tue May 15 09:31:23 2007
+++ mc/Makefile Tue May 15 20:39:36 2007
@@ -2,12 +2,12 @@
# Date created: 15 Jul 1995
# Whom: torstenb@FreeBSD.org
#
-# $FreeBSD: ports/misc/mc/Makefile,v 1.110 2006/07/24 16:48:37 fjoe Exp $
+# $FreeBSD$
#
PORTNAME= mc
PORTVERSION= 4.6.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= misc shells
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/file/managers/mc/
@@ -17,13 +17,17 @@
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
+CONFLICTS= mc-light-4*
+
USE_GETTEXT= yes
+USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME= glib20
GNU_CONFIGURE= yes
OPTIONS= SLANG "Build with SLang library" on \
ICONV "Build with iconv recoding" on \
+ NLS "Build with NLS support" on \
EDIT "Build with internal editor" on \
X11 "Build with X11 library" off \
SUBSHELL "Build with subshell support" on \
@@ -38,12 +42,20 @@
.if defined(WITH_ICONV) || !(defined(WITHOUT_ICONV) || defined(MINIMAL))
CONFIGURE_ARGS+=--enable-charset
-USE_ICONV= yes
PLIST_SUB= CHARSETS=""
.else
PLIST_SUB= CHARSETS="@comment "
.endif
+.if !defined(WITH_NLS) && (defined(WITHOUT_NLS) || defined(MINIMAL))
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+_MANLANG= ""
+.else
+PLIST_SUB+= NLS=""
+_MANLANG= es hu it pl ru.KOI8-R sr
+.endif
+
.if !defined(WITH_X11) || defined(MINIMAL)
CONFIGURE_ARGS+=--without-x
.else
@@ -74,23 +86,33 @@
CONFIGURE_ARGS+=--without-subshell
.endif
-.if defined(WITH_PERL_MODULES) || !(defined(WITHOUT_PERL_MODULES) || defined(MINIMAL))
+.if defined(WITH_PERL_MODULES) || !(defined(WITHOUT_PERL_MODULES) || \
+ defined(MINIMAL))
.if ${PERL_LEVEL} < 500800
RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.endif
-MAN1= mc.1 mcedit.1 mcview.1
+MAN1= mcedit.1 mcview.1
_MAN1= mc.1
-_MANLANG= es hu it pl ru.KOI8-R sr
.for lang in ${_MANLANG}
_MANPAGES+= ${_MAN1:S%^%${MAN1PREFIX}/man/${lang}/man1/%}
.endfor
+.if !defined(WITH_NLS) && (defined(WITHOUT_NLS) || defined(MINIMAL))
post-patch:
+ @${REINPLACE_CMD} -e '224d;225,226d' -e 's|^LIBFILES_CONST.*|\
+ LIBFILES_CONST = mc.hint mc.lib mc.menu cedit.menu edit.indent.rc \
+ edit.spell.rc|' ${WRKSRC}/lib/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/bin/zip|${LOCALBASE}/bin/zip|' \
-e 's|/usr/bin/unzip|${LOCALBASE}/bin/unzip|' \
${WRKSRC}/configure
+.else
+post-patch:
+ @${REINPLACE_CMD} -e 's|/usr/bin/zip|${LOCALBASE}/bin/zip|' \
+ -e 's|/usr/bin/unzip|${LOCALBASE}/bin/unzip|' \
+ ${WRKSRC}/configure
+.endif
post-install:
@${LN} -sf mc ${PREFIX}/bin/midc
diff -ruN mc.old/pkg-plist mc/pkg-plist
--- mc.old/pkg-plist Tue May 15 09:31:23 2007
+++ mc/pkg-plist Tue May 15 12:14:29 2007
@@ -3,142 +3,142 @@
bin/mcmfmt
bin/mcview
bin/midc
-share/locale/az/LC_MESSAGES/mc.mo
-share/locale/be/LC_MESSAGES/mc.mo
-share/locale/bg/LC_MESSAGES/mc.mo
-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/el/LC_MESSAGES/mc.mo
-share/locale/es/LC_MESSAGES/mc.mo
-share/locale/eu/LC_MESSAGES/mc.mo
-share/locale/fi/LC_MESSAGES/mc.mo
-share/locale/fr/LC_MESSAGES/mc.mo
-share/locale/hu/LC_MESSAGES/mc.mo
-share/locale/it/LC_MESSAGES/mc.mo
-share/locale/ja/LC_MESSAGES/mc.mo
-share/locale/ko/LC_MESSAGES/mc.mo
-share/locale/lt/LC_MESSAGES/mc.mo
-share/locale/lv/LC_MESSAGES/mc.mo
-share/locale/mn/LC_MESSAGES/mc.mo
-share/locale/nl/LC_MESSAGES/mc.mo
-share/locale/no/LC_MESSAGES/mc.mo
-share/locale/pl/LC_MESSAGES/mc.mo
-share/locale/pt/LC_MESSAGES/mc.mo
-share/locale/pt_BR/LC_MESSAGES/mc.mo
-share/locale/ro/LC_MESSAGES/mc.mo
-share/locale/ru/LC_MESSAGES/mc.mo
-share/locale/sk/LC_MESSAGES/mc.mo
-share/locale/sl/LC_MESSAGES/mc.mo
-share/locale/sr/LC_MESSAGES/mc.mo
-share/locale/sv/LC_MESSAGES/mc.mo
-share/locale/ta/LC_MESSAGES/mc.mo
-share/locale/tr/LC_MESSAGES/mc.mo
-share/locale/uk/LC_MESSAGES/mc.mo
-share/locale/wa/LC_MESSAGES/mc.mo
-share/locale/zh_CN/LC_MESSAGES/mc.mo
-share/locale/zh_TW/LC_MESSAGES/mc.mo
-share/mc/bin/mc-wrapper.csh
-share/mc/bin/mc-wrapper.sh
-share/mc/bin/mc.csh
-share/mc/bin/mc.sh
-share/mc/cedit.menu
-share/mc/edit.indent.rc
-share/mc/edit.spell.rc
-share/mc/extfs/README
-share/mc/extfs/a
-share/mc/extfs/apt
-share/mc/extfs/audio
-share/mc/extfs/bpp
-share/mc/extfs/deb
-share/mc/extfs/deba
-share/mc/extfs/debd
-share/mc/extfs/dpkg
-share/mc/extfs/extfs.ini
-share/mc/extfs/hp48
-share/mc/extfs/iso9660
-share/mc/extfs/lslR
-share/mc/extfs/mailfs
-share/mc/extfs/patchfs
-share/mc/extfs/rpm
-share/mc/extfs/rpms
-share/mc/extfs/sfs.ini
-share/mc/extfs/trpm
-share/mc/extfs/uar
-share/mc/extfs/uarj
-share/mc/extfs/uha
-share/mc/extfs/ulha
-share/mc/extfs/urar
-share/mc/extfs/uzip
-share/mc/extfs/uzoo
-%%CHARSETS%%share/mc/mc.charsets
-share/mc/mc.ext
-share/mc/mc.hint
-share/mc/mc.hint.cs
-share/mc/mc.hint.es
-share/mc/mc.hint.hu
-share/mc/mc.hint.it
-share/mc/mc.hint.nl
-share/mc/mc.hint.pl
-share/mc/mc.hint.ru
-share/mc/mc.hint.sr
-share/mc/mc.hint.uk
-share/mc/mc.hint.zh
-share/mc/mc.hlp
-share/mc/mc.hlp.es
-share/mc/mc.hlp.hu
-share/mc/mc.hlp.it
-share/mc/mc.hlp.pl
-share/mc/mc.hlp.ru
-share/mc/mc.hlp.sr
-share/mc/mc.lib
-share/mc/mc.menu
-share/mc/mc.menu.sr
-share/mc/syntax/Syntax
-share/mc/syntax/ada95.syntax
-share/mc/syntax/aspx.syntax
-share/mc/syntax/assembler.syntax
-share/mc/syntax/c.syntax
-share/mc/syntax/changelog.syntax
-share/mc/syntax/cs.syntax
-share/mc/syntax/diff.syntax
-share/mc/syntax/dos.syntax
-share/mc/syntax/eiffel.syntax
-share/mc/syntax/fortran.syntax
-share/mc/syntax/html.syntax
-share/mc/syntax/idl.syntax
-share/mc/syntax/java.syntax
-share/mc/syntax/js.syntax
-share/mc/syntax/latex.syntax
-share/mc/syntax/lisp.syntax
-share/mc/syntax/lsm.syntax
-share/mc/syntax/lua.syntax
-share/mc/syntax/m4.syntax
-share/mc/syntax/mail.syntax
-share/mc/syntax/makefile.syntax
-share/mc/syntax/ml.syntax
-share/mc/syntax/nroff.syntax
-share/mc/syntax/octave.syntax
-share/mc/syntax/pascal.syntax
-share/mc/syntax/perl.syntax
-share/mc/syntax/php.syntax
-share/mc/syntax/po.syntax
-share/mc/syntax/povray.syntax
-share/mc/syntax/python.syntax
-share/mc/syntax/ruby.syntax
-share/mc/syntax/sh.syntax
-share/mc/syntax/slang.syntax
-share/mc/syntax/smalltalk.syntax
-share/mc/syntax/spec.syntax
-share/mc/syntax/sql.syntax
-share/mc/syntax/swig.syntax
-share/mc/syntax/syntax.syntax
-share/mc/syntax/tcl.syntax
-share/mc/syntax/texinfo.syntax
-share/mc/syntax/unknown.syntax
-share/mc/syntax/xml.syntax
-@dirrm share/mc/syntax
-@dirrm share/mc/extfs
-@dirrm share/mc/bin
-@dirrm share/mc
+%%NLS%%share/locale/az/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/be/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/da/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/de/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/el/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/es/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/it/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/mn/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/no/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/wa/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/mc.mo
+%%DATADIR%%/bin/mc-wrapper.csh
+%%DATADIR%%/bin/mc-wrapper.sh
+%%DATADIR%%/bin/mc.csh
+%%DATADIR%%/bin/mc.sh
+%%DATADIR%%/cedit.menu
+%%DATADIR%%/edit.indent.rc
+%%DATADIR%%/edit.spell.rc
+%%DATADIR%%/extfs/README
+%%DATADIR%%/extfs/a
+%%DATADIR%%/extfs/apt
+%%DATADIR%%/extfs/audio
+%%DATADIR%%/extfs/bpp
+%%DATADIR%%/extfs/deb
+%%DATADIR%%/extfs/deba
+%%DATADIR%%/extfs/debd
+%%DATADIR%%/extfs/dpkg
+%%DATADIR%%/extfs/extfs.ini
+%%DATADIR%%/extfs/hp48
+%%DATADIR%%/extfs/iso9660
+%%DATADIR%%/extfs/lslR
+%%DATADIR%%/extfs/mailfs
+%%DATADIR%%/extfs/patchfs
+%%DATADIR%%/extfs/rpm
+%%DATADIR%%/extfs/rpms
+%%DATADIR%%/extfs/sfs.ini
+%%DATADIR%%/extfs/trpm
+%%DATADIR%%/extfs/uar
+%%DATADIR%%/extfs/uarj
+%%DATADIR%%/extfs/uha
+%%DATADIR%%/extfs/ulha
+%%DATADIR%%/extfs/urar
+%%DATADIR%%/extfs/uzip
+%%DATADIR%%/extfs/uzoo
+%%CHARSETS%%%%DATADIR%%/mc.charsets
+%%DATADIR%%/mc.ext
+%%DATADIR%%/mc.hint
+%%NLS%%%%DATADIR%%/mc.hint.cs
+%%NLS%%%%DATADIR%%/mc.hint.es
+%%NLS%%%%DATADIR%%/mc.hint.hu
+%%NLS%%%%DATADIR%%/mc.hint.it
+%%NLS%%%%DATADIR%%/mc.hint.nl
+%%NLS%%%%DATADIR%%/mc.hint.pl
+%%NLS%%%%DATADIR%%/mc.hint.ru
+%%NLS%%%%DATADIR%%/mc.hint.sr
+%%NLS%%%%DATADIR%%/mc.hint.uk
+%%NLS%%%%DATADIR%%/mc.hint.zh
+%%DATADIR%%/mc.hlp
+%%NLS%%%%DATADIR%%/mc.hlp.es
+%%NLS%%%%DATADIR%%/mc.hlp.hu
+%%NLS%%%%DATADIR%%/mc.hlp.it
+%%NLS%%%%DATADIR%%/mc.hlp.pl
+%%NLS%%%%DATADIR%%/mc.hlp.ru
+%%NLS%%%%DATADIR%%/mc.hlp.sr
+%%DATADIR%%/mc.lib
+%%DATADIR%%/mc.menu
+%%NLS%%%%DATADIR%%/mc.menu.sr
+%%EDITOR%%%%DATADIR%%/syntax/Syntax
+%%EDITOR%%%%DATADIR%%/syntax/ada95.syntax
+%%EDITOR%%%%DATADIR%%/syntax/aspx.syntax
+%%EDITOR%%%%DATADIR%%/syntax/assembler.syntax
+%%EDITOR%%%%DATADIR%%/syntax/c.syntax
+%%EDITOR%%%%DATADIR%%/syntax/changelog.syntax
+%%EDITOR%%%%DATADIR%%/syntax/cs.syntax
+%%EDITOR%%%%DATADIR%%/syntax/diff.syntax
+%%EDITOR%%%%DATADIR%%/syntax/dos.syntax
+%%EDITOR%%%%DATADIR%%/syntax/eiffel.syntax
+%%EDITOR%%%%DATADIR%%/syntax/fortran.syntax
+%%EDITOR%%%%DATADIR%%/syntax/html.syntax
+%%EDITOR%%%%DATADIR%%/syntax/idl.syntax
+%%EDITOR%%%%DATADIR%%/syntax/java.syntax
+%%EDITOR%%%%DATADIR%%/syntax/js.syntax
+%%EDITOR%%%%DATADIR%%/syntax/latex.syntax
+%%EDITOR%%%%DATADIR%%/syntax/lisp.syntax
+%%EDITOR%%%%DATADIR%%/syntax/lsm.syntax
+%%EDITOR%%%%DATADIR%%/syntax/lua.syntax
+%%EDITOR%%%%DATADIR%%/syntax/m4.syntax
+%%EDITOR%%%%DATADIR%%/syntax/mail.syntax
+%%EDITOR%%%%DATADIR%%/syntax/makefile.syntax
+%%EDITOR%%%%DATADIR%%/syntax/ml.syntax
+%%EDITOR%%%%DATADIR%%/syntax/nroff.syntax
+%%EDITOR%%%%DATADIR%%/syntax/octave.syntax
+%%EDITOR%%%%DATADIR%%/syntax/pascal.syntax
+%%EDITOR%%%%DATADIR%%/syntax/perl.syntax
+%%EDITOR%%%%DATADIR%%/syntax/php.syntax
+%%EDITOR%%%%DATADIR%%/syntax/po.syntax
+%%EDITOR%%%%DATADIR%%/syntax/povray.syntax
+%%EDITOR%%%%DATADIR%%/syntax/python.syntax
+%%EDITOR%%%%DATADIR%%/syntax/ruby.syntax
+%%EDITOR%%%%DATADIR%%/syntax/sh.syntax
+%%EDITOR%%%%DATADIR%%/syntax/slang.syntax
+%%EDITOR%%%%DATADIR%%/syntax/smalltalk.syntax
+%%EDITOR%%%%DATADIR%%/syntax/spec.syntax
+%%EDITOR%%%%DATADIR%%/syntax/sql.syntax
+%%EDITOR%%%%DATADIR%%/syntax/swig.syntax
+%%EDITOR%%%%DATADIR%%/syntax/syntax.syntax
+%%EDITOR%%%%DATADIR%%/syntax/tcl.syntax
+%%EDITOR%%%%DATADIR%%/syntax/texinfo.syntax
+%%EDITOR%%%%DATADIR%%/syntax/unknown.syntax
+%%EDITOR%%%%DATADIR%%/syntax/xml.syntax
+%%EDITOR%%@dirrm %%DATADIR%%/syntax
+@dirrm %%DATADIR%%/extfs
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%
--- mc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070515182953.93BE878E85>