Attachment #136425 for bug #181643

View | Details | Raw Unified | Return to bug 181643
Collapse All | Expand All





PORTNAME=	pkg_replace
PORTVERSION=	0.8.0
PORTREVISION=	1
CATEGORIES=	ports-mgmt
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR=portutil/22116

MAINTAINER=	kdeguchi@sz.tokoha-u.ac.jp
COMMENT=	Utility for upgrading installed packages

DEPRECATED=	Abandoned upstream, does not support pkgng. Consider using ports-mgmt/portmaster, ports-mgmt/portupgrade or pkgng
EXPIRATION_DATE=	2013-12-31

USE_BZIP2=	YES
MAKE_ARGS=	PREFIX="${PREFIX}" \
		PORTSDIR="${PORTSDIR}" PKG_DBDIR="${PKG_DBDIR}"

MAN1=		pkg_replace.1
MANCOMPRESSED=	maybe

OPTIONS_DEFINE=		ZSH

.if empty(WITH_PKGNG)
OPTIONS_DEFINE+=	PKGDB_FIX
PKGDB_FIX_DESC=		Fixing tool of installed package dependencies
.endif

OPTIONS_DEFAULT=
OPTIONS_SUB=	yes

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MPKGDB_FIX}
MAN1+=	pkgdb_fix.1
.endif

post-patch:
.if ${PORT_OPTIONS:MPKGDB_FIX}
	@${REINPLACE_CMD} -e 's/pkg_replace/pkg_replace pkgdb_fix/;' ${WRKSRC}/sbin/Makefile
.endif
.if !${PORT_OPTIONS:MZSH}
	@${REINPLACE_CMD} -e  's/^	sbin \\$$/	sbin/;s/^	share$$//;' ${WRKSRC}/Makefile
.endif

.include <bsd.port.mk>




--- 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
@@ -125,14 +125,27 @@
 	: ${PACKAGEROOT="ftp://ftp.NetBSD.org"}
 	: ${PKG_SUFX=".tgz"}
 #else
+	: ${use_pkgng="`/usr/bin/make -f/usr/share/mk/bsd.port.mk -V WITH_PKGNG`"}
+	if [ "x${use_pkgng}" = "xdevel" ]; then
+		use_pkgng="yes"
+	fi
 	: ${PORTSDIR="/usr/ports"}
+	if is_yes ${use_pkgng}; then
+	: ${PKGREPOSITORY="/var/cache/pkg/All"}
+	else
 	: ${PKGREPOSITORY="${PORTSDIR}/packages/All"}
+	fi
 #ifdef WITH_OPENBSD
 	: ${PACKAGEROOT="ftp://ftp.OpenBSD.org"}
 	: ${PKG_SUFX=".tgz"}
 #else
+	if is_yes ${use_pkgng}; then
+	: ${PACKAGEROOT="http://pkgbeta.FreeBSD.org"}
+	: ${PKG_SUFX=".txz"}
+	else
 	: ${PACKAGEROOT="ftp://ftp.FreeBSD.org"}
 	: ${PKG_SUFX=".tbz"}
+	fi
 #endif
 #endif
 	: ${PKG_BACKUP_DIR=${PKGREPOSITORY}}
@@ -152,10 +165,18 @@
 }
 
 init_pkgtools() {
+	if is_yes ${use_pkgng}; then
+	PKG_ADD="pkg add"
+	PKG_CREATE="pkg create"
+	PKG_DELETE="pkg delete"
+	PKG_INFO="pkg info"
+	PKG_SET="pkg set"
+	else
 	PKG_ADD="pkg_add"
 	PKG_CREATE="pkg_create"
 	PKG_DELETE="pkg_delete"
 	PKG_INFO="pkg_info"
+	fi
 	MAKE="@MAKE@"
 }
 
@@ -213,7 +234,7 @@
 			expand_path 'file' "${p##*=}"
 			file_exist "${file}" || continue
 			p=${p%=*} ;;
-		*.t[bg]z)
+		*.t[bgx]z)
 			expand_path 'file' "$p"
 			get_pkgname_for_binary 'p' "${file}" || continue
 			p=${p%-*} ;;
@@ -423,6 +444,7 @@
 	file_exist "$2" || return 1
 
 	case $2 in
+	*.txz)	_opt=J ;;
 	*.tbz)	_opt=j ;;
 	*.tgz)	_opt=z ;;
 	*)	return 1 ;;
@@ -434,6 +456,7 @@
 #ifdef WITH_OPENBSD
 	X=`@TAR@ x${_opt}f "$2" -O "+CONTENTS" |
 #else
+	is_yes ${use_pkgng} && X=`${PKG_INFO} -F "$2"` ||
 	X=`@TAR@ x${_opt}f "$2" -O --fast-read "+CONTENTS" |
 #endif
 #endif
@@ -467,6 +490,11 @@
 		done < "${PKG_DBDIR}/$2/+BUILD_INFO"
 	fi
 #else
+	if is_yes ${use_pkgng}; then
+		X=`${PKG_INFO} -qo $2`
+		eval $1=\$X
+		return 0
+	fi
 	if [ -r "${PKG_DBDIR}/$2/+CONTENTS" ]; then
 		while read X; do
 			case $X in
@@ -488,7 +516,11 @@
 }
 
 set_pkg_vars() {
+	if is_yes ${use_pkgng}; then
+	${PKG_INFO} -e $1 || return 1
+	else
 	[ -d "${PKG_DBDIR}/$1" ] || return 1
+	fi
 
 	pkg_name=$1
 	pkg_pkgdir=${PKG_DBDIR}/$1
@@ -526,10 +558,27 @@
 
 	for _arg in ${1+"$@"}; do
 		_pattern=${_arg#${PKG_DBDIR}/}
+		if is_yes ${use_pkgng}; then
+			for p in `${PKG_INFO} -g "${_pattern}" 2>/dev/null`; do
+				if is_yes ${opt_depends}; then
+					pkg_depends '_deps' "$p"
+					eval ${_var}=\"\$${_var} \${_deps}\"
+				fi
+
+				eval ${_var}=\"\$${_var} \$p\"
 
+				if is_yes ${opt_required_by}; then
+					pkg_required_by '_req_by' "$p"
+					eval ${_var}=\"\$${_var} \${_req_by}\"
+				fi
+			done
+			if [ -z "${pkgs}" ]; then
+				warn "No such installed package: ${_arg}"
+			fi
+		else
 		case ${_pattern} in
-		*\**|*-pl[0-9]*|*-[0-9]*[0-9.][a-z]|*-[0-9]*[0-9]) ;;
-		*)		_pattern="${_pattern}-[0-9]*[0-9a-z]" ;;
+		*\**|*-[0-9]*|*-[brv.][0-9]*|*-a.[0-9]*|*-pl[0-9]*|*-b.r[0-9]*|*-cr.[a-z]*) ;;
+		*)		_pattern="${_pattern}-[0-9]*[0-9a-zA-Z]" ;;
 		esac
 
 		for p in ${PKG_DBDIR}/${_pattern}/+CONTENTS; do
@@ -552,6 +601,7 @@
 				warn "No such installed package: ${_arg}"
 			fi
 		done
+		fi
 	done
 
 	set -f
@@ -568,6 +618,12 @@
 		done < "${PKG_DBDIR}/$2/+REQUIRING"
 	fi
 #else
+	if is_yes ${use_pkgng}; then
+		X=`${PKG_INFO} -qd $2`
+		eval $1=\"\${X}\"
+		return 0
+	fi
+
 	if [ -r "${PKG_DBDIR}/$2/+CONTENTS" ]; then
 		while read X; do
 			case $X in
@@ -588,6 +644,12 @@
 pkg_required_by() {
 	local X
 
+	if is_yes ${use_pkgng}; then
+		X=`${PKG_INFO} -qr $2`
+		eval $1=\"\$X\"
+		return 0
+	fi
+
 	eval $1=
 	if [ -r "${PKG_DBDIR}/$2/+REQUIRED_BY" ]; then
 		while read X; do
@@ -597,7 +659,7 @@
 }
 
 pkg_sort() {
-	local p _var _sorted _unsorted _arg _deps
+	local p _var _sorted _unsorted _arg _deps _deplist
 
 	_var=$1; shift
 	_sorted=
@@ -612,7 +674,13 @@
 		*" ${_arg} "*)	continue ;;
 		esac
 
-		if [ -s "${PKG_DBDIR}/${_arg}/+REQUIRED_BY" ]; then
+		_deplist=
+		if is_yes ${use_pkgng}; then
+			_deplist=`${PKG_INFO} -qr ${_arg}`
+		else
+			_deplist="${PKG_DBDIR}/${_arg}/+REQUIRED_BY"
+		fi
+		if [ -s "${_deplist}" ]; then
 			pkg_depends '_deps' "${_arg}"
 
 			for p in ${_deps}; do
@@ -757,9 +825,11 @@
 	info "Installing '$1'"
 
 	case $1 in
-	*.t[bg]z)
+	*.t[bgx]z)
 		is_yes ${opt_force} && install_args="-f"
+		if ! is_yes ${use_pkgng}; then
 		is_yes ${opt_verbose} && install_args="${install_args} -v"
+		fi
 
 		xtry "${2-}" ${PKG_ADD} ${install_args} "$1" || return 1
 		;;
@@ -795,7 +865,11 @@
 
 	deinstall_args=
 	is_yes ${opt_force} && deinstall_args="-f"
+	if is_yes ${use_pkgng}; then
+	deinstall_args="${deinstall_args} -y"
+	else
 	is_yes ${opt_verbose} && deinstall_args="${deinstall_args} -v"
+	fi
 
 #ifdef WITH_PKGSRC
 	if [ -e "${PKG_DBDIR}/$1/+PRESERVE" ]; then
@@ -915,7 +989,11 @@
 		*)		subdir="${OS_MAJOR}-stable" ;;
 		esac
 
+		if is_yes ${use_pkgng}; then
+		uri_path=/freebsd-${OS_MAJOR}-${ARCH}/latest/All/
+		else
 		uri_path="/pub/FreeBSD/ports/${ARCH}/packages-${subdir}/All/"
+		fi
 #endif
 #endif
 		uri="${PACKAGEROOT}${uri_path}${pkg}"
@@ -987,7 +1065,11 @@
 		return 1
 	fi
 #else
+	if is_yes ${use_pkgng}; then
+	try ${PKG_CREATE} -f ${PKG_SUFX} -o "${2%/*}" "$1" || return 1
+	else
 	try ${PKG_CREATE} -b "$1" "$2" || return 1
+	fi
 #endif
 #endif
 }
@@ -1031,12 +1113,17 @@
 }
 
 preserve_libs() {
-	local file
+	local file pkg_info_opts
 
 	is_yes ${opt_preserve_libs} || return 0
 
+	if is_yes ${use_pkgng}; then
+		pkg_info_opts='-ql'
+	else
+		pkg_info_opts='-qL'
+	fi
 	preserved_files=
-	for file in $(${PKG_INFO} -qL "$1"); do
+	for file in $(${PKG_INFO} ${pkg_info_opts} "$1"); do
 		case ${file##*/} in
 		lib*.so.[0-9]*)
 			if [ -f "${file}" ]; then
@@ -1080,20 +1167,30 @@
 fix_dependencies() {
 #ifndef WITH_PKGSRC
 #ifndef WITH_OPENBSD
-	local p deps newdep opt_depends opt_required_by
+	local p deps newdep opt_depends opt_required_by dep_installed
 
 	opt_depends=NO
 	opt_required_by=NO
 	pkg_depends 'deps' "$1"
 
 	for p in ${deps}; do
-		if [ ! -d "${PKG_DBDIR}/$p" ]; then
+		dep_installed=no
+		if is_yes ${use_pkgng}; then
+			${PKG_INFO} -e $p && dep_installed=yes || dep_installed=no
+		else
+			[ -d "${PKG_DBDIR}/$p" ] && dep_installed=yes || dep_installed=no
+		fi
+		if ! is_yes ${dep_installed}; then
 			pkg_glob 'newdep' "${p%-*}" 2>/dev/null
 
 			if empty ${newdep}; then
 				warn "'$1' depends on '$p', but it is NOT installed!"
 			else
+				if is_yes ${use_pkgng}; then
+				${PKG_SET} -y -o `${PKG_INFO} -qo $1`:`${PKG_INFO} -qo $p` || return 1
+				else
 				update_pkgdep "$1" "$p" "${newdep##* }" || return 1
+				fi
 			fi
 		fi
 	done
@@ -1102,6 +1199,11 @@
 }
 
 update_dependencies() {
+	if is_yes ${use_pkgng}; then
+		info "Updating the dependencies"
+		${PKG_SET} -y -o $1:$2 || return 1
+		info "	$1 -> $2"
+	else
 	local p req_by
 
 	pkg_required_by 'req_by' "$2"
@@ -1114,6 +1216,7 @@
 			update_pkgdep "$p" "$1-[^-]*" "$2" || return 1
 		done
 	fi
+	fi
 }
 
 have_pkgdep() {
@@ -1122,7 +1225,7 @@
 	if [ -r "${PKG_DBDIR}/$1/+CONTENTS" ]; then
 		while read X; do
 			case $X in
-			@pkgdep\ $2-[0-9]*|@pkgdep\ $2-pl[0-9]*)
+			@pkgdep\ $2-[0-9]*|@pkgdep\ $2-[brv.][0-9]*|@pkgdep\ $2-a.[0-9]*|@pkgdep\ $2-pl[0-9]*|@pkgdep\ $2-b.r[0-9]*|@pkgdep\ $2-cr.[a-z]*)
 				return 0 ;;
 			[!@]*)	break ;;
 			esac
@@ -1134,7 +1237,7 @@
 
 update_pkgdep() {
 	update_file "${PKG_DBDIR}/$1/+CONTENTS" \
-	"s/^@pkgdep $2\$/@pkgdep $3/" || return 1
+	"/^@pkgdep $2\$/,/^@comment DEPORIGIN:/ { s|^@pkgdep $2\$|@pkgdep $3|; s|^@comment DEPORIGIN:.*\$|@comment DEPORIGIN:${pkg_origin}|; }" || return 1
 }
 
 delete_pkgdep() {
@@ -1325,7 +1428,7 @@
 
 init_install() {
 	case $1 in
-	*.t[bg]z)
+	*.t[bgx]z)
 		set_pkg_vars_for_binary "$1" || return 1 ;;
 	/*)	set_port_vars "$1" || return 1 ;;
 	*)	set_port_vars "${PORTSDIR}/$1" || return 1 ;;
@@ -1351,7 +1454,7 @@
 	done
 
 	case ${replace_with} in
-	*.t[bg]z)
+	*.t[bgx]z)
 		pkg_binary=${replace_with} ;;
 	?*)
 		pkg_portdir=${replace_with}
@@ -1428,6 +1531,12 @@
 do_replace() {
 	local pkg_log pkg_tmpdir old_package old_required_by preserved_files
 
+	if is_yes ${use_pkgng}; then
+		local old_origin new_origin
+		old_origin=
+		new_origin=
+	fi
+
 	init_replace "$1" || { status=skipped; return 0; }
 
 	if [ "${cur_pkg_name}" != "${pkg_name}" ]; then
@@ -1482,7 +1591,9 @@
 	fi
 
 	pkg_tmpdir="${tmpdir}/${cur_pkg_name}"
+	if ! is_yes ${use_pkgng}; then
 	old_required_by="${pkg_tmpdir}/+REQUIRED_BY"
+	fi
 
 	if ! find_package 'old_package' "${cur_pkg_name}"; then
 		old_package="${pkg_tmpdir}/${cur_pkg_name}${PKG_SUFX}"
@@ -1491,7 +1602,11 @@
 	if ! {
 		create_dir "${pkg_tmpdir}" &&
 		backup_package "${cur_pkg_name}" "${old_package}" &&
-		backup_file "${cur_pkg_pkgdir}/+REQUIRED_BY" "${old_required_by}" &&
+		if is_yes ${use_pkgng}; then
+			old_origin=`${PKG_INFO} -qo ${cur_pkg_name}` || return 1
+		else
+			backup_file "${cur_pkg_pkgdir}/+REQUIRED_BY" "${old_required_by}"
+		fi &&
 		preserve_libs "${cur_pkg_name}"
 	}; then
 		log="backup error"
@@ -1503,6 +1618,9 @@
 		if install_package "${pkg_binary:-${pkg_portdir}}" "${pkg_log}"; then
 			status=done
 			cur_pkg_pkgdir=${PKG_DBDIR}/${pkg_name}
+			if is_yes ${use_pkgng}; then
+				new_origin=`${PKG_INFO} -qo ${pkg_name}`
+			fi
 		else
 			log="install error"
 			restore_package "${old_package}" || {
@@ -1515,8 +1633,10 @@
 		log="deinstall error"
 	fi
 
+	if ! is_yes ${use_pkgng}; then
 	restore_file "${old_required_by}" "${cur_pkg_pkgdir}/+REQUIRED_BY" ||
 		warn "Failed to restore the +REQUIRED_BY file."
+	fi
 	process_package "${old_package}" ||
 		warn "Failed to keep the old version."
 	clean_libs ||
@@ -1527,7 +1647,11 @@
 	case ${status} in
 	done)
 		fix_dependencies "${pkg_name}" || return 1
-		update_dependencies "${cur_pkg_name%-*}" "${pkg_name}" || return 1 ;;
+		if is_yes ${use_pkgng}; then
+		update_dependencies "${old_origin}" "${new_origin}" || return 1
+		else
+		update_dependencies "${cur_pkg_name%-*}" "${pkg_name}" || return 1
+		fi ;;
 	*)
 		return 1 ;;
 	esac

Lines 1-5 Link Here

(-)pkg_replace/pkg-plist (-3 / +4 lines)
1	sbin/pkg_replace	1	sbin/pkg_replace
		2	%%PKGDB_FIX%%sbin/pkgdb_fix
2	etc/pkg_replace.conf.sample	3	etc/pkg_replace.conf.sample
3	share/zsh/site-functions/_pkg_replace	4	%%ZSH%%share/zsh/site-functions/_pkg_replace
4	@unexec [ -f %D/bin/zsh ] \|\| rmdir %D/share/zsh/site-functions 2>/dev/null \|\| true	5	%%ZSH%%@unexec [ -f %D/bin/zsh ] \|\| rmdir %D/share/zsh/site-functions 2>/dev/null \|\| true
5	@dirrmtry share/zsh	6	%%ZSH%%@dirrmtry share/zsh

Return to bug 181643

Lines 3-18 Link Here

(-)pkg_replace/Makefile (-4 / +26 lines)
3		3
4	PORTNAME= pkg_replace	4	PORTNAME= pkg_replace
5	PORTVERSION= 0.8.0	5	PORTVERSION= 0.8.0
		6	PORTREVISION= 1
6	CATEGORIES= ports-mgmt	7	CATEGORIES= ports-mgmt
7	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}	8	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
8	MASTER_SITE_SUBDIR=portutil/22116	9	MASTER_SITE_SUBDIR=portutil/22116
9		10
10	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= kdeguchi@sz.tokoha-u.ac.jp
11	COMMENT= Utility for upgrading installed packages	12	COMMENT= Utility for upgrading installed packages
12		13
13	DEPRECATED= Abandoned upstream, does not support pkgng. Consider using ports-mgmt/portmaster, ports-mgmt/portupgrade or pkgng
14	EXPIRATION_DATE= 2013-12-31
15
16	USE_BZIP2= YES	14	USE_BZIP2= YES
17	MAKE_ARGS= PREFIX="${PREFIX}" \	15	MAKE_ARGS= PREFIX="${PREFIX}" \
18	PORTSDIR="${PORTSDIR}" PKG_DBDIR="${PKG_DBDIR}"	16	PORTSDIR="${PORTSDIR}" PKG_DBDIR="${PKG_DBDIR}"
Lines 20-23 Link Here
20	MAN1= pkg_replace.1	18	MAN1= pkg_replace.1
21	MANCOMPRESSED= maybe	19	MANCOMPRESSED= maybe
22		20
		21	OPTIONS_DEFINE= ZSH
		22
		23	.if empty(WITH_PKGNG)
		24	OPTIONS_DEFINE+= PKGDB_FIX
		25	PKGDB_FIX_DESC= Fixing tool of installed package dependencies
		26	.endif
		27
		28	OPTIONS_DEFAULT=
		29	OPTIONS_SUB= yes
		30
		31	.include <bsd.port.options.mk>
		32
		33	.if ${PORT_OPTIONS:MPKGDB_FIX}
		34	MAN1+= pkgdb_fix.1
		35	.endif
		36
		37	post-patch:
		38	.if ${PORT_OPTIONS:MPKGDB_FIX}
		39	@${REINPLACE_CMD} -e 's/pkg_replace/pkg_replace pkgdb_fix/;' ${WRKSRC}/sbin/Makefile
		40	.endif
		41	.if !${PORT_OPTIONS:MZSH}
		42	@${REINPLACE_CMD} -e 's/^ sbin \\$$/ sbin/;s/^ share$$//;' ${WRKSRC}/Makefile
		43	.endif
		44
23	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Added Link Here

(-)pkg_replace/files/patch-sbin__pkg_replace__pkg_replace.sh (+414 lines)
1	--- sbin/pkg_replace/pkg_replace.sh.orig 2007-01-25 21:55:46.000000000 +0900
2	+++ sbin/pkg_replace/pkg_replace.sh 2013-05-31 04:13:29.000000000 +0900
3	@@ -125,14 +125,27 @@
4	: ${PACKAGEROOT="ftp://ftp.NetBSD.org"}
5	: ${PKG_SUFX=".tgz"}
6	#else
7	+ : ${use_pkgng="`/usr/bin/make -f/usr/share/mk/bsd.port.mk -V WITH_PKGNG`"}
8	+ if [ "x${use_pkgng}" = "xdevel" ]; then
9	+ use_pkgng="yes"
10	+ fi
11	: ${PORTSDIR="/usr/ports"}
12	+ if is_yes ${use_pkgng}; then
13	+ : ${PKGREPOSITORY="/var/cache/pkg/All"}
14	+ else
15	: ${PKGREPOSITORY="${PORTSDIR}/packages/All"}
16	+ fi
17	#ifdef WITH_OPENBSD
18	: ${PACKAGEROOT="ftp://ftp.OpenBSD.org"}
19	: ${PKG_SUFX=".tgz"}
20	#else
21	+ if is_yes ${use_pkgng}; then
22	+ : ${PACKAGEROOT="http://pkgbeta.FreeBSD.org"}
23	+ : ${PKG_SUFX=".txz"}
24	+ else
25	: ${PACKAGEROOT="ftp://ftp.FreeBSD.org"}
26	: ${PKG_SUFX=".tbz"}
27	+ fi
28	#endif
29	#endif
30	: ${PKG_BACKUP_DIR=${PKGREPOSITORY}}
31	@@ -152,10 +165,18 @@
32	}
33
34	init_pkgtools() {
35	+ if is_yes ${use_pkgng}; then
36	+ PKG_ADD="pkg add"
37	+ PKG_CREATE="pkg create"
38	+ PKG_DELETE="pkg delete"
39	+ PKG_INFO="pkg info"
40	+ PKG_SET="pkg set"
41	+ else
42	PKG_ADD="pkg_add"
43	PKG_CREATE="pkg_create"
44	PKG_DELETE="pkg_delete"
45	PKG_INFO="pkg_info"
46	+ fi
47	MAKE="@MAKE@"
48	}
49
50	@@ -213,7 +234,7 @@
51	expand_path 'file' "${p##*=}"
52	file_exist "${file}" \|\| continue
53	p=${p%=*} ;;
54	- *.t[bg]z)
55	+ *.t[bgx]z)
56	expand_path 'file' "$p"
57	get_pkgname_for_binary 'p' "${file}" \|\| continue
58	p=${p%-*} ;;
59	@@ -423,6 +444,7 @@
60	file_exist "$2" \|\| return 1
61
62	case $2 in
63	+ *.txz) _opt=J ;;
64	*.tbz) _opt=j ;;
65	*.tgz) _opt=z ;;
66	*) return 1 ;;
67	@@ -434,6 +456,7 @@
68	#ifdef WITH_OPENBSD
69	X=`@TAR@ x${_opt}f "$2" -O "+CONTENTS" \|
70	#else
71	+ is_yes ${use_pkgng} && X=`${PKG_INFO} -F "$2"` \|\|
72	X=`@TAR@ x${_opt}f "$2" -O --fast-read "+CONTENTS" \|
73	#endif
74	#endif
75	@@ -467,6 +490,11 @@
76	done < "${PKG_DBDIR}/$2/+BUILD_INFO"
77	fi
78	#else
79	+ if is_yes ${use_pkgng}; then
80	+ X=`${PKG_INFO} -qo $2`
81	+ eval $1=\$X
82	+ return 0
83	+ fi
84	if [ -r "${PKG_DBDIR}/$2/+CONTENTS" ]; then
85	while read X; do
86	case $X in
87	@@ -488,7 +516,11 @@
88	}
89
90	set_pkg_vars() {
91	+ if is_yes ${use_pkgng}; then
92	+ ${PKG_INFO} -e $1 \|\| return 1
93	+ else
94	[ -d "${PKG_DBDIR}/$1" ] \|\| return 1
95	+ fi
96
97	pkg_name=$1
98	pkg_pkgdir=${PKG_DBDIR}/$1
99	@@ -526,10 +558,27 @@
100
101	for _arg in ${1+"$@"}; do
102	_pattern=${_arg#${PKG_DBDIR}/}
103	+ if is_yes ${use_pkgng}; then
104	+ for p in `${PKG_INFO} -g "${_pattern}" 2>/dev/null`; do
105	+ if is_yes ${opt_depends}; then
106	+ pkg_depends '_deps' "$p"
107	+ eval ${_var}=\"\$${_var} \${_deps}\"
108	+ fi
109	+
110	+ eval ${_var}=\"\$${_var} \$p\"
111
112	+ if is_yes ${opt_required_by}; then
113	+ pkg_required_by '_req_by' "$p"
114	+ eval ${_var}=\"\$${_var} \${_req_by}\"
115	+ fi
116	+ done
117	+ if [ -z "${pkgs}" ]; then
118	+ warn "No such installed package: ${_arg}"
119	+ fi
120	+ else
121	case ${_pattern} in
122	- \\|-pl[0-9]\|-[0-9][0-9.][a-z]\|-[0-9]*[0-9]) ;;
123	- ) _pattern="${_pattern}-[0-9][0-9a-z]" ;;
124	+ \\|-[0-9]\|-[brv.][0-9]\|-a.[0-9]\|-pl[0-9]\|-b.r[0-9]\|-cr.[a-z]*) ;;
125	+ ) _pattern="${_pattern}-[0-9][0-9a-zA-Z]" ;;
126	esac
127
128	for p in ${PKG_DBDIR}/${_pattern}/+CONTENTS; do
129	@@ -552,6 +601,7 @@
130	warn "No such installed package: ${_arg}"
131	fi
132	done
133	+ fi
134	done
135
136	set -f
137	@@ -568,6 +618,12 @@
138	done < "${PKG_DBDIR}/$2/+REQUIRING"
139	fi
140	#else
141	+ if is_yes ${use_pkgng}; then
142	+ X=`${PKG_INFO} -qd $2`
143	+ eval $1=\"\${X}\"
144	+ return 0
145	+ fi
146	+
147	if [ -r "${PKG_DBDIR}/$2/+CONTENTS" ]; then
148	while read X; do
149	case $X in
150	@@ -588,6 +644,12 @@
151	pkg_required_by() {
152	local X
153
154	+ if is_yes ${use_pkgng}; then
155	+ X=`${PKG_INFO} -qr $2`
156	+ eval $1=\"\$X\"
157	+ return 0
158	+ fi
159	+
160	eval $1=
161	if [ -r "${PKG_DBDIR}/$2/+REQUIRED_BY" ]; then
162	while read X; do
163	@@ -597,7 +659,7 @@
164	}
165
166	pkg_sort() {
167	- local p _var _sorted _unsorted _arg _deps
168	+ local p _var _sorted _unsorted _arg _deps _deplist
169
170	_var=$1; shift
171	_sorted=
172	@@ -612,7 +674,13 @@
173	" ${_arg} ") continue ;;
174	esac
175
176	- if [ -s "${PKG_DBDIR}/${_arg}/+REQUIRED_BY" ]; then
177	+ _deplist=
178	+ if is_yes ${use_pkgng}; then
179	+ _deplist=`${PKG_INFO} -qr ${_arg}`
180	+ else
181	+ _deplist="${PKG_DBDIR}/${_arg}/+REQUIRED_BY"
182	+ fi
183	+ if [ -s "${_deplist}" ]; then
184	pkg_depends '_deps' "${_arg}"
185
186	for p in ${_deps}; do
187	@@ -757,9 +825,11 @@
188	info "Installing '$1'"
189
190	case $1 in
191	- *.t[bg]z)
192	+ *.t[bgx]z)
193	is_yes ${opt_force} && install_args="-f"
194	+ if ! is_yes ${use_pkgng}; then
195	is_yes ${opt_verbose} && install_args="${install_args} -v"
196	+ fi
197
198	xtry "${2-}" ${PKG_ADD} ${install_args} "$1" \|\| return 1
199	;;
200	@@ -795,7 +865,11 @@
201
202	deinstall_args=
203	is_yes ${opt_force} && deinstall_args="-f"
204	+ if is_yes ${use_pkgng}; then
205	+ deinstall_args="${deinstall_args} -y"
206	+ else
207	is_yes ${opt_verbose} && deinstall_args="${deinstall_args} -v"
208	+ fi
209
210	#ifdef WITH_PKGSRC
211	if [ -e "${PKG_DBDIR}/$1/+PRESERVE" ]; then
212	@@ -915,7 +989,11 @@
213	*) subdir="${OS_MAJOR}-stable" ;;
214	esac
215
216	+ if is_yes ${use_pkgng}; then
217	+ uri_path=/freebsd-${OS_MAJOR}-${ARCH}/latest/All/
218	+ else
219	uri_path="/pub/FreeBSD/ports/${ARCH}/packages-${subdir}/All/"
220	+ fi
221	#endif
222	#endif
223	uri="${PACKAGEROOT}${uri_path}${pkg}"
224	@@ -987,7 +1065,11 @@
225	return 1
226	fi
227	#else
228	+ if is_yes ${use_pkgng}; then
229	+ try ${PKG_CREATE} -f ${PKG_SUFX} -o "${2%/*}" "$1" \|\| return 1
230	+ else
231	try ${PKG_CREATE} -b "$1" "$2" \|\| return 1
232	+ fi
233	#endif
234	#endif
235	}
236	@@ -1031,12 +1113,17 @@
237	}
238
239	preserve_libs() {
240	- local file
241	+ local file pkg_info_opts
242
243	is_yes ${opt_preserve_libs} \|\| return 0
244
245	+ if is_yes ${use_pkgng}; then
246	+ pkg_info_opts='-ql'
247	+ else
248	+ pkg_info_opts='-qL'
249	+ fi
250	preserved_files=
251	- for file in $(${PKG_INFO} -qL "$1"); do
252	+ for file in $(${PKG_INFO} ${pkg_info_opts} "$1"); do
253	case ${file##*/} in
254	lib.so.[0-9])
255	if [ -f "${file}" ]; then
256	@@ -1080,20 +1167,30 @@
257	fix_dependencies() {
258	#ifndef WITH_PKGSRC
259	#ifndef WITH_OPENBSD
260	- local p deps newdep opt_depends opt_required_by
261	+ local p deps newdep opt_depends opt_required_by dep_installed
262
263	opt_depends=NO
264	opt_required_by=NO
265	pkg_depends 'deps' "$1"
266
267	for p in ${deps}; do
268	- if [ ! -d "${PKG_DBDIR}/$p" ]; then
269	+ dep_installed=no
270	+ if is_yes ${use_pkgng}; then
271	+ ${PKG_INFO} -e $p && dep_installed=yes \|\| dep_installed=no
272	+ else
273	+ [ -d "${PKG_DBDIR}/$p" ] && dep_installed=yes \|\| dep_installed=no
274	+ fi
275	+ if ! is_yes ${dep_installed}; then
276	pkg_glob 'newdep' "${p%-*}" 2>/dev/null
277
278	if empty ${newdep}; then
279	warn "'$1' depends on '$p', but it is NOT installed!"
280	else
281	+ if is_yes ${use_pkgng}; then
282	+ ${PKG_SET} -y -o `${PKG_INFO} -qo $1`:`${PKG_INFO} -qo $p` \|\| return 1
283	+ else
284	update_pkgdep "$1" "$p" "${newdep##* }" \|\| return 1
285	+ fi
286	fi
287	fi
288	done
289	@@ -1102,6 +1199,11 @@
290	}
291
292	update_dependencies() {
293	+ if is_yes ${use_pkgng}; then
294	+ info "Updating the dependencies"
295	+ ${PKG_SET} -y -o $1:$2 \|\| return 1
296	+ info " $1 -> $2"
297	+ else
298	local p req_by
299
300	pkg_required_by 'req_by' "$2"
301	@@ -1114,6 +1216,7 @@
302	update_pkgdep "$p" "$1-[^-]*" "$2" \|\| return 1
303	done
304	fi
305	+ fi
306	}
307
308	have_pkgdep() {
309	@@ -1122,7 +1225,7 @@
310	if [ -r "${PKG_DBDIR}/$1/+CONTENTS" ]; then
311	while read X; do
312	case $X in
313	- @pkgdep\ $2-[0-9]\|@pkgdep\ $2-pl[0-9])
314	+ @pkgdep\ $2-[0-9]\|@pkgdep\ $2-[brv.][0-9]\|@pkgdep\ $2-a.[0-9]\|@pkgdep\ $2-pl[0-9]\|@pkgdep\ $2-b.r[0-9]\|@pkgdep\ $2-cr.[a-z])
315	return 0 ;;
316	[!@]*) break ;;
317	esac
318	@@ -1134,7 +1237,7 @@
319
320	update_pkgdep() {
321	update_file "${PKG_DBDIR}/$1/+CONTENTS" \
322	- "s/^@pkgdep $2\$/@pkgdep $3/" \|\| return 1
323	+ "/^@pkgdep $2\$/,/^@comment DEPORIGIN:/ { s\|^@pkgdep $2\$\|@pkgdep $3\|; s\|^@comment DEPORIGIN:.*\$\|@comment DEPORIGIN:${pkg_origin}\|; }" \|\| return 1
324	}
325
326	delete_pkgdep() {
327	@@ -1325,7 +1428,7 @@
328
329	init_install() {
330	case $1 in
331	- *.t[bg]z)
332	+ *.t[bgx]z)
333	set_pkg_vars_for_binary "$1" \|\| return 1 ;;
334	/*) set_port_vars "$1" \|\| return 1 ;;
335	*) set_port_vars "${PORTSDIR}/$1" \|\| return 1 ;;
336	@@ -1351,7 +1454,7 @@
337	done
338
339	case ${replace_with} in
340	- *.t[bg]z)
341	+ *.t[bgx]z)
342	pkg_binary=${replace_with} ;;
343	?*)
344	pkg_portdir=${replace_with}
345	@@ -1428,6 +1531,12 @@
346	do_replace() {
347	local pkg_log pkg_tmpdir old_package old_required_by preserved_files
348
349	+ if is_yes ${use_pkgng}; then
350	+ local old_origin new_origin
351	+ old_origin=
352	+ new_origin=
353	+ fi
354	+
355	init_replace "$1" \|\| { status=skipped; return 0; }
356
357	if [ "${cur_pkg_name}" != "${pkg_name}" ]; then
358	@@ -1482,7 +1591,9 @@
359	fi
360
361	pkg_tmpdir="${tmpdir}/${cur_pkg_name}"
362	+ if ! is_yes ${use_pkgng}; then
363	old_required_by="${pkg_tmpdir}/+REQUIRED_BY"
364	+ fi
365
366	if ! find_package 'old_package' "${cur_pkg_name}"; then
367	old_package="${pkg_tmpdir}/${cur_pkg_name}${PKG_SUFX}"
368	@@ -1491,7 +1602,11 @@
369	if ! {
370	create_dir "${pkg_tmpdir}" &&
371	backup_package "${cur_pkg_name}" "${old_package}" &&
372	- backup_file "${cur_pkg_pkgdir}/+REQUIRED_BY" "${old_required_by}" &&
373	+ if is_yes ${use_pkgng}; then
374	+ old_origin=`${PKG_INFO} -qo ${cur_pkg_name}` \|\| return 1
375	+ else
376	+ backup_file "${cur_pkg_pkgdir}/+REQUIRED_BY" "${old_required_by}"
377	+ fi &&
378	preserve_libs "${cur_pkg_name}"
379	}; then
380	log="backup error"
381	@@ -1503,6 +1618,9 @@
382	if install_package "${pkg_binary:-${pkg_portdir}}" "${pkg_log}"; then
383	status=done
384	cur_pkg_pkgdir=${PKG_DBDIR}/${pkg_name}
385	+ if is_yes ${use_pkgng}; then
386	+ new_origin=`${PKG_INFO} -qo ${pkg_name}`
387	+ fi
388	else
389	log="install error"
390	restore_package "${old_package}" \|\| {
391	@@ -1515,8 +1633,10 @@
392	log="deinstall error"
393	fi
394
395	+ if ! is_yes ${use_pkgng}; then
396	restore_file "${old_required_by}" "${cur_pkg_pkgdir}/+REQUIRED_BY" \|\|
397	warn "Failed to restore the +REQUIRED_BY file."
398	+ fi
399	process_package "${old_package}" \|\|
400	warn "Failed to keep the old version."
401	clean_libs \|\|
402	@@ -1527,7 +1647,11 @@
403	case ${status} in
404	done)
405	fix_dependencies "${pkg_name}" \|\| return 1
406	- update_dependencies "${cur_pkg_name%-*}" "${pkg_name}" \|\| return 1 ;;
407	+ if is_yes ${use_pkgng}; then
408	+ update_dependencies "${old_origin}" "${new_origin}" \|\| return 1
409	+ else
410	+ update_dependencies "${cur_pkg_name%-*}" "${pkg_name}" \|\| return 1
411	+ fi ;;
412	*)
413	return 1 ;;
414	esac