svn commit: r303176 - head/ports-mgmt/portupgrade
Bryan Drewery
bdrewery at FreeBSD.org
Sun Aug 26 03:15:32 UTC 2012
Author: bdrewery
Date: Sun Aug 26 03:15:31 2012
New Revision: 303176
URL: http://svn.freebsd.org/changeset/ports/303176
Log:
- Update to 2.4.9.8
Changelog:
* Fix MOVED tracking when upgrading ports [1]
* Track and display deleted ports when upgrading
* Automatically set DISABLE_CONFLICTS when moving origins
* Fix crash when running portupgrade inside of a WRKDIR
* Fix "Frozen string" error with ruby 1.9 when using the
{BEFORE,AFTER}{INSTALL,DEINSTALL} hooks in pkgtools.conf
* Fix failure being seen as success due to broken script(1) on
older systems [2][3]. This is done by installing a more recent
script(1) into PREFIX/libexec/pkgtools and using it instead.
Only installed/used on FreeBSD 8.0 and earlier.
PR: ports/151662 [1], ports/147242 [2],
ports/131111 [3]
Approved by: eadler (mentor)
Modified:
head/ports-mgmt/portupgrade/Makefile
head/ports-mgmt/portupgrade/distinfo
head/ports-mgmt/portupgrade/pkg-plist
Modified: head/ports-mgmt/portupgrade/Makefile
==============================================================================
--- head/ports-mgmt/portupgrade/Makefile Sun Aug 26 02:54:49 2012 (r303175)
+++ head/ports-mgmt/portupgrade/Makefile Sun Aug 26 03:15:31 2012 (r303176)
@@ -6,7 +6,7 @@
#
PORTNAME= portupgrade
-PORTVERSION= 2.4.9.7
+PORTVERSION= 2.4.9.8
PORTEPOCH= 2
CATEGORIES= ports-mgmt
MASTER_SITES= SF/portupgrade/pkgtools/dist/ \
@@ -29,12 +29,13 @@ BDB4_DESC= Use Berkeley DB >=2
CONFLICTS_INSTALL= portupgrade-devel-*
+DIST_SUBDIR= ${PORTNAME}
USE_BZIP2= yes
USE_RUBY= yes
USE_LDCONFIG= ${PREFIX}/lib/compat/pkg
-MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}"
+MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}"
MAN1= pkg_deinstall.1 \
pkg_fetch.1 \
@@ -76,6 +77,14 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb
RUN_DEPENDS+= ${RUBY_SITELIBDIR}/parsedate.rb:${PORTSDIR}/devel/ruby-date2
.endif
+# Need to install working script(1)
+.if ${OSVERSION} < 801000
+PLIST_SUB+= SCRIPT=""
+MAKE_ENV+= NEED_COMPAT_SCRIPT=yes
+.else
+PLIST_SUB+= SCRIPT="@comment "
+.endif
+
pre-extract:
.if exists(${RUBY_SITEARCHLIBDIR}/bdb.so) && ${PORT_OPTIONS:MBDB1}
@${ECHO_MSG} "================================================================="
Modified: head/ports-mgmt/portupgrade/distinfo
==============================================================================
--- head/ports-mgmt/portupgrade/distinfo Sun Aug 26 02:54:49 2012 (r303175)
+++ head/ports-mgmt/portupgrade/distinfo Sun Aug 26 03:15:31 2012 (r303176)
@@ -1,2 +1,2 @@
-SHA256 (pkgtools-2.4.9.7.tar.bz2) = 9aa5eb67fc4a48d721f36491eca45d7a05760886bae768d498b962bf5fc58cd3
-SIZE (pkgtools-2.4.9.7.tar.bz2) = 80323
+SHA256 (portupgrade/pkgtools-2.4.9.8.tar.bz2) = 3368982aa7c27aa754485f546dff7c56715423074709582bbd4705d786058529
+SIZE (portupgrade/pkgtools-2.4.9.8.tar.bz2) = 83214
Modified: head/ports-mgmt/portupgrade/pkg-plist
==============================================================================
--- head/ports-mgmt/portupgrade/pkg-plist Sun Aug 26 02:54:49 2012 (r303175)
+++ head/ports-mgmt/portupgrade/pkg-plist Sun Aug 26 03:15:31 2012 (r303176)
@@ -26,6 +26,12 @@ sbin/portversion
%%RUBY_SITELIBDIR%%/portinfo.rb
%%RUBY_SITELIBDIR%%/ports.rb
%%RUBY_SITELIBDIR%%/portsdb.rb
+ at dirrmtry %%RUBY_SITELIBDIR%%
+ at dirrmtry lib/ruby/site_ruby
+ at dirrmtry lib/ruby
+%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null
+%%SCRIPT%%libexec/pkgtools/script
+%%SCRIPT%%@dirrm libexec/pkgtools
@unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
etc/pkgtools.conf.sample
@exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
More information about the svn-ports-all
mailing list