--- Makefile.orig	Fri Jan 14 00:00:42 2005
+++ Makefile	Fri Jan 14 00:52:32 2005
@@ -25,12 +25,12 @@
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_SAMBA)
+.if defined(WITH_SAMBA) || !(defined(WITHOUT_SAMBA) || defined(MINIMAL))
 CONFIGURE_ARGS+=--with-samba --with-configdir=${LOCALBASE}/etc \
 		--with-codepagedir=${LOCALBASE}/etc/codepages
 .endif
 
-.if !defined(WITHOUT_ICONV)
+.if defined(WITH_ICONV) || !(defined(WITHOUT_ICONV) || defined(MINIMAL))
 CONFIGURE_ARGS+=--enable-charset
 USE_ICONV=	yes
 PLIST_SUB=	CHARSETS=""
@@ -38,10 +38,17 @@
 PLIST_SUB=	CHARSETS="@comment "
 .endif
 
-.if !defined(WITH_X11)
+.if !defined(WITH_X11) || defined(MINIMAL)
 CONFIGURE_ARGS+=--without-x
 .endif
 
+.if !defined(WITH_EDIT) && (defined(WITHOUT_EDIT) || defined(MINIMAL))
+CONFIGURE_ARGS+=--without-edit
+PLIST_SUB+=	EDITOR="@comment "
+.else
+PLIST_SUB+=	EDITOR=""
+.endif
+
 .if ${ARCH} == "alpha"
 #
 # something is wrong with slang on alpha: mc enters an infinite loop
@@ -49,7 +56,7 @@
 WITHOUT_SLANG=	yes
 .endif
 
-.if defined(WITHOUT_SLANG)
+.if !defined(WITH_SLANG) && (defined(WITHOUT_SLANG) || defined(MINIMAL))
 CONFIGURE_ARGS+=--with-screen=ncurses
 .else
 CONFIGURE_ARGS+=--with-screen=slang
@@ -58,12 +65,14 @@
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
 .endif
 
-.if defined(WITHOUT_SUBSHELL)
+.if !defined(WITH_SUBSHELL) && (defined(WITHOUT_SUBSHELL) || defined(MINIMAL))
 CONFIGURE_ARGS+=--without-subshell
 .endif
 
+.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
--- pkg-plist.orig	Fri Jan 14 00:43:04 2005
+++ pkg-plist	Fri Jan 14 00:56:25 2005
@@ -1,6 +1,6 @@
 bin/mcmfmt
 bin/mc
-bin/mcedit
+%%EDITOR%%bin/mcedit
 bin/mcview
 bin/midc
 share/locale/az/LC_MESSAGES/mc.mo