From ef51112364ec71f5989e6fb89c7f917361e4c818 Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Wed, 24 May 2000 03:03:01 +0000 Subject: Update to 4.5.48 Approved by: reg (maintainer) --- misc/mc/Makefile | 2 +- misc/mc/distinfo | 2 +- misc/mc/files/patch-af | 27 ++++--- misc/mc/files/patch-ag | 161 +++++++++++++----------------------------- misc/mc/files/patch-an | 20 ++++++ misc/mc/files/patch-ao | 10 +++ misc/mc/pkg-plist | 6 +- x11-fm/gnomemc/Makefile | 2 +- x11-fm/gnomemc/distinfo | 2 +- x11-fm/gnomemc/files/patch-af | 10 +-- x11-fm/gnomemc/files/patch-ag | 100 +++++--------------------- x11-fm/gnomemc/pkg-plist | 2 + 12 files changed, 125 insertions(+), 219 deletions(-) create mode 100644 misc/mc/files/patch-an create mode 100644 misc/mc/files/patch-ao diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 659a59bf3953..d5d414b4d2b0 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mc -PORTVERSION= 4.5.44 +PORTVERSION= 4.5.48 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/mc diff --git a/misc/mc/distinfo b/misc/mc/distinfo index fa9818e2ca1b..d2b3039b8ba4 100644 --- a/misc/mc/distinfo +++ b/misc/mc/distinfo @@ -1 +1 @@ -MD5 (mc-4.5.44.tar.gz) = 517990335f11890697e156dbf2c83717 +MD5 (mc-4.5.48.tar.gz) = 0ed6f7cda24307c13afb0c1d1a9fb7a0 diff --git a/misc/mc/files/patch-af b/misc/mc/files/patch-af index 0d49793c0fc6..741b641b2220 100644 --- a/misc/mc/files/patch-af +++ b/misc/mc/files/patch-af @@ -1,12 +1,12 @@ ---- Makefile.in.orig Thu Sep 30 04:39:33 1999 -+++ Makefile.in Sat Oct 9 15:23:23 1999 +--- Makefile.in.orig Wed May 10 17:58:00 2000 ++++ Makefile.in Tue May 16 15:45:21 2000 @@ -5,14 +5,15 @@ @MCFGR@@MCF@ 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 doc slang edit src syntax ++codedirs=vfs lib doc slang gtkedit edit src syntax +unixdirs=intl $(codedirs) @POSUB@ alldirs=$(unixdirs) $(foreigndirs) subdirs=$(alldirs) @@ -27,7 +27,7 @@ chmod +x $(DESTDIR)$(suppbindir)/mcfn_install @echo "Please verify that the configuration values are correctly" @echo "set in the mc.ext file in $(mclibdir)" -@@ -57,9 +58,9 @@ +@@ -57,9 +58,8 @@ installdirs: $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir) $(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir) @@ -35,12 +35,11 @@ + $(MKINSTALLDIRS) $(DESTDIR)$(suppbindir) $(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir) - $(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(syntaxdir) mcfninstall: -/bin/sh ./mcfn_install ---- src/Makefile.in.orig Thu Sep 30 04:39:39 1999 -+++ src/Makefile.in Sat Oct 9 15:03:45 1999 +--- src/Makefile.in.orig Wed May 10 17:58:02 2000 ++++ src/Makefile.in Tue May 16 15:45:43 2000 @@ -130,7 +130,7 @@ -$(RMF) $(srcdir)/Makefile @@ -50,8 +49,8 @@ $(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt $(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/$(libprefix)mc.hlp ---- doc/Makefile.in.orig Thu Sep 30 04:39:38 1999 -+++ doc/Makefile.in Sat Oct 9 15:03:45 1999 +--- doc/Makefile.in.orig Wed May 10 17:58:01 2000 ++++ doc/Makefile.in Tue May 16 15:47:12 2000 @@ -17,7 +17,7 @@ install: $(MKINSTALLDIRS) $(DESTDIR)/$(man1dir) @@ -61,8 +60,8 @@ -$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(man1dir)/$(manprefix)mcedit.$(manext) -$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext) ---- lib/Makefile.in.orig Sat Mar 18 07:43:44 2000 -+++ lib/Makefile.in Mon Mar 20 10:46:31 2000 +--- lib/Makefile.in.orig Wed May 10 17:58:01 2000 ++++ lib/Makefile.in Tue May 16 15:48:15 2000 @@ -12,8 +12,8 @@ # Distribution variables # @@ -71,7 +70,7 @@ -LIBFILES_OUT = mc.ext mc-gnome.ext mc.csh mc.sh +LIBFILES_IN = mc.ext.in +LIBFILES_OUT = mc.ext mc.csh mc.sh - LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru mc.lib mc.menu + 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 @@ -62,7 +62,7 @@ @@ -83,8 +82,8 @@ for I in $(TIFILES); \ do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done $(MKINSTALLDIRS) $(DESTDIR)$(confdir) ---- edit/Makefile.in.orig Wed Jan 5 23:49:36 2000 -+++ edit/Makefile.in Wed Jan 5 23:49:58 2000 +--- edit/Makefile.in.orig Wed May 10 17:58:01 2000 ++++ edit/Makefile.in Tue May 16 15:48:47 2000 @@ -58,7 +58,7 @@ mcedit: diff --git a/misc/mc/files/patch-ag b/misc/mc/files/patch-ag index b1a554447b71..e0caedd36247 100644 --- a/misc/mc/files/patch-ag +++ b/misc/mc/files/patch-ag @@ -1,26 +1,6 @@ ---- lib/mc.ext.in.orig Fri Sep 24 01:01:11 1999 -+++ lib/mc.ext.in Sat Oct 9 12:15:10 1999 -@@ -258,7 +258,7 @@ - # ar library - regex/\.s?a$ - Open=%cd %p#uar -- View=%view{ascii} nm %f -+ View=%view{ascii} nm '%d/%p' - - # C - shell/.c -@@ -320,8 +320,8 @@ - - # ar library - regex/\.s?a$ -- Open=%view{ascii} ar tv %f -- View=%view{ascii} nm %f -+ Open=%view{ascii} ar tv '%d/%p' -+ View=%view{ascii} nm '%d/%p' - Icon=a.xpm - - # .so libraries are not manual pages -@@ -336,26 +336,26 @@ +--- lib/mc.ext.in.orig Wed May 10 17:58:01 2000 ++++ lib/mc.ext.in Tue May 16 15:59:31 2000 +@@ -230,26 +230,26 @@ # Manual page regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|n)|\.man)$ @@ -55,115 +35,72 @@ Icon=man.xpm regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz$ -@@ -380,52 +380,52 @@ - View with GhostView=gv %f - - type/GIF\ image -- Open=ee %f -+ Open=ElectricEyes %f - Icon=gif.xpm - Include=image-options - - type/GIF\ picture -- Open=ee %f -+ Open=ElectricEyes %f - Icon=gif.xpm - Include=image-options - - type/JPEG\ picture -- Open=ee %f -+ Open=ElectricEyes %f - Icon=jpeg.xpm - Include=image-options - - type/PC\ bitmap -- Open=ee %f -+ Open=ElectricEyes %f - Icon=bitmap.xpm - Include=image-options - - type/PNG\ image -- Open=ee %f -+ Open=ElectricEyes %f - Icon=gif.xpm - Include=image-options - - type/JPEG\ image -- Open=ee %f -+ Open=ElectricEyes %f - Icon=jpeg.xpm - Include=image-options - - type/TIFF\ file -- Open=ee %f -+ Open=ElectricEyes %f - Icon=tiff.xpm - Include=image-options - - type/PBM -- Open=ee %f -+ Open=ElectricEyes %f - Icon=pbm.xpm - Include=image-options - - type/PGM -- Open=ee %f -+ Open=ElectricEyes %f - Icon=pgm.xpm - Include=image-options - - type/PPM -- Open=ee %f -+ Open=ElectricEyes %f - Icon=ppm.xpm - Include=image-options +@@ -258,8 +258,8 @@ + Icon=man.xpm -@@ -434,14 +434,14 @@ - Icon=xbm.xpm + regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz2$ +- Open=bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more} +- View=%view{ascii,nroff} bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@ ++ Open=bzip2 -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more} ++ View=%view{ascii,nroff} bzip2 -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ + Icon=man.xpm - shell/.xpm -- Open=ee %f -+ Open=ElectricEyes %f - View=sxpm %f - Include=image-options + regex/(read\.?me$)|(README) +@@ -318,11 +318,11 @@ Icon=xpm.xpm 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 Set root window to this image=background-properties --setwallpaper %f & - Display this file=ee %f & + Display this file=ElectricEyes %f & - # Sound files - shell/.mod -@@ -525,21 +525,21 @@ - Icon=rexx.xpm + + ### Sound files ### +@@ -390,14 +390,14 @@ + View with @X11_WWW@=@X11_WWW@ file://%f # Microsoft Word Document --regex/\.(doc|DOC)$ -+#regex/\.(doc|DOC)$ - # View=%view{ascii} catdoc -w %f -- View=%view{ascii} word2x -f text %f - -- Icon=word.xpm +-regex/\.([Dd]oc|DOC)$ +- #View=%view{ascii} catdoc -w %f +- View=%view{ascii} word2x -f text %f - +- Icon=word.xpm -type/Microsoft Word Document -+# View=%view{ascii} word2x -f text %f - -+# Icon=word.xpm -+#type/Microsoft Word Document - # View=%view{ascii} catdoc -w %f -- View=%view{ascii} word2x -f text %f - -- Icon=word.xpm -+# View=%view{ascii} word2x -f text %f - -+# Icon=word.xpm +- #View=%view{ascii} catdoc -w %f +- View=%view{ascii} word2x -f text %f - +- Icon=word.xpm ++# regex/\.([Dd]oc|DOC)$ ++# #View=%view{ascii} catdoc -w %f ++# View=%view{ascii} word2x -f text %f - ++# Icon=word.xpm ++# type/Microsoft Word Document ++# #View=%view{ascii} catdoc -w %f ++# View=%view{ascii} word2x -f text %f - ++# Icon=word.xpm - # cpio rules - + # Framemaker + type/FrameMaker +@@ -542,7 +542,7 @@ shell/.cpio.Z Open=%cd %d/%p#ucpio/ View=%view{ascii} compress -dc '%f' | cpio -ictv - Extract=compress -dc '%f' | cpio -ic + Extract=compress -dc '%d/%p' | cpio -ic Icon=compressed.xpm - shell/.cpio.gz + Open=%cd %d/%p#ucpio/ +@@ -590,7 +590,7 @@ + regex/\.s?a$ + Open=%cd %p#uar + #Open=%view{ascii} ar tv %f +- View=%view{ascii} nm %f ++ View=%view{ascii} nm '%d/%p' + Icon=a.xpm + + # .so libraries are not manual pages --- lib/mc.csh.in.orig Sat Oct 9 15:08:10 1999 +++ lib/mc.csh.in Sat Oct 9 15:08:28 1999 @@ -1,2 +1,2 @@ diff --git a/misc/mc/files/patch-an b/misc/mc/files/patch-an new file mode 100644 index 000000000000..81f0ef766e78 --- /dev/null +++ b/misc/mc/files/patch-an @@ -0,0 +1,20 @@ +--- src/main.c.orig Fri May 19 17:15:10 2000 ++++ src/main.c Mon May 22 11:36:20 2000 +@@ -1348,7 +1348,7 @@ + { ' ', "", ' ', 0 }, + { ' ', N_("&Extension file edit"), 'E', ext_cmd }, + { ' ', N_("&Menu file edit"), 'M', menu_edit_cmd }, +- {' ', N_("Menu edi&Tor edit"), 'T', edit_user_menu_cmd} ++/* XXX: only appears in gtkedit {' ', N_("Menu edi&Tor edit"), 'T', edit_user_menu_cmd} */ + }; + + /* Must keep in sync with the constants in menu_cmd */ +@@ -3015,7 +3015,7 @@ + } + + vfs_init (); +- edit_init_file(); ++/* XXX: only appears in gtkedit?? edit_init_file(); */ + + #ifdef HAVE_X + /* NOTE: This call has to be before any our argument handling :) */ diff --git a/misc/mc/files/patch-ao b/misc/mc/files/patch-ao new file mode 100644 index 000000000000..94d81f6a0c23 --- /dev/null +++ b/misc/mc/files/patch-ao @@ -0,0 +1,10 @@ +--- syntax/Makefile.in.orig Fri May 19 17:15:17 2000 ++++ syntax/Makefile.in Mon May 22 11:38:57 2000 +@@ -43,6 +43,7 @@ + + + install: Makefile ++ mkdir -p $(DESTDIR)$(syntaxdir) + for I in $(ALLSYNTAX); \ + do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(syntaxdir)/$$I; done + diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist index d020594eb0a5..ac5a0e70df85 100644 --- a/misc/mc/pkg-plist +++ b/misc/mc/pkg-plist @@ -29,13 +29,13 @@ share/locale/wa/LC_MESSAGES/mc.mo share/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo share/locale/zh_TW.Big5/LC_MESSAGES/mc.mo share/mc/FAQ -share/mc/mc.csh -share/mc/mc.sh share/mc/bin/mc.csh share/mc/bin/mc.sh share/mc/bin/mcfn_install +share/mc/cedit.menu share/mc/desktop-scripts/README.desktop share/mc/desktop-scripts/startup.links +share/mc/edit.indent.rc share/mc/extfs/README share/mc/extfs/a share/mc/extfs/deb @@ -58,6 +58,7 @@ share/mc/extfs/unarj.diff share/mc/extfs/urar share/mc/extfs/uzip share/mc/extfs/uzoo +share/mc/mc.csh share/mc/mc.ext share/mc/mc.hint share/mc/mc.hint.cs @@ -66,6 +67,7 @@ share/mc/mc.hint.ru share/mc/mc.hlp share/mc/mc.lib share/mc/mc.menu +share/mc/mc.sh share/mc/syntax/ada95.syntax share/mc/syntax/c.syntax share/mc/syntax/changelog.syntax diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile index 19ef3044c59f..26b15a3cd249 100644 --- a/x11-fm/gnomemc/Makefile +++ b/x11-fm/gnomemc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomemc -PORTVERSION= 4.5.44 +PORTVERSION= 4.5.48 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/mc diff --git a/x11-fm/gnomemc/distinfo b/x11-fm/gnomemc/distinfo index fa9818e2ca1b..d2b3039b8ba4 100644 --- a/x11-fm/gnomemc/distinfo +++ b/x11-fm/gnomemc/distinfo @@ -1 +1 @@ -MD5 (mc-4.5.44.tar.gz) = 517990335f11890697e156dbf2c83717 +MD5 (mc-4.5.48.tar.gz) = 0ed6f7cda24307c13afb0c1d1a9fb7a0 diff --git a/x11-fm/gnomemc/files/patch-af b/x11-fm/gnomemc/files/patch-af index 0bcfb1640fb5..8b71a2fc6a96 100644 --- a/x11-fm/gnomemc/files/patch-af +++ b/x11-fm/gnomemc/files/patch-af @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Sep 23 12:01:07 1999 -+++ Makefile.in Fri Sep 24 16:54:43 1999 +--- 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@ @@ -34,12 +34,12 @@ uninstall: @for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done ---- lib/Makefile.in.orig Sat Mar 18 07:43:44 2000 -+++ lib/Makefile.in Mon Mar 20 10:25:38 2000 +--- 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 + 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 diff --git a/x11-fm/gnomemc/files/patch-ag b/x11-fm/gnomemc/files/patch-ag index 1ac4e786f4de..36ea8fbad6c7 100644 --- a/x11-fm/gnomemc/files/patch-ag +++ b/x11-fm/gnomemc/files/patch-ag @@ -1,92 +1,28 @@ ---- lib/mc.ext.in.orig Thu Jan 28 14:19:18 1999 -+++ lib/mc.ext.in Thu Jan 28 14:21:05 1999 -@@ -367,57 +367,58 @@ - Icon=core.xpm - - type/PostScript -- Open=gv %f -+ Open=ggv %f - Icon=postscript.xpm -+ View=ggv %f - View with GhostView=gv %f - - type/GIF\ image -- Open=ee %f -+ Open=ElectricEyes %f - Icon=gif.xpm - Include=image-options - - type/GIF\ picture -- Open=ee %f -+ Open=ElectricEyes %f - Icon=gif.xpm - Include=image-options - - type/JPEG\ picture -- Open=ee %f -+ Open=ElectricEyes %f - Icon=jpeg.xpm - Include=image-options - - type/PC\ bitmap -- Open=ee %f -+ Open=ElectricEyes %f - Icon=bitmap.xpm - Include=image-options - - type/PNG\ image -- Open=ee %f -+ Open=ElectricEyes %f - Icon=gif.xpm - Include=image-options - - type/JPEG\ image -- Open=ee %f -+ Open=ElectricEyes %f - Icon=jpeg.xpm - Include=image-options - - type/TIFF\ file -- Open=ee %f -+ Open=ElectricEyes %f - Icon=tiff.xpm - Include=image-options - - type/PBM -- Open=ee %f -+ Open=ElectricEyes %f - Icon=pbm.xpm - Include=image-options - - type/PGM -- Open=ee %f -+ Open=ElectricEyes %f - Icon=pgm.xpm - Include=image-options - - type/PPM -- Open=ee %f -+ Open=ElectricEyes %f - Icon=ppm.xpm - Include=image-options - -@@ -426,14 +427,14 @@ - Icon=xbm.xpm - - shell/.xpm -- Open=ee %f -+ Open=ElectricEyes %f - View=sxpm %f - Include=image-options +--- 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 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 Set root window to this image=background-properties --setwallpaper %f & - Display this file=ee %f & + Display this file=ElectricEyes %f & - # Sound files - shell/.mod + + ### Sound files ### +@@ -368,7 +368,7 @@ + + # Postscript + 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 @@ diff --git a/x11-fm/gnomemc/pkg-plist b/x11-fm/gnomemc/pkg-plist index 991e6a110762..381b33d0799c 100644 --- a/x11-fm/gnomemc/pkg-plist +++ b/x11-fm/gnomemc/pkg-plist @@ -6,8 +6,10 @@ 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/deb -- cgit v1.2.3