pkg/26576: incorrect comparisons in mk/dirs.mk

[hira%po6.nsk.ne.jp@localhost]

>Number:         26576
>Category:       pkg
>Synopsis:       incorrect comparisons in mk/dirs.mk
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 06 22:24:01 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kouichirou Hiratsuka
>Release:        NetBSD 2.0G
>Organization:
>Environment:
System: NetBSD firefly.localdomain 2.0G NetBSD 2.0G (FIREFLY.MP) #49: Fri Aug 6 
22:29:16 JST 2004 
hiratuka%firefly.localdomain@localhost:/usr/src/sys/arch/i386/compile/FIREFLY.MP
 i386
Architecture: i386
Machine: i386
>Description:
        In mk/dirs.mk, some strings for comparision are incorrect.
        As a result, {xdg-x11,XFree86,xorg}-dirs dependencies are broken.

>How-To-Repeat:
        cd ${PKGSRCDIR}/meta-pkgs/xorg
        make clean-depends | grep dirs

>Fix:
Index: dirs.mk
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/mk/dirs.mk,v
retrieving revision 1.4
diff -u -r1.4 dirs.mk
--- dirs.mk     29 Jul 2004 07:27:43 -0000      1.4
+++ dirs.mk     6 Aug 2004 21:57:12 -0000
@@ -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
 

>Release-Note:
>Audit-Trail:
>Unformatted: