Update to 0.6.1

PR:		ports/70762
Submitted by:	maintainer

sysutils/thefish/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	thefish
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.energyhq.es.eu.org/files/
 
@@ -15,17 +14,34 @@ MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	Qt/Gtk+/ncurses rc.conf editor/management tool
 
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		LOCALBASE="${LOCALBASE}"
+		LOCALBASE="${LOCALBASE}" \
+		X11BASE="${X11BASE}"
 
-.if defined(WITHOUT_X11) || defined(NO_GUI)
+WANT_GNOME=	yes
+
+OPTIONS=	CONSOLE "Disable X11 support" off \
+		GTK	"Use GTK+ for the X11 interface" on \
+		QT	"Use Qt for the X11 interface" off
+
+PORT_DBDIR?=	/var/db/ports
+LATEST_LINK=	${PORTNAME}
+OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
+
+.if exists(${OPTIONSFILE})
+.include "${OPTIONSFILE}"
+.endif
+
+# Honour legacy WITHOUT_X11 and NO_GUI and support new options
+.if defined(WITHOUT_X11) || defined(NO_GUI) || defined(WITH_CONSOLE)
 NO_GUI=		yes
 MAKE_ENV+=	NO_GUI=yes
-.else
-.if !defined(WITH_QT)
+.endif
+
+.if defined(WITH_GTK)
 USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
-.endif
+MAKE_ENV+=	WITH_GTK=yes
 .endif
+
 .if defined(WITH_QT)
 USE_QT_VER=	3
 MAKE_ENV+=	WITH_QT=yes
@@ -35,15 +51,6 @@ CXXFLAGS+=	-Wall -DWITH_QT -I${X11BASE}/include
 MAN1=		thefish.1
 PLIST_FILES=	bin/thefish
 
-pre-everything::
-.if !defined(WITHOUT_X11) && !defined(NO_GUI)
-	@${ECHO_CMD} "- To build The Fish without the Qt or GTK+ UI, define NO_GUI or WITHOUT_X11"
-.endif
-.if !defined(WITH_QT) && !defined(NO_GUI) && !defined(WITHOUT_X11)
-	@${ECHO_CMD} "- You can replace the GTK+ interface with a Qt version by defining WITH_QT"
-	@${ECHO_CMD}
-.endif
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/thefish ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/thefish.1 ${PREFIX}/man/man1

sysutils/thefish/distinfo

@@ -1,2 +1,2 @@
-MD5 (thefish-0.6.tar.gz) = 6953ae5e870eb59beaa4e1ba5483eee7
-SIZE (thefish-0.6.tar.gz) = 41866
+MD5 (thefish-0.6.1.tar.gz) = dd345f67bbce2482f184f98c65bbe727
+SIZE (thefish-0.6.1.tar.gz) = 41993

sysutils/thefish/pkg-descr

@@ -1,8 +1,6 @@
-The Fish provides a graphical tool (based on GTK and ncurses) to manage and 
-edit system variables stored in /etc/defaults/rc.conf and /etc/rc.conf. For
-testing purposes, or, for users that need to have different configurations,
-the program honours two environment variables: FISH_RC_DEFAULTS and
-FISH_RC.
+The Fish provides a graphical tool (with GTK+, Qt and ncurses frotends) to 
+manage and edit system variables stored in /etc/defaults/rc.conf and 
+/etc/rc.conf. 
 
 WWW: http://www.energyhq.es.eu.org/thefish.html