[pkgsrc/trunk]: pkgsrc Don't create xorg/lib/X11/fs as symlink to the config ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/322f7659c772
branches:  trunk
changeset: 511320:322f7659c772
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Apr 12 21:53:58 2006 +0000

description:
Don't create xorg/lib/X11/fs as symlink to the config directory,
it prevents the default config from being included correctly
in the package. Add a random imake dependency to xorg-fontserver
while here and bump the revision.

diffstat:

 fonts/xorg-fontserver/Makefile |   6 ++++--
 fonts/xorg-fontserver/PLIST    |   3 ++-
 x11/xorg-libs/distinfo         |   3 ++-
 x11/xorg-libs/patches/patch-bn |  13 +++++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r 390a7b85786e -r 322f7659c772 fonts/xorg-fontserver/Makefile
--- a/fonts/xorg-fontserver/Makefile    Wed Apr 12 21:52:15 2006 +0000
+++ b/fonts/xorg-fontserver/Makefile    Wed Apr 12 21:53:58 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/02/12 15:29:18 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/12 21:53:58 joerg Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-fontserver-${XORG_VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    fonts x11
 MASTER_SITES=  ${MASTER_SITE_XORG}
 DISTFILES=     X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.x.org/
 COMMENT=       X.org font server
 
+USE_TOOLS+=    imake
+
 DISTINFO_FILE=         ${.CURDIR}/../../x11/xorg-libs/distinfo
 PATCHDIR=              ${.CURDIR}/../../x11/xorg-libs/patches
 
diff -r 390a7b85786e -r 322f7659c772 fonts/xorg-fontserver/PLIST
--- a/fonts/xorg-fontserver/PLIST       Wed Apr 12 21:52:15 2006 +0000
+++ b/fonts/xorg-fontserver/PLIST       Wed Apr 12 21:53:58 2006 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 05:00:46 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/12 21:53:58 joerg Exp $
 ${X11ROOT_PREFIX}/bin/xfs
 ${X11ROOT_PREFIX}/lib/X11/fs/config
 ${X11ROOT_PREFIX}/${MAN_DIR}/xfs.${MAN_SUFFIX}
+@dirrm ${X11ROOT_PREFIX}/lib/X11/fs
diff -r 390a7b85786e -r 322f7659c772 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Wed Apr 12 21:52:15 2006 +0000
+++ b/x11/xorg-libs/distinfo    Wed Apr 12 21:53:58 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2006/03/20 21:34:59 joerg Exp $
+$NetBSD: distinfo,v 1.39 2006/04/12 21:53:58 joerg Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -44,3 +44,4 @@
 SHA1 (patch-bg) = 3db63fcbe81d9f801ccac6353ad4a213a15c3ffe
 SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec
 SHA1 (patch-bm) = f9b73b7c1bd7d6d6db6d23741d5d1125eea5f860
+SHA1 (patch-bn) = 58049eb799b469b70b5a2c611b8aef37a5631c0c
diff -r 390a7b85786e -r 322f7659c772 x11/xorg-libs/patches/patch-bn
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/patches/patch-bn    Wed Apr 12 21:53:58 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-bn,v 1.4 2006/04/12 21:53:58 joerg Exp $
+
+--- programs/xfs/Imakefile.orig        2006-04-12 21:45:29.000000000 +0000
++++ programs/xfs/Imakefile
+@@ -51,8 +51,6 @@ ServerTarget(xfs,$(FSDIRS),NullParameter
+ ServerTarget(xfs,$(FSDIRS),difs/main.o,$(FSLIBS),$(FSSYSLIBS) $(EXTRA_LIBRARIES))
+ #endif
+ 
+-LinkConfDirectory(fs,.,fs,.)
+-
+ CppFileTarget(config,config.cpp,$(SITE_CONFIG),$(ICONFIGFILES))
+ 
+ InstallManPage(xfs,$(MANDIR))