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 PKGDB_FIX option

Browse Source 
- Improvements to pkgng patch

PR:	ports/182268
Submitted by:	Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp> (maintainer)
This commit is contained in:
Alex Kozlov 2013-09-22 20:25:06 +00:00
parent 1a1cd38e28
commit 8952201db9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=327895
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports-mgmt/pkg_replace/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= pkg_replace
PORTVERSION= 0.8.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= ports-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR=portutil/22116
@ -23,6 +23,8 @@ OPTIONS_DEFINE= ZSH
.if empty(WITH_PKGNG)
OPTIONS_DEFINE+= PKGDB_FIX
PKGDB_FIX_DESC= Fixing tool of installed package dependencies
.else
PLIST_SUB+= PKGDB_FIX="@comment "
.endif
OPTIONS_SUB= yes

13
ports-mgmt/pkg_replace/files/patch-pkg_replace_pkgng
View File

@ -1,5 +1,5 @@
--- sbin/pkg_replace/pkg_replace.sh.orig 2007-01-25 21:55:46.000000000 +0900
+++ sbin/pkg_replace/pkg_replace.sh 2013-05-31 04:13:29.000000000 +0900
+++ sbin/pkg_replace/pkg_replace.sh 2013-09-03 06:58:43.000000000 +0900
@@ -125,14 +125,27 @@
: ${PACKAGEROOT="ftp://ftp.NetBSD.org"}
: ${PKG_SUFX=".tgz"}
@ -184,6 +184,15 @@
pkg_depends '_deps' "${_arg}"
for p in ${_deps}; do
@@ -715,7 +783,7 @@
if empty ${_log}; then
try "$@" || return $?
else
- _cookie="${tmpdir}/.$1_failed"
+ _cookie="${tmpdir}/.${1##*/}_failed"
{ try "$@" || echo $? > "${_cookie}"; } | tee -a "${_log}" ||
warn "tee(1) failed."
@@ -757,9 +825,11 @@
info "Installing '$1'"
@ -292,7 +301,7 @@
update_dependencies() {
+ if is_yes ${use_pkgng}; then
+ info "Updating the dependencies"
+ ${PKG_SET} -y -o $1:$2 || return 1
+ [ "x$1" = "x$2" ] && return 0 || ${PKG_SET} -y -o $1:$2
+ info " $1 -> $2"
+ else
local p req_by