ports/70177: [Maintainer update] sysutils/thefish to 0.6

[Miguel Mendez]

>Number:         70177
>Category:       ports
>Synopsis:       [Maintainer update] sysutils/thefish to 0.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 08 16:30:16 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:


System: FreeBSD 5.2.1-RELEASE-p9 #0: Tue Jul 13 15:09:55 CEST 2004
    root at scienide.energyhq.es.eu.org:/usr/obj/usr/src/sys/SCIENIDE



>Description:


Changelog: 

0.5.1 -> 0.6 

 A new Qt interface was added (can replace the GTK+ one).
 Minor changes in the GTK+ interface.


>How-To-Repeat:





>Fix:


--- thefish.diff begins here ---
diff -ruN thefish.old/Makefile thefish/Makefile
--- thefish.old/Makefile	Mon Apr  5 05:30:15 2004
+++ thefish/Makefile	Sun Aug  8 18:09:49 2004
@@ -6,21 +6,27 @@
 #
 
 PORTNAME=	thefish
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	0.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.energyhq.es.eu.org/files/
 
 MAINTAINER=	flynn at energyhq.es.eu.org
-COMMENT=	Gtk+/ncurses rc.conf editor/management tool
+COMMENT=	Qt/Gtk+/ncurses rc.conf editor/management tool
 
 .if defined(WITHOUT_X11) || defined(NO_GUI)
 NO_GUI=		yes
 MAKE_ENV+=	NO_GUI=yes
 .else
+.if !defined(WITH_QT)
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 .endif
+.endif
+.if defined(WITH_QT)
+USE_QT_VER=	3
+MAKE_ENV+=	WITH_QT=yes
+CXXFLAGS+=	-Wall -DWITH_QT -I${X11BASE}/include
+.endif
 
 MAN1=		thefish.1
 PLIST_FILES=	bin/thefish
@@ -28,6 +34,10 @@
 pre-everything::
 .if !defined(WITHOUT_X11) && !defined(NO_GUI)
 	@${CAT} ${PKGMESSAGE}
+.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:
diff -ruN thefish.old/distinfo thefish/distinfo
--- thefish.old/distinfo	Sun Mar  7 17:31:55 2004
+++ thefish/distinfo	Sun Aug  8 18:00:21 2004
@@ -1,2 +1,2 @@
-MD5 (thefish-0.5.1.tar.gz) = 9bccf2987a19c59bff144364b74c5e6c
-SIZE (thefish-0.5.1.tar.gz) = 37174
+MD5 (thefish-0.6.tar.gz) = d16c7a2d89fe7d96d15ecae1fc67ca72
+SIZE (thefish-0.6.tar.gz) = 41811
diff -ruN thefish.old/pkg-message thefish/pkg-message
--- thefish.old/pkg-message	Mon May 12 10:08:53 2003
+++ thefish/pkg-message	Sun Aug  8 18:13:06 2004
@@ -1,3 +1,2 @@
 ***********************************************************************
-To build The Fish without the GTK+ UI, define NO_GUI or WITHOUT_X11
-***********************************************************************
+- To build The Fish without the Qt or GTK+ UI, define NO_GUI or WITHOUT_X11
--- thefish.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: