Update to 20011030. Some minor bugs/typos were fixed.

portupgrade:
- Fix quotes.
  [Submitted by: Jimmy Olgeni <olgeni@uli.it>]

- Do not ask whether to install a port twice. (portinstall/-N)

- Complete missing words in the manpage.

pkgdb:
- Comment out deleted pkgdeps properly.

misc.:
- Convert the install script to Makefiles.

- Change the examples/docs subdirectory name from `portupgrade' to
  `pkgtools'.

6 files changed, 48 insertions, 62 deletions

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 852e5aa12f13..b387b3cd59e2 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011029.1
+PORTVERSION=	20011030
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -25,17 +25,17 @@ RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 
 USE_RUBY=	yes
 
-RUBY_SHEBANG_FILES=	\
-		${WRKSRC}/pkg_fetch \
-		${WRKSRC}/pkg_glob \
-		${WRKSRC}/pkgdb \
-		${WRKSRC}/portcvsweb \
-		${WRKSRC}/portsclean \
-		${WRKSRC}/portsdb \
-		${WRKSRC}/portupgrade \
-		${WRKSRC}/portversion
+MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
 
-NO_BUILD=	yes
+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 \
@@ -49,25 +49,18 @@ MAN1=		pkg_deinstall.1 \
 MLINKS=		pkgdb.1 pkg_which.1 \
 		portupgrade.1 portinstall.1 \
 		portsdb.1 ports_glob.1
-MANCOMPRESSED=	yes
+MANCOMPRESSED=	maybe
 
 DOCS=		ChangeLog README
 
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/pkgtools
 
 post-patch:
 .for f in pkgdb.rb pkgtools.rb
-	${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/${f}
+	${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/lib/${f}
 .endfor
 
-do-install:
-	cd ${WRKSRC} && ${RUBY} install.rb
-	${MKDIR} ${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
-	${MKDIR} ${EXAMPLESDIR}/bash
-	${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/
-	${MKDIR} ${EXAMPLESDIR}/tcsh
-	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+post-install:
 	# Remove old database
 	${RM} -f /var/db/pkg/pkgdb.byfile.db
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 64628f3230d6..647a78fdccd4 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011029.1.tar.gz) = e1b4c8a38c71da0f4512b6fe64dc387b
+MD5 (pkgtools-20011030.tar.gz) = fd3f6c18f6fef49bfde4e2e6d24a2bda
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index c4e7d68b8b66..07e68b1a128c 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -37,12 +37,12 @@ share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
 @unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @unexec rmdir %D/share/zsh 2>/dev/null || true
-%%PORTDOCS%%share/examples/portupgrade/bash/complete.sample
-%%PORTDOCS%%@dirrm share/examples/portupgrade/bash
-%%PORTDOCS%%share/examples/portupgrade/tcsh/complete.sample
-%%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
-%%PORTDOCS%%@dirrm share/examples/portupgrade
-%%PORTDOCS%%share/doc/portupgrade/ChangeLog
-%%PORTDOCS%%share/doc/portupgrade/README
-%%PORTDOCS%%@dirrm share/doc/portupgrade
+%%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
+%%PORTDOCS%%@dirrm share/examples/pkgtools/bash
+%%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample
+%%PORTDOCS%%@dirrm share/examples/pkgtools/tcsh
+%%PORTDOCS%%@dirrm share/examples/pkgtools
+%%PORTDOCS%%share/doc/pkgtools/ChangeLog
+%%PORTDOCS%%share/doc/pkgtools/README
+%%PORTDOCS%%@dirrm share/doc/pkgtools
 @exec rm -f /var/db/pkg/pkgdb.byfile.db
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 852e5aa12f13..b387b3cd59e2 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20011029.1
+PORTVERSION=	20011030
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -25,17 +25,17 @@ RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 
 USE_RUBY=	yes
 
-RUBY_SHEBANG_FILES=	\
-		${WRKSRC}/pkg_fetch \
-		${WRKSRC}/pkg_glob \
-		${WRKSRC}/pkgdb \
-		${WRKSRC}/portcvsweb \
-		${WRKSRC}/portsclean \
-		${WRKSRC}/portsdb \
-		${WRKSRC}/portupgrade \
-		${WRKSRC}/portversion
+MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}"
 
-NO_BUILD=	yes
+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 \
@@ -49,25 +49,18 @@ MAN1=		pkg_deinstall.1 \
 MLINKS=		pkgdb.1 pkg_which.1 \
 		portupgrade.1 portinstall.1 \
 		portsdb.1 ports_glob.1
-MANCOMPRESSED=	yes
+MANCOMPRESSED=	maybe
 
 DOCS=		ChangeLog README
 
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/pkgtools
 
 post-patch:
 .for f in pkgdb.rb pkgtools.rb
-	${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/${f}
+	${RUBY} -i~ -pe 'sub %r:/usr/local:, "${LOCALBASE}"' ${WRKSRC}/lib/${f}
 .endfor
 
-do-install:
-	cd ${WRKSRC} && ${RUBY} install.rb
-	${MKDIR} ${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/misc/zsh/* ${PREFIX}/share/zsh/site-functions/
-	${MKDIR} ${EXAMPLESDIR}/bash
-	${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/
-	${MKDIR} ${EXAMPLESDIR}/tcsh
-	${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/
+post-install:
 	# Remove old database
 	${RM} -f /var/db/pkg/pkgdb.byfile.db
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 64628f3230d6..647a78fdccd4 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20011029.1.tar.gz) = e1b4c8a38c71da0f4512b6fe64dc387b
+MD5 (pkgtools-20011030.tar.gz) = fd3f6c18f6fef49bfde4e2e6d24a2bda
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index c4e7d68b8b66..07e68b1a128c 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -37,12 +37,12 @@ share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
 @unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @unexec rmdir %D/share/zsh 2>/dev/null || true
-%%PORTDOCS%%share/examples/portupgrade/bash/complete.sample
-%%PORTDOCS%%@dirrm share/examples/portupgrade/bash
-%%PORTDOCS%%share/examples/portupgrade/tcsh/complete.sample
-%%PORTDOCS%%@dirrm share/examples/portupgrade/tcsh
-%%PORTDOCS%%@dirrm share/examples/portupgrade
-%%PORTDOCS%%share/doc/portupgrade/ChangeLog
-%%PORTDOCS%%share/doc/portupgrade/README
-%%PORTDOCS%%@dirrm share/doc/portupgrade
+%%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
+%%PORTDOCS%%@dirrm share/examples/pkgtools/bash
+%%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample
+%%PORTDOCS%%@dirrm share/examples/pkgtools/tcsh
+%%PORTDOCS%%@dirrm share/examples/pkgtools
+%%PORTDOCS%%share/doc/pkgtools/ChangeLog
+%%PORTDOCS%%share/doc/pkgtools/README
+%%PORTDOCS%%@dirrm share/doc/pkgtools
 @exec rm -f /var/db/pkg/pkgdb.byfile.db