aboutsummaryrefslogtreecommitdiffstats
path: root/x11-fm/gnomemc
diff options
context:
space:
mode:
Diffstat (limited to 'x11-fm/gnomemc')
-rw-r--r--x11-fm/gnomemc/Makefile6
-rw-r--r--x11-fm/gnomemc/distinfo2
-rw-r--r--x11-fm/gnomemc/files/patch-aa55
-rw-r--r--x11-fm/gnomemc/files/patch-ab39
-rw-r--r--x11-fm/gnomemc/files/patch-af105
-rw-r--r--x11-fm/gnomemc/files/patch-ag95
-rw-r--r--x11-fm/gnomemc/files/patch-ak7
-rw-r--r--x11-fm/gnomemc/pkg-plist22
8 files changed, 93 insertions, 238 deletions
diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile
index c78491c2c3b..9f2ff023be6 100644
--- a/x11-fm/gnomemc/Makefile
+++ b/x11-fm/gnomemc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomemc
-PORTVERSION= 4.5.51
+PORTVERSION= 4.5.54
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/mc
@@ -22,4 +22,8 @@ CONFIGURE_ARGS= --without-edit -with-ncurses
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+post-patch:
+ @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|\$\(libdir\)/mc|\$\(datadir\)/mc|g'
+
.include <bsd.port.mk>
diff --git a/x11-fm/gnomemc/distinfo b/x11-fm/gnomemc/distinfo
index e787c0ca94c..6fcebadbbc7 100644
--- a/x11-fm/gnomemc/distinfo
+++ b/x11-fm/gnomemc/distinfo
@@ -1 +1 @@
-MD5 (mc-4.5.51.tar.gz) = c604292554887e9e6baba0828081b963
+MD5 (mc-4.5.54.tar.gz) = 46bd6d7e25fc3f509c5d8d063fa701eb
diff --git a/x11-fm/gnomemc/files/patch-aa b/x11-fm/gnomemc/files/patch-aa
index 10a970fc5e6..80f1a383780 100644
--- a/x11-fm/gnomemc/files/patch-aa
+++ b/x11-fm/gnomemc/files/patch-aa
@@ -1,51 +1,18 @@
---- configure.orig Tue Jul 13 05:57:18 1999
-+++ configure Sun Jul 18 02:09:53 1999
-@@ -3383,15 +3383,15 @@
+--- configure.orig Sun Mar 18 12:20:41 2001
++++ configure Thu Mar 29 10:08:26 2001
+@@ -3106,3 +3106,3 @@
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
fi
-
-
-- USE_INCLUDED_LIBINTL=yes
-+# USE_INCLUDED_LIBINTL=yes
- CATOBJEXT=.gmo
- INSTOBJEXT=.mo
- DATADIRNAME=share
-- INTLDEPS='$(top_builddir)/intl/libintl.a'
-+ INTLDEPS='-lintl'
- INTLLIBS=$INTLDEPS
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-- nls_cv_header_intl=intl/libintl.h
-- nls_cv_header_libgt=intl/libgettext.h
-+# nls_cv_header_intl=intl/libintl.h
-+# nls_cv_header_libgt=intl/libgettext.h
- fi
-
- if test "$XGETTEXT" != ":"; then
-@@ -10731,7 +10731,7 @@
- if test -f /usr/include/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
-- CURSES_LIBS="-lncurses"
-+ CURSES_LIBS="-lncurses -lmytinfo"
- CURSES_INCLUDEDIR=""
- search_ncurses=false
- screen_manager="ncurses on /usr/include"
-@@ -10859,6 +10859,8 @@
- fi
- fi
-
-+CFLAGS="$CFLAGS $CURSES_INCLUDEDIR"
-+LIBS="$LIBS $CURSES_LIBS"
-
- if $search_ncurses
- then
-@@ -12224,10 +12226,6 @@
- *) # Relative path.
- ac_sub_cache_file="$ac_dots$cache_file" ;;
+@@ -12107,6 +12107,6 @@
esac
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
++# case "$ac_given_INSTALL" in
++# [/$]*) INSTALL="$ac_given_INSTALL" ;;
++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++# esac
- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
- # The eval makes quoting arguments work.
diff --git a/x11-fm/gnomemc/files/patch-ab b/x11-fm/gnomemc/files/patch-ab
index d946fe49cb1..5fc08c7574e 100644
--- a/x11-fm/gnomemc/files/patch-ab
+++ b/x11-fm/gnomemc/files/patch-ab
@@ -1,37 +1,12 @@
---- vfs/Make-mc.in.orig Tue Mar 30 08:34:34 1999
-+++ vfs/Make-mc.in Wed Apr 7 22:53:32 1999
-@@ -13,8 +13,9 @@
- DEFS = $(XDEFS)
- LIBS = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
+--- vfs/Make-mc.in.orig Wed Mar 14 20:05:53 2001
++++ vfs/Make-mc.in Wed Mar 28 18:11:44 2001
+@@ -20,3 +20,3 @@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- AR = @AR@
-
- #
-@@ -184,9 +185,6 @@
- -$(RMF) $(srcdir)/Makefile
-
- install: @mcserv@ install.extfs
-- -(if test x@mcserv@ != x; then \
-- $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
-- fi)
-
- install.extfs:
- for I in $(EXTFS_MISC); do \
-@@ -194,11 +192,11 @@
- $(DESTDIR)$(extfsdir)/$$I; \
- done
- for I in $(EXTFS_CONST) ; do \
-- $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
-+ $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \
- $(DESTDIR)$(extfsdir)/$$I; \
- done
- for I in $(EXTFS_OUT) ; do \
-- $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
-+ $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \
- $(DESTDIR)$(extfsdir)/$$I; \
- done
+@@ -242,4 +242,2 @@
+ install_mcserv:
+- $(mkinstalldirs) $(DESTDIR)$(bindir)
+- $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv
diff --git a/x11-fm/gnomemc/files/patch-af b/x11-fm/gnomemc/files/patch-af
index 8b71a2fc6a9..0daa10d153f 100644
--- a/x11-fm/gnomemc/files/patch-af
+++ b/x11-fm/gnomemc/files/patch-af
@@ -1,66 +1,49 @@
---- Makefile.in.orig Wed May 10 17:58:00 2000
-+++ Makefile.in Tue May 16 13:25:57 2000
-@@ -5,8 +5,8 @@
- @MCFGR@@MCF@
+--- Makefile.in.orig Sun Mar 18 12:20:52 2001
++++ Makefile.in Wed Mar 28 18:16:22 2001
+@@ -159,3 +159,3 @@
- foreigndirs=pc
--codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
--unixdirs=intl $(codedirs) doc-gnome @POSUB@
-+codedirs=vfs lib gtkedit gnome new_icons icons idl syntax
-+unixdirs=intl $(codedirs) @POSUB@
- alldirs=$(unixdirs) $(foreigndirs)
- subdirs=$(alldirs)
+-SUBDIRS = vfs lib doc slang gtkedit edit src gnome new_icons idl syntax intl doc-gnome po pc
++SUBDIRS = vfs lib gtkedit gnome new_icons idl syntax intl po
-@@ -45,8 +45,6 @@
- install: installdirs
- @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
-- $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
-- chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
- @echo "Please verify that the configuration values are correctly"
- @echo "set in the mc.ext file in $(mclibdir)"
+@@ -174,3 +174,3 @@
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = Make.common mc.spec mcfn_install
++CONFIG_CLEAN_FILES = Make.common mc.spec
+ DATA = $(noinst_DATA)
+--- lib/Makefile.in.orig Sun Mar 18 12:20:57 2001
++++ lib/Makefile.in Wed Mar 28 18:19:55 2001
+@@ -161,4 +161,2 @@
+ desktopdir = $(mclibdir)/desktop-scripts
+-suppbindir = $(mclibdir)/bin
+-tidir = $(mclibdir)/term
+ confdir = $(sysconfdir)
+@@ -176,5 +174,3 @@
+ conf_DATA = mc.global
+-suppbin_SCRIPTS = mc.csh mc.sh
+ desktop_DATA = startup.links README.desktop
+-ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
-@@ -57,12 +55,8 @@
- installdirs:
- $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
- $(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
-- $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
-- $(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(extfsdir)
- $(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
--
--mcfninstall:
-- -/bin/sh ./mcfn_install
+@@ -188,6 +184,5 @@
+ CONFIG_CLEAN_FILES = mc.ext mc.sh mc.csh
+-SCRIPTS = $(noinst_SCRIPTS) $(suppbin_SCRIPTS)
++SCRIPTS = $(noinst_SCRIPTS)
+
+-DATA = $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA) \
+-$(ti_DATA)
++DATA = $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA)
- uninstall:
- @for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
---- lib/Makefile.in.orig Wed May 10 17:58:01 2000
-+++ lib/Makefile.in Tue May 16 13:27:02 2000
-@@ -15,16 +15,11 @@
- LIBFILES_IN = mc.ext.in mc-gnome.ext.in
- LIBFILES_OUT = mc.ext mc-gnome.ext mc.csh mc.sh
- LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru mc.lib mc.menu cedit.menu edit.indent.rc
--SUPPBIN_IN = mc.csh.in mc.sh.in
--SUPPBIN_OUT = mc.csh mc.sh
- DESKTOP_FILES = startup.links README.desktop
--TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
+@@ -340,4 +335,4 @@
+
+-install-data-am: install-suppbinSCRIPTS install-confDATA \
+- install-desktopDATA install-mclibDATA install-tiDATA
++install-data-am: install-confDATA \
++ install-desktopDATA install-mclibDATA
+ install-data: install-data-am
+@@ -356,5 +351,4 @@
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(suppbindir) $(DESTDIR)$(confdir) \
+- $(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir) \
+- $(DESTDIR)$(tidir)
++ $(mkinstalldirs) $(DESTDIR)$(confdir) \
++ $(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir)
- DISTLIB = \
- $(LIBFILES_IN) \
- $(LIBFILES_CONST) \
-- $(SUPPBIN_IN) \
-- $(TIFILES) \
- $(DESKTOP_FILES) \
- Makefile.in tdiff \
- xnc.hlp ncurses.h \
-@@ -61,10 +56,6 @@
- do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(mclibdir)/$$I; done
- for I in $(LIBFILES_OUT); \
- do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
-- for I in $(SUPPBIN_OUT); \
-- do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
-- for I in $(TIFILES); \
-- do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
- $(MKINSTALLDIRS) $(DESTDIR)$(confdir)
- $(INSTALL_DATA) $(srcdir)/mc.global $(DESTDIR)$(confdir)
- $(MKINSTALLDIRS) $(DESTDIR)$(desktopdir)
diff --git a/x11-fm/gnomemc/files/patch-ag b/x11-fm/gnomemc/files/patch-ag
index 36ea8fbad6c..4b0bf6e4959 100644
--- a/x11-fm/gnomemc/files/patch-ag
+++ b/x11-fm/gnomemc/files/patch-ag
@@ -1,105 +1,20 @@
---- lib/mc.ext.in.orig Wed May 10 17:58:01 2000
-+++ lib/mc.ext.in Tue May 16 13:31:33 2000
-@@ -318,11 +318,11 @@
- Icon=xpm.xpm
-
+--- lib/mc.ext.in.orig Sat Mar 3 16:33:22 2001
++++ lib/mc.ext.in Wed Mar 28 19:08:24 2001
+@@ -283,3 +283,3 @@
include/image-options
- Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ee %f &); fi
+ Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ElectricEyes %f &); fi
View=%view{ascii} identify %f
- #View=%view{ascii} asciiview %f
+@@ -287,3 +287,3 @@
Set root window to this image=background-properties --setwallpaper %f &
- Display this file=ee %f &
+ Display this file=ElectricEyes %f &
-
- ### Sound files ###
-@@ -368,7 +368,7 @@
-
- # Postscript
+@@ -329,3 +329,3 @@
type/PostScript
- Open=gv %f&
+ Open=ggv %f&
- Icon=postscript.xpm
View=%view{ascii} ps2ascii %f
- View with GhostView=gv %f
---- lib/mc-gnome.ext.in.orig Thu Jan 28 14:21:23 1999
-+++ lib/mc-gnome.ext.in Thu Jan 28 14:21:59 1999
-@@ -271,60 +271,60 @@
- View=%view{ascii,nroff} gunzip -dc %f | nroff @TROFFASCII@ @MANDOC@
-
- type/PostScript
-- Open=gv %f
-- View with GhostView=gv %f
-+ Open=ggv %f
-+ View with GhostView=ggv %f
-
- type/GIF\ image
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/GIF\ picture
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/JPEG\ picture
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/PC\ bitmap
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/PNG\ image
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/JPEG\ image
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/TIFF\ file
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/PBM
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/PGM
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- type/PPM
-- Open=ee %f
-+ Open=ElectricEyes %f
- Include=image-options
-
- shell/.xbm
- Open=bitmap %f
-
- shell/.xpm
-- Open=ee %f
-+ Open=ElectricEyes %f
- View=sxpm %f
- Include=image-options
-
- include/image-options
- Set root window to this image=background-properties --setwallpaper %f &
-- Display this file=ee %f &
-+ Display this file=ElectricEyes %f &
-
- # Sound files
- shell/.mod
--- gnome/mc.keys.in.in.orig Tue Feb 16 01:29:18 1999
+++ gnome/mc.keys.in.in Fri Feb 19 01:47:31 1999
@@ -96,7 +96,7 @@
diff --git a/x11-fm/gnomemc/files/patch-ak b/x11-fm/gnomemc/files/patch-ak
new file mode 100644
index 00000000000..202cfc2a7a5
--- /dev/null
+++ b/x11-fm/gnomemc/files/patch-ak
@@ -0,0 +1,7 @@
+--- idl/Makefile.in.orig Sun Mar 18 12:21:08 2001
++++ idl/Makefile.in Thu Mar 29 10:09:30 2001
+@@ -159,3 +159,3 @@
+
+-idldir = $(prefix)/share/idl
++idldir = $(datadir)/idl
+
diff --git a/x11-fm/gnomemc/pkg-plist b/x11-fm/gnomemc/pkg-plist
index 3b48a21d35a..846af0c8fc9 100644
--- a/x11-fm/gnomemc/pkg-plist
+++ b/x11-fm/gnomemc/pkg-plist
@@ -4,14 +4,19 @@ bin/plain-gmc
etc/CORBA/servers/gmc.gnorba
etc/mc.global
share/gnome/idl/FileManager.idl
-share/gnome/idl/Makefile.in
-share/gnome/mc/FAQ
+share/gnome/mc/cedit.menu
share/gnome/mc/desktop-scripts/README.desktop
share/gnome/mc/desktop-scripts/startup.links
share/gnome/mc/edit.indent.rc
share/gnome/mc/extfs/README
share/gnome/mc/extfs/a
+share/gnome/mc/extfs/apt
+share/gnome/mc/extfs/audio
+share/gnome/mc/extfs/bpp
share/gnome/mc/extfs/deb
+share/gnome/mc/extfs/deba
+share/gnome/mc/extfs/debd
+share/gnome/mc/extfs/dpkg
share/gnome/mc/extfs/extfs.ini
share/gnome/mc/extfs/ftplist
share/gnome/mc/extfs/hp48
@@ -32,16 +37,16 @@ share/gnome/mc/extfs/urar
share/gnome/mc/extfs/uzip
share/gnome/mc/extfs/uzoo
share/gnome/mc/layout
-share/gnome/mc/mc-gnome.ext
-share/gnome/mc/mc.csh
share/gnome/mc/mc.ext
share/gnome/mc/mc.hint
share/gnome/mc/mc.hint.cs
share/gnome/mc/mc.hint.es
+share/gnome/mc/mc.hint.it
+share/gnome/mc/mc.hint.pl
share/gnome/mc/mc.hint.ru
+share/gnome/mc/mc.hlp.hu
share/gnome/mc/mc.lib
share/gnome/mc/mc.menu
-share/gnome/mc/mc.sh
share/gnome/mc/syntax/ada95.syntax
share/gnome/mc/syntax/c.syntax
share/gnome/mc/syntax/changelog.syntax
@@ -64,7 +69,6 @@ share/gnome/mc/syntax/swig.syntax
share/gnome/mc/syntax/texinfo.syntax
share/gnome/mc/syntax/unknown.syntax
share/gnome/mime-info/mc.keys
-share/gnome/pixmaps/mc/directory.xpm
share/gnome/pixmaps/mc/gnome-application-encapsulated_postscript.png
share/gnome/pixmaps/mc/gnome-application-pdf.png
share/gnome/pixmaps/mc/gnome-application-pgp.png
@@ -158,9 +162,7 @@ share/gnome/pixmaps/mc/i-stalled.png
share/gnome/pixmaps/mc/i-symlink.png
share/gnome/pixmaps/mc/i-zipdisk.png
share/gnome/pixmaps/mc/i-zipdisk2.png
-share/gnome/pixmaps/mc/makefile.xpm
-share/gnome/pixmaps/mc/sound.xpm
-share/gnome/pixmaps/mc/trash.xpm
+share/locale/az/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
@@ -174,6 +176,7 @@ 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/lv/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
@@ -183,6 +186,7 @@ share/locale/ru/LC_MESSAGES/mc.mo
share/locale/sk/LC_MESSAGES/mc.mo
share/locale/sl/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