svn commit: r212400 - in
user/pgollucci/portupgrade/tags/20091221_1: . bin etc lib man
misc misc/bash misc/tcsh misc/zsh tests
Philip M. Gollucci
pgollucci at FreeBSD.org
Thu Sep 9 23:38:29 UTC 2010
Author: pgollucci (ports committer)
Date: Thu Sep 9 23:38:29 2010
New Revision: 212400
URL: http://svn.freebsd.org/changeset/base/212400
Log:
tag 20091221_1
Added:
user/pgollucci/portupgrade/tags/20091221_1/
- copied from r212398, user/pgollucci/portupgrade/trunk/
Replaced:
user/pgollucci/portupgrade/tags/20091221_1/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/Makefile
user/pgollucci/portupgrade/tags/20091221_1/Makefile.compat
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/Makefile.compat
user/pgollucci/portupgrade/tags/20091221_1/Makefile.inc
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/Makefile.inc
user/pgollucci/portupgrade/tags/20091221_1/NEWS
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/NEWS
user/pgollucci/portupgrade/tags/20091221_1/README
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/README
user/pgollucci/portupgrade/tags/20091221_1/bin/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/Makefile
user/pgollucci/portupgrade/tags/20091221_1/bin/pkg_fetch
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/pkg_fetch
user/pgollucci/portupgrade/tags/20091221_1/bin/pkg_glob
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/pkg_glob
user/pgollucci/portupgrade/tags/20091221_1/bin/pkg_sort
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/pkg_sort
user/pgollucci/portupgrade/tags/20091221_1/bin/pkgdb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/pkgdb
user/pgollucci/portupgrade/tags/20091221_1/bin/pkgdu
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/pkgdu
user/pgollucci/portupgrade/tags/20091221_1/bin/portcvsweb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/portcvsweb
user/pgollucci/portupgrade/tags/20091221_1/bin/portsclean
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/portsclean
user/pgollucci/portupgrade/tags/20091221_1/bin/portsdb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/portsdb
user/pgollucci/portupgrade/tags/20091221_1/bin/portupgrade
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/portupgrade
user/pgollucci/portupgrade/tags/20091221_1/bin/portversion
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/bin/portversion
user/pgollucci/portupgrade/tags/20091221_1/etc/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/etc/Makefile
user/pgollucci/portupgrade/tags/20091221_1/etc/pkgtools.conf
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/etc/pkgtools.conf
user/pgollucci/portupgrade/tags/20091221_1/etc/pkgtools.sh
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/etc/pkgtools.sh
user/pgollucci/portupgrade/tags/20091221_1/etc/status-pkg.sh
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/etc/status-pkg.sh
user/pgollucci/portupgrade/tags/20091221_1/lib/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/Makefile
user/pgollucci/portupgrade/tags/20091221_1/lib/pkg.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/pkg.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/pkgdb.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/pkgdb.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/pkgdbtools.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/pkgdbtools.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/pkginfo.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/pkginfo.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/pkgmisc.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/pkgmisc.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/pkgtools.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/pkgtools.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/pkgtsort.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/pkgtsort.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/pkgversion.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/pkgversion.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/portinfo.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/portinfo.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/ports.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/ports.rb
user/pgollucci/portupgrade/tags/20091221_1/lib/portsdb.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/lib/portsdb.rb
user/pgollucci/portupgrade/tags/20091221_1/man/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/Makefile
user/pgollucci/portupgrade/tags/20091221_1/man/pkg_deinstall.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/pkg_deinstall.1
user/pgollucci/portupgrade/tags/20091221_1/man/pkg_fetch.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/pkg_fetch.1
user/pgollucci/portupgrade/tags/20091221_1/man/pkg_glob.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/pkg_glob.1
user/pgollucci/portupgrade/tags/20091221_1/man/pkg_sort.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/pkg_sort.1
user/pgollucci/portupgrade/tags/20091221_1/man/pkgdb.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/pkgdb.1
user/pgollucci/portupgrade/tags/20091221_1/man/pkgdu.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/pkgdu.1
user/pgollucci/portupgrade/tags/20091221_1/man/pkgtools.conf.5
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/pkgtools.conf.5
user/pgollucci/portupgrade/tags/20091221_1/man/portcvsweb.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/portcvsweb.1
user/pgollucci/portupgrade/tags/20091221_1/man/portsclean.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/portsclean.1
user/pgollucci/portupgrade/tags/20091221_1/man/portsdb.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/portsdb.1
user/pgollucci/portupgrade/tags/20091221_1/man/portupgrade.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/portupgrade.1
user/pgollucci/portupgrade/tags/20091221_1/man/portversion.1
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/man/portversion.1
user/pgollucci/portupgrade/tags/20091221_1/misc/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/misc/Makefile
user/pgollucci/portupgrade/tags/20091221_1/misc/Makefile.inc
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/misc/Makefile.inc
user/pgollucci/portupgrade/tags/20091221_1/misc/bash/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/misc/bash/Makefile
user/pgollucci/portupgrade/tags/20091221_1/misc/bash/complete.sample
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/misc/bash/complete.sample
user/pgollucci/portupgrade/tags/20091221_1/misc/tcsh/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/misc/tcsh/Makefile
user/pgollucci/portupgrade/tags/20091221_1/misc/tcsh/complete.sample
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/misc/tcsh/complete.sample
user/pgollucci/portupgrade/tags/20091221_1/misc/zsh/Makefile
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/misc/zsh/Makefile
user/pgollucci/portupgrade/tags/20091221_1/tests/test_all.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/tests/test_all.rb
user/pgollucci/portupgrade/tags/20091221_1/tests/test_pkgdb.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/tests/test_pkgdb.rb
user/pgollucci/portupgrade/tags/20091221_1/tests/test_pkginfo.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/tests/test_pkginfo.rb
user/pgollucci/portupgrade/tags/20091221_1/tests/test_pkgtsort.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/tests/test_pkgtsort.rb
user/pgollucci/portupgrade/tags/20091221_1/tests/test_pkgversion.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/tests/test_pkgversion.rb
user/pgollucci/portupgrade/tags/20091221_1/tests/test_portinfo.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/tests/test_portinfo.rb
user/pgollucci/portupgrade/tags/20091221_1/tests/test_portsdb.rb
- copied unchanged from r212399, user/pgollucci/portupgrade/trunk/tests/test_portsdb.rb
Copied: user/pgollucci/portupgrade/tags/20091221_1/Makefile (from r212399, user/pgollucci/portupgrade/trunk/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pgollucci/portupgrade/tags/20091221_1/Makefile Thu Sep 9 23:38:29 2010 (r212400, copy of r212399, user/pgollucci/portupgrade/trunk/Makefile)
@@ -0,0 +1,91 @@
+# $Id: Makefile,v 1.1.1.1 2006/06/13 12:58:59 sem Exp $
+
+SUBDIR= bin \
+ etc \
+ lib \
+ man \
+ misc
+
+.include <bsd.subdir.mk>
+
+.include "${.CURDIR}/Makefile.inc"
+
+HOME?= /home/knu
+TMPDIR?= /tmp
+
+REL_DIRS= ${HOME}/freefall/public_distfiles \
+ ${HOME}/www.idaemons.org/data/distfiles
+
+REL_MINOR?= # none
+.if !defined(REL_DATE)
+REL_DATE!= date '+%Y%m%d'
+.endif
+.if empty(REL_MINOR)
+REL_VERSION= ${REL_DATE}
+.else
+REL_VERSION= ${REL_DATE}.${REL_MINOR}
+.endif
+
+DISTNAME= pkgtools-${REL_VERSION}
+TARBALL= ${DISTNAME}.tar.bz2
+CHANGELOG= ChangeLog NEWS
+README= README
+
+PORTDIR= ${HOME}/work/ports/sysutils/portupgrade
+
+DOCOWN?= ${BINOWN}
+DOCGRP?= ${BINGRP}
+DOCMODE?= 444
+
+DOCFILES= ${CHANGELOG} ${README}
+
+CLEANFILES= pkgtools-*.tar.bz2
+
+.if 0
+install: install-doc
+.endif
+
+install-doc: ${CHANGELOG}
+ mkdir -p ${DOCSDIR}
+ ${INSTALL} -c -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
+ ${DOCFILES} ${DESTDIR}${DOCSDIR}
+
+clean: clean-release
+
+clean-release:
+ rm -f ${CLEANFILES}
+
+${CHANGELOG}:
+ env LANG=C svn log -v > ${CHANGELOG}
+
+${TARBALL}: ${CHANGELOG}
+ svn up
+ svn export svn+ssh://svn.idaemons.org/home/svn/repos/pkgtools/trunk ${TMPDIR}/${DISTNAME}
+ cp ${CHANGELOG} ${TMPDIR}/${DISTNAME}/
+ tar -cf - -C ${TMPDIR} ${DISTNAME} | bzip2 -9c > ${TARBALL}
+ rm -r ${TMPDIR}/${DISTNAME}
+
+tarball: ${TARBALL}
+
+release: ${CHANGELOG} ${TARBALL}
+.for d in ${REL_DIRS}
+ cp -p ${TARBALL} ${d}
+.endfor
+
+upload:
+ @syncfreefall -f
+
+port:
+ @${RUBY} -i -pe \
+ "sub /^PORTVERSION=.*/, %{PORTVERSION=\t${REL_VERSION}}" \
+ ${PORTDIR}/Makefile
+ @cd ${PORTDIR}; make MASTER_SORT_REGEX=idaemons distclean makesum
+ @cd ${PORTDIR}; cvs -d freefall:/home/ncvs di | less
+
+commit:
+ @cd ${PORTDIR}; cvs -d freefall:/home/ncvs di | $${PAGER:-more}
+ @echo -n 'OK? '; read ans; expr "$$ans" : '[Yy]' > /dev/null
+ @cd ${PORTDIR}; echo cvs -d freefall:/home/ncvs ci
+
+test:
+ @env PORTSDIR=/usr/ports ${RUBY} -Ilib tests/test_all.rb
Copied: user/pgollucci/portupgrade/tags/20091221_1/Makefile.compat (from r212399, user/pgollucci/portupgrade/trunk/Makefile.compat)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pgollucci/portupgrade/tags/20091221_1/Makefile.compat Thu Sep 9 23:38:29 2010 (r212400, copy of r212399, user/pgollucci/portupgrade/trunk/Makefile.compat)
@@ -0,0 +1,101 @@
+# $Id: Makefile.compat 52 2006-01-01 06:26:59Z koma2 $
+
+.if defined(SCRIPTS) && !empty(SCRIPTS) && !target(_scriptsinstall)
+
+all: ${SCRIPTS}
+
+realinstall: _scriptsinstall
+
+SCRIPTSDIR?= ${BINDIR}
+SCRIPTSOWN?= ${BINOWN}
+SCRIPTSGRP?= ${BINGRP}
+SCRIPTSMODE?= ${BINMODE}
+
+.for script in ${SCRIPTS}
+.if defined(SCRIPTSNAME)
+SCRIPTSNAME_${script:T}?= ${SCRIPTSNAME}
+.else
+SCRIPTSNAME_${script:T}?= ${script:T:R}
+.endif
+SCRIPTSDIR_${script:T}?= ${SCRIPTSDIR}
+SCRIPTSOWN_${script:T}?= ${SCRIPTSOWN}
+SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
+SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
+_scriptsinstall: _SCRIPTSINS_${script:T}
+_SCRIPTSINS_${script:T}: ${script}
+ ${INSTALL} ${COPY} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
+ -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
+ ${_INSTALLFLAGS} ${.ALLSRC} \
+ ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}/${SCRIPTSNAME_${.ALLSRC:T}}
+.endfor
+
+.endif
+
+.if !defined(FILESGROUPS)
+
+FILESGROUPS?= FILES
+
+.if !target(buildfiles)
+.for group in ${FILESGROUPS}
+buildfiles: ${${group}}
+.endfor
+.endif
+
+all: buildfiles
+
+.if !target(installfiles)
+.for group in ${FILESGROUPS}
+.if defined(${group}) && !empty(${group})
+
+${group}OWN?= ${SHAREOWN}
+${group}GRP?= ${SHAREGRP}
+${group}MODE?= ${SHAREMODE}
+${group}DIR?= ${BINDIR}
+
+_${group}FILES=
+.for file in ${${group}}
+.if defined(${group}OWN_${file:T}) || defined(${group}GRP_${file:T}) || \
+ defined(${group}MODE_${file:T}) || defined(${group}DIR_${file:T}) || \
+ defined(${group}NAME_${file:T})
+${group}OWN_${file:T}?= ${${group}OWN}
+${group}GRP_${file:T}?= ${${group}GRP}
+${group}MODE_${file:T}?= ${${group}MODE}
+${group}DIR_${file:T}?= ${${group}DIR}
+.if defined(${group}NAME)
+${group}NAME_${file:T}?= ${${group}NAME}
+.else
+${group}NAME_${file:T}?= ${file:T}
+.endif
+installfiles: _${group}INS_${file:T}
+_${group}INS_${file:T}: ${file}
+ ${INSTALL} ${COPY} -o ${${group}OWN_${.ALLSRC:T}} \
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ ${.ALLSRC} \
+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
+.else
+_${group}FILES+= ${file}
+.endif
+.endfor
+.if !empty(_${group}FILES)
+installfiles: _${group}INS
+_${group}INS: ${_${group}FILES}
+.if defined(${group}NAME)
+ ${INSTALL} ${COPY} -o ${${group}OWN} -g ${${group}GRP} \
+ -m ${${group}MODE} ${.ALLSRC} \
+ ${DESTDIR}${${group}DIR}/${${group}NAME}
+.else
+ ${INSTALL} ${COPY} -o ${${group}OWN} -g ${${group}GRP} \
+ -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
+.endif
+.endif
+
+.endif # defined(${group}) && !empty(${group})
+.endfor
+
+.endif
+
+.if target(installfiles)
+realinstall: installfiles
+.endif
+
+.endif
Copied: user/pgollucci/portupgrade/tags/20091221_1/Makefile.inc (from r212399, user/pgollucci/portupgrade/trunk/Makefile.inc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pgollucci/portupgrade/tags/20091221_1/Makefile.inc Thu Sep 9 23:38:29 2010 (r212400, copy of r212399, user/pgollucci/portupgrade/trunk/Makefile.inc)
@@ -0,0 +1,8 @@
+# $Id: Makefile.inc 52 2006-01-01 06:26:59Z koma2 $
+
+PREFIX?= /usr/local
+
+DOCSDIR?= ${PREFIX}/share/doc/pkgtools
+EXAMPLESDIR?= ${PREFIX}/share/examples/pkgtools
+
+RUBY?= ${PREFIX}/bin/ruby
Copied: user/pgollucci/portupgrade/tags/20091221_1/NEWS (from r212399, user/pgollucci/portupgrade/trunk/NEWS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pgollucci/portupgrade/tags/20091221_1/NEWS Thu Sep 9 23:38:29 2010 (r212400, copy of r212399, user/pgollucci/portupgrade/trunk/NEWS)
@@ -0,0 +1,353 @@
+ ======================
+ NEWS for portupgrade
+ ======================
+
+------------------------------------------------------------------------
+
+portupgrade 2.4.6 (released 2008-07-11):
+
+* Fix man pages install.
+
+portupgrade 2.4.5 (released 2008-07-10):
+
+* [portversion, portversion.1] Document new options.
+
+* [pkgtools.rb] Do not touch +CONTENTS file if it's not necessary.
+
+* [pkgmisc.rb] Remove temporary dir with `rm -r'. It could be inner dirs there.
+
+* [pkgdu] A new utility to display disk usage of installed packages.
+
+portupgrade 2.4.4 (released 2008-07-01):
+
+* [pkgtools.rb] Close +CONTENTS file. It made a few problems before.
+
+* [portupgrade.1] Some leftovers removed. Fix .Pp tag.
+
+* [portupgrade] Fix a failure when -PP specified for some ports.
+
+* [portversion] Add -F to show a package full name (with a version number)
+ -o to show an origin of a package and -q for quiet output.
+
+* [portupgrade, pkgmisc.rb] Fix a bug in make arguments quoting. If you
+ had an argument with spaces (e.g. WITH_MODULES="module1 module2"), it
+ was parsed wrong.
+
+* [portupgrade] Allow upgrade dependencies if -R or -r options specified
+ but main port is up-to-date.
+
+* [pkgdb.rb, portsdb.rb] If DB can't be updated, remove it and try again.
+
+* [portupgrade] setproctitle with a port name when 'make config' runs.
+
+* [portupgrade] If 'make config' fails, show a warning and ignore it.
+
+* [pkgdb] Do not show 'You do not own pkgdb dir' for root.
+
+portupgrade 2.4.3 (released 2008-02-11):
+
+* [portupgrade] Fix dependencies list after we gather it. So we will not
+ try to upgrade dependecies when a specified port is up-to-date.
+
+* [portsclean] Fix a typo in a condition. Now it's work again.
+
+* [portupgrade] Change a semantic of -q option. Now it means 'quiet'.
+ Don't show a message when -N specified and there is already installed
+ package. (For Peter Hofer. DesktopBSD).
+
+portupgrade 2.4.2 (released 2008-02-04):
+
+* A few bugs was fixed.
+
+portupgrade 2.4.1 (released 2008-01-29):
+
+* Bugs fix releasse.
+
+* [portupgrade] Throw RecursiveDependencyError exception instead of
+ plain ruby error.
+
+portupgrade 2.4.0 (released 2008-01-26):
+
+* [portupgrade] All dependencies run under portupgrade control now.
+
+* [portupgrade] -c and -C options was changed. Now portupgrade
+ run `make config-conditional` and `make config` accordingly.
+
+* [pkgdb] Bug fix: remove +REQUIRED_BY file if there are no ports
+ require this one.
+
+portupgrade 2.3.2 (released 2008-01-13):
+
+* Bugs fix release
+
+portupgrade 2.3.1 (released 2007-07-03):
+
+* [portupgrade] [pkgbd] Many bug fixes related to the last xorg update
+ to 7.2.0
+
+portupgrade 2.3.0 (released 2007-03-01):
+
+* [portupgrade] At last all dependencies are tracked by portupgrade.
+
+portupgrade 2.2.6 (released 2007-02-27):
+
+* [pkgdb] Fix -O option parsing.
+
+* [portsdb.db] Fix and update language specific categories list.
+
+* [pkgdb] When run as pkg_which, don't check file existence. It allows to check
+ against accidently removed files. (Asked by skv@).
+
+* [pkgdb] Fix a bug when only origins worked in ALT_PKGDEP. pkgname globs
+ are very helpful there. (e.g. 'mysql*-server' => 'mysql40-server').
+
+portupgrade 2.2.5 (released 2007-02-26):
+
+* [pkgdb] Fix issues with ghostscript-afpl vs. ghostscript-gnu,
+ apache13 vs. apache13+mod-ssl, etc. when -F or -L. The ports must be
+ described in ALT_PKGDEP section of pkgtools.conf.
+
+* [pkgdb] Do not make broken pkgdb.db if no ports installed. nanobsd needs it.
+ (Asked by Nick Hibma <n_hibma at ...>)
+
+* [pkgdb.rb] Speed-up autofix() - add -O option for pkgdb -aF execution.
+
+* [pkgtools.conf] Describe PKG_SUFX variable. (Submitted by Pavel Gubin).
+
+portupgrade 2.2.4 (released 2007-02-23):
+
+* [pkgdb] Fix a bug when some dependencies could lost.
+
+* [pkgdb] -L to allow users fix dependencies those was lost with the bug
+ mentioned above.
+
+* [pkgdb] -i turns interactive mode on.
+
+* [pkgdb] Add -O option to turn off dependencies check instead of
+ -d option, that turned it on.
+
+portupgrade 2.2.3 (released 2007-02-16, never released in ports):
+
+* Fixes reflected last changes in the ports tree.
+
+* Hide pkgdb -F smartness under -d switch. It makes life harder when
+ there are a lot of ports with a lot of depends. (Asked by marcus@).
+
+portupgrade 2.2.2 (released 2006-11-18):
+
+* Add UPGRADE_PORT_VER environment variable. Discussed with DougB@ and
+ skv at .
+
+* Add description of UPGRADE_* environment variables in a portupgrade
+ man page.
+
+* Add checking size of a lock file before trying read it. It protects us
+ from a ruby error if the file is empty by some reason.
+ (Reported by: Lowell Gilbert <freebsd-ports-local at be-well.ilk.org>)
+
+portupgrade 2.2.1 (released 2006-11-12):
+
+* Raise an error when MOVED file has a wrong format instead of a weird
+ ruby error. (Reported by kris at FreeBSD.org).
+
+* Fix a bug when -P always treated as -PP.
+
+* Change PORT_UPGRADE environment variable with UPGRADE_PORT (contains
+ a package name for updating port) and UPGRADE_TOOL=portupgrade.
+ Discussed with skv at FreeBSD.org and DougB at FreeBSD.org.
+
+portupgrade 2.2.0 (released 2006-11-06):
+
+* Respect INDEXDIR after fetching INDEX (Andrew Pantyukhin <sat at FreeBSD.org>)
+
+* Add --batch opition.
+
+* Add --without-env-upgrade option.
+
+* Remove -DPACKAGE_BUILDING (it was in fetch-only mode) because it's only
+ for build cluster, not users. (Pointed out by kris at FreeBSD.org)
+
+* Add detection of stale lock files. They can stay if one of tools suddenly
+ terminated.
+
+* Improve pkgdb -F - respect OPTIONS and pkgtools.conf settings.
+
+portupgrade 2.1.7 (released 2006-08-14):
+
+* Make fetch(1) quiet if stdout is not a tty.
+
+* Highlight summary messages with '**'.
+
+* Extract common code from pkgdb.rb and portdb.rb in pkgdbtools.rb.
+ So we have a common open/locking/close etc. procedures for both DBs.
+
+* Do not remove +REQUIRED_BY files when they are empty. pkg_delete(1)
+ works this way. (Requested by: Jeremy Messenger <mezz at FreeBSD.org>,
+ Doug Barton <dougb at FreeBSD.org>)
+
+* Bugs fixes.
+
+portupgrade 2.1.6 (released 2006-07-23):
+
+* Move all man pages into own one directory for easier maintain.
+
+* Bugs fixes.
+
+portupgrade 2.1.5 (released 2006-07-01):
+
+* Try bdb driver first. If it's failed fall back to bdb1 and dbd afterwards.
+ Before the chain was bdb1->dbd, no bdb driver tried.
+
+* Disable running config for all ports. It should be moved to after
+ depedencies parsing and dependencies parsing should be rerun after config.
+
+* Fix portupgrade work when stdin closed. It allows to run portupgrade from
+ wrappers.
+
+* Do not lock pkgdb.db when runned not as root. No writting possible
+ anyway.
+
+* Other bugs fixes.
+
+portupgrade 2.1.4 (released 2006-06-18):
+
+* Add -e (--emit-summaries) option and show summary messages only when
+ the option defined or verbose mode is on.
+
+* Allow origins in ALT_PKGDEP. This announced in pkgtools.conf
+ but did not work really.
+
+* Run 'make config' before all operations unless -j (--jet-mode)
+ option specified.
+
+* Add lock on operations with pkgdb.db. Now you can safe run a few
+ portupgrade(1).
+
+* Bugs fixes.
+
+portupgrade 2.1.3 (released 2006-06-11):
+
+* Add ALT_INDEX array to pkgtools.conf. The array holds additional
+ INDEX files. It's useful for local categories.
+
+* Add to pkgtools.conf a new dirrective: include_hash('glob').
+ It downloads keys and values from files coincided with 'glob'
+ and returns a filled hash. The glob is related to PREFIX.
+
+* Add a summary messages on each upgrade/install transaction:
+ how many tasks and how many task done.
+
+portupgrade 2.1.2 (released 2006-06-07):
+
+* Set both make argument and environment variable to PORT_UPGRADE=yes.
+ It makes possible a port or a package (via install/deinstall scripts)
+ to detect if it builds/installs/deinstalls under portupgrade(1)
+
+* Add to pkgtools.conf a new directive: include_eval('file')
+ The file will included and evaluated in the place where encountered.
+ The file path looking inside of PREFIX.
+
+* Add ALT_MOVED array to pkgtools.conf. The array holds alternate MOVED file.
+ E.g. for files in EXTRA_CATEGORIES.
+
+* Make pkgdb offer install a stale dependency before selecting it from
+ installed.
+
+portupgrade 2.1.1 (released 2006-06-04):
+
+* Allow set MAKE_ENV in pkgtools.conf. It works like MAKE_ARGS but sets
+ environment variables.
+
+* Add firefox in a browser list in portcvsweb(1)
+
+* Add PKG_BACKUP_DIR environment variable to set a directory where
+ old package will keep (when '-b' specified). Default: PKG_PATH
+
+* Other bugs fixes.
+
+portupgrade 2.1.0 (released 2006-06-01):
+
+* Rewrite version checking. Now it's complete compliant with pkg_version(1)
+ Add mode test in tests/test_pkgversion.rb
+
+* Make tests/test_pkgdb.rb does not depend on libtool with specific version.
+ Make it depends on ruby port with dynamicaly getting of its full package name.
+
+* Fix a pointyhat URL. Get rid on bento.freebsd.org URL and alpha platform.
+
+* Other bugs fixes.
+
+portupgrade 2.0.1 (released 2006-01-03):
+
+* portversion(1) also reads MOVED and trace origin change,
+ and, when invoked with "-v", displays the new origin.
+
+ Example:
+
+ % portversion -v screen
+ screen-4.0.2_2 < needs updating (port has 4.0.2_3) (=> 'sysutils/screen')
+
+* Add "--ignore-moved" to portupgrade(1) and portversion(1).
+ When invoked with this option, both programs totally ignore MOVED.
+ If you encounter strange behaviour of these programs, try this out.
+
+* Add IGNORE_MOVED option to pkgtools.conf.
+ This can be used to selectively ignore MOVED by pkgs.
+ See pkgtools.conf.sample for details.
+
+* Keep the order of MOVED entries, and do not trace back to old entries.
+ Previously, when encounters the following entries,
+
+ editors/emacs|editors/emacs19|2004-03-20|emacs 19.x moved to a non-default port location
+ editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location
+
+ portupgrade traces as "editors/emacs21" -> "editors/emacs" -> "editors/emacs19".
+ I thought this behavior should not be what we want to, so added this change.
+
+
+------------------------------------------------------------------------
+
+portupgrade 2.0.0 (released 2006-01-01):
+
+* Change the versioning scheme of portupgrade.
+ portupgrade now becomes 2.0.0!
+
+* Add FreshPorts support to portcvsweb(1).
+ You can view CVS history via FreshPorts instead of CVSweb
+ by using "portcvsweb -F". See the man page of portcvsweb(1) for details.
+
+* If the change of the origin is written in MOVED,
+ portupgrade reads and chases it.
+ You no longer need to supply the origin of the new pkg by "-o" option.
+
+ Example:
+
+ When ftp/wget-devel is moved to ftp/wget, previously you had to run,
+ % portupgrade -o ftp/wget wget
+
+ Now, just run
+
+ % portupgrade wget
+
+ and portupgrade will do what you want to do.
+
+* Try to guess the pkg to be upgraded, when no pkgname is supplied
+ as a command line argument.
+ This can be done only when the current directory is under $PORTSDIR.
+
+ Example:
+
+ Running
+
+ % cd /usr/ports/ftp/wget
+ % portupgrade
+
+ will upgrade ftp/wget.
+
+* The frequency of INDEX generation on official site is now sufficient,
+ recommend to run "portsdb -F" (fetch INDEX from official site)
+ instead of "portsdb -U" (make INDEX by yourself) in portsdb(1). [1]
+
+ Pointed out by: Enrique Matias <cronopios at gmail dot com> [1]
+
+$FreeBSD: projects/pkgtools/NEWS,v 1.27 2009-10-27 23:31:09 stas Exp $
Copied: user/pgollucci/portupgrade/tags/20091221_1/README (from r212399, user/pgollucci/portupgrade/trunk/README)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pgollucci/portupgrade/tags/20091221_1/README Thu Sep 9 23:38:29 2010 (r212400, copy of r212399, user/pgollucci/portupgrade/trunk/README)
@@ -0,0 +1,169 @@
+$Id: README 52 2006-01-01 06:26:59Z koma2 $
+
+You need to install the following ports to use these pkgtools.
+
+ lang/ruby18 - Ruby 1.8 interpreter
+ or
+ lang/ruby16 - Ruby 1.6 interpreter
+ and
+ lang/ruby16-shim-ruby18 - Ruby 1.8 features and modules for 1.6
+
+ and if you want to run tests:
+
+ devel/ruby-testunit - Unit testing framework
+
+============
+portupgrade
+============
+
+Portupgrade is a tool to upgrade installed packages via ports or
+packages. It allows you to upgrade installed packages without having
+to reinstall dependent/required packages by directly adjusting the
+package database located under /var/db/pkg, while it can also upgrade
+packages recursively.
+
+e.g.
+ portupgrade gtk
+
+============
+portinstall
+============
+
+Portinstall is equivalent to `portupgrade -N', which means it tries to
+install the latest version when a specified package is not installed.
+Prior to the installation of a new package, all the required packages
+are upgraded.
+
+e.g.
+ portinstall shells/zsh
+
+============
+portversion
+============
+
+Portversion is a tool to compare the versions of install packages with
+those in the ports tree. It is a replacement for pkg_version(1)
+cooperative with portupgrade, that is, the command output is optimized
+for portupgrade. Besides, it runs much faster than pkg_version(1)
+because it utilizes the prebuilt ports database. (See portsdb)
+
+e.g.
+ portversion
+
+============
+portsdb
+============
+
+Portsdb generates the ports database named INDEX.db from the ports
+INDEX file. It is commonly used among the tool suite and
+automatically updated on demand when it gets older than the ports
+INDEX file.
+
+e.g.
+ portsdb -Uu
+
+============
+ports_glob
+============
+
+Ports_glob expands ports globs. It understands wildcards and is
+capable of listing the required, dependent or master ports of a given
+port. It would be handy to use from within a shell script.
+
+e.g.
+ portsdb -M japanese/linux-netscape47-navigator
+
+============
+pkg_fetch
+============
+
+Pkg_fetch is a tool to download binary packages from remote sites. It
+can optionally download packages recursively through dependencies.
+
+e.g.
+ pkg_fetch -r sawfish
+
+============
+pkg_glob
+============
+
+Pkg_glob expands package globs. It understands wildcards and is
+capable of listing the required or dependent packages of a package.
+It would be handy to use from within a shell script.
+
+e.g.
+ pkg_glob -R gnome
+
+============
+pkg_deinstall
+============
+
+Pkg_deinstall is a wrapper/replacement of pkg_delete(1), which
+understands wildcards and is capable of recursing through
+dependencies. It has an option to preserve shared libraries.
+
+e.g.
+ pkg_deinstall -r xmms
+
+============
+pkgdb
+============
+
+Pkgdb creates and updates the packages database which is commonly used
+among the tool suite. It keeps a hash that maps an installed file to
+a package name, a hash that maps a package to an origin, and a list of
+installed packages. The database file is automatically updated on
+demand when any package is installed or deinstalled after the database
+was last updated.
+
+e.g.
+ pkgdb -u
+
+Pkgdb also works as an interactive tool for fixing the package
+registry database when -F is specified. It helps you resolve stale
+dependencies, unlink cyclic dependencies, complete stale or missing
+origins, and remove duplicates. You have to run this periodically so
+that portupgrade and other tools can work effectively and unfailingly.
+
+e.g.
+ pkgdb -Fv
+
+
+============
+pkg_which
+============
+
+Pkg_which inquires of the packages database which package each given
+file came from. If you do not have permission to update the database
+although it is outdated, it delegates tasks to pkg_info(1).
+
+e.g.
+ pkg_which patgen
+
+============
+portsclean
+============
+
+Portsclean is a tool to clean ports working directories, no longer
+referenced distfiles, outdated package files, and/or obsolete and
+orphan shared libraries.
+
+e.g.
+ portsclean -Di
+
+============
+portcvsweb
+============
+
+Portcvsweb is a tool to instantly browse a history of a given file via
+CVSweb. It may be more useful than you expect. Try it with src, www,
+doc, NetBSD pkgsrc, and OpenBSD ports files. :)
+
+e.g.
+ portcvsweb sysutils/portupgrade
+
+--
+ /
+ /__ __ Akinori.org / MUSHA.org
+ / ) ) ) ) / FreeBSD.org / Ruby-lang.org
+Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp
Copied: user/pgollucci/portupgrade/tags/20091221_1/bin/Makefile (from r212399, user/pgollucci/portupgrade/trunk/bin/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pgollucci/portupgrade/tags/20091221_1/bin/Makefile Thu Sep 9 23:38:29 2010 (r212400, copy of r212399, user/pgollucci/portupgrade/trunk/bin/Makefile)
@@ -0,0 +1,41 @@
+# $Id: Makefile,v 1.3 2008/07/10 13:17:02 sem Exp $
+
+SCRIPTSDIR?= ${PREFIX}/sbin
+
+BUILDDIR= .build
+
+SCRIPTS= ${BUILDDIR}/pkg_fetch \
+ ${BUILDDIR}/pkg_glob \
+ ${BUILDDIR}/pkg_sort \
+ ${BUILDDIR}/pkgdb \
+ ${BUILDDIR}/pkgdu \
+ ${BUILDDIR}/portcvsweb \
+ ${BUILDDIR}/portsclean \
+ ${BUILDDIR}/portsdb \
+ ${BUILDDIR}/portupgrade \
+ ${BUILDDIR}/portversion
+LINKS= ${SCRIPTSDIR}/pkg_glob ${SCRIPTSDIR}/pkg_deinstall \
+ ${SCRIPTSDIR}/pkgdb ${SCRIPTSDIR}/pkg_which \
+ ${SCRIPTSDIR}/portupgrade ${SCRIPTSDIR}/portinstall \
+ ${SCRIPTSDIR}/portsdb ${SCRIPTSDIR}/ports_glob
+
+CLEANDIRS= ${BUILDDIR}
+
+.for script in ${SCRIPTS}
+${script}: ${script:T}
+ ${RUBY} -wc ${.ALLSRC}
+ @mkdir -p ${BUILDDIR}
+ ${RUBY} -pe ' \
+ if $$. == 1; \
+ if /^#!/; \
+ $$_.sub(/^#!\s*\S*(\benv\s+)?\bruby/, "#!${RUBY}"); \
+ else; \
+ $$_ = "#!${RUBY}\n" + $$_; \
+ end; \
+ end' \
+ ${.ALLSRC} > ${.TARGET}
+.endfor
+
+.include <bsd.prog.mk>
+
+.include "${.CURDIR}/../Makefile.compat"
Copied: user/pgollucci/portupgrade/tags/20091221_1/bin/pkg_fetch (from r212399, user/pgollucci/portupgrade/trunk/bin/pkg_fetch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pgollucci/portupgrade/tags/20091221_1/bin/pkg_fetch Thu Sep 9 23:38:29 2010 (r212400, copy of r212399, user/pgollucci/portupgrade/trunk/bin/pkg_fetch)
@@ -0,0 +1,365 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+#
+# Copyright (c) 2000-2004 Akinori MUSHA
+# Copyright (c) 2006-2008 Sergey Matveychuk <sem at FreeBSD.org>
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+MYREVISION = %w$Rev: 52 $[1]
+MYDATE = %w$Date: 2008/01/08 11:32:27 $[1]
+MYNAME = File.basename($0)
+
+require "fileutils"
+require "optparse"
+require "pkgtools"
+require "uri"
+
+def init_global
+ $force = false
+ $noconfig = false
+ #$sanity_check = true
+ $tempdir = ""
+ $upward_recursive = false
+end
+
+COLUMNSIZE = 24
+NEXTLINE = "\n%*s" % [5 + COLUMNSIZE, '']
+
+if PkgConfig::OS_MAJOR.to_i >= 5
+ PKG_SUFFIXES = ['.tbz', '.tgz']
+else
+ PKG_SUFFIXES = ['.tgz', '.tbz']
+end
+
+def main(argv)
+ usage = <<-"EOF"
+usage: #{MYNAME} [-hfqRv] {pkgname|URI} ...
+ EOF
+
+ banner = <<-"EOF"
+#{MYNAME} #{Version} (#{MYDATE})
+
+#{usage}
+ EOF
+
+ dry_parse = true
+
+ OptionParser.new(banner, COLUMNSIZE) do |opts|
+ opts.def_option("-h", "--help", "Show this message") {
+ print opts
+ exit 0
+ }
+
+ opts.def_option("-f", "--force", "Download a package even if recorded as installed;#{NEXTLINE}Remove existing packages if they are corrupt") { |v|
+ $force = v
+ }
+
+# opts.def_option("-O", "--omit-check", "Omit sanity checks for dependencies.") {
+# $sanity_check = false
+# }
+
+ opts.def_option("-q", "--noconfig", "Do not read pkgtools.conf") { |v|
+ $noconfig = v
+ }
+
+ opts.def_option("-R", "--upward-recursive", "Download the packages required by the given#{NEXTLINE}packages as well") { |v|
+ $upward_recursive = v
+ }
+
+ opts.def_option("-v", "--verbose", "Be verbose") { |v|
+ $verbose = v
+ }
+
+ opts.def_tail_option '
+pkgname is a full pkgname, a pkgname w/o version followed by an @,
+or a full URI.
+
+Environment Variables [default]:
+ PACKAGEROOT URI of the root of the site [ftp://ftp.FreeBSD.org]
+ PACKAGESITE URI of the directory to fetch packages from [none]
+ (overrides PACKAGEROOT and PKG_SITES)
+ PACKAGES packages directory to save files [$PORTSDIR/packages]
+ PKGTOOLS_CONF configuration file [$PREFIX/etc/pkgtools.conf]
+ PKG_DBDIR packages DB directory [/var/db/pkg]
+ PKG_FETCH command to fetch files [/usr/bin/fetch -ao %2$s %1$s]
+ PKG_SITES list of URIs to fetch packages from [none]
+ PKG_TMPDIR temporary directory for download [$TMPDIR]
+ PORTSDIR ports directory [/usr/ports]
+ TMPDIR temporary directory [/var/tmp]'
+
+ begin
+ init_global
+ init_pkgtools_global
+
+ rest = opts.order(*argv)
+
+ unless $noconfig
+ init_global
+ load_config
+ else
+ argv = rest
+ end
+
+ dry_parse = false
+
+ opts.order!(argv)
+
+ if argv.empty?
+ print opts
+ return 0
+ end
+
+ results = PkgResultSet.new
+
+ opts.order(*argv) do |arg|
+ set_uri_base(arg)
+
+ arg = File.basename(arg).sub(/\.t[bg]z$/, '')
+
+ fetch_pkg(arg, $upward_recursive, results)
+ end
+
+ return results.show('downloaded')
+ rescue OptionParser::ParseError => e
+ STDERR.puts "#{MYNAME}: #{e}", usage
+ exit 64
+ end
+ end
+end
+
+def fetch_pkg(pkgname, recursive, results)
+ downloaded, pkgdep = do_fetch_pkg(pkgname)
+
+ $subdir = nil
+
+ results << PkgResult.new(pkgname, downloaded ? :done : :ignored)
+
+ if pkgdep.is_a?(Array) && recursive
+ pkgdep.each do |dep|
+ results.include?(dep) or fetch_pkg(dep, true, results)
+ end
+ end
+rescue => e
+ results << PkgResult.new(pkgname, e)
+end
+
+def do_fetch_pkg(pkgname)
+ pkgname = pkgname.dup
+
+ latest = pkgname.chomp!('@') || !pkgname.index(/-\d/)
+
+ if !latest && !$force && $pkgdb.installed?(pkgname)
+ progress_message "Skipping #{pkgname} (already installed)"
+ return false, nil
+ end
+
+ PKG_SUFFIXES.each do |suffix|
+ pkgfilename = pkgname + suffix
+ path = File.join($packages_dir, pkgfilename)
+
+ File.exist?(path) or next
+
+ progress_message "Identifying the package #{path}"
+
+ id_pkgname, origin, pkgdep = identify_pkg(path)
+
+ return false, pkgdep if not id_pkgname.nil?
+
+ warning_message "Failed to extract information from #{path}"
+
+ raise "corrupt package" unless $force
+
+ warning_message "Removing the corrupt package #{path}"
+
+ File.unlink(path)
+ end
+
+ FileUtils.mkdir_p [$tmpdir, $packages_dir]
+
+ progress_message "Fetching #{pkgname}"
+
+ temp_path_base = File.join($tmpdir, pkgname)
+
+ temp_path = real_fetch_pkg(pkgname, temp_path_base, latest)
+
+ if not temp_path
+ warning_message "Failed to fetch #{pkgname}"
+ raise "fetch error"
+ end
+
+ pkgfilename = File.basename(temp_path)
+
+ progress_message "Downloaded as #{pkgfilename}"
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list