Date: Mon, 18 Feb 2013 09:35:49 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312493 - in head/sysutils/thefish: . files Message-ID: <201302180935.r1I9Znde006257@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Feb 18 09:35:48 2013 New Revision: 312493 URL: http://svnweb.freebsd.org/changeset/ports/312493 Log: - Unbreak by disabling curses-bases GUI, which relied on old libdialog Added: head/sysutils/thefish/files/ head/sysutils/thefish/files/patch-Makefile (contents, props changed) head/sysutils/thefish/files/patch-main.c (contents, props changed) Modified: head/sysutils/thefish/Makefile Modified: head/sysutils/thefish/Makefile ============================================================================== --- head/sysutils/thefish/Makefile Mon Feb 18 09:01:18 2013 (r312492) +++ head/sysutils/thefish/Makefile Mon Feb 18 09:35:48 2013 (r312493) @@ -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> Added: head/sysutils/thefish/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/thefish/files/patch-Makefile Mon Feb 18 09:35:48 2013 (r312493) @@ -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 Added: head/sysutils/thefish/files/patch-main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/thefish/files/patch-main.c Mon Feb 18 09:35:48 2013 (r312493) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302180935.r1I9Znde006257>