git: b6d170968ef6 - 2024Q4 - sysutils/ods2: unbreak fetch, fix build on 15-CURRENT, define license
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Nov 2024 08:51:44 UTC
The branch 2024Q4 has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b6d170968ef6f5610f82528f9eda8c535fec4e7e
commit b6d170968ef6f5610f82528f9eda8c535fec4e7e
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-11-10 12:42:25 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
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