mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

Fix regression: The find_new_port function is now invoked from an earlier

Browse Source 
place than before flavor	support	was added. Move	its definition to an
appropriate place.

Silence	one pkq	query command that may be called for a non-existing
package	name.

Approved by:    antoine	(implicit)
Reported by:	Milan Obuch, Paul Beard
This commit is contained in:
Stefan Eßer 2017-12-15 17:55:49 +00:00
parent 82b8c66259
commit 912a5ef5ef
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=456411
2 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports-mgmt/portmaster/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= portmaster
PORTVERSION= 3.17.11
PORTREVISION= 1
CATEGORIES= ports-mgmt
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
http://mirror.shatow.net/freebsd/${PORTNAME}/ \

67
ports-mgmt/portmaster/files/patch-portmaster Normal file
View File

@ -0,0 +1,67 @@
--- portmaster.orig 2017-12-15 12:40:13.818570000 +0100
+++ portmaster 2017-12-15 16:49:11.583821000 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
# Copyright (c) 2005-2012 Douglas Barton, All rights reserved
# Please see detailed copyright below
@@ -1449,6 +1449,24 @@
fi
}
+find_new_port () {
+ # Global: new_port
+ local portdir flavor flavor_option
+
+ [ -n "$new_port" ] && return
+
+ portdir=$(dir_part "$1")
+ flavor=$(flavor_part "$1")
+ flavor_option=${flavor:+FLAVOR=$flavor}
+# export_flavor $flavor
+ if pm_cd_pd $portdir; then
+ new_port=`pm_make -V PKGNAME ${flavor_option}`
+ else
+ new_port=`parse_index $portdir name` ||
+ fail "No entry for $portdir in $PM_INDEX"
+ fi
+}
+
check_for_updates () {
# Global: num_updates
local nf iport originflavor flavor origin port_ver do_update skip
@@ -2148,24 +2166,6 @@
PM_NEEDS_UPDATE="${PM_NEEDS_UPDATE}${1} "
}
-find_new_port () {
- # Global: new_port
- local portdir flavor flavor_option
-
- [ -n "$new_port" ] && return
-
- portdir=$(dir_part "$1")
- flavor=$(flavor_part "$1")
- flavor_option=${flavor:+FLAVOR=$flavor}
-# export_flavor $flavor
- if pm_cd_pd $portdir; then
- new_port=`pm_make -V PKGNAME ${flavor_option}`
- else
- new_port=`parse_index $portdir name` ||
- fail "No entry for $portdir in $PM_INDEX"
- fi
-}
-
update_build_l () {
local originflavor origin flavor iport
@@ -3129,7 +3129,7 @@
dir=$(dir_part $1)
flavor=$(flavor_part $1)
pkgname=$(make -C "$pd/$dir" -V PKGNAME FLAVOR=$flavor) || return 1
- pkg info -x ${pkgname%-*}'-[^-]*'
+ pkg info -qx ${pkgname%-*}'-[^-]*'
}
if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then