From nobody Mon Aug 29 01:19:41 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 4MGCK93jNpz4ZsXX; Mon, 29 Aug 2022 01:19:41 +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 4MGCK93ClGz3FRY; Mon, 29 Aug 2022 01:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661735981; 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=XykEKGHDxUCvUMCmmqfko+9Uewi6tOHSwC3elSOQasQ=; b=yz1TOzLkkUUeDQj0dwLXihXOo6qGOnMjgcqfGjom+1ZcoCy3Fz3S25GPnaOQsawKbPiFvL XFSojAw3YeQQPLi3ISpmesfsEIdYYsJAgUUEibu5h7xO09Y1TQrjj+93QjcVejJLd2yOsh gBvR4Px6OPz2KxU2W3DSeFkGlCo/+BEOmpXXnAFaCtO9pwhIyJuXUAmh6IXePfuEq90pV7 1Tpz/yJyjTZydlt3bZB2u6ZmWOZRqZS36rYv5L+6xk2mpO0kMq6pSIaOTQxJbuYv9TRiX4 tA52tZGbLFJ0foWq9iB2GkmwYJICXkSBKXoGHCdZXkwCDD2UKQDd+qJ8Q2y8fQ== 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 4MGCK92Gc1zGgb; Mon, 29 Aug 2022 01:19:41 +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 27T1JfI7033781; Mon, 29 Aug 2022 01:19:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27T1JfaL033780; Mon, 29 Aug 2022 01:19:41 GMT (envelope-from git) Date: Mon, 29 Aug 2022 01:19:41 GMT Message-Id: <202208290119.27T1JfaL033780@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: b4521d44c7f0 - main - x11-clocks/xdaliclock: Adopt/Update to 2.46 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4521d44c7f02e022fa92fdd445ee4274aa96948 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661735981; 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=XykEKGHDxUCvUMCmmqfko+9Uewi6tOHSwC3elSOQasQ=; b=VVQY7fVpRGnxwwmVPnDbKBtRgICA7kFraqKA3eeh4l1O9HmGSAHq4Aq7mQM/cLk0vj+p0L MdyYpNsO5KwGNfYPMI5+fSsU3Hi3Y4DmyLmyx9ym6Kr2GRbTmf0jqIwnqyns5JrxJbODOE /i/tcJpN08hZfQmVJc4LlFyKvAeM48mSkY/TmmaiSpLhINSaxmICvAxzrgcsvD9yG5UTW4 wRxNXA+I3GzOg6IOhKnpsI0xGbb+MhhbP3c3RR8tJxiKkZNBtlrWqGUQdIj8Z0D/hngzzl Q+Qm6nymyk0p55QEv1CBRLMYZodNu8AaGxmsZABq6rQWvPPtIjdC5cEWOK5mbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661735981; a=rsa-sha256; cv=none; b=hamYPEY2sVVSOvD+uT5tlETwb1Wzc+88q3zHgM19tPfu4Hq6U+o3lazw75n0keycTZOvwd ma+K0ks7hHvGYYVyxs14H4eHPc/I8+4V9y6yHnVT93tZhzMXK2uka0x5GvMFP6mTD3ikjQ 5CrnEwAod5VeKRnVb1TnNqnF7QJlshUZBinsZJK6/UwkV6lyrWvLoyf/JLuXmrDp/8fo+5 L4FV3vxDqhE1p8v/L/f7QtgeR7rS7WXoJiecMUpXqQnXDBQi3c8+1bc7tbtprkgjSpaSUR OsLWcgTg2Y/EhOdoTm0e31GBW1ztP/runPRdi53IPZ3MzHh4ps9OHIxaNeUuOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4521d44c7f02e022fa92fdd445ee4274aa96948 commit b4521d44c7f02e022fa92fdd445ee4274aa96948 Author: Nuno Teixeira AuthorDate: 2022-08-29 01:16:32 +0000 Commit: Nuno Teixeira CommitDate: 2022-08-29 01:19:27 +0000 x11-clocks/xdaliclock: Adopt/Update to 2.46 ChangeLog: https://www.jwz.org/blog/2022/08/dali-clock-2-46-released/ PR: 266082 --- x11-clocks/xdaliclock/Makefile | 28 +++++++++--- x11-clocks/xdaliclock/distinfo | 6 +-- x11-clocks/xdaliclock/files/patch-Makefile.in | 62 ++++++++++++++++++++++----- x11-clocks/xdaliclock/pkg-descr | 2 +- 4 files changed, 77 insertions(+), 21 deletions(-) diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile index 1ffda13d52d5..daf84a221a8e 100644 --- a/x11-clocks/xdaliclock/Makefile +++ b/x11-clocks/xdaliclock/Makefile @@ -1,16 +1,30 @@ PORTNAME= xdaliclock -PORTVERSION= 2.44 +DISTVERSION= 2.46 CATEGORIES= x11-clocks -MASTER_SITES= http://www.jwz.org/xdaliclock/ +MASTER_SITES= https://www.jwz.org/${PORTNAME}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eduardo@FreeBSD.org COMMENT= Rather neat animated clock -WRKSRC= ${WRKDIR}/${DISTNAME}/X11 +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz + +USES= gl gmake gnome pkgconfig +USE_GL= gl +USE_GNOME= cairo gdkpixbuf2 gtk30 + +GLIB_SCHEMAS= org.jwz.xdaliclock.gschema.xml GNU_CONFIGURE= yes -USES= xorg -USE_XORG= xt sm ice xext x11 -PLIST_FILES= bin/xdaliclock man/man1/${PORTNAME}.1.gz +WRKSRC= ${WRKDIR}/${DISTNAME}/X11 + +PLIST_FILES= bin/xdaliclock \ + man/man1/xdaliclock.1.gz \ + share/applications/xdaliclock.desktop \ + share/glib-2.0/schemas/gschemas.compiled \ + share/pixmaps/xdaliclock.png + +# workaround: missing share/glib-2.0/schemas in stage +pre-install: + ${MKDIR} ${STAGEDIR}/${PREFIX}/share/glib-2.0/schemas .include diff --git a/x11-clocks/xdaliclock/distinfo b/x11-clocks/xdaliclock/distinfo index ad9ccf708b72..936e9309e630 100644 --- a/x11-clocks/xdaliclock/distinfo +++ b/x11-clocks/xdaliclock/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547035290 -SHA256 (xdaliclock-2.44.tar.gz) = 800db9ad00adaeb73079370fb64452230ff186e670b6fbd36315506caab64fbf -SIZE (xdaliclock-2.44.tar.gz) = 17727649 +TIMESTAMP = 1661726886 +SHA256 (xdaliclock-2.46.tar.gz) = 320b49e673068697d2ac6dd84771f243bda215305817285fc21e52efc24162e4 +SIZE (xdaliclock-2.46.tar.gz) = 3400980 diff --git a/x11-clocks/xdaliclock/files/patch-Makefile.in b/x11-clocks/xdaliclock/files/patch-Makefile.in index f08c1bf7fb0e..69331e439734 100644 --- a/x11-clocks/xdaliclock/files/patch-Makefile.in +++ b/x11-clocks/xdaliclock/files/patch-Makefile.in @@ -1,15 +1,57 @@ ---- Makefile.in.orig 2018-12-26 10:10:53 UTC +--- Makefile.in.orig 2022-08-28 18:52:55 UTC +++ Makefile.in -@@ -79,10 +79,10 @@ install-strip: - install +@@ -92,35 +92,35 @@ $(install_prefix)$(SCHEMA_DIR): + $(install_prefix)$(GTK_APPDIR) \ + $(install_prefix)$(GTK_ICONDIR) \ + $(install_prefix)$(SCHEMA_DIR): +- mkdir -p $@ ++# mkdir -p $@ - install-program: xdaliclock -- $(INSTALL_PROGRAM) xdaliclock $(install_prefix)$(bindir)/xdaliclock -+ $(INSTALL_PROGRAM) xdaliclock $(DESTDIR)$(install_prefix)$(bindir)/xdaliclock + install-program: xdaliclock $(install_prefix)$(bindir) +- $(INSTALL_PROGRAM) $< $(install_prefix)$(bindir)/xdaliclock ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(install_prefix)$(bindir)/xdaliclock + + # If /usr/share/glib-2.0/schemas/org.jwz.xdaliclock.gschema.xml" does + # not exist, the app won't launch. This is an amazing design. Spectacular. + # No notes. + # + install-schema: $(SCHEMA) $(install_prefix)$(SCHEMA_DIR) +- $(INSTALL_DATA) $< $(install_prefix)$(SCHEMA_DIR)/ +- $(GLIB_COMPILE_SCHEMAS) $(install_prefix)$(SCHEMA_DIR) ++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(SCHEMA_DIR)/ ++ $(GLIB_COMPILE_SCHEMAS) $(DESTDIR)$(install_prefix)$(SCHEMA_DIR) + + # /usr/share/pixmaps/xdaliclock.png + install-gnome:: $(LOGO) $(install_prefix)$(GTK_ICONDIR) +- $(INSTALL_DATA) $< $(install_prefix)$(GTK_ICONDIR)/ ++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(GTK_ICONDIR)/ + + # /usr/share/applications/xdaliclock.desktop + install-gnome:: $(DESK) $(install_prefix)$(GTK_APPDIR) +- $(INSTALL_DATA) $< $(install_prefix)$(GTK_APPDIR)/ ++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(GTK_APPDIR)/ + + # /usr/share/pixmaps/index.theme + install-gnome:: update-icon-caches + update-icon-caches:: + @\ +- for f in $(install_prefix)$(datadir)/icons/index.theme \ +- $(install_prefix)$(datadir)/icons/*/index.theme \ +- $(install_prefix)$(datadir)/pixmaps/index.theme \ +- $(install_prefix)$(datadir)/pixmaps/*/index.theme ; do \ ++ for f in $(DESTDIR)$(install_prefix)$(datadir)/icons/index.theme \ ++ $(DESTDIR)$(install_prefix)$(datadir)/icons/*/index.theme \ ++ $(DESTDIR)$(install_prefix)$(datadir)/pixmaps/index.theme \ ++ $(DESTDIR)$(install_prefix)$(datadir)/pixmaps/*/index.theme ; do \ + if [ -f $$f ]; then \ + f=`dirname $$f` ; \ + echo $(UPDATE_ICON_CACHE) --force --quiet $$f ; \ +@@ -129,7 +129,7 @@ install-man: xdaliclock.man $(install_prefix)$(man1dir + done + + install-man: xdaliclock.man $(install_prefix)$(man1dir) +- $(INSTALL_DATA) $< $(install_prefix)$(man1dir)/xdaliclock.$(mansuffix) ++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(man1dir)/xdaliclock.$(mansuffix) - install-man: xdaliclock.man -- $(INSTALL_DATA) $(srcdir)/xdaliclock.man $(install_prefix)$(man1dir)/xdaliclock.1 -+ $(INSTALL_DATA) $(srcdir)/xdaliclock.man $(DESTDIR)$(install_prefix)$(man1dir)/xdaliclock.1 uninstall-program: - rm -f $(install_prefix)$(bindir)/xdaliclock diff --git a/x11-clocks/xdaliclock/pkg-descr b/x11-clocks/xdaliclock/pkg-descr index 32316fb33f57..eb98eed3ba1f 100644 --- a/x11-clocks/xdaliclock/pkg-descr +++ b/x11-clocks/xdaliclock/pkg-descr @@ -2,6 +2,6 @@ This is a neat program which ``morphs'' each of the digits into the next in the sequence to update the time. Good processor hog for all you P90 owners. -WWW: http://www.jwz.org/xdaliclock/ +WWW: https://www.jwz.org/xdaliclock/ Gary Palmer