svn commit: r456411 - in head/ports-mgmt/portmaster: . files
Stefan Esser
se at FreeBSD.org
Fri Dec 15 17:55:51 UTC 2017
Author: se
Date: Fri Dec 15 17:55:49 2017
New Revision: 456411
URL: https://svnweb.freebsd.org/changeset/ports/456411
Log:
Fix regression: The find_new_port function is now invoked from an earlier
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
Added:
head/ports-mgmt/portmaster/files/
head/ports-mgmt/portmaster/files/patch-portmaster (contents, props changed)
Modified:
head/ports-mgmt/portmaster/Makefile
Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile Fri Dec 15 17:19:56 2017 (r456410)
+++ head/ports-mgmt/portmaster/Makefile Fri Dec 15 17:55:49 2017 (r456411)
@@ -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}/ \
Added: head/ports-mgmt/portmaster/files/patch-portmaster
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ports-mgmt/portmaster/files/patch-portmaster Fri Dec 15 17:55:49 2017 (r456411)
@@ -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
More information about the svn-ports-all
mailing list