CVS commit: pkgsrc/mk

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Jun 29 18:07:45 UTC 2020

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
mk/haskell.mk: fix PLIST status detection

Before, running "HS_UPDATE_PLIST=yes bmake update" in wm/xmonad did not
apply the proper substitutions to the generated PLIST file since the
PLIST file was created empty during the GENERATE_PLIST command, and that
empty PLIST file changed the status to "plain" instead of "missing".
Because of that, the HS_INTF and related placeholders were not defined.

The 2 conditions for the status "missing" had to be written in separate
.if clauses because of a bug in bmake that was introduced in 2015 and
will be fixed with the next bmake update.  For further details, see
src/usr.bin/make/unit-tests/cond-short.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/haskell.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.21 pkgsrc/mk/haskell.mk:1.22
--- pkgsrc/mk/haskell.mk:1.21   Sun Jun 21 22:21:02 2020
+++ pkgsrc/mk/haskell.mk        Mon Jun 29 18:07:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.21 2020/06/21 22:21:02 rillig Exp $
+# $NetBSD: haskell.mk,v 1.22 2020/06/29 18:07:45 rillig Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
@@ -218,6 +218,8 @@ CONFIGURE_ARGS+=    -O${HASKELL_OPTIMIZATIO
 
 .if !exists(${PKGDIR}/PLIST)
 _HS_PLIST_STATUS=      missing
+.elif !${${GREP} "." ${PKGDIR}/PLIST || ${TRUE}:L:sh}
+_HS_PLIST_STATUS=      missing
 .elif ${${GREP} HS_INTF ${PKGDIR}/PLIST || ${TRUE}:L:sh}
 _HS_PLIST_STATUS=      lib-ok
 .elif !${${GREP} "/package-id" ${PKGDIR}/PLIST || ${TRUE}:L:sh}