bcb9abd Merge pull request #236 from xzhavilla/master — HardenedBSD-pkg

HardenedBSD Package Manager

Merge pull request #236 from xzhavilla/master

Baptiste Daroussin committed 14 years ago

commit bcb9abd03be638008e64454575e0e4ec2988c046
parent 29450dcc826b9c6b2170acc12009b3e8fa3e9bb7

1 file changed +2 -2

modified ports/patch-portmaster-pkgng

@@ -1,5 +1,5 @@

 --- portmaster.sh.in.orig	2012-05-12 12:32:59.760289065 +0200
 +++ portmaster.sh.in	2012-05-12 12:47:04.510208108 +0200
 +++ portmaster.sh.in	2012-05-12 15:53:06.560563067 +0200
@@ -49,7 +49,7 @@
  #=============== Begin functions we always want to have ===============

@@ -164,7 +164,7 @@

  	if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then
 +		if [ -n "$use_pkgng" ]; then
 +			unset PM_PACKAGES PM_PACKAGES_BUILD PM_PACKAGES_LOCAL PM_PACKAGES_NEWER PM_ALWAYS_FETCH PM_DELETE_PACKAGES
 +			echo "===>>> Package installation support cannot be used with pkg(8) yet,"
 +			echo "===>>> Package installation support cannot be used with pkgng yet,"
 +			echo "       it will be disabled"
 +			echo ''
 +		fi