Index: head/ports-mgmt/portmaster/Makefile =================================================================== --- head/ports-mgmt/portmaster/Makefile (revision 456410) +++ head/ports-mgmt/portmaster/Makefile (revision 456411) @@ -1,56 +1,57 @@ # $FreeBSD$ PORTNAME= portmaster PORTVERSION= 3.17.11 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH MAINTAINER= se@FreeBSD.org COMMENT= Manage your ports without external databases or languages LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd OPTIONS_DEFINE= BASH ZSH OPTIONS_DEFAULT=BASH ZSH PLIST_FILES= sbin/portmaster \ etc/portmaster.rc.sample \ man/man8/portmaster.8.gz BASH_PLIST_FILES= etc/bash_completion.d/portmaster.sh ZSH_PLIST_FILES= share/zsh/site-functions/_portmaster NO_ARCH= yes verify: checksum do-build: .for file in portmaster files/portmaster.rc.sample files/portmaster.8 ${SED} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/${file} \ > ${WRKDIR}/${file:T} .endfor do-install: ${INSTALL_SCRIPT} ${WRKDIR}/portmaster \ ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKDIR}/portmaster.rc.sample \ ${STAGEDIR}${PREFIX}/etc ${INSTALL_MAN} ${WRKSRC}/files/portmaster.8 \ ${STAGEDIR}${MAN8PREFIX}/man/man8 post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/files/bash-completions \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/portmaster.sh post-install-ZSH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/files/zsh-completions \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_portmaster .include Index: head/ports-mgmt/portmaster/files/patch-portmaster =================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster (nonexistent) +++ head/ports-mgmt/portmaster/files/patch-portmaster (revision 456411) @@ -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 Property changes on: head/ports-mgmt/portmaster/files/patch-portmaster ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property