On Thu, Nov 12, 2020 at 08:43:29PM +0000, Stuart Henderson wrote:
> On 2020/11/12 19:42, Caspar Schutijser wrote:
> > - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit
> ..
> > share/doc/monit/
> > -share/doc/monit/README
>
> ${PREFIX}/share/doc/monit/ isn't doing anything useful any more
Thanks, good point! Fixed.
> > -Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279)
> > +Using $< in a non-suffix rule context is a GNUmake idiom.
> > +
> > +Using the "define" directive is a GNUmake idiom.
>
> I think this is ok though it would probably be better to switch to
> USE_GMAKE if it gets much more complex than this.
I was thinking/doubting about that as well. I'll indeed to that if more
patching is required in a next version.
An updated diff follows.
Caspar
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile 14 Sep 2019 21:18:18 -0000 1.64
+++ Makefile 13 Nov 2020 19:00:13 -0000
@@ -2,7 +2,7 @@
COMMENT= monitoring and managing daemons utility
-DISTNAME= monit-5.26.0
+DISTNAME= monit-5.27.1
CATEGORIES= sysutils
@@ -19,6 +19,9 @@ MASTER_SITES= ${HOMEPAGE}/dist/
CONFIGURE_STYLE=gnu
+# Must specify C99 for base-gcc
+CFLAGS+= -std=c99
+
SUBST_VARS= LOCALSTATEDIR
pre-configure:
@@ -26,7 +29,6 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/monit
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit
${INSTALL_DATA} ${WRKSRC}/monitrc ${PREFIX}/share/examples/monit
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo 14 Sep 2019 21:18:18 -0000 1.42
+++ distinfo 13 Nov 2020 19:00:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (monit-5.26.0.tar.gz) = h/xFaKOvmivokEDvsWnjouR7Ji+Z541d3emd2J8C88I=
-SIZE (monit-5.26.0.tar.gz) = 1371327
+SHA256 (monit-5.27.1.tar.gz) = 9XQI0WGFaHUTo8TrPyu3Lu92MxrBYhDpZS6EblyE7VE=
+SIZE (monit-5.27.1.tar.gz) = 1459360
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 14 Sep 2019 21:18:18 -0000 1.4
+++ patches/patch-Makefile_in 13 Nov 2020 19:00:13 -0000
@@ -1,12 +1,26 @@
$OpenBSD: patch-Makefile_in,v 1.4 2019/09/14 21:18:18 sthen Exp $
-Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279)
+Using $< in a non-suffix rule context is a GNUmake idiom.
+
+Using the "define" directive is a GNUmake idiom.
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -1297,7 +1297,7 @@ cleanall: clean distclean
- -rm -rf m4 config
+@@ -1292,11 +1292,6 @@ uninstall-man: uninstall-man1
+ .PRECIOUS: Makefile
+
+
+-define check-exit
+-|| exit 1
+-
+-endef
+-
+ # -------
+ # Targets
+ # -------
+@@ -1331,7 +1326,7 @@ cleanall: clean distclean
+ -git clean -fxd
monit.1: doc/monit.pod
- $(POD2MAN) $(POD2MANFLAGS) $< > $@
@@ -14,3 +28,21 @@ Index: Makefile.in
-rm -f pod2*
# -------------
+@@ -1342,14 +1337,14 @@ src/y.tab.c src/y.tab.h: run-yacc
+
+ .INTERMEDIATE: run-yacc
+ run-yacc: src/p.y
+- $(YACC) $(YACCFLAGS) -o src/y.tab.c $<
++ $(YACC) $(YACCFLAGS) -o src/y.tab.c src/p.y
+
+ src/lex.yy.c: src/l.l
+- $(FLEX) $(FLEXFLAGS) -o$@ $<
++ $(FLEX) $(FLEXFLAGS) -o$@ src/l.l
+ @WITH_CODESIGN_TRUE@all-local: $(bin_PROGRAMS)
+ @WITH_CODESIGN_TRUE@ $(foreach file, $(bin_PROGRAMS), \
+ @WITH_CODESIGN_TRUE@ codesign -s $(CODESIGN_IDENTITY) -v
--deep --timestamp --options runtime $(file) \
+-@WITH_CODESIGN_TRUE@ $(check-exit))
++@WITH_CODESIGN_TRUE@ || exit 1)
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/monit/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 1 May 2019 19:21:57 -0000 1.11
+++ pkg/PLIST 13 Nov 2020 19:00:13 -0000
@@ -2,8 +2,6 @@
@rcscript ${RCDIR}/monit
@bin bin/monit
@man man/man1/monit.1
-share/doc/monit/
-share/doc/monit/README
share/examples/monit/
share/examples/monit/monitrc
@mode 0600
