diff options
| author | xtraeme <xtraeme> | 2004-01-25 07:47:00 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-01-25 07:47:00 +0000 |
| commit | 4398b0f42d4acf5aa7807bd48600f0160e814df9 (patch) | |
| tree | ef82eaee6c4f11163ee9bbaf676e5893bc128883 /mk | |
| parent | dc2dd9d46b7e2b40814d24cacf50915175cd1df8 (diff) | |
| download | pkgsrc-4398b0f42d4acf5aa7807bd48600f0160e814df9.tar.gz | |
Removed XFree86-libs dependency if we are trying to use XFree86
packages from pkgsrc, it's not really needed with the latest change
to x11-links.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 35c3070dcdb..cb2657bd283 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1356 2004/01/25 02:37:49 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1357 2004/01/25 07:47:00 xtraeme Exp $ # # This file is in the public domain. # @@ -1374,15 +1374,13 @@ PKG_FAIL_REASON+= "${PKGNAME} is restricted:" \ PKG_FAIL_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography" . endif . endif -. if defined(USE_X11) && !empty(USE_PKGSRC_XFREE86:M[Yy][Ee][Ss]) -DEPENDS+= XFree86-libs>=4.3.0:../../x11/XFree86-libs -. endif -. if defined(USE_X11) && !exists(${X11BASE}) && !empty(USE_PKGSRC_XFREE86:M[Yy][Ee][Ss]) - @${MKDIR} ${X11BASE} - @${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${X11BASE} - @${CHMOD} ${PKGDIRMODE} ${X11BASE} -DEPENDS+= XFree86-libs>=4.3.0:../../x11/XFree86-libs -. elif defined(USE_X11) && !exists(${X11BASE}) +. if defined(USE_X11) && !exists(${X11BASE}) && \ + !empty(USE_PKGSRC_XFREE86:M[Yy][Ee][Ss]) + @${MKDIR} ${X11BASE} + @${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${X11BASE} + @${CHMOD} ${PKGDIRMODE} ${X11BASE} +. elif defined(USE_X11) && !exists(${X11BASE}) && \ + !empty(USE_PKGSRC_XFREE86:M[Nn][Oo]) PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found" . endif . if defined(BROKEN) |