pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Warn when PLIST is missing, not just when it is out...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/31e360c8167c
branches:  trunk
changeset: 373137:31e360c8167c
user:      pho <pho%pkgsrc.org@localhost>
date:      Mon Feb 07 02:58:24 2022 +0000

description:
Warn when PLIST is missing, not just when it is outdated

diffstat:

 mk/haskell.mk |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 5946117f2c5b -r 31e360c8167c mk/haskell.mk
--- a/mk/haskell.mk     Mon Feb 07 02:43:42 2022 +0000
+++ b/mk/haskell.mk     Mon Feb 07 02:58:24 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.37 2022/01/18 02:24:36 pho Exp $
+# $NetBSD: haskell.mk,v 1.38 2022/02/07 02:58:24 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # Package configuration, building, installation, registration and
@@ -223,7 +223,7 @@
 PRINT_PLIST_AWK+=      ${!empty(_HS_PLIST.lib.pkg-id):?${_HS_PRINT_PLIST_AWK.lib}:}
 
 .if ${_HS_PLIST_STATUS} == missing || ${_HS_PLIST_STATUS} == outdated
-.  if ${HS_UPDATE_PLIST} == yes
+.  if ${HS_UPDATE_PLIST:tl} == yes
 GENERATE_PLIST+=       ${MAKE} print-PLIST > ${PKGDIR}/PLIST;
 .  endif
 GENERATE_PLIST+=       \
@@ -232,9 +232,14 @@
 PLIST_SRC=             # none
 .endif
 
-.if ${_HS_PLIST_STATUS} == outdated && ${HS_UPDATE_PLIST} == no
+.if ${HS_UPDATE_PLIST:tl} == no
+.  if ${_HS_PLIST_STATUS} == missing
+WARNINGS+=     "[haskell.mk] A PLIST is missing."
+WARNINGS+=     "[haskell.mk] Set HS_UPDATE_PLIST=yes to generate it automatically."
+.  elif ${_HS_PLIST_STATUS} == outdated
 WARNINGS+=     "[haskell.mk] The PLIST format is outdated."
 WARNINGS+=     "[haskell.mk] Set HS_UPDATE_PLIST=yes to update it automatically."
+.  endif
 .endif
 
 # Define configure target. We might not have any working Haskell



Home | Main Index | Thread Index | Old Index