pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Don't require a read-write pkgsrc tree when invoking i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/577073f6f5e6
branches:  trunk
changeset: 495165:577073f6f5e6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jun 03 16:03:09 2005 +0000

description:
Don't require a read-write pkgsrc tree when invoking imake.  We avoid
this requirement by using TMPDIR as the read-write location demanded
by using imake.

diffstat:

 fonts/Xft2/builtin.mk           |  6 ++++--
 fonts/fontconfig/builtin.mk     |  6 ++++--
 graphics/MesaLib/builtin.mk     |  6 ++++--
 graphics/freetype2/builtin.mk   |  6 ++++--
 graphics/glu/builtin.mk         |  6 ++++--
 graphics/xpm/builtin.mk         |  6 ++++--
 textproc/expat/builtin.mk       |  6 ++++--
 x11/Xcomposite/builtin.mk       |  6 ++++--
 x11/Xfixes/builtin.mk           |  6 ++++--
 x11/Xrandr-mixedcase/builtin.mk |  6 ++++--
 x11/Xrender/builtin.mk          |  6 ++++--
 x11/xcursor/builtin.mk          |  6 ++++--
 12 files changed, 48 insertions(+), 24 deletions(-)

diffs (252 lines):

diff -r 25ad68c0727b -r 577073f6f5e6 fonts/Xft2/builtin.mk
--- a/fonts/Xft2/builtin.mk     Fri Jun 03 15:40:30 2005 +0000
+++ b/fonts/Xft2/builtin.mk     Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  Xft2
 
@@ -18,8 +18,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xft2!=                                                      \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.Xft2} && ${PWD_CMD}`;             \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.Xft2}/builtin-imake.mk         \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 fonts/fontconfig/builtin.mk
--- a/fonts/fontconfig/builtin.mk       Fri Jun 03 15:40:30 2005 +0000
+++ b/fonts/fontconfig/builtin.mk       Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  fontconfig
 
@@ -19,8 +19,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.fontconfig!=                                                        \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.fontconfig} && ${PWD_CMD}`;       \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.fontconfig}/builtin-imake.mk   \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 graphics/MesaLib/builtin.mk
--- a/graphics/MesaLib/builtin.mk       Fri Jun 03 15:40:30 2005 +0000
+++ b/graphics/MesaLib/builtin.mk       Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  MesaLib
 
@@ -18,8 +18,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.MesaLib!=                                                   \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.MesaLib} && ${PWD_CMD}`;          \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.MesaLib}/builtin-imake.mk      \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 graphics/freetype2/builtin.mk
--- a/graphics/freetype2/builtin.mk     Fri Jun 03 15:40:30 2005 +0000
+++ b/graphics/freetype2/builtin.mk     Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  freetype2
 
@@ -18,8 +18,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.freetype2!=                                                 \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.freetype2} && ${PWD_CMD}`;        \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.freetype2}/builtin-imake.mk    \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 graphics/glu/builtin.mk
--- a/graphics/glu/builtin.mk   Fri Jun 03 15:40:30 2005 +0000
+++ b/graphics/glu/builtin.mk   Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  glu
 
@@ -18,8 +18,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.glu!=                                                       \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.glu} && ${PWD_CMD}`;              \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.glu}/builtin-imake.mk          \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 graphics/xpm/builtin.mk
--- a/graphics/xpm/builtin.mk   Fri Jun 03 15:40:30 2005 +0000
+++ b/graphics/xpm/builtin.mk   Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/02 22:48:18 dillo Exp $
+# $NetBSD: builtin.mk,v 1.8 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  xpm
 
@@ -28,8 +28,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .      if defined(IMAKE) && exists(${IMAKE:C/ .*//})
 IS_BUILTIN.xpm!=                                                       \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.xpm} && ${PWD_CMD}`;              \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.xpm}/builtin-imake.mk          \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .      endif
diff -r 25ad68c0727b -r 577073f6f5e6 textproc/expat/builtin.mk
--- a/textproc/expat/builtin.mk Fri Jun 03 15:40:30 2005 +0000
+++ b/textproc/expat/builtin.mk Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  expat
 
@@ -18,8 +18,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.expat!=                                                     \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.expat} && ${PWD_CMD}`;            \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.expat}/builtin-imake.mk        \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 x11/Xcomposite/builtin.mk
--- a/x11/Xcomposite/builtin.mk Fri Jun 03 15:40:30 2005 +0000
+++ b/x11/Xcomposite/builtin.mk Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  Xcomposite
 
@@ -19,8 +19,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xcomposite!=                                                        \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.Xcomposite} && ${PWD_CMD}`;       \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.Xcomposite}/builtin-imake.mk   \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 x11/Xfixes/builtin.mk
--- a/x11/Xfixes/builtin.mk     Fri Jun 03 15:40:30 2005 +0000
+++ b/x11/Xfixes/builtin.mk     Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  Xfixes
 
@@ -18,8 +18,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xfixes!=                                                    \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.Xfixes} && ${PWD_CMD}`;           \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.Xfixes}/builtin-imake.mk       \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 x11/Xrandr-mixedcase/builtin.mk
--- a/x11/Xrandr-mixedcase/builtin.mk   Fri Jun 03 15:40:30 2005 +0000
+++ b/x11/Xrandr-mixedcase/builtin.mk   Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  Xrandr
 
@@ -18,8 +18,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xrandr!=                                                    \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.Xrandr} && ${PWD_CMD}`;           \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.Xrandr}/builtin-imake.mk       \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 x11/Xrender/builtin.mk
--- a/x11/Xrender/builtin.mk    Fri Jun 03 15:40:30 2005 +0000
+++ b/x11/Xrender/builtin.mk    Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  Xrender
 
@@ -17,8 +17,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xrender!=                                                   \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.Xrender} && ${PWD_CMD}`;          \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.Xrender}/builtin-imake.mk      \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif
diff -r 25ad68c0727b -r 577073f6f5e6 x11/xcursor/builtin.mk
--- a/x11/xcursor/builtin.mk    Fri Jun 03 15:40:30 2005 +0000
+++ b/x11/xcursor/builtin.mk    Fri Jun 03 16:03:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=  xcursor
 
@@ -18,8 +18,10 @@
 IMAKE?=                        ${X11BASE}/bin/imake    # XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.xcursor!=                                                   \
+       dir=`cd ${BUILDLINK_PKGSRCDIR.xcursor} && ${PWD_CMD}`;          \
+       cd ${TMPDIR:U/tmp:Q} &&                                         \
        ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config             \
-               -f ${BUILDLINK_PKGSRCDIR.xcursor}/builtin-imake.mk      \
+               -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c       \
                -s - |                                                  \
        ${IMAKE_MAKE} -f - builtin-test
 .    endif



Home | Main Index | Thread Index | Old Index