[pkgsrc/pkgsrc-2004Q4]: pkgsrc Pullup ticket 188 - requested by Juan RP

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/66dfdbe0dde6
branches:  pkgsrc-2004Q4
changeset: 485780:66dfdbe0dde6
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon Dec 27 18:30:51 2004 +0000

description:
Pullup ticket 188 - requested by Juan RP
build fix for xorg-*

Module Name:    pkgsrc
Committed By:   xtraeme
Date:           Mon Dec 27 17:26:19 UTC 2004

Modified Files:
        pkgsrc/meta-pkgs/xorg: Makefile.common
        pkgsrc/x11/xorg-imake: Makefile distinfo
        pkgsrc/x11/xorg-imake/patches: patch-ac
        pkgsrc/x11/xorg-libs: Makefile
        pkgsrc/x11/xorg-server: Makefile

Log Message:
Finish my previous commit and unbreak xorg-*:

* Move the subst macros for threadlib.h from xorg-libs to
  xorg/Makefile.common.
* SUBST_CLASSES should be appended.

Thanks to Manuel Stuehn <manuel.stuehn%student.uni-siegen.de@localhost> for
the email showing me the problems.

diffstat:

 meta-pkgs/xorg/Makefile.common  |  17 ++++++++++++++++-
 x11/xorg-imake/Makefile         |  17 ++++++++++++++++-
 x11/xorg-imake/distinfo         |   4 ++--
 x11/xorg-imake/patches/patch-ac |  15 ++++++++++++---
 x11/xorg-libs/Makefile          |  17 +----------------
 x11/xorg-server/Makefile        |   4 ++--
 6 files changed, 49 insertions(+), 25 deletions(-)

diffs (150 lines):

diff -r 1f09184aa72b -r 66dfdbe0dde6 meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common    Fri Dec 24 01:08:41 2004 +0000
+++ b/meta-pkgs/xorg/Makefile.common    Mon Dec 27 18:30:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/11/05 02:58:56 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.13.2.1 2004/12/27 18:30:51 snj Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -162,6 +162,21 @@
 
 .if !defined(NO_XORG_TARGETS)
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-2.[0-9]*)
+.  if exists(/usr/include/threadlib.h)
+SUBST_CLASSES+=                thr
+SUBST_STAGE.thr=        post-patch
+SUBST_FILES.thr=       config/cf/NetBSD.cf.in
+SUBST_SED.thr=         -e 's|@@NETBSD_THREADLIB@@|-DUSE_NBSD_THREADLIB|'
+SUBST_MESSAGE.thr=     "Fixes for threadlib.h."
+.  else
+SUBST_CLASSES+=                nada
+SUBST_STAGE.nada=      post-patch
+SUBST_FILES.nada=      config/cf/NetBSD.cf.in
+SUBST_SED.nada=                -e 's|@@NETBSD_THREADLIB@@||'
+.  endif
+.endif
+
 USE_LANGUAGES=         c c++
 
 .  if !target(post-extract)
diff -r 1f09184aa72b -r 66dfdbe0dde6 x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile   Fri Dec 24 01:08:41 2004 +0000
+++ b/x11/xorg-imake/Makefile   Mon Dec 27 18:30:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/11/01 23:41:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2004/12/27 18:30:51 snj Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-imake-${XORG_VER}
@@ -90,4 +90,19 @@
        ${ECHO} "#endif";                               \
        ) >> ${X11ROOT}/lib/X11/config/host.def
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-2.[0-9]*)
+.  if exists(/usr/include/threadlib.h)
+SUBST_CLASSES+=                thr
+SUBST_STAGE.thr=       post-patch
+SUBST_FILES.thr=       config/cf/NetBSD.cf.in
+SUBST_SED.thr=         -e 's|@@NETBSD_THREADLIB@@|-DUSE_NBSD_THREADLIB|'
+SUBST_MESSAGE.thr=     "Fixes for threadlib.h."
+.  else
+SUBST_CLASSES+=                nada
+SUBST_STAGE.nada=      post-patch
+SUBST_FILES.nada=      config/cf/NetBSD.cf.in
+SUBST_SED.nada=                -e 's|@@NETBSD_THREADLIB@@||'
+.  endif
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r 1f09184aa72b -r 66dfdbe0dde6 x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo   Fri Dec 24 01:08:41 2004 +0000
+++ b/x11/xorg-imake/distinfo   Mon Dec 27 18:30:51 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/11/15 11:15:42 hira Exp $
+$NetBSD: distinfo,v 1.7.2.1 2004/12/27 18:30:51 snj Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -6,7 +6,7 @@
 Size (X11R6.8.1-src3.tar.gz) = 10014808 bytes
 SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = 938c15a6103d741aa29f1ec45e19be2284fb2a0b
+SHA1 (patch-ac) = 1c12d9c5b976ac5c9b6667e0f3a98792eef433fc
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
 SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
diff -r 1f09184aa72b -r 66dfdbe0dde6 x11/xorg-imake/patches/patch-ac
--- a/x11/xorg-imake/patches/patch-ac   Fri Dec 24 01:08:41 2004 +0000
+++ b/x11/xorg-imake/patches/patch-ac   Mon Dec 27 18:30:51 2004 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2004/11/15 11:15:42 hira Exp $
+$NetBSD: patch-ac,v 1.2.2.1 2004/12/27 18:30:52 snj Exp $
 
---- config/cf/NetBSD.cf.in.orig        2004-08-15 09:03:36.000000000 +0900
-+++ config/cf/NetBSD.cf.in     2004-11-03 16:54:50.000000000 +0900
+--- config/cf/NetBSD.cf.in.orig        2004-08-15 02:03:36.000000000 +0200
++++ config/cf/NetBSD.cf.in     2004-12-20 15:33:15.000000000 +0100
+@@ -123,7 +123,7 @@
+ # define ThreadedX            YES
+ # define HasThreadSafeAPI     YES
+ # define ThreadsLibraries     -lpthread
+-# define LibraryMTDefines     -DUSE_NBSD_THREADLIB
++# define LibraryMTDefines     @@NETBSD_THREADLIB@@
+ # define SystemMTDefines      -D_REENTRANT
+ # define MTSafeAPIDefines     -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+ #else 
 @@ -146,7 +146,7 @@
  #define MkdirHierCmd          mkdir -p
  
diff -r 1f09184aa72b -r 66dfdbe0dde6 x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile    Fri Dec 24 01:08:41 2004 +0000
+++ b/x11/xorg-libs/Makefile    Mon Dec 27 18:30:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/12/20 14:45:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2004/12/27 18:30:52 snj Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-libs-${XORG_VER}
@@ -47,21 +47,6 @@
        @${LDCONFIG} ${X11ROOT}/lib || ${TRUE}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-2.[0-9]*)
-.  if exists(/usr/include/threadlib.h)
-SUBST_CLASSES+=                thr
-SUBST_STAGE.thr=       post-patch
-SUBST_FILES.thr=       config/cf/NetBSD.cf.in
-SUBST_SED.thr=         -e 's|@@NETBSD_THREADLIB@@|-DUSE_NBSD_THREADLIB|'
-SUBST_MESSAGE.thr=     "Fixes for threadlib.h."
-.  else
-SUBST_CLASSES+=                nada
-SUBST_STAGE.nada=      post-patch
-SUBST_FILES.nada=      config/cf/NetBSD.cf.in
-SUBST_SED.nada=                -e 's|@@NETBSD_THREADLIB@@||'
-.  endif
-.endif
-
 pre-install:
 .if !exists(${X11ROOT}/lib/pkgconfig)
        ${INSTALL_DATA_DIR} ${X11BASE}/lib/pkgconfig
diff -r 1f09184aa72b -r 66dfdbe0dde6 x11/xorg-server/Makefile
--- a/x11/xorg-server/Makefile  Fri Dec 24 01:08:41 2004 +0000
+++ b/x11/xorg-server/Makefile  Mon Dec 27 18:30:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/02 22:53:58 hira Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2004/12/27 18:30:52 snj Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-server-${XORG_VER}
@@ -28,7 +28,7 @@
 
 REPLACE_PERL=          exports/lib/modules/getconfig*
 
-SUBST_CLASSES=         parser
+SUBST_CLASSES+=                parser
 SUBST_STAGE.parser=    pre-install
 SUBST_FILES.parser=    programs/Xserver/hw/xfree86/parser/Makefile
 SUBST_SED.parser=      -e '/$$(INSTALL).*lib$$(LIBNAME).a/ d'