imake config files issue on opensuse 11

[Lars Nordlund <lars.nordlund%hem.utfors.se@localhost>]

Hello

I have tested pkgsrc-current on opensuse 11.0 and discovered some
issues. My goal has been to use the native X11 distribution and get
pkgsrc to use it. I quickly ran into a problem with imake. Pkgsrc
thinks that imake's config files are installed in
$X11BASE/lib/X11/config but opensuse uses $X11BASE/share/X11/config.
Also, X11BASE is /usr, but that is easily set in mk.conf.

I ended up inventing a new variable, IMAKE_CONFIG, to control the
location of the config files.

===> lars@glengoyne:~/work/pkgsrc/mk %cvs diff

NetBSD.SE anoncvs mirror. You are welcome to visit us at:

        http://www.netbsd.se/

Index: buildlink3/imake-check
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/imake-check,v
retrieving revision 1.5
diff -u -r1.5 imake-check
--- buildlink3/imake-check      10 Sep 2006 16:39:31 -0000      1.5
+++ buildlink3/imake-check      13 Dec 2008 23:04:55 -0000
@@ -44,6 +44,7 @@
 
 : ${X11BASE:=/usr/X11R6}
 : ${IMAKE:=${X11BASE}/bin/imake}
+: ${IMAKE_CONFIG:=${X11BASE}/lib/X11/config}
 
 : ${CAT:=cat}
 : ${ECHO:=echo}
@@ -86,7 +87,7 @@
 fi
 
 # Run imake to process the Imakefile.
-${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config -s - |
+${IMAKE} -DUseInstalled -I${IMAKE_CONFIG} -s - |
 ${IMAKE_MAKE} -f - builtin-test |
 ${GREP} -q yes
 exitcode="$?"
Index: buildlink3/imake-check.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/imake-check.mk,v
retrieving revision 1.7
diff -u -r1.7 imake-check.mk
--- buildlink3/imake-check.mk   27 Nov 2007 23:06:43 -0000
1.7 +++ buildlink3/imake-check.mk       13 Dec 2008 23:04:55 -0000
@@ -72,6 +72,7 @@
 BUILTIN_IMAKE_CHECK.${pkg}!=                           \
        if ${SETENV} CAT=${CAT:Q} ECHO=${ECHO:Q}
GREP=${GREP:Q}          \ IMAKE=${IMAKE:Q}
IMAKE_MAKE=${IMAKE_MAKE:Q}              \
+
IMAKE_CONFIG=${IMAKE_CONFIG}                            \
MKDIR=${MKDIR:Q} PATH_ORIG=${_PATH_ORIG:Q}              \ RM=${RM:Q}
TEST=${TEST:Q}                          \
X11BASE=${X11BASE:Q}                                    \ Index:
platform/Linux.mk
=================================================================== RCS
file: /cvsroot/pkgsrc/mk/platform/Linux.mk,v retrieving revision 1.33
diff -u -r1.33 Linux.mk
--- platform/Linux.mk   4 Mar 2008 06:45:34 -0000       1.33
+++ platform/Linux.mk   13 Dec 2008 23:04:55 -0000
@@ -5,6 +5,7 @@
 ECHO_N?=       ${ECHO} -n
 .if !defined(X11_TYPE) || ${X11_TYPE} == "native"
 IMAKE_MAKE?=   ${GMAKE}        # program which gets invoked by
imake +IMAKE_CONFIG?=   ${X11BASE}/share/X11/config # imake config
files .endif
 IMAKEOPTS+=    -DBuildHtmlManPages=NO
 PKGLOCALEDIR?= share


As you can see I bluntly assume that all Linux OSes are like this now..
Which is most likely not the case! Some kind of autodetection is needed.

Also.. I had to patch pkgtools/xpkgwedge to propagate the change into
the builds.

===> lars@glengoyne:~/work/pkgsrc/pkgtools/xpkgwedge %cvs diff

NetBSD.SE anoncvs mirror. You are welcome to visit us at:

        http://www.netbsd.se/

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/xpkgwedge/Makefile,v
retrieving revision 1.75
diff -u -r1.75 Makefile
--- Makefile    12 Apr 2008 22:43:09 -0000      1.75
+++ Makefile    13 Dec 2008 23:07:22 -0000
@@ -72,6 +72,7 @@
 SUBST_SED.paths+=      -e 's,@X11BASE@,${X11BASE},g'
 SUBST_SED.paths+=      -e 's,@VIEWBASE@,${VIEWBASE},g'
 SUBST_SED.paths+=      -e 's,@MAKE@,${IMAKE_MAKE},g'
+SUBST_SED.paths+=      -e 's,@IMAKE_CONFIG@,${IMAKE_CONFIG},g'
 SUBST_STAGE.paths=     post-patch
 
 post-extract:
Index: files/pkgxmkmf.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/xpkgwedge/files/pkgxmkmf.in,v
retrieving revision 1.6
diff -u -r1.6 pkgxmkmf.in
--- files/pkgxmkmf.in   14 Jun 2005 20:12:51 -0000      1.6
+++ files/pkgxmkmf.in   13 Dec 2008 23:07:22 -0000
@@ -10,7 +10,7 @@
 
 usage="usage:  $0 [-a] [top_of_sources_pathname [current_directory]]"
 
-xcfgdir=@X11BASE@/lib/X11/config
+xcfgdir=@IMAKE_CONFIG@
 lcfgdir=@PREFIX@/lib/X11/config
 vcfgdir=@VIEWBASE@/lib/X11/config
 configdirspec=''


I hope the above patches are enough for the imake thing.. I find myself
having to patch a bunch of packages to get them to build.


Best regards,
        Lars Nordlund