From nobody Thu Nov 14 08:51:44 2024 X-Original-To: dev-commits-ports-branches@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 4Xpv5s0sxBz5cMYT; Thu, 14 Nov 2024 08:51:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xpv5r757Yz4rkM; Thu, 14 Nov 2024 08:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731574305; 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=VR7aSnCuDx5GLsx+2TDcnDFo7jcj8JETx1T/gi0lV4I=; b=euvYm7WllzwV+DrdmPqsH8cf+fKn4dRGUaGMBoXePIo/f/nH03nbFjJyR54F0LN6SLddCy smL4XburAi3yqt6OLYARwzLWYfjq/YYNWpCc9JtBz1+zWTBzvh/1F6P427/VveDRmj9o68 31PwCr32826RcAUqSGRD9xHzZILBTESUA8d7hruVk6Wi/SzQS4fpZa5bzWxyA+eqzCVGP0 +qt5j10GASAcTSAVcFXTuXGhsgHsYuuRZ9tpAmcL6MTJ8G6J0WJv/2Em4XJDdgIOnbpO0k jkOYWFHhqjnm2Fxbm+YAoqUIL5mP1bEhCUFunTg5YjNJ1bZ+xcvntJ6DrUEjBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731574305; 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=VR7aSnCuDx5GLsx+2TDcnDFo7jcj8JETx1T/gi0lV4I=; b=L0WguOBjIgxH2AqMtwxG5qxMUE2vDMVgjuY1dl7iqcohWBH/2F7gv7O2QrL4S36TcZpgMu DdOMbhsEhLAewFMQKr+Qq2YembaLjATwXfb+2Kf9hpLTsn0NIeOdFiqpHvkABS7al9Ebi4 yeIwSTcTme0ThbFVf1Hr+OiMfiHmuTN1d3qddK0o67vrJldbPC/XWP1gRdMVDjTcf1hkEX mPkMRRD30TbQVx5s4LTJrAlBYjAGkguP6dhxzxrm2D5+z2KI6Vga4koACsTPLTQPvN0dvD hFuExut3Hd9+HTjarxR/WuHb06Q8qmN8ZyMb9OJf2U6UG4uk8YsKFsD00HbUoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731574305; a=rsa-sha256; cv=none; b=rRyjOaxFWrNsQS6ozTV+Mi1wVoNhMiUpSYH5KtnGuTX1+/uRO1KXiWRuLH7dds5JibhdjF L7ctIKtjXJjSauVMknbl/23V2B2eNLNY3XcWbB2+hCUDrLXwRouXhKL3JsjoslP7a+5vxK a6wLHWSxHFGB92kZNSwFKoK/jcvm8SP+yj3adF5zx1SOfcySXfKpyEGJbGpsplbHER9dhs 7dF1XWkD7VfDE1TVYrI6/e+LhmVr+Nn5QhmWaJ8nTZRC45S4DJQetZWEW16Lbv/lAN0A0n qCEXpgZ2T1Hkuncy2QPwpEG/t60zWe4QZZwlBJyNh2kzm/uqYOOCZ5G4mE2Q7w== 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 4Xpv5r5rMBzXQQ; Thu, 14 Nov 2024 08:51:44 +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 4AE8pinW036258; Thu, 14 Nov 2024 08:51:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AE8piSa036253; Thu, 14 Nov 2024 08:51:44 GMT (envelope-from git) Date: Thu, 14 Nov 2024 08:51:44 GMT Message-Id: <202411140851.4AE8piSa036253@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: b6d170968ef6 - 2024Q4 - sysutils/ods2: unbreak fetch, fix build on 15-CURRENT, define license List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: b6d170968ef6f5610f82528f9eda8c535fec4e7e Auto-Submitted: auto-generated The branch 2024Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6d170968ef6f5610f82528f9eda8c535fec4e7e commit b6d170968ef6f5610f82528f9eda8c535fec4e7e Author: Robert Clausecker AuthorDate: 2024-11-10 12:42:25 +0000 Commit: Robert Clausecker CommitDate: 2024-11-14 08:47:25 +0000 sysutils/ods2: unbreak fetch, fix build on 15-CURRENT, define license - turn static REINPLACE_CMD into patch file - define LICENSE - host distfile that has gone away locally (port seems import enough to warrant keeping it) - obey CC - link with -lutil to get ftime() on 15-CURRENT, this is harmless on older versions of FreeBSD Approved by: portmgr (build fix, infrastructure blanket) MFH: 2024Q4 (cherry picked from commit 3a14c653f469248012926e196386c487c51fb7ce) --- sysutils/ods2/Makefile | 14 +++++++++----- sysutils/ods2/files/patch-makefile.unix | 11 +++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sysutils/ods2/Makefile b/sysutils/ods2/Makefile index 174b99d60574..87f77fac6820 100644 --- a/sysutils/ods2/Makefile +++ b/sysutils/ods2/Makefile @@ -2,13 +2,21 @@ PORTNAME= ods2 PORTVERSION= 1.3 PORTREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= http://www.lugs.ch/~dussuett/ +MASTER_SITES= LOCAL/fuz DISTNAME= ods2 MAINTAINER= pzn.unixbsd@gmail.com COMMENT= Utility for manipulating ODS-2 filesystems WWW= https://www.goatley.com/hunter/ +LICENSE= ODS2 +LICENSE_NAME= ODS2 +LICENSE_TEXT= ODS2 is distributed freely for all members of the \ + VMS community to use. However all derived works \ + must maintain comments in their source to acknowledge \ + the contibution of the original author. +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + USES= zip NO_WRKSUBDIR= yes MAKEFILE= makefile.unix @@ -19,10 +27,6 @@ PORTDOCS= aareadme.too aareadme.txt OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's|cc |${CC} |; /-oods2/ s|vmstime\.o|& -lcompat|' \ - ${WRKSRC}/${MAKEFILE} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ods2 ${STAGEDIR}${PREFIX}/sbin diff --git a/sysutils/ods2/files/patch-makefile.unix b/sysutils/ods2/files/patch-makefile.unix new file mode 100644 index 000000000000..13f4cffac11d --- /dev/null +++ b/sysutils/ods2/files/patch-makefile.unix @@ -0,0 +1,11 @@ +--- makefile.unix.orig 2001-09-27 00:40:14 UTC ++++ makefile.unix +@@ -6,7 +6,7 @@ ods2 : ods2.o rms.o direct.o update.o access.o device. + all : ods2 + + ods2 : ods2.o rms.o direct.o update.o access.o device.o phyunix.o cache.o vmstime.o +- cc $(CCFLAGS) -oods2 ods2.o rms.o direct.o update.o access.o device.o phyunix.o cache.o vmstime.o ++ $(CC) $(CCFLAGS) -oods2 ods2.o rms.o direct.o update.o access.o device.o phyunix.o cache.o vmstime.o -lcompat -lutil + + vmstime.o : vmstime.c vmstime.h + cc -c $(CCFLAGS) $(DEFS) vmstime.c