From nobody Mon Oct 21 23:22:21 2024 X-Original-To: dev-commits-ports-all@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 4XXWYT5fFcz51lXC; Mon, 21 Oct 2024 23:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXWYT2ztFz4s02; Mon, 21 Oct 2024 23:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729552941; 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=V/h0sZ7oWDfxTdw9UNrX6kA7BKmUOrzNcn2hq8setG4=; b=lUN0e9OVnKwCjjedbMXfXdCpcmPCw/vnN8GrY0jYrPTVnYrjjMGB21NTHXQOo6+tgb3/vS 61j/NwfZtZISjAs9R1ZS13YUVS3eJ1wsP4SCOQP5tSmXlbt4N30lfeZYEE8BqEGCt9YWy7 veEvMTL1K4payWbTQy3tgXbs3alLBrw0ALVv0sbtKbjX6vfFAwiML2B6sgaQoNaiqoqfR6 qEw9vaXd3nbl79qcVS8gEkC7hb25vlR3U8m40O0P+1r4l4MJ2NWqx2zNTLH7hoXzB/XZZu k0RbOGyeE56918Y3M2ZhZih0zwj2qXjpCure2fcUl4vaJlQZYPLVHNmHcO9AiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729552941; 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=V/h0sZ7oWDfxTdw9UNrX6kA7BKmUOrzNcn2hq8setG4=; b=Hev/myI7F4fqm7GnCf5KslxOQYXWZqGNAdw3KYozJMOKt2CxgRRppE3rHMoMzOs/HC6iBc MMrnH3dkrQIOsSXOGJoLtdp6LBnZ2C4PjqAVwDuJ/eM1h+lD7HQU/vzhVJ82NmNtKzjZuY ++cVkxZeqr/COMaxZYpx4h+yvHL5dJcGlReE+oAT84t6IkfZCHL7SeXMyogMa9Xj841t1D +8k+KhAZZBWkEn9VmdnBn+Xt0jFwSp+V3kHN14HtONEr97R7ZifWDU8/KCul66ulxjH1sy Y6KVmQ9ypen8xwS3PG7Qgivfpj3fSCblkluE8Mzyw5/B7IFXfkYTfrh3ANwqCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729552941; a=rsa-sha256; cv=none; b=l2/RO02O+hBSxxJoTTpNZb+c3bgFQAjVFJh4xMoDKBIDAC+CGbMdn7A5afc86h1A5ZK8rv RrH+ahgXz85cdIAUIkys6hAXxzP854EoCwDYHsWcNfLiFjBwzWOpboanUVfEerm79YAM3Y JXn9hIsn+7y56hQLZaSi1nbtpgJ3LHBcVZXT2O0ehB+m9JCtre3jE/WNIccbCvHn5oP9J+ 8VMZaOg/91HpS2mMMgitKZkOwsJYAOl5BO7GCzyHVQeB/qiyNSZtURpBKFQRfr5X4iJPS4 p92E+FRQ7UxttT08yrmlL6h3McHn3I4EGIGiOQuXTJvswZsnHuv9tRrrmmoQLw== 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 4XXWYT1qdgzqsm; Mon, 21 Oct 2024 23:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LNML9a073416; Mon, 21 Oct 2024 23:22:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LNMLOR073413; Mon, 21 Oct 2024 23:22:21 GMT (envelope-from git) Date: Mon, 21 Oct 2024 23:22:21 GMT Message-Id: <202410212322.49LNMLOR073413@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 57adfe949734 - main - deskutils/deforaos-todo: update to version 0.3.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57adfe94973446bf114d5a405fc2a7e811b29db6 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=57adfe94973446bf114d5a405fc2a7e811b29db6 commit 57adfe94973446bf114d5a405fc2a7e811b29db6 Author: Pierre Pronchery AuthorDate: 2024-10-14 15:29:05 +0000 Commit: Olivier Cochard 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 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