[pkgsrc/trunk]: pkgsrc/x11/xservers Update "xservers" package to version 3.3....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc6258324dc8
branches:  trunk
changeset: 497962:cc6258324dc8
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Aug 08 18:12:46 2005 +0000

description:
Update "xservers" package to version 3.3.6.4. Changes:
- Provide a normal downloadable distribution file because this is much more
  convenient after XFree86 3.3.6 was removed from the CVS sources.
- Fix buildlink issued which caused shared library runtime path problems.
- Compile the libraries without thread support. They aren't used by
  anything but "xkbcomp" and the server. And neither of those uses threads.
  BTW: this does *not* limit the server's ability to handle threaded X11
  applications.

diffstat:

 x11/xservers/Makefile |  32 +++++++-------------------------
 x11/xservers/distinfo |   5 ++++-
 2 files changed, 11 insertions(+), 26 deletions(-)

diffs (79 lines):

diff -r 26c3d5c424ca -r cc6258324dc8 x11/xservers/Makefile
--- a/x11/xservers/Makefile     Mon Aug 08 16:59:20 2005 +0000
+++ b/x11/xservers/Makefile     Mon Aug 08 18:12:46 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:54 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/08/08 18:12:46 tron Exp $
 
-DISTNAME=      xservers-3.3.6.3
+DISTNAME=      xservers-3.3.6.4
 CATEGORIES=    x11
-MASTER_SITES=  # empty
-DISTFILES=     # empty
+MASTER_SITES=  ${MASTER_SITE_LOCAL}
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    tron%NetBSD.org@localhost
 HOMEPAGE=      http://www.xfree86.org/
@@ -23,8 +23,6 @@
 .  endif
 .endif
 
-USE_TOOLS+=    gtar
-
 X11_SUBDIR=    X11R6.3
 X11_SRCS=      Imakefile Makefile config fonts include lib nls \
                programs/Imakefile programs/Xserver programs/bdftopcf \
@@ -32,29 +30,12 @@
 
 MESSAGE_SUBST+=        X11_SUBDIR=${X11_SUBDIR}
 
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/x11.buildlink3.mk"
-
-do-fetch:
-.if defined(BSDXSRCDIR)
-.if !exists(${BSDXSRCDIR}/xc/config/cf/NetBSD.cf)
-       @${ECHO_MSG} "Cannot find NetBSD 2.0 (or older) X11 sources in ${BSDXSRCDIR}."
-       @${FALSE}
-.endif
-.else
-       @${ECHO_MSG} "Please set BSDXSRCDIR in /etc/mk.conf, pointing it to a"
-       @${ECHO_MSG} "directory that contains NetBSD 2.0 (or older) X11 sources."
-       @${FALSE}
-.endif
-
-do-extract:
-       ${MKDIR} ${WRKSRC}
-       ${GTAR} --exclude '*/CVS' -c -C ${BSDXSRCDIR}/xc -f - ${X11_SRCS} | \
-       ${GTAR} xCf ${WRKSRC} -
+BUILDLINK_PASSTHRU_RPATHDIRS+=         ${PREFIX}/X11R6.3/lib
 
 do-configure:
        ${SED} -e 's#@PROJECTROOT@#${PREFIX}/${X11_SUBDIR}#' \
          ${FILESDIR}/host.def >${WRKSRC}/config/cf/host.def
+       ${ECHO} "#define NetBSDThreads NO" >>${WRKSRC}/config/cf/host.def
 
 post-install:
        cd ${PREFIX} && \
@@ -62,6 +43,7 @@
        ${FIND} ${X11_SUBDIR} -type d -print | ${SORT} -r | \
        ${AWK} '{print("@dirrm "$$1)}' >>${PLIST_SRC}
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 print-x11-release:
diff -r 26c3d5c424ca -r cc6258324dc8 x11/xservers/distinfo
--- a/x11/xservers/distinfo     Mon Aug 08 16:59:20 2005 +0000
+++ b/x11/xservers/distinfo     Mon Aug 08 18:12:46 2005 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/06/04 12:36:16 tron Exp $
+$NetBSD: distinfo,v 1.4 2005/08/08 18:12:46 tron Exp $
 
+SHA1 (xservers-3.3.6.4.tar.bz2) = 6e78dfd8e76d0fc07b0427021bc09581deb08d13
+RMD160 (xservers-3.3.6.4.tar.bz2) = 18e456aa8b39936688cda1798c134ef9ffc27619
+Size (xservers-3.3.6.4.tar.bz2) = 24058313 bytes
 SHA1 (patch-aa) = 023c69ba09127bc4de484f0cd372aef3a8ea1ed7
 SHA1 (patch-ab) = 49380b43e031c878297eb32aaf014ac9244b1785
 SHA1 (patch-ac) = 35f3f5f7e431a0ca2e1ff97ba5ffc22a65681d4d