Subject: Re: X.org only NetBSD
To: None <tech-pkg@NetBSD.org>
From: Makoto Fujiwara <makoto@ki.nu>
List: tech-pkg
Date: 04/03/2005 01:08:27
Lars> It feels like the Imake.tmpl file is missing in the build wrapper setup.
Lars> Is the real /usr visible for packages during the build process?
Do we need this (hardcoded) change for that kind of situation ?
Index: files/pkgxmkmf.in
===================================================================
RCS file: /e/st4200/cvsync/pkgsrc/pkgtools/xpkgwedge/files/pkgxmkmf.in,v
retrieving revision 1.4
diff -u -r1.4 pkgxmkmf.in
--- files/pkgxmkmf.in 3 Jan 2004 23:34:21 -0000 1.4
+++ files/pkgxmkmf.in 8 Mar 2005 06:45:22 -0000
@@ -10,7 +10,7 @@
usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]"
-xcfgdir=@X11BASE@/lib/X11/config
+xcfgdir=@X11BASE@/libdata/config
lcfgdir=@PREFIX@/lib/X11/config
vcfgdir=@VIEWBASE@/lib/X11/config
configdirspec=''
Index: files/xpkgwedge.def
===================================================================
RCS file: /e/st4200/cvsync/pkgsrc/pkgtools/xpkgwedge/files/xpkgwedge.def,v
retrieving revision 1.12
diff -u -r1.12 xpkgwedge.def
--- files/xpkgwedge.def 31 Jul 2004 01:42:06 -0000 1.12
+++ files/xpkgwedge.def 8 Mar 2005 06:45:22 -0000
@@ -82,7 +82,7 @@
#undef ProjectRoot
#define ProjectRoot $(PREFIX)
#undef ConfigDir
-#define ConfigDir $(X11_ROOT)/lib/X11/config
+#define ConfigDir $(X11_ROOT)/libdata/config
/*
* This emits dual -I and -L options to cc automatically, one for the actual
@@ -118,7 +118,7 @@
* configuration files installed there.
*/
#undef ImakeCmd
-#define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/lib/X11/config
+#define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/libdata/config
#endif
#endif /* AfterVendorCF */
---
Makoto Fujiwara,
Chiba, Japan, Narita Airport and Disneyland prefecture.