CVS commit: pkgsrc/misc/plan9port

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed Mar  8 22:30:52 UTC 2023

Modified Files:
        pkgsrc/misc/plan9port: Makefile distinfo
        pkgsrc/misc/plan9port/patches: patch-INSTALL

Log Message:
misc/plan9port: modular xorg fix.

Allow INSTALL script to find the required headers when using
pkgsrc freetype2 and modular X11.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/plan9port/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/plan9port/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/plan9port/patches/patch-INSTALL

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

Modified files:

Index: pkgsrc/misc/plan9port/Makefile
diff -u pkgsrc/misc/plan9port/Makefile:1.4 pkgsrc/misc/plan9port/Makefile:1.5
--- pkgsrc/misc/plan9port/Makefile:1.4  Thu Mar  2 13:58:04 2023
+++ pkgsrc/misc/plan9port/Makefile      Wed Mar  8 22:30:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/03/02 13:58:04 vins Exp $
+# $NetBSD: Makefile,v 1.5 2023/03/08 22:30:52 vins Exp $
 
 DISTNAME=      plan9port-20230123
 CATEGORIES=    misc plan9
@@ -64,8 +64,8 @@ SUBST_MESSAGE.cc=     Defining preferred com
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    pre-configure
 SUBST_FILES.prefix+=   src/cmd/devdraw/mkwsysrules.sh
-SUBST_FILES.prefix+=   plan9.sh acme.sh
-SUBST_VARS.prefix=     PREFIX
+SUBST_FILES.prefix+=   INSTALL plan9.sh acme.sh
+SUBST_VARS.prefix=     PREFIX X11BASE
 SUBST_MESSAGE.prefix=  Replacing PREFIX placeholders.
 
 PLAN9_TARGET=  ${PREFIX}/plan9

Index: pkgsrc/misc/plan9port/distinfo
diff -u pkgsrc/misc/plan9port/distinfo:1.2 pkgsrc/misc/plan9port/distinfo:1.3
--- pkgsrc/misc/plan9port/distinfo:1.2  Thu Mar  2 13:58:04 2023
+++ pkgsrc/misc/plan9port/distinfo      Wed Mar  8 22:30:52 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2023/03/02 13:58:04 vins Exp $
+$NetBSD: distinfo,v 1.3 2023/03/08 22:30:52 vins Exp $
 
 BLAKE2s (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = 99010aa1dc24bbd7a6a2f24fef9f3e2cd525261d1628fcc9405cbfa7ac2acd2f
 SHA512 (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = 
c2c730e478ed3d876dead7cf3ff3d6d24ac37436f18ad478fd61e943248b0e37435520ea6c57fcb398ee7424d7609af3bfb9704f5ac3ddb1a23553cebf906ccd
 Size (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = 23411241 bytes
-SHA1 (patch-INSTALL) = c57b8248b52f4f2143c6b2d67226fb3e0ccfe8a1
+SHA1 (patch-INSTALL) = a20664c816a3c242bb6ca3484bccb84350843122
 SHA1 (patch-bin_9c) = f82600788e2643d9b93941a47774be1b3c79c03b
 SHA1 (patch-bin_9l) = e6daeac87657ed3e25e0f0db403d973f60d544d2
 SHA1 (patch-src_cmd_devdraw_mkwsysrules.sh) = b81252ff054868622e07e743e436ddaad540b9e0

Index: pkgsrc/misc/plan9port/patches/patch-INSTALL
diff -u pkgsrc/misc/plan9port/patches/patch-INSTALL:1.1 pkgsrc/misc/plan9port/patches/patch-INSTALL:1.2
--- pkgsrc/misc/plan9port/patches/patch-INSTALL:1.1     Tue Dec  6 14:29:25 2022
+++ pkgsrc/misc/plan9port/patches/patch-INSTALL Wed Mar  8 22:30:52 2023
@@ -1,21 +1,23 @@
-$NetBSD: patch-INSTALL,v 1.1 2022/12/06 14:29:25 vins Exp $
+$NetBSD: patch-INSTALL,v 1.2 2023/03/08 22:30:52 vins Exp $
 
 Do not filter/redirect stdout/stderr to files making possible
 debugging harder.
 
 Properly honor $CC.
 
---- INSTALL.orig       2022-09-12 14:35:36.000000000 +0000
+--- INSTALL.orig       2023-01-23 20:45:55.000000000 +0000
 +++ INSTALL
-@@ -113,7 +113,7 @@ fi
+@@ -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 \
-+      @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 \
+-          -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