- add hooks and patches that add an ability to use this port as master

for ports/x11-fm/gnomemc
- fix pkg-plist if mc is being built with charset support

5 files changed, 242 insertions, 79 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 2d593b8d483b..52eb658ae16c 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mc
+PORTNAME?=	mc
 PORTVERSION=	4.5.55
-PORTREVISION=	3
-CATEGORIES=	misc
+PORTREVISION?=	3
+CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/mc
 
@@ -25,21 +25,35 @@ LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
+.if ${PORTNAME} == "mc"
 USE_GNOME=	glib12
+.else
+USE_GNOME=	gnomeprefix gnomelibs
+.endif
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 .if !defined(WITHOUT_SLANG)
-CONFIGURE_ARGS=	--with-slang --without-gnome
+CONFIGURE_ARGS=	--with-slang
 .else
-CONFIGURE_ARGS=	--with-ncurses --without-gnome
+CONFIGURE_ARGS=	--with-ncurses
 .endif
 .if !defined(WITHOUT_ICONV)
 CONFIGURE_ARGS+=--enable-charset --with-libiconv-prefix=${LOCALBASE}
+PLIST_SUB=	CHARSETS=""
+.else
+PLIST_SUB=	CHARSETS="@comment "
+.endif
+.if ${PORTNAME} == "mc"
+CONFIGURE_ARGS+=--without-gnome
 .endif
-
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+.if ${PORTNAME} == "mc"
+PLIST_SUB+=	GNOMEMC="@comment " SHARE_PATH="share"
+.else
+PLIST_SUB+=	GNOMEMC="" SHARE_PATH="share/gnome"
+.endif
 
 MAN1=		mc.1 mcedit.1
 
diff --git a/misc/mc/files/patch-gnome::Makefile.in b/misc/mc/files/patch-gnome::Makefile.in
new file mode 100644
index 000000000000..0fc63d352ef6
--- /dev/null
+++ b/misc/mc/files/patch-gnome::Makefile.in
@@ -0,0 +1,11 @@
+--- gnome/Makefile.in.orig	Sun Aug 11 18:29:17 2002
++++ gnome/Makefile.in	Sun Aug 11 18:30:01 2002
+@@ -9,7 +9,7 @@
+ 
+ corbadir   = $(sysconfdir)/CORBA/servers
+ desktopdir = $(mclibdir)/desktop-scripts
+-gnewdir	   = $(prefix)/share/mc/templates
++gnewdir	   = $(mclibdir)/templates
+ gnomeicondir = @gnomeicondir@
+ icondir    = $(datadir)/pixmaps/mc
+ 
diff --git a/misc/mc/files/patch-gnome::gdesktop.c b/misc/mc/files/patch-gnome::gdesktop.c
new file mode 100644
index 000000000000..01cce97d1ec0
--- /dev/null
+++ b/misc/mc/files/patch-gnome::gdesktop.c
@@ -0,0 +1,14 @@
+--- gnome/gdesktop.c.orig	Sun Aug 11 18:35:31 2002
++++ gnome/gdesktop.c	Sun Aug 11 18:37:59 2002
+@@ -3036,9 +3036,9 @@
+ 	strip_tearoff_menu_item (desktop_arrange_icons_items);
+ 	i = strip_tearoff_menu_item (gnome_panel_new_menu);
+ 	shell = gnome_panel_new_menu[0].widget->parent;
+-	file = gnome_unconditional_datadir_file ("mc/templates");
++	file = gnome_unconditional_datadir_file ("gnome/mc/templates");
+ 	i = create_new_menu_from (file, shell, i);
+-	file2 = gnome_datadir_file ("mc/templates");
++	file2 = gnome_datadir_file ("gnome/mc/templates");
+ 	if (file2 != NULL){
+ 		if (strcmp (file, file2) != 0)
+ 			create_new_menu_from (file2, shell, i);
diff --git a/misc/mc/files/patch-gnome::glayout.c b/misc/mc/files/patch-gnome::glayout.c
new file mode 100644
index 000000000000..0a8dc746cf41
--- /dev/null
+++ b/misc/mc/files/patch-gnome::glayout.c
@@ -0,0 +1,18 @@
+--- gnome/glayout.c.orig	Sun Aug 11 18:35:37 2002
++++ gnome/glayout.c	Sun Aug 11 18:37:47 2002
+@@ -625,13 +625,13 @@
+ 
+ 	shell = gnome_panel_new_menu[0].widget->parent;
+ 
+-	file = gnome_unconditional_datadir_file ("mc/templates");
++	file = gnome_unconditional_datadir_file ("gnome/mc/templates");
+ 
+ 	child_list = gtk_container_children (GTK_CONTAINER (shell));
+ 	pos = g_list_length (child_list);
+ 	pos = create_new_menu_from (file, shell, pos);
+ 
+-	file2 = gnome_datadir_file ("mc/templates");
++	file2 = gnome_datadir_file ("gnome/mc/templates");
+ 	if (file2 != NULL){
+ 		if (strcmp (file, file2) != 0)
+ 			create_new_menu_from (file2, shell, pos);
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 3a733a2d88d5..c0a453266a7b 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -1,7 +1,12 @@
+%%GNOMEMC%%bin/gmc
+%%GNOMEMC%%bin/gmc-client
+%%GNOMEMC%%bin/plain-gmc
 bin/mcmfmt
 bin/mc
 bin/mcedit
+bin/mcview
 bin/midc
+%%GNOMEMC%%etc/CORBA/servers/gmc.gnorba
 etc/mc.global
 share/locale/az/LC_MESSAGES/mc.mo
 share/locale/ca/LC_MESSAGES/mc.mo
@@ -33,76 +38,177 @@ share/locale/uk/LC_MESSAGES/mc.mo
 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/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/ftplist
-share/mc/extfs/hp48
-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/ucpio
-share/mc/extfs/uha
-share/mc/extfs/ulha
-share/mc/extfs/unarj.diff
-share/mc/extfs/urar
-share/mc/extfs/uzip
-share/mc/extfs/uzoo
-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.uk
-share/mc/mc.hint.zh
-share/mc/mc.hlp
-share/mc/mc.hlp.hu
-share/mc/mc.lib
-share/mc/mc.menu
-share/mc/syntax/ada95.syntax
-share/mc/syntax/c.syntax
-share/mc/syntax/changelog.syntax
-share/mc/syntax/diff.syntax
-share/mc/syntax/fortran.syntax
-share/mc/syntax/html.syntax
-share/mc/syntax/java.syntax
-share/mc/syntax/latex.syntax
-share/mc/syntax/lsm.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/po.syntax
-share/mc/syntax/python.syntax
-share/mc/syntax/sh.syntax
-share/mc/syntax/slang.syntax
-share/mc/syntax/smalltalk.syntax
-share/mc/syntax/swig.syntax
-share/mc/syntax/texinfo.syntax
-share/mc/syntax/unknown.syntax
-@dirrm share/mc/syntax
-@dirrm share/mc/extfs
-@dirrm share/mc
+%%SHARE_PATH%%/mc/cedit.menu
+%%CHARSETS%%%%SHARE_PATH%%/mc/mc.charsets
+%%SHARE_PATH%%/mc/edit.indent.rc
+%%SHARE_PATH%%/mc/edit.spell.rc
+%%SHARE_PATH%%/mc/extfs/README
+%%SHARE_PATH%%/mc/extfs/a
+%%SHARE_PATH%%/mc/extfs/apt
+%%SHARE_PATH%%/mc/extfs/audio
+%%SHARE_PATH%%/mc/extfs/bpp
+%%SHARE_PATH%%/mc/extfs/deb
+%%SHARE_PATH%%/mc/extfs/deba
+%%SHARE_PATH%%/mc/extfs/debd
+%%SHARE_PATH%%/mc/extfs/dpkg
+%%SHARE_PATH%%/mc/extfs/extfs.ini
+%%SHARE_PATH%%/mc/extfs/ftplist
+%%SHARE_PATH%%/mc/extfs/hp48
+%%SHARE_PATH%%/mc/extfs/lslR
+%%SHARE_PATH%%/mc/extfs/mailfs
+%%SHARE_PATH%%/mc/extfs/patchfs
+%%SHARE_PATH%%/mc/extfs/rpm
+%%SHARE_PATH%%/mc/extfs/rpms
+%%SHARE_PATH%%/mc/extfs/sfs.ini
+%%SHARE_PATH%%/mc/extfs/trpm
+%%SHARE_PATH%%/mc/extfs/uar
+%%SHARE_PATH%%/mc/extfs/uarj
+%%SHARE_PATH%%/mc/extfs/ucpio
+%%SHARE_PATH%%/mc/extfs/uha
+%%SHARE_PATH%%/mc/extfs/ulha
+%%SHARE_PATH%%/mc/extfs/unarj.diff
+%%SHARE_PATH%%/mc/extfs/urar
+%%SHARE_PATH%%/mc/extfs/uzip
+%%SHARE_PATH%%/mc/extfs/uzoo
+%%SHARE_PATH%%/mc/mc.ext
+%%SHARE_PATH%%/mc/mc.hint
+%%SHARE_PATH%%/mc/mc.hint.cs
+%%SHARE_PATH%%/mc/mc.hint.es
+%%SHARE_PATH%%/mc/mc.hint.hu
+%%SHARE_PATH%%/mc/mc.hint.it
+%%SHARE_PATH%%/mc/mc.hint.nl
+%%SHARE_PATH%%/mc/mc.hint.pl
+%%SHARE_PATH%%/mc/mc.hint.ru
+%%SHARE_PATH%%/mc/mc.hint.uk
+%%SHARE_PATH%%/mc/mc.hint.zh
+%%SHARE_PATH%%/mc/mc.hlp
+%%SHARE_PATH%%/mc/mc.hlp.hu
+%%SHARE_PATH%%/mc/mc.lib
+%%SHARE_PATH%%/mc/mc.menu
+%%SHARE_PATH%%/mc/syntax/ada95.syntax
+%%SHARE_PATH%%/mc/syntax/c.syntax
+%%SHARE_PATH%%/mc/syntax/changelog.syntax
+%%SHARE_PATH%%/mc/syntax/diff.syntax
+%%SHARE_PATH%%/mc/syntax/fortran.syntax
+%%SHARE_PATH%%/mc/syntax/html.syntax
+%%SHARE_PATH%%/mc/syntax/java.syntax
+%%SHARE_PATH%%/mc/syntax/latex.syntax
+%%SHARE_PATH%%/mc/syntax/lsm.syntax
+%%SHARE_PATH%%/mc/syntax/mail.syntax
+%%SHARE_PATH%%/mc/syntax/makefile.syntax
+%%SHARE_PATH%%/mc/syntax/ml.syntax
+%%SHARE_PATH%%/mc/syntax/nroff.syntax
+%%SHARE_PATH%%/mc/syntax/octave.syntax
+%%SHARE_PATH%%/mc/syntax/pascal.syntax
+%%SHARE_PATH%%/mc/syntax/perl.syntax
+%%SHARE_PATH%%/mc/syntax/po.syntax
+%%SHARE_PATH%%/mc/syntax/python.syntax
+%%SHARE_PATH%%/mc/syntax/sh.syntax
+%%SHARE_PATH%%/mc/syntax/slang.syntax
+%%SHARE_PATH%%/mc/syntax/smalltalk.syntax
+%%SHARE_PATH%%/mc/syntax/swig.syntax
+%%SHARE_PATH%%/mc/syntax/texinfo.syntax
+%%SHARE_PATH%%/mc/syntax/unknown.syntax
+%%GNOMEMC%%share/gnome/idl/FileManager.idl
+%%GNOMEMC%%share/gnome/mc/desktop-scripts/README.desktop
+%%GNOMEMC%%share/gnome/mc/desktop-scripts/startup.links
+%%GNOMEMC%%share/gnome/mime-info/mc.keys
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-encapsulated_postscript.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-pdf.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-pgp.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-postscript.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-c-header.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-c-source.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-cc-source.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-e-theme.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-generic-spreadsheet.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-gnome-app-info.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-java-source.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-kde-app-info.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-php.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-reject.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-scheme-source.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-application-x-sql.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-basic.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-midi.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-ulaw.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-aiff.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-mod.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-mp3.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-pn-realaudio.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-s3m.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-stm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-voc.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-wav.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-xi.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio-x-xm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-audio.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-compressed.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-core.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-font-afm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-font-ttf.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-font-x-pcf.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-http-url.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-bmp.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-generic.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-gif.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-ief.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-jpeg.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-pbm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-pgm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-png.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-pnm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-ppm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-psd.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-ras.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-rgb.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-tga.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-tiff.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-x-xfig.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-xbm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-xcf.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-xpm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-image-xwd.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-library.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-manpage.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-objectfile.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-pack-deb.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-pack-rpm.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-pack-slp.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-package.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-tex.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-text-html.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-text-x-authors.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-text-x-copying.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-text-x-credits.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-text-x-install.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-text-x-makefile.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-text-x-readme.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-textfile.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-trashcan.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-video-mpeg.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-video-quicktime.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/gnome-video-x-msvideo.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-blockdev.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-cdrom.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-chardev.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-core.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-dirclosed.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-directory.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-executable.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-fifo.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-floppy.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-nfs.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-printer.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-regular.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-sock.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-stalled.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-symlink.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-zipdisk.png
+%%GNOMEMC%%share/gnome/pixmaps/mc/i-zipdisk2.png
+%%GNOMEMC%%@dirrm share/gnome/pixmaps/mc
+%%GNOMEMC%%@dirrm share/gnome/mc/templates
+%%GNOMEMC%%@dirrm share/gnome/mc/desktop-scripts
+@dirrm %%SHARE_PATH%%/mc/syntax
+@dirrm %%SHARE_PATH%%/mc/extfs
+@dirrm %%SHARE_PATH%%/mc