summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-pkgs/xorg/Makefile.common17
-rw-r--r--x11/xorg-imake/Makefile17
-rw-r--r--x11/xorg-imake/distinfo4
-rw-r--r--x11/xorg-imake/patches/patch-ac15
-rw-r--r--x11/xorg-libs/Makefile17
-rw-r--r--x11/xorg-server/Makefile4
6 files changed, 49 insertions, 25 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 6ee13cc967c..4f83d99ff45 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/11/05 02:58:56 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/12/27 17:26:19 xtraeme Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -162,6 +162,21 @@ SYSTEMS= FreeBSD NetBSD OpenBSD linux DragonFly
.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 --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 90695ccea3c..f753f2203f4 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/11/01 23:41:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/27 17:26:18 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
@@ -90,4 +90,19 @@ post-install:
${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 --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index 4e602bcfd7d..393ac2b0557 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/11/15 11:15:42 hira Exp $
+$NetBSD: distinfo,v 1.8 2004/12/27 17:26:18 xtraeme Exp $
SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -6,7 +6,7 @@ SHA1 (X11R6.8.1-src3.tar.gz) = e17afc90b0c43f4f40b2ff7410f4ff5d4297de28
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 --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac
index 79907b5d248..27ebe20945c 100644
--- a/x11/xorg-imake/patches/patch-ac
+++ b/x11/xorg-imake/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2004/11/15 11:15:42 hira Exp $
+$NetBSD: patch-ac,v 1.3 2004/12/27 17:26:18 xtraeme 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 --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index b066b4b026a..a277830f73c 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/12/20 14:45:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/27 17:26:18 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-libs-${XORG_VER}
@@ -47,21 +47,6 @@ post-install:
@${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 --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index bb66ffb75b4..02ab60401bb 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/02 22:53:58 hira Exp $
+# $NetBSD: Makefile,v 1.12 2004/12/27 17:26:18 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-server-${XORG_VER}
@@ -28,7 +28,7 @@ XINSTALL_MAN_DIRS= programs/Xserver
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'