diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-07-30 07:48:56 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-07-30 07:48:56 +0000 |
| commit | fc2209416d992f83c55c4d4e62b0b7c57bcdff70 (patch) | |
| tree | f9c91923cfc71f02eea9a816b17001c142f2c5e6 /x11/xorg-libs | |
| parent | 6edb1b06bb30d14d283102cf04675319c66ca40d (diff) | |
| download | pkgsrc-fc2209416d992f83c55c4d4e62b0b7c57bcdff70.tar.gz | |
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 (limited to 'x11/xorg-libs')
| -rw-r--r-- | x11/xorg-libs/Makefile | 6 | ||||
| -rw-r--r-- | x11/xorg-libs/buildlink3.mk | 6 |
2 files changed, 6 insertions, 6 deletions
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 |