2c37416 Merge branch 'master' of github.com:pkgng/pkgng — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge branch 'master' of github.com:pkgng/pkgng

jlaffaye committed 15 years ago

commit 2c374160567ecabed9b3f2f3a6816addc1430199
parent 655cc8e

2 files changed +5 -7

modified ports/bsd.pkgng.mk

@@ -92,7 +92,7 @@ check-build-conflicts:

 .if ( defined(CONFLICTS) || defined(CONFLICTS_BUILD) ) && !defined(DISABLE_CONFLICTS) && !defined(DEFER_CONFLICTS_CHECK)
 	@found=`${PKG_INFO} -q -O ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/}`; \
 	conflicts_with=; \
 	if [ -n "$${found}}" ]; then \
 	if [ -n "$${found}" ]; then \
 		prfx=`${PKG_INFO} -q -p "$${found}"`; \
 		orgn=`${PKG_INFO} -q -o "$${found}"`; \
 		if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \

@@ -118,7 +118,7 @@ identify-install-conflicts:

 .if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS)
 	@found=`${PKG_INFO} -q -O ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/}`; \
 	conflicts_with=; \
 	if [ -n "$${found}}" ]; then \
 	if [ -n "$${found}" ]; then \
 		prfx=`${PKG_INFO} -q -p "$${found}"`; \
 		orgn=`${PKG_INFO} -q -o "$${found}"`; \
 		if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \

@@ -145,7 +145,7 @@ check-install-conflicts:

 .if defined(DEFER_CONFLICTS_CHECK)
 	@found=`${PKG_INFO} -q -O ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/}`; \
 	conflicts_with=; \
 	if [ -n "$${found}}" ]; then \
 	if [ -n "$${found}" ]; then \
 		prfx=`${PKG_INFO} -q -p "$${found}"`; \
 		orgn=`${PKG_INFO} -q -o "$${found}"`; \
 		if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \

@@ -165,7 +165,7 @@ check-install-conflicts:

 .else
 	@found=`${PKG_INFO} -q -O ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/}`; \
 	conflicts_with=; \
 	if [ -n "$${found}}" ]; then \
 	if [ -n "$${found}" ]; then \
 		prfx=`${PKG_INFO} -q -p "$${entry}"`; \
 		orgn=`${PKG_INFO} -q -o "$${entry}"`; \
 		if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \

modified ports/pkg2ng

@@ -68,10 +68,8 @@ do

 	test -n "${OPTIONS}" && CMD_ARGS="${CMD_ARGS} -O ${OPTIONS}"
 	# register a package only if it's not registered already
 	pkg info -e ${ORIGIN}
 	if [ $? -eq 0 ]
 	then
 	if pkg info -e ${ORIGIN}; then
 		echo "package is already registered."
 	else
 		pkg register -c "${COMMENT}" -d ${DESC} -p /usr/local -n ${PKG} \