diff options
| author | jlam <jlam> | 2006-06-21 18:33:18 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-21 18:33:18 +0000 |
| commit | 5437085fca0a9263416d317a3270382de955d176 (patch) | |
| tree | ac71f662ef4344116f5aa5dbcb8e8613f52bda46 /misc | |
| parent | 6e84f2a8f114821f4a796df825bd4501a94a9e32 (diff) | |
| download | pkgsrc-5437085fca0a9263416d317a3270382de955d176.tar.gz | |
Improve the error message if an Xserver is not running during
installation. Remove the BROKEN_IN tag as there are extenuating
circumstances for why this can't install. Also, remove some useless
shell commands that should be re-added as MAKE_ENV after more testing
is done.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/hanzim/Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/misc/hanzim/Makefile b/misc/hanzim/Makefile index 2f4b723ad24..5373fddaec6 100644 --- a/misc/hanzim/Makefile +++ b/misc/hanzim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/05/18 20:29:59 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/21 18:33:18 jlam Exp $ # DISTNAME= hanzim-1.3 @@ -11,22 +11,25 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://zakros.ucsd.edu/~arobert/hanzim.html COMMENT= Chinese character learning-aid program -BROKEN_IN= pkgsrc-2006Q1 - WRKSRC= ${WRKDIR}/Hanzim BUILD_TARGET= hanzim -pre-install: - @if [ "$$DISPLAY" = "" ]; then \ - ${ECHO} "${DISTNAME} can only be installed under X11."; \ - exit 1; \ - else \ - ${SETENV} SHELL=${SH:Q}; export LC_CTYPE=en_US.ISO8859-1; \ - fi +# XXX This is presumably needed during installation according to revision +# XXX 1.1 of this Makefile, but needs to be tested. +# XXX +#MAKE_ENV+= SHELL=${SH:Q} LC_CTYPE=en_US.ISO8859-1 .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/x11.buildlink3.mk" + +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" |