Re: pkg/24853 (buildlink3 broken for non-X-pkgs when X11BASE == LOCALBASE)

["Jeremy C. Reed" <reed%reedmedia.net@localhost>]

The following reply was made to PR pkg/24853; it has been noted by GNATS.

From: "Jeremy C. Reed" <reed%reedmedia.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/24853 (buildlink3 broken for non-X-pkgs when X11BASE ==
 LOCALBASE)
Date: Wed, 4 Oct 2006 12:30:30 -0500 (CDT)

 > State-Changed-Why:
 > Johnny said more work is needed for non-xpkgwedge setups.
 
 May I commit the following? Or may I remove all references to 
 BUILDLINK_X11_DIR?
 
 Something like this is needed -- I have had this problem for years -- and 
 when others start using modular Xorg they will too.
 
 diff -u -r1.187 bsd.buildlink3.mk
 --- mk/buildlink3/bsd.buildlink3.mk    10 Sep 2006 19:49:53 -0000      1.187
 +++ mk/buildlink3/bsd.buildlink3.mk    4 Oct 2006 17:15:46 -0000
 @@ -570,11 +570,6 @@
                exit 1;                                                 \
                ;;                                                      \
        esac
 -      ${_PKG_SILENT}${_PKG_DEBUG}                                     \
 -      case ${BUILDLINK_PREFIX.${_pkg_}} in                            \
 -      ${X11BASE})     buildlink_dir="${BUILDLINK_X11_DIR}" ;;         \
 -      *)              buildlink_dir="${BUILDLINK_DIR}" ;;             \
 -      esac;                                                           \
        cd ${BUILDLINK_PREFIX.${_pkg_}};                                \
        ${_BLNK_FILES_CMD.${_pkg_}} |                                   \
        while read file; do                                             \
 @@ -583,10 +578,10 @@
                        msg="$$src: not found";                         \
                else                                                    \
                        if [ -z "${BUILDLINK_TRANSFORM.${_pkg_}:Q}" ]; then \
 -                              dest="$$buildlink_dir/$$file";          \
 +                              dest="${BUILDLINK_DIR}/$$file";         \
                                msg="$$src";                            \
                        else                                            \
 -                              dest="$$buildlink_dir/$$file";          \
 +                              dest="${BUILDLINK_DIR}/$$file";         \
                                dest=`${ECHO} $$dest | ${SED} 
${BUILDLINK_TRANSFORM.${_pkg_}}`; \
                                msg="$$src -> $$dest";                  \
                        fi;                                             \