head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.26
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.24
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.22
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.20
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.18
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.16
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.14
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.12
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.10
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.8
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.6
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.4
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.2
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.1.0.2
	pkgsrc-2022Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2023.03.08.22.30.52;	author vins;	state Exp;
branches;
next	1.1;
commitid	vylLMVEHq11B6ngE;

1.1
date	2022.12.06.14.29.25;	author vins;	state Exp;
branches;
next	;
commitid	hNjKysmt0gkkpv4E;


desc
@@


1.2
log
@misc/plan9port: modular xorg fix.

Allow INSTALL script to find the required headers when using
pkgsrc freetype2 and modular X11.
@
text
@$NetBSD: patch-INSTALL,v 1.1 2022/12/06 14:29:25 vins Exp $

Do not filter/redirect stdout/stderr to files making possible
debugging harder.

Properly honor $CC.

--- INSTALL.orig	2023-01-23 20:45:55.000000000 +0000
+++ INSTALL
@@@@ -113,8 +113,8 @@@@ fi
 if [ `uname` != Darwin ]; then
 	# Determine whether fontsrv X11 files are available.
 	rm -f a.out
-	cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
-	    -I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \
+	@@CC@@ -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I@@PREFIX@@/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
+	    -I/usr/X11R7/include -I/usr/X11R7/include/freetype2 -I@@X11BASE@@/include -I@@PREFIX@@/include/freetype2 \
 	    -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
 	if [ -f a.out ]; then
 		echo "	fontsrv dependencies found."
@@@@ -139,7 +139,7 @@@@ echo "* Compiler version:"
 cd src
 if $dobuild; then
 	echo "* Building mk..."
-	../dist/buildmk 2>&1 | sed 's/^[+] //'
+	../dist/buildmk 2>&1
 
 	if [ ! -x ../bin/mk ]; then
 		echo "* Error: mk failed to build."
@@@@ -206,5 +206,5 @@@@ if $doinstall; then
 	echo "	PLAN9=$PLAN9 export PLAN9"
 	echo '	PATH=$PATH:$PLAN9/bin export PATH'
 fi
-) 2>&1 | tee install.log | $awk -f $PLAN9/dist/isum.awk -v 'copy='install.sum
+)
 
@


1.1
log
@misc/plan9port: import package from wip.

Plan 9 from User Space (aka plan9port) is a port of many Plan 9
programs from their native Plan 9 environment to Unix-like operating
systems.
@
text
@d1 1
a1 1
$NetBSD$
d8 1
a8 1
--- INSTALL.orig	2022-09-12 14:35:36.000000000 +0000
d10 1
a10 1
@@@@ -113,7 +113,7 @@@@ fi
d15 3
a17 2
+	@@CC@@ -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
 	    -I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \
d20 1
@