diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2017-12-14 20:32:26 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2017-12-14 20:32:26 +0000 |
| commit | 606a3cac9d1ddbf9fed95dfd3ba75b933b43fd59 (patch) | |
| tree | fe4deb073daa42924ef55b40649133d0c51622b6 /ports-mgmt | |
| parent | a77eeed867e65d3c9220fb373c2e5ab117e4b790 (diff) | |
| download | ports-606a3cac9d1ddbf9fed95dfd3ba75b933b43fd59.tar.gz ports-606a3cac9d1ddbf9fed95dfd3ba75b933b43fd59.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/distinfo | 6 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 69 |
3 files changed, 4 insertions, 73 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index c0d88869c7c2..7b9b2229b6da 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= portmaster -PORTVERSION= 3.17.10 +PORTVERSION= 3.17.11 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/portmaster/distinfo b/ports-mgmt/portmaster/distinfo index 41bbdf12144f..39f1da6cd683 100644 --- a/ports-mgmt/portmaster/distinfo +++ b/ports-mgmt/portmaster/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486159871 -SHA256 (freebsd-portmaster-3.17.10_GH0.tar.gz) = 29d71ada63715f33645479ea2840b2223b5086ef2213bd42cc900f2baad06eb4 -SIZE (freebsd-portmaster-3.17.10_GH0.tar.gz) = 44745 +TIMESTAMP = 1513277951 +SHA256 (freebsd-portmaster-3.17.11_GH0.tar.gz) = 7c4c95aa680d7f637a7ac0ae5c0fbc3c7678fa15f32513f78d6b1841476d6589 +SIZE (freebsd-portmaster-3.17.11_GH0.tar.gz) = 42939 diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster deleted file mode 100644 index eca7f1e88be3..000000000000 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ /dev/null @@ -1,69 +0,0 @@ ---- portmaster.orig 2016-02-05 22:36:56 UTC -+++ portmaster -@@ -1239,7 +1239,8 @@ all_pkgs_by_origin () { - echo $iport $origin - done - else -- pkg query -a "%n-%v %o" -+ namesorigins=`pkg query -a "%n-%v %o"` -+ echo "$namesorigins" - fi - return - } -@@ -1644,42 +1645,21 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then - unique_list=':' - - echo "===>>> Building list of installed port names"; echo '' -- if [ -z "$use_pkgng" ]; then -- for pkg in $pdb/*; do -- [ -d $pkg ] || continue -- -- iport=${pkg#$pdb/} -- origin=`origin_from_pdb $iport` || continue -- -- if [ ! -d "$pd/$origin" ]; then -- find_moved_port $origin $iport nonfatal >/dev/null -- [ -n "$moved_npd" ] || continue -- origin=$moved_npd -- fi -- -- if ! pm_cd $pd/$origin; then -- echo " ===>>> $pd/$origin does not exist for $pkg" -- continue -- fi -- unique_list="${unique_list}`make -V UNIQUENAME -V OPTIONS_NAME | tr '\n' ':'`" -- done -- else -- while read pkg origin; do -- if [ ! -d "$pd/$origin" ]; then -- find_moved_port $origin $pkg nonfatal >/dev/null -- [ -n "$moved_npd" ] || continue -- origin=$moved_npd -- fi -+ while read pkg origin; do -+ if [ ! -d "$pd/$origin" ]; then -+ find_moved_port $origin $pkg nonfatal >/dev/null -+ [ -n "$moved_npd" ] || continue -+ origin=$moved_npd -+ fi - -- if ! pm_cd $pd/$origin; then -- echo " ===>>> $pd/$origin does not exist for $pkg" -- continue -- fi -- unique_list="${unique_list}`make -V UNIQUENAME -V OPTIONS_NAME | tr '\n' ':'`" -- done <<-EOF -- $(pkg query -a "%n-%v %o") -- EOF -- fi -+ if ! pm_cd $pd/$origin; then -+ echo " ===>>> $pd/$origin does not exist for $pkg" -+ continue -+ fi -+ unique_list="${unique_list}`make -V UNIQUENAME -V OPTIONS_NAME | tr '\n' ':'`" -+ done <<-EOF -+ $(all_pkgs_by_origin) -+ EOF - - echo "===>>> Checking $port_dbdir" - |