Attachment 46010 Details for Bug 70762 – thefish.diff

[patch] thefish.diff

thefish.diff (text/plain), 2.74 KB, created by Miguel Mendez on 2004-08-21 10:50:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Mendez

Created: 2004-08-21 10:50:24 UTC

Size: 2.74 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 70762: 46010