git: b4521d44c7f0 - main - x11-clocks/xdaliclock: Adopt/Update to 2.46
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Aug 2022 01:19:41 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b4521d44c7f02e022fa92fdd445ee4274aa96948
commit b4521d44c7f02e022fa92fdd445ee4274aa96948
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-08-29 01:16:32 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
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 <bsd.port.mk>
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 <gpalmer@FreeBSD.ORG>