3 files changed, 51 insertions, 15 deletions

diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 8a7b4c3ed403..702a723a37b1 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -11,29 +11,22 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt/Gtk+/ncurses rc.conf editor/management tool
 
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
-
 WANT_GNOME=	yes
 
-OPTIONS_DEFINE=	X11
-OPTIONS_SINGLE=	X11
+OPTIONS_SINGLE=		X11
 OPTIONS_SINGLE_X11=	GTK2 QT3
-OPTIONS_DEFAULT=	X11 GTK2
+OPTIONS_DEFAULT=	GTK2
 
 QT3_DESC=	Use Qt3 for the X11 interface
 
 .include <bsd.port.options.mk>
 
-.if ! ${PORT_OPTIONS:MX11}
-MAKE_ENV+=	NO_GUI=yes
-.endif
-
-.if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20
 MAKE_ENV+=	WITH_GTK=yes
 .endif
 
-.if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MQT3}
+.if ${PORT_OPTIONS:MQT3}
 USE_QT_VER=	3
 MAKE_ENV+=	WITH_QT=yes
 CXXFLAGS+=	-Wall -DWITH_QT -I${LOCALBASE}/include
@@ -46,8 +39,4 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/thefish ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/thefish.1 ${PREFIX}/man/man1
 
-.if ${OSVERSION} >= 900000
-BROKEN=		does not build
-.endif
-
 .include <bsd.port.mk>
diff --git a/sysutils/thefish/files/patch-Makefile b/sysutils/thefish/files/patch-Makefile
new file mode 100644
index 000000000000..4c816c4abeb8
--- /dev/null
+++ b/sysutils/thefish/files/patch-Makefile
@@ -0,0 +1,25 @@
+--- Makefile.orig	2013-02-18 10:27:09.000000000 +0100
++++ Makefile	2013-02-18 10:28:21.000000000 +0100
+@@ -19,11 +19,11 @@
+ CXXFLAGS+= -Wall -g -DWITH_QT -I$(X11BASE)/include
+ .endif
+ 
+-LDFLAGS= -ldialog -lncurses
++LDFLAGS=
+ 
+ .if defined(WITH_GTK)
+ GTK_LDFLAGS!=pkg-config gtk+-2.0 --libs
+-LDFLAGS+= $(GTK_LDFLAGS) -ldialog -lncurses
++LDFLAGS+= $(GTK_LDFLAGS)
+ .endif
+ 
+ .if defined(WITH_QT)
+@@ -37,7 +37,7 @@
+ PARSER_OBJ=	lex.yy.o parser.o
+ CFLAGS+= -DYY_NO_UNPUT
+ 
+-OBJECTS= $(PARSER_OBJ) main.o file.o ncurses_ui.o
++OBJECTS= $(PARSER_OBJ) main.o file.o
+ 
+ .if defined(WITH_GTK)
+ OBJECTS+= gtk_ui.o
diff --git a/sysutils/thefish/files/patch-main.c b/sysutils/thefish/files/patch-main.c
new file mode 100644
index 000000000000..e9aa10260e18
--- /dev/null
+++ b/sysutils/thefish/files/patch-main.c
@@ -0,0 +1,22 @@
+--- main.c.orig	2013-02-18 10:27:42.000000000 +0100
++++ main.c	2013-02-18 10:28:04.000000000 +0100
+@@ -48,8 +48,6 @@
+ #include "qt_ui.h"
+ #endif
+ 
+-#include "ncurses_ui.h"
+-
+ static void usage(void);
+ static void about(void);
+ void purge(void);
+@@ -181,10 +179,6 @@
+ 		 argc, argv);
+ #endif
+ 
+-  } else {
+-	
+-    create_ncurses_ui(my_rc_defaults);
+-
+   }
+ 
+   return 0;