Date: Mon, 21 Oct 2024 23:22:21 GMT From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 57adfe949734 - main - deskutils/deforaos-todo: update to version 0.3.1 Message-ID: <202410212322.49LNMLOR073413@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=57adfe94973446bf114d5a405fc2a7e811b29db6 commit 57adfe94973446bf114d5a405fc2a7e811b29db6 Author: Pierre Pronchery <khorben@defora.org> AuthorDate: 2024-10-14 15:29:05 +0000 Commit: Olivier Cochard <olivier@FreeBSD.org> CommitDate: 2024-10-21 23:20:11 +0000 deskutils/deforaos-todo: update to version 0.3.1 Sponsored by: The FreeBSD Foundation --- deskutils/deforaos-todo/Makefile | 36 +++++++++++------------- deskutils/deforaos-todo/distinfo | 5 ++-- deskutils/deforaos-todo/files/patch-doc_Makefile | 16 ++++++++--- deskutils/deforaos-todo/pkg-plist | 10 +++++-- 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/deskutils/deforaos-todo/Makefile b/deskutils/deforaos-todo/Makefile index 936d4d5ac0a5..49b77d19f2f7 100644 --- a/deskutils/deforaos-todo/Makefile +++ b/deskutils/deforaos-todo/Makefile @@ -1,8 +1,7 @@ PORTNAME= todo -PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTVERSION= 0.3.1 CATEGORIES= deskutils -MASTER_SITES= http://www.defora.org/os/download/download/4429/ +MASTER_SITES= https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Todo/ PKGNAMEPREFIX= deforaos- DISTNAME= Todo-${PORTVERSION} @@ -13,21 +12,25 @@ WWW= https://www.defora.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \ - libDesktop.so:x11/deforaos-libdesktop -BUILD_DEPENDS= ${LOCALBASE}/include/Desktop/Mailer/plugin.h:mail/deforaos-mailer +LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \ + libSystem.so:devel/deforaos-libsystem -USES= desktop-file-utils gnome pkgconfig -USE_GNOME= gtk20 +USES= desktop-file-utils gnome pkgconfig xorg +USE_GNOME= gtk30 +USE_XORG= x11 MAKE_ARGS+= PREFIX=${PREFIX} CONFLICTS_INSTALL= devtodo # man/man1/todo.1.gz -OPTIONS_DEFINE= DOCS NLS -OPTIONS_SUB= yes -NLS_USES= gettext -DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ - ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +DOCS_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ + xsltproc:textproc/libxslt +NLS_USES= gettext + +post-patch: + ${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ + ${WRKSRC}/data/pkgconfig.sh post-patch-DOCS-off: ${REINPLACE_CMD} 's|= data doc|= data|' \ @@ -37,13 +40,8 @@ post-patch-NLS-off: ${REINPLACE_CMD} 's|po src tools|src tools|' \ ${WRKSRC}/Makefile -post-patch: - ${REINPLACE_CMD} 's|-Wl,-pie||g' \ - ${WRKSRC}/tools/Makefile \ - ${WRKSRC}/src/Makefile - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/todo \ - ${STAGEDIR}${PREFIX}/lib/Mailer/plugins/todo.so + ${STAGEDIR}${PREFIX}/lib/libTodo.so.0.0 .include <bsd.port.mk> diff --git a/deskutils/deforaos-todo/distinfo b/deskutils/deforaos-todo/distinfo index c6c3352373c4..d3b7f4f486a0 100644 --- a/deskutils/deforaos-todo/distinfo +++ b/deskutils/deforaos-todo/distinfo @@ -1,2 +1,3 @@ -SHA256 (Todo-0.2.1.tar.gz) = 08bbe78cbce11944af962f728463bee3c1dc001e1ebefda19431fa5f258e2a8e -SIZE (Todo-0.2.1.tar.gz) = 29369 +TIMESTAMP = 1728542509 +SHA256 (Todo-0.3.1.tar.gz) = c3293bef3d1bbd7712f13916fb7c004503559dc5420d9ef65c16a6008ddd8368 +SIZE (Todo-0.3.1.tar.gz) = 32445 diff --git a/deskutils/deforaos-todo/files/patch-doc_Makefile b/deskutils/deforaos-todo/files/patch-doc_Makefile index 477ae157fedf..a6db5a667156 100644 --- a/deskutils/deforaos-todo/files/patch-doc_Makefile +++ b/deskutils/deforaos-todo/files/patch-doc_Makefile @@ -1,11 +1,19 @@ ---- doc/Makefile.orig 2016-03-05 17:04:57 UTC +--- doc/Makefile.orig 2024-10-10 06:45:59 UTC +++ doc/Makefile -@@ -30,8 +30,6 @@ distclean: clean +@@ -1,4 +1,4 @@ +-TARGETS = $(OBJDIR)todo.1 $(OBJDIR)todo.html $(OBJDIR)todo.xml ++TARGETS = $(OBJDIR)todo.1 + OBJDIR = + PREFIX = /usr/local + DESTDIR = +@@ -29,10 +29,8 @@ install: all - install: $(TARGETS) + install: all ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)todo.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)todo.html" -- ../tools/subst.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)todo.xml" uninstall: ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "todo.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "todo.html" + + .PHONY: all clean distclean install uninstall diff --git a/deskutils/deforaos-todo/pkg-plist b/deskutils/deforaos-todo/pkg-plist index 03a732b27117..5105eab55764 100644 --- a/deskutils/deforaos-todo/pkg-plist +++ b/deskutils/deforaos-todo/pkg-plist @@ -1,9 +1,15 @@ bin/todo +include/Desktop/Todo.h +lib/libTodo.a +lib/libTodo.so +lib/libTodo.so.0 +lib/libTodo.so.0.0 +libdata/pkgconfig/Todo.pc +%%PORTDOCS%%share/doc/Todo/COPYING %%PORTDOCS%%share/man/man1/todo.1.gz -share/applications/deforaos-todo.desktop +share/applications/org.defora.todo.desktop share/icons/hicolor/16x16/apps/todo.png share/icons/hicolor/24x24/apps/todo.png share/icons/hicolor/48x48/apps/todo.png -lib/Mailer/plugins/todo.so %%NLS%%share/locale/fr/LC_MESSAGES/Todo.mo %%NLS%%share/locale/es/LC_MESSAGES/Todo.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410212322.49LNMLOR073413>