pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Fix some comparisson strings to handle XFree86/xorg...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/322c22d0e35d
branches:  trunk
changeset: 479208:322c22d0e35d
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Aug 07 14:44:05 2004 +0000

description:
Fix some comparisson strings to handle XFree86/xorg dirs.mk files properly,
PR pkg/26576: Kouichirou Hiratsuka.

diffstat:

 mk/dirs.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 54e020961ddc -r 322c22d0e35d mk/dirs.mk
--- a/mk/dirs.mk        Sat Aug 07 14:31:57 2004 +0000
+++ b/mk/dirs.mk        Sat Aug 07 14:44:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.4 2004/07/29 07:27:43 xtraeme Exp $
+# $NetBSD: dirs.mk,v 1.5 2004/08/07 14:44:05 xtraeme Exp $
 #
 
 .if !defined(DIRS_MK)
@@ -21,11 +21,12 @@
 _USE_GNOME2_DIRS:=     ${ver}
 .  elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} && !defined(USE_X11BASE)
 _USE_XDG_DIRS:=                ${ver}
-.  elif ${pkg} == "xdg" && ${_USE_XDG_X11_DIRS} < ${ver} && defined(USE_X11BASE)
+.  elif ${pkg} == "xdg-x11" && ${_USE_XDG_X11_DIRS} < ${ver} && \
+       defined(USE_X11BASE)
 _USE_XDG_X11_DIRS:=    ${ver}
-.  elif ${pkg} == "xdg" && ${_USE_XFREE86_DIRS} < ${ver}
+.  elif ${pkg} == "XFree86" && ${_USE_XFREE86_DIRS} < ${ver}
 _USE_XFREE86_DIRS:=    ${ver}
-.  elif ${pkg} == "xdg" && ${_USE_XORG_DIRS} < ${ver}
+.  elif ${pkg} == "xorg" && ${_USE_XORG_DIRS} < ${ver}
 _USE_XORG_DIRS:=       ${ver}
 .  endif
 



Home | Main Index | Thread Index | Old Index