From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 21 09:50:25 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1039416A4D8 for ; Sat, 21 Aug 2004 09:50:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6A4943D5F for ; Sat, 21 Aug 2004 09:50:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7L9oOU3087022 for ; Sat, 21 Aug 2004 09:50:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7L9oO1e087015; Sat, 21 Aug 2004 09:50:24 GMT (envelope-from gnats) Resent-Date: Sat, 21 Aug 2004 09:50:24 GMT Resent-Message-Id: <200408210950.i7L9oO1e087015@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Miguel Mendez" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D53016A4CE for ; Sat, 21 Aug 2004 09:48:20 +0000 (GMT) Received: from mindfields.energyhq.es.eu.org (73.Red-213-97-200.pooles.rima-tde.net [213.97.200.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id A045643D3F for ; Sat, 21 Aug 2004 09:48:08 +0000 (GMT) (envelope-from flynn@energyhq.es.eu.org) Received: from scienide.energyhq.es.eu.org (scienide.energyhq.es.eu.org [192.168.100.1]) by mindfields.energyhq.es.eu.org (Postfix) with ESMTP id A28B335867 for ; Sat, 21 Aug 2004 11:47:46 +0200 (CEST) Message-Id: <1093081652.0@scienide.energyhq.es.eu.org> Date: Sat, 21 Aug 2004 11:47:32 +0200 From: "Miguel Mendez" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.3.3 Subject: ports/70762: [Maintainer Update] sysutils/thefish to 0.6.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Aug 2004 09:50:25 -0000 >Number: 70762 >Category: ports >Synopsis: [Maintainer Update] sysutils/thefish to 0.6.1 >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: Sat Aug 21 09:50:24 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@scienide.energyhq.es.eu.org:/usr/obj/usr/src/sys/SCIENIDE >Description: Changelog 0.6 -> 0.6.1 - A small bug in the parser code was fixed. - Minor changes in the Qt interface. - The FreeBSD port was OPTIONS-ified >How-To-Repeat: >Fix: --- thefish.diff begins here --- diff -ruN thefish.old/Makefile thefish/Makefile --- thefish.old/Makefile Tue Aug 10 08:31:08 2004 +++ thefish/Makefile Sat Aug 21 11:06:11 2004 @@ -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 @@ 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) -USE_GNOME= gtk20 -USE_X_PREFIX= yes .endif + +.if defined(WITH_GTK) +USE_GNOME= gtk20 +MAKE_ENV+= WITH_GTK=yes .endif + .if defined(WITH_QT) USE_QT_VER= 3 MAKE_ENV+= WITH_QT=yes @@ -34,15 +50,6 @@ 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 diff -ruN thefish.old/distinfo thefish/distinfo --- thefish.old/distinfo Tue Aug 10 00:39:25 2004 +++ thefish/distinfo Fri Aug 20 17:15:45 2004 @@ -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 diff -ruN thefish.old/pkg-descr thefish/pkg-descr --- thefish.old/pkg-descr Mon May 12 10:08:53 2003 +++ thefish/pkg-descr Sat Aug 21 11:03:55 2004 @@ -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 --- thefish.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: