From 022de76493785880d3ba070b88433e32305b8f6c Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Sat, 6 Oct 2001 21:01:34 +0000 Subject: Update to 20011006.1, a hotfix release. This fixes a bug where pkgdb fails to create a new database for the very first time. (Run "pkgdb -fu" if you have 20011006 installed) Fix MAN1 entries. Remove old database pkgdb.byfile.db on installation. (new database is named pkgdb.db) --- ports-mgmt/portupgrade-devel/Makefile | 13 +++++++------ ports-mgmt/portupgrade-devel/distinfo | 1 + ports-mgmt/portupgrade-devel/pkg-plist | 1 + ports-mgmt/portupgrade/Makefile | 13 +++++++------ ports-mgmt/portupgrade/distinfo | 1 + ports-mgmt/portupgrade/pkg-plist | 1 + sysutils/portupgrade-devel/Makefile | 13 +++++++------ sysutils/portupgrade-devel/distinfo | 1 + sysutils/portupgrade-devel/pkg-plist | 1 + sysutils/portupgrade/Makefile | 13 +++++++------ sysutils/portupgrade/distinfo | 1 + sysutils/portupgrade/pkg-plist | 1 + 12 files changed, 36 insertions(+), 24 deletions(-) diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index bd695cefa958..8870299f0497 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -6,15 +6,15 @@ # PORTNAME= portupgrade -PORTVERSION= 20011006 +PORTVERSION= 20011006.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-${PORTVERSION} +DISTNAME= pkgtools-${PORTVERSION:R} -#PATCH_SITES= ${MASTER_SITES} -#PATCHFILES= pkgtools-${PORTVERSION}.1.patch.gz +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= pkgtools-${PORTVERSION}.patch.gz MAINTAINER= knu@FreeBSD.org @@ -40,9 +40,8 @@ NO_BUILD= yes MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ - pkg_which.1 \ + pkgdb.1 \ portcvsweb.1 \ - ports_glob.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ @@ -69,6 +68,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/ ${MKDIR} ${EXAMPLESDIR}/tcsh ${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/ + # Remove old database + ${RM} -f /var/db/pkg/pkgdb.byfile.db .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for f in ${DOCS} diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo index 908784282e93..0537d15de4cf 100644 --- a/ports-mgmt/portupgrade-devel/distinfo +++ b/ports-mgmt/portupgrade-devel/distinfo @@ -1 +1,2 @@ MD5 (pkgtools-20011006.tar.gz) = d95cbaa0fbede15ca39c4b2bba38e024 +MD5 (pkgtools-20011006.1.patch.gz) = 7e19fac028f0e390e7df6d337f5c49e1 diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist index 3f101d5b4e58..198e7bfe16a0 100644 --- a/ports-mgmt/portupgrade-devel/pkg-plist +++ b/ports-mgmt/portupgrade-devel/pkg-plist @@ -40,3 +40,4 @@ share/zsh/site-functions/_portversion %%PORTDOCS%%share/doc/portupgrade/ChangeLog %%PORTDOCS%%share/doc/portupgrade/README %%PORTDOCS%%@dirrm share/doc/portupgrade +@exec rm -f /var/db/pkg/pkgdb.byfile.db diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index bd695cefa958..8870299f0497 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,15 +6,15 @@ # PORTNAME= portupgrade -PORTVERSION= 20011006 +PORTVERSION= 20011006.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-${PORTVERSION} +DISTNAME= pkgtools-${PORTVERSION:R} -#PATCH_SITES= ${MASTER_SITES} -#PATCHFILES= pkgtools-${PORTVERSION}.1.patch.gz +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= pkgtools-${PORTVERSION}.patch.gz MAINTAINER= knu@FreeBSD.org @@ -40,9 +40,8 @@ NO_BUILD= yes MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ - pkg_which.1 \ + pkgdb.1 \ portcvsweb.1 \ - ports_glob.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ @@ -69,6 +68,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/ ${MKDIR} ${EXAMPLESDIR}/tcsh ${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/ + # Remove old database + ${RM} -f /var/db/pkg/pkgdb.byfile.db .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for f in ${DOCS} diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index 908784282e93..0537d15de4cf 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1 +1,2 @@ MD5 (pkgtools-20011006.tar.gz) = d95cbaa0fbede15ca39c4b2bba38e024 +MD5 (pkgtools-20011006.1.patch.gz) = 7e19fac028f0e390e7df6d337f5c49e1 diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index 3f101d5b4e58..198e7bfe16a0 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/pkg-plist @@ -40,3 +40,4 @@ share/zsh/site-functions/_portversion %%PORTDOCS%%share/doc/portupgrade/ChangeLog %%PORTDOCS%%share/doc/portupgrade/README %%PORTDOCS%%@dirrm share/doc/portupgrade +@exec rm -f /var/db/pkg/pkgdb.byfile.db diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index bd695cefa958..8870299f0497 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -6,15 +6,15 @@ # PORTNAME= portupgrade -PORTVERSION= 20011006 +PORTVERSION= 20011006.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-${PORTVERSION} +DISTNAME= pkgtools-${PORTVERSION:R} -#PATCH_SITES= ${MASTER_SITES} -#PATCHFILES= pkgtools-${PORTVERSION}.1.patch.gz +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= pkgtools-${PORTVERSION}.patch.gz MAINTAINER= knu@FreeBSD.org @@ -40,9 +40,8 @@ NO_BUILD= yes MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ - pkg_which.1 \ + pkgdb.1 \ portcvsweb.1 \ - ports_glob.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ @@ -69,6 +68,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/ ${MKDIR} ${EXAMPLESDIR}/tcsh ${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/ + # Remove old database + ${RM} -f /var/db/pkg/pkgdb.byfile.db .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for f in ${DOCS} diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo index 908784282e93..0537d15de4cf 100644 --- a/sysutils/portupgrade-devel/distinfo +++ b/sysutils/portupgrade-devel/distinfo @@ -1 +1,2 @@ MD5 (pkgtools-20011006.tar.gz) = d95cbaa0fbede15ca39c4b2bba38e024 +MD5 (pkgtools-20011006.1.patch.gz) = 7e19fac028f0e390e7df6d337f5c49e1 diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist index 3f101d5b4e58..198e7bfe16a0 100644 --- a/sysutils/portupgrade-devel/pkg-plist +++ b/sysutils/portupgrade-devel/pkg-plist @@ -40,3 +40,4 @@ share/zsh/site-functions/_portversion %%PORTDOCS%%share/doc/portupgrade/ChangeLog %%PORTDOCS%%share/doc/portupgrade/README %%PORTDOCS%%@dirrm share/doc/portupgrade +@exec rm -f /var/db/pkg/pkgdb.byfile.db diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index bd695cefa958..8870299f0497 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -6,15 +6,15 @@ # PORTNAME= portupgrade -PORTVERSION= 20011006 +PORTVERSION= 20011006.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-${PORTVERSION} +DISTNAME= pkgtools-${PORTVERSION:R} -#PATCH_SITES= ${MASTER_SITES} -#PATCHFILES= pkgtools-${PORTVERSION}.1.patch.gz +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= pkgtools-${PORTVERSION}.patch.gz MAINTAINER= knu@FreeBSD.org @@ -40,9 +40,8 @@ NO_BUILD= yes MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ - pkg_which.1 \ + pkgdb.1 \ portcvsweb.1 \ - ports_glob.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ @@ -69,6 +68,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/misc/bash/* ${EXAMPLESDIR}/bash/ ${MKDIR} ${EXAMPLESDIR}/tcsh ${INSTALL_DATA} ${WRKSRC}/misc/tcsh/* ${EXAMPLESDIR}/tcsh/ + # Remove old database + ${RM} -f /var/db/pkg/pkgdb.byfile.db .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for f in ${DOCS} diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo index 908784282e93..0537d15de4cf 100644 --- a/sysutils/portupgrade/distinfo +++ b/sysutils/portupgrade/distinfo @@ -1 +1,2 @@ MD5 (pkgtools-20011006.tar.gz) = d95cbaa0fbede15ca39c4b2bba38e024 +MD5 (pkgtools-20011006.1.patch.gz) = 7e19fac028f0e390e7df6d337f5c49e1 diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist index 3f101d5b4e58..198e7bfe16a0 100644 --- a/sysutils/portupgrade/pkg-plist +++ b/sysutils/portupgrade/pkg-plist @@ -40,3 +40,4 @@ share/zsh/site-functions/_portversion %%PORTDOCS%%share/doc/portupgrade/ChangeLog %%PORTDOCS%%share/doc/portupgrade/README %%PORTDOCS%%@dirrm share/doc/portupgrade +@exec rm -f /var/db/pkg/pkgdb.byfile.db -- cgit v1.2.3