Date: Tue, 29 Aug 2017 17:33:37 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 219780] [fix proposal] USE_PACKAGE_DEPENDS broken if PACKAGES' definition contains colons Message-ID: <bug-219780-13-h0VdjT3Kl2@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-219780-13@https.bugs.freebsd.org/bugzilla/> References: <bug-219780-13@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D219780 --- Comment #2 from Harald Schmalzbauer <bugzilla.freebsd@omnilan.de> --- While the former does fix USE_PACKAGE_DEPENDS, the real problem with https://svnweb.freebsd.org/ports/head/Mk/bsd.port.mk?view=3Dlog&pathrev=3D4= 41712 persists and breaks several scripts here. So please don't consider the proposal in the former comment as a possible f= ix! Since I'm not planning to rewrite my scripts and in my opinion, it's simply wrong to define PKGFILE etc, with elsewhere unadequate escape characters, I propose this patch: Index: bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- bsd.port.mk (Revision 448848) +++ bsd.port.mk (Arbeitskopie) @@ -2518,7 +2518,6 @@ PKGREPOSITORYSUBDIR?=3D All PKGREPOSITORY?=3D ${PACKAGES}/${PKGREPOSITORYSUBDIR} .if exists(${PACKAGES}) -PACKAGES:=3D ${PACKAGES:S/:/\:/g} _HAVE_PACKAGES=3D yes PKGFILE?=3D ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} .else @@ -3302,19 +3301,19 @@ # Package .if defined(_HAVE_PACKAGES) -_EXTRA_PACKAGE_TARGET_DEP+=3D ${PKGFILE} -_PORTS_DIRECTORIES+=3D ${PKGREPOSITORY} +_EXTRA_PACKAGE_TARGET_DEP+=3D ${PKGFILE:S/:/\:/g} +_PORTS_DIRECTORIES+=3D ${PKGREPOSITORY:S/:/\:/g} -${PKGFILE}: ${WRKDIR_PKGFILE} ${PKGREPOSITORY} +${PKGFILE:S/:/\:/g}: ${WRKDIR_PKGFILE:S/:/\:/g} ${PKGREPOSITORY:S/:/\:/g} @${LN} -f ${WRKDIR_PKGFILE} ${PKGFILE} 2>/dev/null \ || ${CP} -f ${WRKDIR_PKGFILE} ${PKGFILE} . if ${PKGORIGIN} =3D=3D "ports-mgmt/pkg" || ${PKGORIGIN} =3D=3D "ports-mgmt/pkg-devel" -_EXTRA_PACKAGE_TARGET_DEP+=3D ${PKGLATESTREPOSITORY} -_PORTS_DIRECTORIES+=3D ${PKGLATESTREPOSITORY} -_EXTRA_PACKAGE_TARGET_DEP+=3D ${PKGLATESTFILE} +_EXTRA_PACKAGE_TARGET_DEP+=3D ${PKGLATESTREPOSITORY:S/:/\:/g} +_PORTS_DIRECTORIES+=3D "${PKGLATESTREPOSITORY:S/:/\:/g}" +_EXTRA_PACKAGE_TARGET_DEP+=3D ${PKGLATESTFILE:S/:/\:/g} -${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY} +${PKGLATESTFILE:S/:/\:/g}: ${PKGFILE:S/:/\:/g} ${PKGLATESTREPOSITORY:S/:/\= :/g} ${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE} . endif -harry --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-219780-13-h0VdjT3Kl2>