Update to 20011101, keeping things stable, safe and clean.

portupgrade:

  Properly remove obsoleted dependencies in an upgrade.  This reduces
  pkgdb(1)'s turn.

portversion:

  Inspect the origin port to get the latest version if a package's
  origin is not found in the ports database.

  Distinguish between `origin is not recorded' and `origin port is not
  found'.  Now the flag `#' represents the former and the flag `?'
  represents the latter.

    - Resurrect the flag `!', which means `port Makefile broken'.

    - Yes, the meanings of `#' and `!' have been reversed.  Because we
      would hardly see ports missing origins any longer, I decided to
      assign `!' to the one we see more often.

portsdb:

  Call make_describe_pass[12] with the full paths.  This fixes a
  problem where `portsdb -U' cannot run them if ${PREFIX}/sbin is not
  in the PATH.

miscellaneous:

  Improve the build process.

    - Move shebang line adjustment and ${PREFIX} substitution from the
      port Makefile to the source Makefiles.

    - Add Makefile.compat in order to support old systems which
      doesn't have the SCRIPTS framework. (4.3 or prior)

4 files changed, 4 insertions, 34 deletions

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index b387b3cd59e2..b2df285365d8 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011030
+PORTVERSION=	20011101
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -27,16 +27,6 @@ USE_RUBY=	yes
 
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
 
-RUBY_SHEBANG_FILES=	\
-		${WRKSRC}/bin/pkg_fetch \
-		${WRKSRC}/bin/pkg_glob \
-		${WRKSRC}/bin/pkgdb \
-		${WRKSRC}/bin/portcvsweb \
-		${WRKSRC}/bin/portsclean \
-		${WRKSRC}/bin/portsdb \
-		${WRKSRC}/bin/portupgrade \
-		${WRKSRC}/bin/portversion
-
 MAN1=		pkg_deinstall.1 \
 		pkg_fetch.1 \
 		pkg_glob.1 \
@@ -55,11 +45,6 @@ DOCS=		ChangeLog README
 
 DOCSDIR=	${PREFIX}/share/doc/pkgtools
 
-post-patch:
-.for f in pkgdb.rb pkgtools.rb
-	${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/lib/${f}
-.endfor
-
 post-install:
 	# Remove old database
 	${RM} -f /var/db/pkg/pkgdb.byfile.db
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 647a78fdccd4..ed4ec65b52bb 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011030.tar.gz) = fd3f6c18f6fef49bfde4e2e6d24a2bda
+MD5 (pkgtools-20011101.tar.gz) = c21f494f7b7ee2985d3cd0a81f232842
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index b387b3cd59e2..b2df285365d8 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011030
+PORTVERSION=	20011101
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -27,16 +27,6 @@ USE_RUBY=	yes
 
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
 
-RUBY_SHEBANG_FILES=	\
-		${WRKSRC}/bin/pkg_fetch \
-		${WRKSRC}/bin/pkg_glob \
-		${WRKSRC}/bin/pkgdb \
-		${WRKSRC}/bin/portcvsweb \
-		${WRKSRC}/bin/portsclean \
-		${WRKSRC}/bin/portsdb \
-		${WRKSRC}/bin/portupgrade \
-		${WRKSRC}/bin/portversion
-
 MAN1=		pkg_deinstall.1 \
 		pkg_fetch.1 \
 		pkg_glob.1 \
@@ -55,11 +45,6 @@ DOCS=		ChangeLog README
 
 DOCSDIR=	${PREFIX}/share/doc/pkgtools
 
-post-patch:
-.for f in pkgdb.rb pkgtools.rb
-	${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/lib/${f}
-.endfor
-
 post-install:
 	# Remove old database
 	${RM} -f /var/db/pkg/pkgdb.byfile.db
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 647a78fdccd4..ed4ec65b52bb 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011030.tar.gz) = fd3f6c18f6fef49bfde4e2e6d24a2bda
+MD5 (pkgtools-20011101.tar.gz) = c21f494f7b7ee2985d3cd0a81f232842