From nobody Sat Sep 23 02:10:31 2023 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 4Rsszq6f78z4tq25; Sat, 23 Sep 2023 02:10:31 +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 4Rsszq62m6z3Nf9; Sat, 23 Sep 2023 02:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695435031; 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=QAuypRuqyaMpoV+Rk9+fIObAcJP/yWqgG3452wWimPY=; b=WMUQ7GYzYZSBBtdAJONfhiHjDmSCSy5Z3qrF2fI6zG2gy2thl1Ye0koO78uJ68ERW+yucw BGqS4iE3vAA6cSN7+viGjJ/NGDMxxxEhXLBIA2IFI1gOehnI2oWoDtiGqzQKIo4VQMigw1 di9P0K8DrIxk03Q+ZDfIE0TW/VQc+tgQ7PZ8/Q2UsPwb3bhzNVVfRF4ho/lnozQGT6iAsq g4TpIPZ+tM+Uhv+b443SjaYQvxdUYOVmDcp/4IWItQJl1NnZeSwB6kq037Mw0IHKcFK+dp WtdsCZR9ldax+lAqSs4OayTVY8ha/lt/uOGLXPw3Wat5Ere4h+wFq0Hdiq9qlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695435031; a=rsa-sha256; cv=none; b=d7XavqzemtnnHwA8KT0hXm41I4kgQUhnrbQOVJS+UU4q2x3z65VXkfI9N/kbtKLNK8F4SI dSlibVNrfXiLNx2sQq1LtII1FCA2XvedXP36A7OFaidb57N0/SKPwJeWCLDdJ2J4s3p6oW c2EMndogTpCMTfrmnuPAm5rNZyUmqBfqpfL0Ctp283N+v+0YPtu7gGN5Y1WhM6l43JK7MN UMBFjhWZOjmSpclQdlAOAOmmNxzmdYaj++8u4TqipoBsX+1hIwhgvzs9KaMp9WMkKaPpge r79z0L1ZfY6aLvkMverRJc6/+cC5WryekhycszQICrDEVSmi/gY+8zqnWWx6jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695435031; 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=QAuypRuqyaMpoV+Rk9+fIObAcJP/yWqgG3452wWimPY=; b=Zp0Hg6HF03gEiGNn2f0jfFUtiNwsVaVo09tynsH8h5SJBfXGe5K6eBdp7K5FWZIYpilUoW mJWHDQie1pGfPlT6WjEQTzQjCwC9xSZKl/EWhpqwu7VFwOvgZiIFFkWgPf8gwvjSVqPTSm IpOEq0Qb7uq2Vvfc32GR6yIP6YLeRgVZEWXNDr9OAMDB/QEJv5MFvJmG/G/v2LcrNFgE1V pJAX+YFKE0AwUSgvlr7gbu+eICtwUadnVpDGaOEajDnccXOks1tYUEfFe7B8O43EU/Zp58 Yn4wUDbZr9RUGqbJpLsvt3/xsGxIr7ZKBfbhG7iyjkqtIqHU+Qly9lY2bAPp1A== 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 4Rsszq55nDzm13; Sat, 23 Sep 2023 02:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38N2AVWs084550; Sat, 23 Sep 2023 02:10:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38N2AVbM084547; Sat, 23 Sep 2023 02:10:31 GMT (envelope-from git) Date: Sat, 23 Sep 2023 02:10:31 GMT Message-Id: <202309230210.38N2AVbM084547@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 04cfaff8c84d - main - textproc/libkolabxml: Update to 1.2.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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04cfaff8c84d18d6ce14583ae6a24c0e5b2f0e88 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=04cfaff8c84d18d6ce14583ae6a24c0e5b2f0e88 commit 04cfaff8c84d18d6ce14583ae6a24c0e5b2f0e88 Author: Jason E. Hale AuthorDate: 2023-09-23 01:53:59 +0000 Commit: Jason E. Hale CommitDate: 2023-09-23 02:10:25 +0000 textproc/libkolabxml: Update to 1.2.1 Upstream doesn't seem to put out pre-made releases anymore and the distfiles are gone for the previous version as it is, so we're rolling our own now from the official git repository. Add script and 'create-distfile' target to make future updates easier. Update WWW and LICENSE --- textproc/libkolabxml/Makefile | 18 +++++--- textproc/libkolabxml/distinfo | 6 +-- .../files/create_libkolabxml_release.sh | 49 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/textproc/libkolabxml/Makefile b/textproc/libkolabxml/Makefile index 4d77de9e5ccc..8cdd4a7e1546 100644 --- a/textproc/libkolabxml/Makefile +++ b/textproc/libkolabxml/Makefile @@ -1,17 +1,17 @@ PORTNAME= libkolabxml -PORTVERSION= 1.1.6 -PORTREVISION= 16 +DISTVERSION= 1.2.1 CATEGORIES= textproc -MASTER_SITES= http://mirror.kolabsys.com/pub/releases/ +MASTER_SITES= LOCAL/kde/${PORTNAME} +DIST_SUBDIR= ${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Kolab XML Format Schema Definitions Library -WWW= http://www.kolab.org/about/libkolabxml +WWW= https://kolab.org/ # The XSD schemas in schemas/ are APACHE20-licensed, and some files # are in public domain. The library itself and the installed headers # are considered LGPL3-licensed, though. -LICENSE= LGPL3 +LICENSE= LGPL3+ BUILD_DEPENDS= xsdcxx:devel/xsd LIB_DEPENDS= libboost_system.so:devel/boost-libs \ @@ -26,10 +26,16 @@ CMAKE_OFF= BUILD_TESTS \ JAVA_BINDINGS \ PHP_BINDINGS \ PYTHON_BINDINGS -USES= cmake +USES= cmake tar:xz USE_CXXSTD= c++11 USE_LDCONFIG= yes PLIST_SUB= SHLIB_VER=${PORTVERSION} +create-distfile: + ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} + ${SH} ${FILESDIR}/create_libkolabxml_release.sh \ + ${DISTDIR}/${DIST_SUBDIR} \ + ${DISTVERSION} + .include diff --git a/textproc/libkolabxml/distinfo b/textproc/libkolabxml/distinfo index 0d91cdfad521..2be902837021 100644 --- a/textproc/libkolabxml/distinfo +++ b/textproc/libkolabxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473183297 -SHA256 (libkolabxml-1.1.6.tar.gz) = e48d7f5de1860a381da27981f6c70de1c9f38c4cd536bc6558b6529ce95f0677 -SIZE (libkolabxml-1.1.6.tar.gz) = 128843 +TIMESTAMP = 1695429252 +SHA256 (libkolabxml/libkolabxml-1.2.1.tar.xz) = b3f0fd0aeb4977d36b273a087c502bfa9c52f262e3b2e3e31f17ae5d43832f51 +SIZE (libkolabxml/libkolabxml-1.2.1.tar.xz) = 105900 diff --git a/textproc/libkolabxml/files/create_libkolabxml_release.sh b/textproc/libkolabxml/files/create_libkolabxml_release.sh new file mode 100644 index 000000000000..97aa044ded9e --- /dev/null +++ b/textproc/libkolabxml/files/create_libkolabxml_release.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +# Creates and updates a git checkout in ${BASE_DIRECTORY} for libkolabxml. +# After that, a new distfile for the ports tree is created. + +PROJECT=libkolabxml +BASE_DIRECTORY="$1" +VERSION="$2" + +# Remote libkolabxml git repository +REPO="https://git.kolab.org/diffusion/LKX/${PROJECT}.git" +# Local checkout +CHECKOUT="${BASE_DIRECTORY}/${PROJECT}" +# Use the default branch +BRANCH=master + +# Make sure we can use ${BASE_DIRECTORY} +if [ ! -d "${BASE_DIRECTORY}" ] || [ ! -w "${BASE_DIRECTORY}" ] ; then + echo "Directory '${BASE_DIRECTORY}' does not exist" + exit 1 +fi + +# Init a new git checkout if it is missing +if [ ! -d "${CHECKOUT}" ] ; then + git -C "${BASE_DIRECTORY}" clone "${REPO}" +fi + +# Update the checkout of the required branch +git -C "${CHECKOUT}" checkout "${BRANCH}" && \ +git -C "${CHECKOUT}" pull --ff-only --rebase --autostash && \ +git -C "${CHECKOUT}" fetch --tags +if [ $? -ne 0 ] ; then + echo "Failed to update ${CHECKOUT}" + exit 1 +fi + +# Set up information for the distfile +DISTNAME="${PROJECT}-${VERSION}" +DISTFILE="${BASE_DIRECTORY}/${DISTNAME}.tar.xz" + +# Tar and compress distfile +git -C ${CHECKOUT} archive --format=tar --prefix="${DISTNAME}/" "${DISTNAME}" | xz > "${DISTFILE}" +if [ $? -ne 0 ] ; then + echo "Failed to create tarball ${DISTFILE}" + exit 1 +fi + +# Print out distfile information +echo -e "Distfile:\t${DISTFILE}"