summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Packages.txt8
-rw-r--r--meta-pkgs/XFree86/Makefile.common6
-rw-r--r--meta-pkgs/xorg/Makefile.common5
-rw-r--r--mk/bsd.pkg.defaults.mk17
-rw-r--r--x11/XFree86-libs/MESSAGE10
-rw-r--r--x11/XFree86-libs/buildlink3.mk6
-rw-r--r--x11/xorg-libs/Makefile6
-rw-r--r--x11/xorg-libs/buildlink3.mk6
8 files changed, 31 insertions, 33 deletions
diff --git a/Packages.txt b/Packages.txt
index 31b8929dfc7..b4388f5b2b1 100644
--- a/Packages.txt
+++ b/Packages.txt
@@ -1,4 +1,4 @@
-# $NetBSD: Packages.txt,v 1.343 2004/07/29 06:40:35 xtraeme Exp $
+# $NetBSD: Packages.txt,v 1.344 2004/07/30 07:48:56 xtraeme Exp $
###########################################################################
==========================
@@ -2919,9 +2919,6 @@ X11 (/usr/X11R6, /usr/openwin, ...), you will have to add the following
lines into mk.conf:
X11_TYPE=XFree86
- X11BASE=/usr/pkg/X11R6
-
-`LOCALBASE' by default is `/usr/pkg'.
10.44 How can I install/use X.org from pkgsrc?
======================================
@@ -2931,9 +2928,6 @@ X11 (/usr/X11R6, /usr/openwin, ...) you will have to add the following
lines into mk.conf:
X11_TYPE=xorg
- X11BASE=/usr/pkg/xorg
-
-`LOCALBASE' by default is `/usr/pkg'.
10.45 Where's the pkgviews documentation?
=========================================
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common
index dcd18ba5f47..12b2213e9e8 100644
--- a/meta-pkgs/XFree86/Makefile.common
+++ b/meta-pkgs/XFree86/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2004/07/29 08:59:15 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/07/30 07:48:56 xtraeme Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -111,10 +111,8 @@ PKG_FAIL_REASON+= "X11_TYPE=XFree86 is mandatory."
NO_MTREE= # defined
-X11ROOT_PREFIX?= X11R6
WRKSRC?= ${WRKDIR}/xc
-X11ROOT?= ${PREFIX}/${X11ROOT_PREFIX}
-X11BASE= ${X11ROOT}
+X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX}
PREPEND_PATH= ${X11ROOT}/bin # Make sure we have this in PATH :)
PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX}
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 287a9842b2c..daffb69e260 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/07/29 08:59:15 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/07/30 07:48:56 xtraeme Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -103,9 +103,8 @@ PKG_FAIL_REASON+= "X11_TYPE=xorg is mandatory."
NO_MTREE= # defined
-X11ROOT_PREFIX?= xorg
WRKSRC?= ${WRKDIR}/xc
-X11ROOT?= ${PREFIX}/${X11ROOT_PREFIX}
+X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX}
PREPEND_PATH+= ${X11ROOT}/bin # Make sure we have this in PATH :)
PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX}
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index b746db2584d..9dad4264cd1 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.268 2004/07/27 15:59:31 xtraeme Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.269 2004/07/30 07:48:56 xtraeme Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -159,6 +159,21 @@ VARBASE?= /var
# Possible: any path
# Default: /var
+# Default installation prefix for meta-pkgs/XFree86 and
+# meta-pkgs/xorg.
+.if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
+X11ROOT_PREFIX?= XFree86
+.elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
+X11ROOT_PREFIX?= xorg
+.else
+X11ROOT_PREFIX?= # empty
+.endif
+
+.if ((defined(X11_TYPE) && !empty(X11_TYPE:MXFree86) || \
+ defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)) && \
+ defined(X11_TYPE) && empty(X11_TYPE:Mnative))
+X11BASE?= ${LOCALBASE}/${X11ROOT_PREFIX}
+.endif
#X11BASE?= /usr/X11R6
# Where X11 is installed on the system.
# (and the default install path of X11 pkgs)
diff --git a/x11/XFree86-libs/MESSAGE b/x11/XFree86-libs/MESSAGE
deleted file mode 100644
index 98843a9c78c..00000000000
--- a/x11/XFree86-libs/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/07/21 23:55:19 xtraeme Exp $
-
-Make sure you have defined X11BASE in /etc/mk.conf before try to install
-any package that uses X11 headers/libraries. Then you can just add the
-following:
-
- X11BASE=${X11ROOT}
-
-===========================================================================
diff --git a/x11/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk
index 7a70a5dccea..a6f46f9d998 100644
--- a/x11/XFree86-libs/buildlink3.mk
+++ b/x11/XFree86-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/28 23:36:27 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/07/30 07:48:56 xtraeme Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFREE86_LIBS_BUILDLINK3_MK:= ${XFREE86_LIBS_BUILDLINK3_MK}+
@@ -14,11 +14,13 @@ BUILDLINK_DEPENDS+= XFree86-libs
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXFree86-libs}
BUILDLINK_PACKAGES:= XFree86-libs ${BUILDLINK_PACKAGES}
+.include "../../mk/bsd.prefs.mk"
+
.if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.XFree86-libs+= XFree86-libs>=4.4.0
BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../x11/XFree86-libs
-BUILDLINK_TRANSFORM.XFree86-libs+= -e "s|/X11R6/|/|"
+BUILDLINK_TRANSFORM.XFree86-libs+= -e "s|/${X11ROOT_PREFIX}/|/|"
.endif # XFREE86_LIBS_BUILDLINK3_MK
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index eb297105ca9..ed4baaed3b6 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/30 07:48:56 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-libs-${XORG_VER}
@@ -15,7 +15,7 @@ CONFLICTS+= xextensions-[0-9]*
CONFLICTS+= libX11-[0-9]*
CONFLICTS+= libXau-[0-9]*
-BUILD_DEPENDS= xorg-imake>=6.7.0:../../x11/xorg-imake
+BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake
.include "../../mk/bsd.prefs.mk"
@@ -25,8 +25,6 @@ BUILD_DEPENDS= xorg-imake>=6.7.0:../../x11/xorg-imake
CONFLICTS+= MesaLib-[0-9]* glu-[0-9]*
.endif
-MESSAGE_SRC= ${_PKGSRCDIR}/x11/XFree86-libs/MESSAGE
-
USE_BUILDLINK3= yes
BUILDLINK_PASSTHRU_DIRS+= ${X11ROOT}/lib
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index 6a3e74e9beb..079c02dbc36 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/07/29 07:12:33 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/07/30 07:48:56 xtraeme Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XORG_LIBS_BUILDLINK3_MK:= ${XORG_LIBS_BUILDLINK3_MK}+
@@ -14,11 +14,13 @@ BUILDLINK_DEPENDS+= xorg-libs
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxorg-libs}
BUILDLINK_PACKAGES:= xorg-libs ${BUILDLINK_PACKAGES}
+.include "../../mk/bsd.prefs.mk"
+
.if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.7.0
BUILDLINK_PKGSRCDIR.xorg-libs?= ../../x11/xorg-libs
-BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/xorg/|/|"
+BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|"
.endif # XORG_LIBS_BUILDLINK3_MK
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 13:01:34 +0000