Attachment 251823 Details for Bug 279282 – updated git diff against sysutils/thefish

[patch] updated git diff against sysutils/thefish

0002-sysutils-thefish-update-to-0.6.8-move-to-codeberg.patch (text/plain), 3.91 KB, created by Chris Hutchinson on 2024-07-01 23:04:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2024-07-01 23:04:09 UTC

Size: 3.91 KB

patch

obsolete

>From 27d6ef619a3837e8ca59372a498a6cead32d52b2 Mon Sep 17 00:00:00 2001
>From: Chris Hutchinson <portmaster@BSDforge.com>
>Date: Mon, 1 Jul 2024 15:57:23 -0700
>Subject: [PATCH] sysutils/thefish: update to 0.6.8, move to codeberg
>
>---
> sysutils/thefish/Makefile             | 26 ++++++++++++++------------
> sysutils/thefish/distinfo             |  5 +++--
> sysutils/thefish/files/patch-Makefile | 25 -------------------------
> sysutils/thefish/files/patch-main.c   | 22 ----------------------
> 4 files changed, 17 insertions(+), 61 deletions(-)
> delete mode 100644 sysutils/thefish/files/patch-Makefile
> delete mode 100644 sysutils/thefish/files/patch-main.c
>
>diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
>index 007135c2a611..cf126b452009 100644
>--- a/sysutils/thefish/Makefile
>+++ b/sysutils/thefish/Makefile
>@@ -1,29 +1,31 @@
> PORTNAME=	thefish
>-PORTVERSION=	0.6.7
>-PORTREVISION=	2
>+PORTVERSION=	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
>+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
>diff --git a/sysutils/thefish/distinfo b/sysutils/thefish/distinfo
>index 7deced638353..051961557486 100644
>--- a/sysutils/thefish/distinfo
>+++ b/sysutils/thefish/distinfo
>@@ -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
>diff --git a/sysutils/thefish/files/patch-Makefile b/sysutils/thefish/files/patch-Makefile
>deleted file mode 100644
>index 09ede186f8af..000000000000
>--- a/sysutils/thefish/files/patch-Makefile
>+++ /dev/null
>@@ -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
>diff --git a/sysutils/thefish/files/patch-main.c b/sysutils/thefish/files/patch-main.c
>deleted file mode 100644
>index 3d0b82955764..000000000000
>--- a/sysutils/thefish/files/patch-main.c
>+++ /dev/null
>@@ -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;
>-- 
>2.44.0
>

Flags:

portmaster: maintainer-approval+

Actions: View | Diff

Attachments on bug 279282: 250937 | 251823