From nobody Mon Feb 26 17:55:10 2024 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 4Tk7Yq01wGz5BsSX; Mon, 26 Feb 2024 17:55:11 +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 4Tk7Yp5zQyz4k3B; Mon, 26 Feb 2024 17:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708970110; 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=dn6hqyfrRjbObwqSntMyPQoG1fRevSSBkao4yFLtKjM=; b=G6IxJVx4BiXh/mdcP9WOBXQjuUN1qP5hg5Q2coHMys8euwWAmdX+9xFMPgl43VWNFA//Gl O2Izl5QozGP8z2sbDTZ2FGmZS4mW0iChhy3PpsqAYz4SSN4K242+01O0nMUO9Cr7epsk0/ M/MPIZ1ROtmu4Sg6iTHCV2mbmVpr3mKqsBrKW/Wyo1PV5FjHvtfrATuu/dFvwkVTnIT0MY K58vJJ3WEpG3teyYk7yw3ZBMyCWzGXtopb4CQTFgqov23iarOtppdQEf3gV6pLr9tkJYj3 Oct8FXkrEXtlR9sDKlIrnelXr0E58YRHy51V59ErqFZu6FH9bdJ2r2fb8DX4jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708970110; a=rsa-sha256; cv=none; b=Tap+asVINHiNnPXJGMZvPQjKP07RYMKRvsWHgrxsyf33tnWKxIYay0CkhX23NKXNU7tgj3 QK55BK/+KhjIeur7zpBo7FZzZ3CVmD23UPhjZNpv+tY+kgIlRIIzNRAV4HS64DW1iW8xM+ NzXd8qfQoHfJOvwidci8N8rUOFS2hEGLpuflv2tcuHvh0bNSNmSXWVUW6aK7XMhyw6Ba06 eiFh8ypnIbMJA7ZX4qO6NsE72qEXBqCfRn7JwZgD8vtbDpkw/7O9EXtimm94btwQZILsf2 McamYxJRkWPmoA50lymNzPoTYJarSyHFe5bWVqdfHvbzOnNNBwfA1WrcMvo4VQ== 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=1708970110; 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=dn6hqyfrRjbObwqSntMyPQoG1fRevSSBkao4yFLtKjM=; b=uraRmaq7EVWo+jI/RLNXJVpubGePlLruYmsJn740C41zvMQ7oRnKwjr0gcOpESsrkUpstx G4fwjJmdBVnaUqAfG8TA2/oLO+KpgAS7CJseHCnwpRi9iP25aNM6kr5IvZsDjULa5toIgJ 3R+Xc8xPqOh46jVvaaoiEMxcicxId3yaL5aZH2pA2l3FosOYSct2MgOXSKV42p326awQhJ YvcWte6yyauWqiEcqA3mSErQYQBt7yxUnrKMZCm0TUGPrNXGZ4u0TdthrmApKBcPQeJfHI PwPuk0f4KCVBRcOHOqGIFCsZiWLNkSwpOMpmbAj6EBJIsb5z8IrSY3i8oLGpsg== 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 4Tk7Yp542czf5W; Mon, 26 Feb 2024 17:55:10 +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 41QHtAQO063149; Mon, 26 Feb 2024 17:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QHtAIh063146; Mon, 26 Feb 2024 17:55:10 GMT (envelope-from git) Date: Mon, 26 Feb 2024 17:55:10 GMT Message-Id: <202402261755.41QHtAIh063146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 5ffc7be91585 - main - devel/libtai: moved manpages to share/man 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: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ffc7be915856fa656b06fd773d8012f9b4572e5 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ffc7be915856fa656b06fd773d8012f9b4572e5 commit 5ffc7be915856fa656b06fd773d8012f9b4572e5 Author: Rodrigo Osorio AuthorDate: 2024-02-25 11:41:17 +0000 Commit: Rodrigo Osorio CommitDate: 2024-02-26 17:54:38 +0000 devel/libtai: moved manpages to share/man Fix do-install target and plist to install manpages in share/man Reorder and format Makefile to make linter happy --- devel/libtai/Makefile | 24 ++++++++++++------------ devel/libtai/files/patch-Makefile | 4 ++-- devel/libtai/files/patch-conf-ccso | 4 ++-- devel/libtai/files/patch-leadsecs_read.c | 4 ++-- devel/libtai/files/patch-leapsecs.3 | 4 ++-- devel/libtai/files/patch-make-compile.sh | 4 ++-- devel/libtai/files/patch-make-makelibso.sh | 4 ++-- devel/libtai/files/patch-yearcal.c | 4 ++-- devel/libtai/pkg-plist | 22 +++++++++++----------- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/devel/libtai/Makefile b/devel/libtai/Makefile index 9a74731dea5f..3015827a548d 100644 --- a/devel/libtai/Makefile +++ b/devel/libtai/Makefile @@ -1,6 +1,6 @@ PORTNAME= libtai PORTVERSION= 0.60 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MASTER_SITES= http://cr.yp.to/libtai/ \ ftp://ftp.task.gda.pl/mirror/mirror.qmail.org/koobera/pub/software/ @@ -11,16 +11,16 @@ WWW= https://cr.yp.to/libtai.html LICENSE= UNLICENSE -CONFLICTS_INSTALL= mess822 - -ALL_TARGET= it USES= groff USE_LDCONFIG= yes MAKE_ENV= LIBVERSION="${LIBVERSION}" MAKE_JOBS_UNSAFE= yes +ALL_TARGET= it -PLIST_SUB= LIBVERSION=${LIBVERSION} \ - LIBFILE=${LIBFILE} +CONFLICTS_INSTALL= mess822 + +PLIST_SUB= LIBFILE=${LIBFILE} \ + LIBVERSION=${LIBVERSION} MAN_FILES= caldate.3 caldate_mjd.3 caltime.3 caltime_tai.3 leapsecs.3 \ tai.3 tai_now.3 tai_pack.3 taia.3 taia_now.3 taia_pack.3 @@ -40,6 +40,11 @@ do-configure: # update leap seconds table @${CAT} ${FILESDIR}/leapsecs-update.txt >> ${WRKSRC}/leapsecs.txt +post-build: + @${SETENV} LD_LIBRARY_PATH=${WRKSRC} \ + ${WRKSRC}/leapsecs < ${WRKSRC}/leapsecs.txt > \ + ${WRKSRC}/leapsecs.dat + pre-install: # correct header locations inside files .for file in ${HEADER_FILES} @@ -47,15 +52,10 @@ pre-install: ${WRKSRC}/${file} .endfor -post-build: - @${SETENV} LD_LIBRARY_PATH=${WRKSRC} \ - ${WRKSRC}/leapsecs < ${WRKSRC}/leapsecs.txt > \ - ${WRKSRC}/leapsecs.dat - do-install: ${INSTALL_DATA} ${WRKSRC}/leapsecs.dat ${STAGEDIR}${PREFIX}/etc .for i in ${MAN_FILES} - ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/man/man3 + ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/share/man/man3 .endfor .for i in ${PROGRAM_FILES} ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin diff --git a/devel/libtai/files/patch-Makefile b/devel/libtai/files/patch-Makefile index 01e4ba96bd13..776ec2d96c0b 100644 --- a/devel/libtai/files/patch-Makefile +++ b/devel/libtai/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Oct 13 14:52:20 1998 -+++ Makefile Fri Jun 16 20:30:27 2000 +--- Makefile.orig Tue Oct 13 14:52:20 1998 UTC ++++ Makefile @@ -5,10 +5,11 @@ default: it diff --git a/devel/libtai/files/patch-conf-ccso b/devel/libtai/files/patch-conf-ccso index 235040125e43..8b2229b4e728 100644 --- a/devel/libtai/files/patch-conf-ccso +++ b/devel/libtai/files/patch-conf-ccso @@ -1,4 +1,4 @@ ---- conf-ccso.orig Wed Dec 31 21:00:00 1969 -+++ conf-ccso Fri Jun 16 19:17:52 2000 +--- conf-ccso.orig Wed Dec 31 21:00:00 1969 UTC ++++ conf-ccso @@ -0,0 +1 @@ +-fPIC -DPIC diff --git a/devel/libtai/files/patch-leadsecs_read.c b/devel/libtai/files/patch-leadsecs_read.c index 4705cda0fe54..f9cf1a43b559 100644 --- a/devel/libtai/files/patch-leadsecs_read.c +++ b/devel/libtai/files/patch-leadsecs_read.c @@ -1,5 +1,5 @@ ---- leapsecs_read.c.orig Fri Jun 16 22:44:31 2000 -+++ leapsecs_read.c Fri Jun 16 22:45:17 2000 +--- leapsecs_read.c.orig Fri Jun 16 22:44:31 2000 UTC ++++ leapsecs_read.c @@ -18,7 +18,7 @@ int i; struct tai u; diff --git a/devel/libtai/files/patch-leapsecs.3 b/devel/libtai/files/patch-leapsecs.3 index 02d1a1a19eb0..b36f9eafb517 100644 --- a/devel/libtai/files/patch-leapsecs.3 +++ b/devel/libtai/files/patch-leapsecs.3 @@ -1,5 +1,5 @@ ---- leapsecs.3.orig Fri Jun 16 22:44:24 2000 -+++ leapsecs.3 Fri Jun 16 22:44:47 2000 +--- leapsecs.3.orig Fri Jun 16 22:44:24 2000 UTC ++++ leapsecs.3 @@ -52,10 +52,10 @@ .B leapsecs_read diff --git a/devel/libtai/files/patch-make-compile.sh b/devel/libtai/files/patch-make-compile.sh index 611bb2f8fbed..e5a01ec1670f 100644 --- a/devel/libtai/files/patch-make-compile.sh +++ b/devel/libtai/files/patch-make-compile.sh @@ -1,5 +1,5 @@ ---- make-compile.sh.orig Tue Oct 13 14:52:20 1998 -+++ make-compile.sh Fri Jun 16 19:18:35 2000 +--- make-compile.sh.orig Tue Oct 13 14:52:20 1998 UTC ++++ make-compile.sh @@ -1 +1,2 @@ -echo exec "$CC" -c '${1+"$@"}' +echo "$CC" -c '${1+"$@"}' diff --git a/devel/libtai/files/patch-make-makelibso.sh b/devel/libtai/files/patch-make-makelibso.sh index 1a7426e975ab..c2660f9cd14e 100644 --- a/devel/libtai/files/patch-make-makelibso.sh +++ b/devel/libtai/files/patch-make-makelibso.sh @@ -1,5 +1,5 @@ ---- make-makelibso.sh.orig Wed Dec 31 21:00:00 1969 -+++ make-makelibso.sh Fri Jun 16 19:32:24 2000 +--- make-makelibso.sh.orig Wed Dec 31 21:00:00 1969 UTC ++++ make-makelibso.sh @@ -0,0 +1,3 @@ +echo 'main="$1"; shift' +echo 'rm -f "$main"' diff --git a/devel/libtai/files/patch-yearcal.c b/devel/libtai/files/patch-yearcal.c index c12bc4f68956..08aac57665fc 100644 --- a/devel/libtai/files/patch-yearcal.c +++ b/devel/libtai/files/patch-yearcal.c @@ -1,5 +1,5 @@ ---- yearcal.c.orig 1998-10-13 18:52:20.000000000 +0200 -+++ yearcal.c 2011-07-01 09:45:48.000000000 +0200 +--- yearcal.c.orig 1998-10-13 18:52:20 UTC ++++ yearcal.c @@ -16,7 +16,7 @@ , "December" } ; diff --git a/devel/libtai/pkg-plist b/devel/libtai/pkg-plist index 2557c9945b59..640ab6e1a2f5 100644 --- a/devel/libtai/pkg-plist +++ b/devel/libtai/pkg-plist @@ -11,15 +11,15 @@ include/libtai/uint64.h lib/%%LIBFILE%%.a lib/%%LIBFILE%%.so lib/%%LIBFILE%%.so.%%LIBVERSION%% -man/man3/caldate.3.gz -man/man3/caldate_mjd.3.gz -man/man3/caltime.3.gz -man/man3/caltime_tai.3.gz -man/man3/leapsecs.3.gz -man/man3/tai.3.gz -man/man3/tai_now.3.gz -man/man3/tai_pack.3.gz -man/man3/taia.3.gz -man/man3/taia_now.3.gz -man/man3/taia_pack.3.gz +share/man/man3/caldate.3.gz +share/man/man3/caldate_mjd.3.gz +share/man/man3/caltime.3.gz +share/man/man3/caltime_tai.3.gz +share/man/man3/leapsecs.3.gz +share/man/man3/tai.3.gz +share/man/man3/tai_now.3.gz +share/man/man3/tai_pack.3.gz +share/man/man3/taia.3.gz +share/man/man3/taia_now.3.gz +share/man/man3/taia_pack.3.gz @(,,0644) etc/leapsecs.dat