From nobody Thu Mar 3 09:06:20 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1087919F7DE8; Thu, 3 Mar 2022 09:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K8Q8D74Pmz4YQw; Thu, 3 Mar 2022 09:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646298381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ao+6Vyk832G1zIV0cLxsfob5R84pm8Uhhr4G4gmJ99E=; b=XNraR6Wt+GhzAG8cvOp2X+gPiZzQNzcod+Xv+AZ/Z8vIhNhtFcGS/Vg+XE8lxsU4N6IXn7 3sSsNxlzxSzxApk1udjUIYdZD2AyD0vbZpv8vnqLUxXUvvIh3OpKGT1RezPELxJf6pEOSr sn7ZLJDsN736y2BmqeWr8YmoUmp3rJvucMtP3C2CBWtwrW2+8AxYXOPOCPkubs9G+kZOcR mAnG8UDoT+eBIh+zIeDGGeF5BKvHcRtv+Xi0TezUTVZkHhRhwkte85G/X8erjSnD9AkBYQ jlKcavZCpojH3GE+mdGrEs8bkpZZBqthpZUDnsc/ClpPE+g9x1zRGmikt46KIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEAB115109; Thu, 3 Mar 2022 09:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22396K0J066094; Thu, 3 Mar 2022 09:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22396KbJ066093; Thu, 3 Mar 2022 09:06:20 GMT (envelope-from git) Date: Thu, 3 Mar 2022 09:06:20 GMT Message-Id: <202203030906.22396KbJ066093@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: ae0a77505bfb - main - graphics/telak: Update to 0.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae0a77505bfbad636374341fc235cb3e45c24f62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646298381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ao+6Vyk832G1zIV0cLxsfob5R84pm8Uhhr4G4gmJ99E=; b=MQdvREOH/VSdAHOtkoHLGq6tmTnEldVKuuERyHR3j2h7ui0LHor4CFtcChupZk5FpL3/Lk ugnMi6PYlwrZwXXnJXuqwkDWdtY5vjAmqbGkLZIuBID6syxK0LVQDuWl7PUzimd5rE8iOU WJ7QRqMFIIDyc247gSLM6vjI7Q52nc+ksbH+Klea40rnw0guAmouUuzViqE2OmMdYmUDXM lbTbwNQCxArfKWRfDhmqnTOT84c15KNjQxTF8J3z9+2FiTlAZm13DcxtqY1f0jsTII1Lf7 Q9njXDI377L3TZR2wRsKs6g9nXoF3yqcIQgU9xOE+waXTsxunVj3Nc0G+XGTsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646298381; a=rsa-sha256; cv=none; b=nbI4NOvNYRa/O5DRvc/y2C8oF0AWNNix42kmVBN1eUeiUuGa7ZDCQX+8dKtDg/QoZmOLDH mc8xZmLFfUvHLLPOlJkcMlzK1BeaGS0g9Gy4yFXiOzPtvE1qGT/LGlCXsreUPLErt46nFO QuTywtFxbVdeTAzlZPoLowNak8KI71e4z3ypOTnopM6n1/DWX+78s81ujrP+yuivmjLZob R1WJ4bQxkCbV7/hVzf7XYxl3PKcNEyTnG2FitL+s6tUKIHP3KzdvHTN9QemFjMvlLNvMEF yRxd3oso36okCZBXdnzePVgweQ5TWGbS3+03qTRYay39kGKQcSHSEmakPoyo7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae0a77505bfbad636374341fc235cb3e45c24f62 commit ae0a77505bfbad636374341fc235cb3e45c24f62 Author: Emanuel Haupt AuthorDate: 2022-03-03 09:05:08 +0000 Commit: Emanuel Haupt CommitDate: 2022-03-03 09:05:08 +0000 graphics/telak: Update to 0.7 - Update WWW - Update URL to sample config --- graphics/telak/Makefile | 11 ++++++----- graphics/telak/distinfo | 5 +++-- graphics/telak/files/install-user | 2 +- graphics/telak/files/patch-Makefile | 8 ++++---- graphics/telak/files/patch-toon.c | 11 ----------- graphics/telak/files/patch-toon.h | 10 ---------- graphics/telak/pkg-descr | 2 +- 7 files changed, 15 insertions(+), 34 deletions(-) diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile index 0d863c1e9488..a73ba9bb7d80 100644 --- a/graphics/telak/Makefile +++ b/graphics/telak/Makefile @@ -1,11 +1,9 @@ # Created by: Emanuel Haupt PORTNAME= telak -PORTVERSION= 0.6 -PORTREVISION= 8 +PORTVERSION= 0.7 +DISTVERSIONPREFIX= v CATEGORIES= graphics -MASTER_SITES= http://julien.danjou.info/telak/ \ - LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Tool to draw pictures on your root window @@ -17,11 +15,14 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libImlib2.so:graphics/imlib2 USES= gmake xorg +USE_GITHUB= yes +GH_ACCOUNT= jd USE_XORG= x11 ALL_TARGET= ${PORTNAME} -PLIST_FILES= bin/telak man/man1/telak.1.gz +PLIST_FILES= bin/telak \ + man/man1/telak.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/graphics/telak/distinfo b/graphics/telak/distinfo index 7035276436b9..f87432110950 100644 --- a/graphics/telak/distinfo +++ b/graphics/telak/distinfo @@ -1,2 +1,3 @@ -SHA256 (telak-0.6.tar.gz) = 6737e15307b580ce61e3b4293c7a68ff46998f1e44051c83920f072c365ec22e -SIZE (telak-0.6.tar.gz) = 18425 +TIMESTAMP = 1646293024 +SHA256 (jd-telak-v0.7_GH0.tar.gz) = 864c0de98434138058471b91f3ab3a40dca859cb2878b731a11befbab9929ee0 +SIZE (jd-telak-v0.7_GH0.tar.gz) = 144237 diff --git a/graphics/telak/files/install-user b/graphics/telak/files/install-user index 8110b67ab02d..4730b99a861b 100644 --- a/graphics/telak/files/install-user +++ b/graphics/telak/files/install-user @@ -8,7 +8,7 @@ cat << "EOF" > $HOME/.telak/telakrc # telakrc - see telak(1) for more config options [example] -url = http://www.critical.ch/telak/d-mon.gif +url = https://critical.ch/telak/d-mon.png x = 15 y = 15 diff --git a/graphics/telak/files/patch-Makefile b/graphics/telak/files/patch-Makefile index e1091860e173..8dc33de4ba06 100644 --- a/graphics/telak/files/patch-Makefile +++ b/graphics/telak/files/patch-Makefile @@ -1,13 +1,13 @@ ---- Makefile.orig 2008-03-20 15:05:59 UTC +--- Makefile.orig 2021-11-19 07:48:49 UTC +++ Makefile @@ -1,8 +1,8 @@ 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 +-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 += $(shell curl-config --cflags) $(shell imlib2-config --cflags) -DTELAK_USER_AGENT="\"$(BIN) $(VERSION)\"" -DTELAK_VERSION="\"$(VERSION)\"" ++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)\"" BINDIR=$(DESTDIR)/usr/bin MANDIR=$(DESTDIR)/usr/share/man/man1 diff --git a/graphics/telak/files/patch-toon.c b/graphics/telak/files/patch-toon.c deleted file mode 100644 index 98f3ceba2f03..000000000000 --- a/graphics/telak/files/patch-toon.c +++ /dev/null @@ -1,11 +0,0 @@ ---- toon.c.orig 2008-02-25 16:41:19 UTC -+++ toon.c -@@ -95,6 +95,8 @@ - #include - #include - -+char toon_message[TOON_MESSAGE_LENGTH]; -+ - /* Time to throw up. Here is a kludgey function that recursively calls - * itself (up to a limit) to find the window ID of the KDE desktop to - * draw on. It works with KDE 2.0, but since KDE 2.0 is less stable diff --git a/graphics/telak/files/patch-toon.h b/graphics/telak/files/patch-toon.h deleted file mode 100644 index e1e9e07b38d5..000000000000 --- a/graphics/telak/files/patch-toon.h +++ /dev/null @@ -1,10 +0,0 @@ ---- toon.h.orig 2008-02-25 16:41:19 UTC -+++ toon.h -@@ -1,6 +1,6 @@ - #include - - #define TOON_MESSAGE_LENGTH 128 --char toon_message[TOON_MESSAGE_LENGTH]; -+/* char toon_message[TOON_MESSAGE_LENGTH]; */ - - Window ToonGetRootWindow(Display *display, int screen, Window *clientparent); diff --git a/graphics/telak/pkg-descr b/graphics/telak/pkg-descr index 2615a21edf90..f55a112760a3 100644 --- a/graphics/telak/pkg-descr +++ b/graphics/telak/pkg-descr @@ -1,4 +1,4 @@ Telak is a small tool to draw local or remote pictures on your root window. This is very useful if you want to have RRD graphs drawn above your wallpaper. -WWW: http://julien.danjou.info/projects/telak +WWW: https://github.com/jd/telak