CVS commit: pkgsrc/misc/hanzim

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov 29 18:46:32 UTC 2024

Modified Files:
        pkgsrc/misc/hanzim: Makefile

Log Message:
hanzim: set PKG_FAIL_REASON if Xorg isn't running

rather than relying on later reporting, refuse to build early.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/misc/hanzim/Makefile

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

Modified files:

Index: pkgsrc/misc/hanzim/Makefile
diff -u pkgsrc/misc/hanzim/Makefile:1.22 pkgsrc/misc/hanzim/Makefile:1.23
--- pkgsrc/misc/hanzim/Makefile:1.22    Sun Nov 12 13:22:45 2023
+++ pkgsrc/misc/hanzim/Makefile Fri Nov 29 18:46:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/11/12 13:22:45 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2024/11/29 18:46:32 nia Exp $
 #
 
 DISTNAME=      hanzim-1.3
@@ -29,6 +29,10 @@ BUILDLINK_TRANSFORM+=        rm:-Werror=char-su
 
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
+.if empty(DISPLAY)
+PKG_FAIL_REASON+=      "requires an Xserver to be running"
+.endif
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
@@ -36,11 +40,4 @@ INSTALLATION_DIRS+=  bin ${PKGMANDIR}/man
 
 CFLAGS+=       -DUSE_INTERP_RESULT
 
-pre-install:
-       @if ${TEST} -z "$$DISPLAY"; then                                \
-               ${ERROR_MSG} "${PKGNAME} runs a binary during installation"; \
-               ${ERROR_MSG} "that requires an Xserver to be running."; \
-               exit 1;                                                 \
-       fi
-
 .include "../../mk/bsd.pkg.mk"