- Update to 2.1.1

  o Fix -O that should force ignoring dependency errors,
    but really did not work [1]
  o Add PKG_BACKUP_DIR environment variable where specified
    a directory where will keep saved packages (-b).
    Default: PKG_PATH (PORTSDIR/packages/All) [2]
  o Add MAKE_ENV in pkgtools.conf that is like MAKE_ARGS but
    allows to set environment variables for ports [3]
  o Fix pkg_fetch(1) to guess a right source directory for
    download (All or Latest). It works in much more cases now [4]
    And make a notice for using of '@' in package name more clean.
  o *_rc_scripts internal procs don't recognize RC-scripts without .sh.
    It's wrong for 6.0+ [5]
  o Fix pkgdb -s [6]
  o Add firefox in a browser list in portcvsweb(1)
  o Revive NEWS file

PR:		ports/56301 [1]
		ports/81454 [2] (based on)
		ports/92896 [3]
		ports/94054 [4]
		ports/95775 [5]
		ports/96832 [6]
Reported by:	Roman Neuhauser <neuhauser at sigpipe.cz> [1]
		Fernan Aguero <fernan at iib.unsam.edu.ar> [3]
		Andrew Webster <awebster at connectalk.com> [4]
		Rong-En Fan <rafan at infor.org> [5]
		Richard Brooksby <rb at ravenbrook.com> [6]
Submitted by:	KOMATSU Shinichiro <koma2 at lovepeers.org> [2]

4 files changed, 8 insertions, 40 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 24d026b5ab46..ef7792972088 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -16,15 +16,6 @@ DISTNAME=	pkgtools-${DISTVERSION}
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	FreeBSD ports/packages administration and management tool suite
 
-DISTVERSION=	${PORTVERSION}
-
-.if ${DISTVERSION} != ${PORTVERSION}
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
-PATCH_DIST_STRIP=	-p1
-.endif
-
 OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend. (Use BDB 1.85 if off)" off
 
 USE_BZIP2=	yes
@@ -69,13 +60,6 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1
 .endif
 
-# pkg_create(1) must support -b. (4.5-RELEASE or later)
-# XXX: PKG_CMD is not defined yet..
-PKG_CREATE_OK!=	/usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE}
-.if empty(PKG_CREATE_OK)
-IGNORE=	pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4
-.endif
-
 post-install: install-ldconfig-file
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 23a96dbc67b2..96b8f1d92784 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.1.0.tar.bz2) = 952045c8659eded82cce4181f1502811
-SHA256 (pkgtools-2.1.0.tar.bz2) = 777eeae3a906e3af1014a7291180332cfd10a8e0fb9a57393149c733eb2bfa5f
-SIZE (pkgtools-2.1.0.tar.bz2) = 108129
+MD5 (pkgtools-2.1.1.tar.bz2) = a3848cf5cffedf196a28b4c3b20746cb
+SHA256 (pkgtools-2.1.1.tar.bz2) = 6b6369fe18a9a2fdb1062361d4211a2e31e49999a0c037f963c7e781af7c1d4c
+SIZE (pkgtools-2.1.1.tar.bz2) = 108685
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 24d026b5ab46..ef7792972088 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -16,15 +16,6 @@ DISTNAME=	pkgtools-${DISTVERSION}
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	FreeBSD ports/packages administration and management tool suite
 
-DISTVERSION=	${PORTVERSION}
-
-.if ${DISTVERSION} != ${PORTVERSION}
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
-PATCH_DIST_STRIP=	-p1
-.endif
-
 OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend. (Use BDB 1.85 if off)" off
 
 USE_BZIP2=	yes
@@ -69,13 +60,6 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1
 .endif
 
-# pkg_create(1) must support -b. (4.5-RELEASE or later)
-# XXX: PKG_CMD is not defined yet..
-PKG_CREATE_OK!=	/usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE}
-.if empty(PKG_CREATE_OK)
-IGNORE=	pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4
-.endif
-
 post-install: install-ldconfig-file
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 23a96dbc67b2..96b8f1d92784 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.1.0.tar.bz2) = 952045c8659eded82cce4181f1502811
-SHA256 (pkgtools-2.1.0.tar.bz2) = 777eeae3a906e3af1014a7291180332cfd10a8e0fb9a57393149c733eb2bfa5f
-SIZE (pkgtools-2.1.0.tar.bz2) = 108129
+MD5 (pkgtools-2.1.1.tar.bz2) = a3848cf5cffedf196a28b4c3b20746cb
+SHA256 (pkgtools-2.1.1.tar.bz2) = 6b6369fe18a9a2fdb1062361d4211a2e31e49999a0c037f963c7e781af7c1d4c
+SIZE (pkgtools-2.1.1.tar.bz2) = 108685