pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Add a new variable to specify the installation prefix for
details: https://anonhg.NetBSD.org/pkgsrc/rev/c6e23c7b3988
branches: trunk
changeset: 478786:c6e23c7b3988
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Fri Jul 30 07:48:56 2004 +0000
description:
Add a new variable to specify the installation prefix for
X11 packages (currently XFree86 and xorg), X11ROOT_PREFIX.
Defaults:
xorg: X11ROOT_PREFIX = xorg.
XFree86: X11ROOT_PREFIX = XFree86.
Otherwise it's undefined.
With this modification we don't have to specify X11BASE anymore,
because it's assigned automatically via bsd.pkg.defaults.mk.
If you want to change the defaults, specify X11ROOT_PREFIX in mk.conf.
Update Packages.txt now that we don't need X11BASE.
diffstat:
Packages.txt | 8 +-------
meta-pkgs/XFree86/Makefile.common | 6 ++----
meta-pkgs/xorg/Makefile.common | 5 ++---
mk/bsd.pkg.defaults.mk | 17 ++++++++++++++++-
x11/XFree86-libs/MESSAGE | 10 ----------
x11/XFree86-libs/buildlink3.mk | 6 ++++--
x11/xorg-libs/Makefile | 6 ++----
x11/xorg-libs/buildlink3.mk | 6 ++++--
8 files changed, 31 insertions(+), 33 deletions(-)
diffs (190 lines):
diff -r d58ab6f7d30c -r c6e23c7b3988 Packages.txt
--- a/Packages.txt Fri Jul 30 07:38:01 2004 +0000
+++ b/Packages.txt Fri Jul 30 07:48:56 2004 +0000
@@ -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 @@
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 @@
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 -r d58ab6f7d30c -r c6e23c7b3988 meta-pkgs/XFree86/Makefile.common
--- a/meta-pkgs/XFree86/Makefile.common Fri Jul 30 07:38:01 2004 +0000
+++ b/meta-pkgs/XFree86/Makefile.common Fri Jul 30 07:48:56 2004 +0000
@@ -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 @@
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 -r d58ab6f7d30c -r c6e23c7b3988 meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common Fri Jul 30 07:38:01 2004 +0000
+++ b/meta-pkgs/xorg/Makefile.common Fri Jul 30 07:48:56 2004 +0000
@@ -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 @@
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 -r d58ab6f7d30c -r c6e23c7b3988 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk Fri Jul 30 07:38:01 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk Fri Jul 30 07:48:56 2004 +0000
@@ -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 @@
# 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 -r d58ab6f7d30c -r c6e23c7b3988 x11/XFree86-libs/MESSAGE
--- a/x11/XFree86-libs/MESSAGE Fri Jul 30 07:38:01 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d58ab6f7d30c -r c6e23c7b3988 x11/XFree86-libs/buildlink3.mk
--- a/x11/XFree86-libs/buildlink3.mk Fri Jul 30 07:38:01 2004 +0000
+++ b/x11/XFree86-libs/buildlink3.mk Fri Jul 30 07:48:56 2004 +0000
@@ -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_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 -r d58ab6f7d30c -r c6e23c7b3988 x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile Fri Jul 30 07:38:01 2004 +0000
+++ b/x11/xorg-libs/Makefile Fri Jul 30 07:48:56 2004 +0000
@@ -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+= 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 @@
CONFLICTS+= MesaLib-[0-9]* glu-[0-9]*
.endif
-MESSAGE_SRC= ${_PKGSRCDIR}/x11/XFree86-libs/MESSAGE
-
USE_BUILDLINK3= yes
BUILDLINK_PASSTHRU_DIRS+= ${X11ROOT}/lib
diff -r d58ab6f7d30c -r c6e23c7b3988 x11/xorg-libs/buildlink3.mk
--- a/x11/xorg-libs/buildlink3.mk Fri Jul 30 07:38:01 2004 +0000
+++ b/x11/xorg-libs/buildlink3.mk Fri Jul 30 07:48:56 2004 +0000
@@ -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_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
Home |
Main Index |
Thread Index |
Old Index