1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00

sysutils/thefish: Update to 0.6.8

Remove options because can choose between GTK2 and Qt3, Qt3 is
outdated.
Project moves to codeberg.
Switch to DISTVERSION.
Add LICENSE_FILE.

PR:		279282
Approved by:	Submitter is maintainer
This commit is contained in:
Chris Hutchinson 2024-07-02 07:22:37 +02:00 committed by Zsolt Udvari
parent 8bf302164a
commit 70a67dbdf6
4 changed files with 16 additions and 63 deletions

View File

@ -1,29 +1,28 @@
PORTNAME= thefish
PORTVERSION= 0.6.7
PORTREVISION= 2
DISTVERSION= 0.6.8
CATEGORIES= sysutils
MASTER_SITES= https://BSDforge.com/projects/source/sysutils/thefish/
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://BSDforge.com/projects/sysutils/thefish
WWW= https://codeberg.org/BSDforge/${PORTNAME}
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= gnome pkgconfig tar:xz
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz
OPTIONS_SINGLE= X11
OPTIONS_SINGLE_X11= GTK2
OPTIONS_DEFAULT= GTK2
USES= gnome pkgconfig
.include <bsd.port.options.mk>
#.if ${PORT_OPTIONS:MGTK2}
USE_GNOME= gtk20
USE_GNOME= cairo gdkpixbuf2 gtk20
MAKE_ENV+= WITH_GTK=yes
#.endif
PLIST_FILES= bin/thefish share/man/man1/thefish.1.gz
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_FILES= bin/thefish \
share/man/man1/thefish.1.gz
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/thefish ${STAGEDIR}${PREFIX}/bin

View File

@ -1,2 +1,3 @@
SHA256 (thefish-0.6.7.tar.xz) = bd40e18d564f799ca0ee814256b6da7bed387d45bcd9c71b901245c53fa39089
SIZE (thefish-0.6.7.tar.xz) = 33364
TIMESTAMP = 1719873774
SHA256 (thefish-0.6.8.tar.gz) = 7d214a4c4c2af9955c71d7cde59fe278dc738666888ac6a2e83f541c7b6173e6
SIZE (thefish-0.6.8.tar.gz) = 43491

View File

@ -1,25 +0,0 @@
--- 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

View File

@ -1,22 +0,0 @@
--- 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;