Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Dec 2024 14:37:00 GMT
From:      Yasuhiro Kimura <yasu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d1f94b3a7ec6 - main - sysutils/lockfile-progs: Update to 0.2.0
Message-ID:  <202412111437.4BBEb0ww094508@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d1f94b3a7ec6bb76e9c4f11d32966260a0fc75e3

commit d1f94b3a7ec6bb76e9c4f11d32966260a0fc75e3
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2024-12-11 14:30:14 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2024-12-11 14:36:01 +0000

    sysutils/lockfile-progs: Update to 0.2.0
    
    ChangeLog:      https://tracker.debian.org/news/1593225/accepted-lockfile-progs-020-source-into-unstable/
---
 sysutils/lockfile-progs/Makefile                | 20 +++++++++++++-------
 sysutils/lockfile-progs/distinfo                |  6 +++---
 sysutils/lockfile-progs/files/patch-GNUmakefile | 11 +++++++++++
 sysutils/lockfile-progs/files/patch-Makefile    | 23 -----------------------
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/sysutils/lockfile-progs/Makefile b/sysutils/lockfile-progs/Makefile
index 648b5321de6f..98bfb6b202ab 100644
--- a/sysutils/lockfile-progs/Makefile
+++ b/sysutils/lockfile-progs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	lockfile-progs
-DISTVERSION=	0.1.20
+DISTVERSION=	0.2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -11,11 +11,17 @@ WWW=		https://tracker.debian.org/pkg/lockfile-progs
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	bash:shells/bash \
+		gsed:textproc/gsed
 LIB_DEPENDS=	liblockfile.so:devel/liblockfile
 
-USES=		tar:xz
+USES=		gmake localbase:ldflags tar:xz
+
+MAKEFILE=	GNUmakefile
+ALL_TARGET=	bin/lockfile-create man/lockfile-progs.1
+
+BINARY_ALIAS=	sed=gsed
 
-ALL_TARGET=	lockfile-create
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 
 PORTDOCS=	changelog
@@ -23,10 +29,10 @@ PORTDOCS=	changelog
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lockfile-create ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/lockfile-progs.1 ${STAGEDIR}${PREFIX}/share/man/man1
-.for f in lockfile-remove lockfile-touch lockfile-check mail-lock mail-unlock \
-	mail-touchlock
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/lockfile-create ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/man/lockfile-progs.1 ${STAGEDIR}${PREFIX}/share/man/man1
+.for f in lockfile-check lockfile-remove lockfile-touch mail-lock mail-touchlock \
+	mail-unlock
 	${LN} ${STAGEDIR}${PREFIX}/bin/lockfile-create ${STAGEDIR}${PREFIX}/bin/${f}
 	${LN} -s lockfile-progs.1 ${STAGEDIR}${PREFIX}/share/man/man1/${f}.1
 .endfor
diff --git a/sysutils/lockfile-progs/distinfo b/sysutils/lockfile-progs/distinfo
index e5a2bd1ca94b..977d91b92df4 100644
--- a/sysutils/lockfile-progs/distinfo
+++ b/sysutils/lockfile-progs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733812293
-SHA256 (lockfile-progs_0.1.20.tar.xz) = 0197e8b7826ce393b0585d345f3dd97e51829aba465a8770b5658837b6d4188c
-SIZE (lockfile-progs_0.1.20.tar.xz) = 14460
+TIMESTAMP = 1733925431
+SHA256 (lockfile-progs_0.2.0.tar.xz) = 2988fb5a8b407e52e2aa6282ce45497f465c921d591138c100f4898215844c90
+SIZE (lockfile-progs_0.2.0.tar.xz) = 15360
diff --git a/sysutils/lockfile-progs/files/patch-GNUmakefile b/sysutils/lockfile-progs/files/patch-GNUmakefile
new file mode 100644
index 000000000000..fee4af184375
--- /dev/null
+++ b/sysutils/lockfile-progs/files/patch-GNUmakefile
@@ -0,0 +1,11 @@
+--- GNUmakefile.orig	2024-12-10 21:05:21 UTC
++++ GNUmakefile
+@@ -10,7 +10,7 @@ cleanfiles += $(generated)
+ generated  += $(patsubst %,man/%.1,$(variants))
+ cleanfiles += $(generated)
+ 
+-CFLAGS := -g -Wall -Wformat-security -Werror -O2 -fwrapv -fno-strict-aliasing $(CFLAGS)
++#CFLAGS := -g -Wall -Wformat-security -Werror -O2 -fwrapv -fno-strict-aliasing $(CFLAGS)
+ CPPFLAGS ?=
+ LDFLAGS ?=
+ 
diff --git a/sysutils/lockfile-progs/files/patch-Makefile b/sysutils/lockfile-progs/files/patch-Makefile
deleted file mode 100644
index 307454a3c047..000000000000
--- a/sysutils/lockfile-progs/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	2024-12-09 19:42:32 UTC
-+++ Makefile
-@@ -1,6 +1,6 @@
- 
--LOADLIBES := -llockfile
--CFLAGS := -g -Wall -Wformat-security -Werror -O2 -fwrapv -fno-strict-aliasing $(CFLAGS)
-+LOADLIBES := -L${LOCALBASE}/lib -llockfile
-+#CFLAGS := -g -Wall -Wformat-security -Werror -O2 -fwrapv -fno-strict-aliasing $(CFLAGS)
- 
- all: lockfile-create
- 	rm -rf bin
-@@ -23,7 +23,10 @@ lockfile-create: lockfile-progs.o
- .PHONY: all
- 
- lockfile-create: lockfile-progs.o
--	${CC} -o $@ ${LDFLAGS} $^ ${LOADLIBES}
-+	${CC} -o $@ ${LDFLAGS} lockfile-progs.o ${LOADLIBES}
-+
-+lockfile-progs.o:
-+	${CC} ${CFLAGS} -c -I${LOCALBASE}/include lockfile-progs.c
- 
- # These tests are quite insufficient, but perhaps better than nothing for now.
- check: all



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412111437.4BBEb0ww094508>