Re: install/49870: postinstall script skipping fontconfig check

[Martin Husemann <martin%duskware.de@localhost>]

The following reply was made to PR install/49870; it has been noted by GNATS.

From: Martin Husemann <martin%duskware.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: install/49870: postinstall script skipping fontconfig check
Date: Sat, 2 May 2015 21:05:24 +0200

 I think instead of changing the (documented) default for postinstall(8),
 we should pass the proper arguments from the Makefile (as we certainly
 know the directory there).
 
 The attached (mostly untested) patch should do that - can you give it
 a try?
 
 Thanks,
 
 Martin
 
 (note: this is -current, didn't check wether it applies cleanly, but the
 idea should be obvious)
 
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/src/Makefile,v
 retrieving revision 1.312
 diff -u -r1.312 Makefile
 --- Makefile	7 Jan 2015 20:42:01 -0000	1.312
 +++ Makefile	2 May 2015 19:01:04 -0000
 @@ -181,24 +181,28 @@
  	SED=${TOOL_SED:Q}		\
  	STAT=${TOOL_STAT:Q}
  
 +.if ${MKX11} != "no"
 +_POSTINSTALL_X11=-x ${X11SRCDIR}
 +.endif
 +
  postinstall-check: .PHONY
  	@echo "   === Post installation checks ==="
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
  	@echo "   ================================"
  
  postinstall-fix: .NOTMAIN .PHONY
  	@echo "   === Post installation fixes ==="
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix
  	@echo "   ==============================="
  
  postinstall-fix-obsolete: .NOTMAIN .PHONY
  	@echo "   === Removing obsolete files ==="
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete
  	@echo "   ==============================="
  
  postinstall-fix-obsolete_stand: .NOTMAIN .PHONY
  	@echo "   === Removing obsolete files ==="
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete_stand
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete_stand
  	@echo "   ==============================="