>Number:         18324
>Category:       pkg
>Synopsis:       zoularis buildlink2.mk failure
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Sep 17 11:01:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     John Kohl
>Release:        NetBSD 1.6
>Organization:
NetBSD Kernel Hackers `R` Us
>Environment:
	
	
System: NetBSD kolvir.arlington.ma.us 1.6 NetBSD 1.6 (KOLVIR-$Revision: 1.48 $) #15: Sun Sep 8 23:03:07 EDT 2002 jtk@kolvir.arlington.ma.us:/usr/u4/sandbox/src/sys/arch/i386/compile/KOLVIR i386
Architecture: i386
Machine: i386
>Description:
buildlink2 didn't work for me on Solaris without the attached fix (had
to prevent clobbering of unprotect sed commands)
>How-To-Repeat:
	download zoularis binary pkgs for Solaris, plus pkgsrc, and try
	building something that uses buildlink2.
>Fix:

--- bsd.buildlink2.mk.~1~	Sat Sep  7 06:13:54 2002
+++ bsd.buildlink2.mk	Tue Sep 17 13:53:04 2002
@@ -227,13 +227,13 @@
 # subdirectories of ${LOCALBASE}, /usr/pkg, or /usr/local.
 #
 _BLNK_PROTECT_SED=	-e "s|${_PKGSRCDIR}|_pKgSrCdIr_|g"
+_BLNK_UNPROTECT_SED=	-e "s|_pKgSrCdIr_|${_PKGSRCDIR}|g"
 _BLNK_PROTECT_SED+=	-e "s|${BUILDLINK_DIR}|_bUiLdLiNk_dIr_|g"
+_BLNK_UNPROTECT_SED+=	-e "s|_bUiLdLiNk_dIr_|${BUILDLINK_DIR}|g"
 .if defined(ZOULARISBASE) && (${ZOULARISBASE} != ${LOCALBASE})
 _BLNK_PROTECT_SED+=	-e "s|${ZOULARISBASE}|_zOuLaRiSbAsE_|g"
 _BLNK_UNPROTECT_SED+=	-e "s|_zOuLaRiSbAsE_|${ZOULARISBASE}|g"
 .endif
-_BLNK_UNPROTECT_SED=	-e "s|_bUiLdLiNk_dIr_|${BUILDLINK_DIR}|g"
-_BLNK_UNPROTECT_SED+=	-e "s|_pKgSrCdIr_|${_PKGSRCDIR}|g"
 #
 # Create _BLNK_TRANSFORM_SED.{1,2,3} from _BLNK_TRANSFORM.  We must use
 # separate variables instead of just one because the contents are too long

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