[pkgsrc/trunk]: pkgsrc/meta-pkgs/xorg Always copy the file DragonFly.cf uncon...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/19b42200dcfd
branches:  trunk
changeset: 488439:19b42200dcfd
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Jan 31 20:14:11 2005 +0000

description:
Always copy the file DragonFly.cf unconditionally into xc/config/cf,
otherwise the post-extract target will fail.

This closes PR pkg/29169 and pkg/29135, thanks.

diffstat:

 meta-pkgs/xorg/Makefile.common |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (25 lines):

diff -r 269cb8898bf2 -r 19b42200dcfd meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common    Mon Jan 31 19:53:31 2005 +0000
+++ b/meta-pkgs/xorg/Makefile.common    Mon Jan 31 20:14:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/01/25 17:49:57 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/01/31 20:14:11 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -211,13 +211,10 @@
        @${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf
        @${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf
 
-.if ${OPSYS} == "DragonFly"
-       @${CP} ../../x11/xorg-libs/files/DragonFly.cf ${WRKSRC}/config/cf/
-.endif
+       @${CP} ${PKGSRCDIR}/x11/xorg-libs/files/DragonFly.cf ${WRKSRC}/config/cf
 
 .  for F in ${SYSTEMS}
-       @${MV} ${WRKSRC}/config/cf/${F}.cf \
-               ${WRKSRC}/config/cf/${F}.cf.in
+       @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
 .  endfor
 .  undef F