git: fcc556799e7d - main - graphics/telak: Fix build with graphics/imlib2 1.12.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 18 Jan 2024 21:26:23 UTC
The branch main has been updated by ehaupt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fcc556799e7d818af54b9a7433686574e53364a3
commit fcc556799e7d818af54b9a7433686574e53364a3
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-01-18 21:25:38 +0000
Commit: Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2024-01-18 21:26:06 +0000
graphics/telak: Fix build with graphics/imlib2 1.12.1
PR: 276435
---
graphics/telak/Makefile | 6 +++---
graphics/telak/files/patch-Makefile | 9 ++++++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 1485ecbe97dd..4be6d1bcbb56 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -1,7 +1,7 @@
PORTNAME= telak
-PORTVERSION= 0.7
-PORTREVISION= 2
DISTVERSIONPREFIX= v
+DISTVERSION= 0.7
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= ehaupt@FreeBSD.org
@@ -14,7 +14,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libgcrypt.so:security/libgcrypt \
libImlib2.so:graphics/imlib2
-USES= gmake xorg
+USES= gmake pkgconfig xorg
USE_GITHUB= yes
GH_ACCOUNT= jd
USE_XORG= x11
diff --git a/graphics/telak/files/patch-Makefile b/graphics/telak/files/patch-Makefile
index 92b7517734e1..35b08ac3f800 100644
--- a/graphics/telak/files/patch-Makefile
+++ b/graphics/telak/files/patch-Makefile
@@ -1,13 +1,16 @@
+Add minimal support to `pkg-config imlib2`; imlib2-config has been
+dropped since imlib2-1.7.5.
+
--- Makefile.orig 2021-11-19 07:48:49 UTC
+++ Makefile
-@@ -1,8 +1,8 @@
+@@ -1,8 +1,8 @@ O = telak.o fetch.o image.o parse.o toon.o
VERSION = $(shell grep '^Version' ChangeLog | head -n 1 | cut -d' ' -f2 | tr -d ' ')
BIN = telak
O = telak.o fetch.o image.o parse.o toon.o
-LDFLAGS = $(shell imlib2-config --libs) $(shell curl-config --libs) -lgcrypt -lX11
-CFLAGS = -pg -W -Wall $(shell curl-config --cflags) $(shell imlib2-config --cflags) -DTELAK_USER_AGENT="\"$(BIN) $(VERSION)\"" -DTELAK_VERSION="\"$(VERSION)\"" -g
-+LDFLAGS += $(shell imlib2-config --libs) $(shell curl-config --libs) -lgcrypt -lX11
-+CFLAGS += -W -Wall $(shell curl-config --cflags) $(shell imlib2-config --cflags) -DTELAK_USER_AGENT="\"$(BIN) $(VERSION)\"" -DTELAK_VERSION="\"$(VERSION)\""
++LDFLAGS += $(shell pkg-config imlib2 --libs) $(shell curl-config --libs) -lgcrypt -lX11
++CFLAGS += -W -Wall $(shell curl-config --cflags) $(shell pkg-config imlib2 --cflags) -DTELAK_USER_AGENT="\"$(BIN) $(VERSION)\"" -DTELAK_VERSION="\"$(VERSION)\""
BINDIR=$(DESTDIR)/usr/bin
MANDIR=$(DESTDIR)/usr/share/man/man1