[pkgsrc/trunk]: pkgsrc/x11/xorg-imake As suggested by Kouichirou Hiratsuka in...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ab489064f0f
branches:  trunk
changeset: 478837:4ab489064f0f
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Jul 31 01:37:23 2004 +0000

description:
As suggested by Kouichirou Hiratsuka in PR pkg/26483, move
ProjectRoot definition inside #ifdef BeforeVendorCF, otherwise
it's overwritten by xpkgwedge two times.

Finally xpkgwedge works, bump PKGREVISION.

diffstat:

 x11/xorg-imake/Makefile       |  30 ++++++++++++++++++++++--------
 x11/xorg-imake/files/host.def |   2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 62aef33e5f88 -r 4ab489064f0f x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile   Sat Jul 31 01:25:33 2004 +0000
+++ b/x11/xorg-imake/Makefile   Sat Jul 31 01:37:23 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/07/30 22:47:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/31 01:37:23 xtraeme Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-imake-${XORG_VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG}
 DISTFILES=     X11R6.7.0-src1.tar.gz X11R6.7.0-src3.tar.gz
@@ -17,7 +17,6 @@
 USE_DIRS+=             xorg-1.1
 INSTALL_TARGET=                install install.man
 NO_XORG_TARGETS=       yes
-CHECK_X11_TYPE=                yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -42,10 +41,10 @@
 
 pre-configure:
 .for F in ${SYSTEMS}
-       @${SED} -e "s|@@PKGSRC_CC@@|${CC}|g" \
-               -e "s|@@PKGSRC_CPP@@|${CPP}|g" \
-               -e "s|@@PKGSRC_CXX@@|${CXX}|g" \
-               -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \
+       @${SED} -e "s|@@PKGSRC_CC@@|${CC}|g"            \
+               -e "s|@@PKGSRC_CPP@@|${CPP}|g"          \
+               -e "s|@@PKGSRC_CXX@@|${CXX}|g"          \
+               -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g"    \
                ${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf
 .endfor
 .undef F
@@ -63,7 +62,7 @@
                -e "s|@LOCALBASE@|${LOCALBASE}|g "      \
                -e "s|@MAKE@|${MAKE_PROGRAM}|"  ${FILESDIR}/host.def > \
                ${WRKSRC}/config/cf/host.def
-       cd ${WRKSRC} && ${MAKE} Makefile.boot && \
+       cd ${WRKSRC} && ${MAKE} Makefile.boot &&        \
        ${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes
 
 pre-install:
@@ -71,4 +70,19 @@
        @${SED} 's/SUBDIRS = include/SUBDIRS =/' ${WRKSRC}/xmakefile.bak > \
                ${WRKSRC}/xmakefile
 
+post-install:
+       @${CP} ${X11ROOT}/lib/X11/config/host.def               \
+               ${X11ROOT}/lib/X11/config/host.def.orig
+       @${SED} -e "s|\#define ProjectRoot ${X11ROOT}||"        \
+               ${X11ROOT}/lib/X11/config/host.def.orig >       \
+               ${X11ROOT}/lib/X11/config/host.def
+       @${RM} ${X11ROOT}/lib/X11/config/host.def.orig
+
+       @( \
+       ${ECHO};                                        \
+       ${ECHO} "#ifdef BeforeVendorCF";                \
+       ${ECHO} "#define ProjectRoot ${X11ROOT}";       \
+       ${ECHO} "#endif";                               \
+       ) >> ${X11ROOT}/lib/X11/config/host.def
+
 .include "../../mk/bsd.pkg.mk"
diff -r 62aef33e5f88 -r 4ab489064f0f x11/xorg-imake/files/host.def
--- a/x11/xorg-imake/files/host.def     Sat Jul 31 01:25:33 2004 +0000
+++ b/x11/xorg-imake/files/host.def     Sat Jul 31 01:37:23 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD*/
+/* $NetBSD: host.def,v 1.2 2004/07/31 01:37:23 xtraeme Exp $ */
 
 #define ProjectRoot @PREFIX@
 #define BuildHtmlManPages NO