On Fri, Jan 30, 2015 at 07:04:01PM +0100, Stephan Marwedel wrote:
> My symlinks look like this:
>
> lrwxr-xr-x 1 som users 20B Jan 30 17:15 X11 -> /usr/pkg/include/X11
> lrwxr-xr-x 1 som users 19B Jan 30 17:15 Xm -> /usr/pkg/include/Xm
>
> However, I find in cdesktopenv/cde/config/cf/NetBSD.cf the following
> definitions:
>
> #define LibDir /usr/X11R7/lib/X11
> #define UsrLibDir /usr/X11R7/lib
> #define ManDirectoryRoot /usr/X11R7/man
> #define FontDir /usr/X11R7/lib/X11/fonts
> #define FontEncDir /usr/X11R7/lib/X11/fonts/encodings
>
> This clearly do not point to my X11 installation which is located under
> /usr/pkg
>
> Furthermore, in the file cdesktopenv/cde/config/cf/site.def the definition
>
> #ifndef X11ProjectRoot
> # if defined(LinuxArchitecture)
> # define X11ProjectRoot /usr
> # elif defined(FreeBSDArchitecture)
> # define X11ProjectRoot /usr/local
> # elif defined(SunArchitecture)
> # define X11ProjectRoot /usr
> # elif defined(OpenBSDArchitecture)
> # define X11ProjectRoot /usr/X11R6
> # elif defined(NetBSDArchitecture)
> # define X11ProjectRoot /usr/X11R7 <-- Not correct
> # else for NetBSD modular Xorg
> # define X11ProjectRoot /X11
> # endif
> #endif
>
> I assume that all of these definition must be changed in order to build CDE
> on NetBSD with modular Xorg.
All the ones in NetBSD.cf; I'm not sure about site.cf.
(I wish I knew in what order the *.cf files get included.)
I'd suggest adding something like this towards the top of NetBSD.cf
(above the #define LibDir ...):
XCOMM Set X11ProjectRoot to /usr/X11R7 if the X set was installed,
XCOMM /usr/pkg if X is from pkgsrc.
#ifndef X11ProjectRoot
#define X11ProjectRoot /usr/pkg
#endif
Then replace occurrences of "/usr/X11R7" *following a #define*
with "X11ProjectRoot".
With a sed supporting -i (NetBSD sed did last I knew), here's the command:
sed -e 's:^\(#define.*\)/usr/X11R7/:\1X11ProjectRoot/:g' \
-i cdesktopenv/cde/config/cf/NetBSD.cf
The point here is to make X11ProjectRoot adjust *everything*.
Hope this helps,
Isaac Dunham
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
