Attachment #251823 for bug #279282




PORTNAME=	thefish
PORTVERSION=	0.6.8
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	https://codeberg.org/BSDforge/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/

MAINTAINER=	portmaster@BSDforge.com
COMMENT=	Gtk+/ncurses rc.conf editor/management tool
WWW=		https://codeberg.org/BSDforge/${PORTNAME}

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libharfbuzz.so:print/harfbuzz

USES=		gnome pkgconfig
OPTIONS_SINGLE_X11=	GTK2
OPTIONS_DEFAULT=	GTK2

.include <bsd.port.options.mk>

USE_GNOME=	cairo gdkpixbuf2 gtk20
USE_GNOME=	gtk20
MAKE_ENV+=	WITH_GTK=yes
#.endif

PLIST_FILES=	bin/thefish \
		share/man/man1/thefish.1.gz

post-extract:
	${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${DISTVERSION}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/thefish ${STAGEDIR}${PREFIX}/bin

Lines 1-2 Link Here

(-)b/sysutils/thefish/distinfo (-2 / +3 lines)
1	SHA256 (thefish-0.6.7.tar.xz) = bd40e18d564f799ca0ee814256b6da7bed387d45bcd9c71b901245c53fa39089	1	TIMESTAMP = 1719873774
2	SIZE (thefish-0.6.7.tar.xz) = 33364	2	SHA256 (thefish-0.6.8.tar.gz) = 7d214a4c4c2af9955c71d7cde59fe278dc738666888ac6a2e83f541c7b6173e6
		3	SIZE (thefish-0.6.8.tar.gz) = 43491




--- Makefile.orig	2015-11-09 12:52:16.212487000 -0800
+++ Makefile	2015-11-09 12:55:18.251402000 -0800
@@ -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




--- main.c.orig	2015-11-09 12:50:35.505718000 -0800
+++ main.c	2015-11-09 12:51:47.774569000 -0800
@@ -49,8 +49,6 @@
 #include "qt_ui.h"
 #endif
 
-#include "ncurses_ui.h"
-
 static void usage(void);
 static void about(void);
 void purge(void);
@@ -182,10 +180,6 @@
 		 argc, argv);
 #endif
 
-  } else {
-	
-    create_ncurses_ui(my_rc_defaults);
-
   }
 
   return 0;
- 

Return to bug 279282

Lines 1-29 Link Here

(-)b/sysutils/thefish/Makefile (-12 / +14 lines)
1	PORTNAME= thefish	1	PORTNAME= thefish
2	PORTVERSION= 0.6.7	2	PORTVERSION= 0.6.8
3	PORTREVISION= 2
4	CATEGORIES= sysutils	3	CATEGORIES= sysutils
5	MASTER_SITES= https://BSDforge.com/projects/source/sysutils/thefish/	4	MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
6		5
7	MAINTAINER= portmaster@BSDforge.com	6	MAINTAINER= portmaster@BSDforge.com
8	COMMENT= Gtk+/ncurses rc.conf editor/management tool	7	COMMENT= Gtk+/ncurses rc.conf editor/management tool
9	WWW= https://BSDforge.com/projects/sysutils/thefish	8	WWW= https://codeberg.org/BSDforge/${PORTNAME}
10		9
11	LICENSE= BSD2CLAUSE	10	LICENSE= BSD2CLAUSE
		11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	USES= gnome pkgconfig tar:xz	13	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
		14	libfreetype.so:print/freetype2 \
		15	libharfbuzz.so:print/harfbuzz
14		16
15	OPTIONS_SINGLE= X11	17	USES= gnome pkgconfig
16	OPTIONS_SINGLE_X11= GTK2
17	OPTIONS_DEFAULT= GTK2
18		18
19	.include <bsd.port.options.mk>	19	.include <bsd.port.options.mk>
20		20
21	#.if ${PORT_OPTIONS:MGTK2}	21	USE_GNOME= cairo gdkpixbuf2 gtk20
22	USE_GNOME= gtk20
23	MAKE_ENV+= WITH_GTK=yes	22	MAKE_ENV+= WITH_GTK=yes
24	#.endif
25		23
26	PLIST_FILES= bin/thefish share/man/man1/thefish.1.gz	24	PLIST_FILES= bin/thefish \
		25	share/man/man1/thefish.1.gz
		26
		27	post-extract:
		28	${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${DISTVERSION}
27		29
28	do-install:	30	do-install:
29	${INSTALL_PROGRAM} ${WRKSRC}/thefish ${STAGEDIR}${PREFIX}/bin	31	${INSTALL_PROGRAM} ${WRKSRC}/thefish ${STAGEDIR}${PREFIX}/bin

Removed Link Here

(-)a/sysutils/thefish/files/patch-Makefile (-25 lines)
1	--- Makefile.orig 2015-11-09 12:52:16.212487000 -0800
2	+++ Makefile 2015-11-09 12:55:18.251402000 -0800
3	@@ -19,11 +19,11 @@
4	CXXFLAGS+= -Wall -g -DWITH_QT -I$(X11BASE)/include
5	.endif
6
7	-LDFLAGS= -ldialog -lncurses
8	+LDFLAGS=
9
10	.if defined(WITH_GTK)
11	GTK_LDFLAGS!=pkg-config gtk+-2.0 --libs
12	-LDFLAGS+= $(GTK_LDFLAGS) -ldialog -lncurses
13	+LDFLAGS+= $(GTK_LDFLAGS)
14	.endif
15
16	.if defined(WITH_QT)
17	@@ -37,7 +37,7 @@
18	PARSER_OBJ= lex.yy.o parser.o
19	CFLAGS+= -DYY_NO_UNPUT
20
21	-OBJECTS= $(PARSER_OBJ) main.o file.o ncurses_ui.o
22	+OBJECTS= $(PARSER_OBJ) main.o file.o
23
24	.if defined(WITH_GTK)
25	OBJECTS+= gtk_ui.o

Removed Link Here

(-)a/sysutils/thefish/files/patch-main.c (-23 lines)
1	--- main.c.orig 2015-11-09 12:50:35.505718000 -0800
2	+++ main.c 2015-11-09 12:51:47.774569000 -0800
3	@@ -49,8 +49,6 @@
4	#include "qt_ui.h"
5	#endif
6
7	-#include "ncurses_ui.h"
8	-
9	static void usage(void);
10	static void about(void);
11	void purge(void);
12	@@ -182,10 +180,6 @@
13	argc, argv);
14	#endif
15
16	- } else {
17	-
18	- create_ncurses_ui(my_rc_defaults);
19	-
20	}
21
22	return 0;
23	-