diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2004-07-01 04:05:16 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2004-07-01 04:05:16 +0000 |
| commit | 8f484b7d54fb8b4ffb5c025643dacb47b381a9c7 (patch) | |
| tree | 398dc323b212d19e838732559b3d88e651db06c7 /sysutils/portupgrade-devel | |
| parent | 11bda5392b509cc01ff5c723c8e0ebe95f3c3e43 (diff) | |
| download | ports-8f484b7d54fb8b4ffb5c025643dacb47b381a9c7.tar.gz ports-8f484b7d54fb8b4ffb5c025643dacb47b381a9c7.zip | |
Update to 20040701. New distfile.
portupgrade:
- Make -PP/--use-packages-only work better, just as I originally
intended. Now packages are correctly identified using
pkg_info(1), "LATEST_LINK" files are also properly detected.
Related informational messages have also been improved.
It turned out that the LATEST_LINK/NO_LATEST_LINK detection was
broken long ago and hasn't been working for long.
pkg_fetch(1):
- Properly rename a "latest link" file with a full package name with
version part.
pkgtools.conf(5):
- Improve and unify the method for pattern matching in MAKE_ARGS,
BEFOREBUILD, BEFOREDEINSTALL and AFTERINSTALL variables.
This should fix some cases where it looks like MAKE_ARGS entries
are ignored.
Notes
Notes:
svn path=/head/; revision=112640
Diffstat (limited to 'sysutils/portupgrade-devel')
| -rw-r--r-- | sysutils/portupgrade-devel/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/distinfo | 8 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/files/patch-portinfo.rb | 16 |
3 files changed, 5 insertions, 27 deletions
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index baf92609e5f6..87deaa74b641 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -6,21 +6,19 @@ # PORTNAME= portupgrade -PORTVERSION= 20040529 -PORTREVISION= 2 +PORTVERSION= 20040701 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040208 +DISTVERSION= 20040701 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -PATCHFILES= ${DISTNAME}-20040325.diff.bz2 \ - pkgtools-20040325-${PORTVERSION}.diff.bz2 +PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo index 39fd18115ef9..9a26ccdb6b5d 100644 --- a/sysutils/portupgrade-devel/distinfo +++ b/sysutils/portupgrade-devel/distinfo @@ -1,6 +1,2 @@ -MD5 (pkgtools-20040208.tar.bz2) = 7d8ba8b4b23049cb4c2a23b8403932e2 -SIZE (pkgtools-20040208.tar.bz2) = 98338 -MD5 (pkgtools-20040208-20040325.diff.bz2) = 7233aa86593711cbc4a34a5986359ed1 -SIZE (pkgtools-20040208-20040325.diff.bz2) = 2419 -MD5 (pkgtools-20040325-20040529.diff.bz2) = fe36aa00cc31906cbddf9e1f6995fdac -SIZE (pkgtools-20040325-20040529.diff.bz2) = 3180 +MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 +SIZE (pkgtools-20040701.tar.bz2) = 99351 diff --git a/sysutils/portupgrade-devel/files/patch-portinfo.rb b/sysutils/portupgrade-devel/files/patch-portinfo.rb deleted file mode 100644 index 749629114d57..000000000000 --- a/sysutils/portupgrade-devel/files/patch-portinfo.rb +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/portinfo.rb.orig Sat Nov 9 02:18:27 2002 -+++ lib/portinfo.rb Tue Jun 22 13:07:48 2004 -@@ -17,11 +17,9 @@ - line.is_a?(String) or raise ArgumentError, - "You must specify a one line text of port info." - -- values = line.chomp.split(FIELD_SEPARATOR, NFIELDS) -+ values = line.chomp.split(FIELD_SEPARATOR) - -- if values.size != NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR) -- raise ArgumentError, "Port info line must consist of #{NFIELDS} fields." -- end -+ values.push("") while values.size < NFIELDS - - @attr = {} - |