cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oops, the previous patch was bogus. Sorry.

Browse Source
This commit is contained in:
Akinori MUSHA 2004-06-22 04:09:43 +00:00
parent aea5e67f45
commit 957f9e448a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=111965
8 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/portupgrade-devel/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20040529
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}

19
ports-mgmt/portupgrade-devel/files/patch-portinfo.rb
View File

@ -1,11 +1,6 @@
Index: lib/portinfo.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/portinfo.rb,v
retrieving revision 1.16
diff -u -r1.16 portinfo.rb
--- lib/portinfo.rb 8 Nov 2002 17:18:27 -0000 1.16
+++ lib/portinfo.rb 21 Jun 2004 17:36:11 -0000
@@ -17,9 +17,9 @@
--- 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."
@ -13,7 +8,9 @@ diff -u -r1.16 portinfo.rb
+ values = line.chomp.split(FIELD_SEPARATOR)
- if values.size != NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR)
+ if values.size < NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR)
raise ArgumentError, "Port info line must consist of #{NFIELDS} fields."
end
- raise ArgumentError, "Port info line must consist of #{NFIELDS} fields."
- end
+ values.push("") while values.size < NFIELDS
@attr = {}

2
ports-mgmt/portupgrade/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20040529
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}

19
ports-mgmt/portupgrade/files/patch-portinfo.rb
View File

@ -1,11 +1,6 @@
Index: lib/portinfo.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/portinfo.rb,v
retrieving revision 1.16
diff -u -r1.16 portinfo.rb
--- lib/portinfo.rb 8 Nov 2002 17:18:27 -0000 1.16
+++ lib/portinfo.rb 21 Jun 2004 17:36:11 -0000
@@ -17,9 +17,9 @@
--- 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."
@ -13,7 +8,9 @@ diff -u -r1.16 portinfo.rb
+ values = line.chomp.split(FIELD_SEPARATOR)
- if values.size != NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR)
+ if values.size < NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR)
raise ArgumentError, "Port info line must consist of #{NFIELDS} fields."
end
- raise ArgumentError, "Port info line must consist of #{NFIELDS} fields."
- end
+ values.push("") while values.size < NFIELDS
@attr = {}

2
sysutils/portupgrade-devel/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20040529
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}

19
sysutils/portupgrade-devel/files/patch-portinfo.rb
View File

@ -1,11 +1,6 @@
Index: lib/portinfo.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/portinfo.rb,v
retrieving revision 1.16
diff -u -r1.16 portinfo.rb
--- lib/portinfo.rb 8 Nov 2002 17:18:27 -0000 1.16
+++ lib/portinfo.rb 21 Jun 2004 17:36:11 -0000
@@ -17,9 +17,9 @@
--- 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."
@ -13,7 +8,9 @@ diff -u -r1.16 portinfo.rb
+ values = line.chomp.split(FIELD_SEPARATOR)
- if values.size != NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR)
+ if values.size < NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR)
raise ArgumentError, "Port info line must consist of #{NFIELDS} fields."
end
- raise ArgumentError, "Port info line must consist of #{NFIELDS} fields."
- end
+ values.push("") while values.size < NFIELDS
@attr = {}

2
sysutils/portupgrade/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20040529
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}

19
sysutils/portupgrade/files/patch-portinfo.rb
View File

@ -1,11 +1,6 @@
Index: lib/portinfo.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/portinfo.rb,v
retrieving revision 1.16
diff -u -r1.16 portinfo.rb
--- lib/portinfo.rb 8 Nov 2002 17:18:27 -0000 1.16
+++ lib/portinfo.rb 21 Jun 2004 17:36:11 -0000
@@ -17,9 +17,9 @@
--- 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."
@ -13,7 +8,9 @@ diff -u -r1.16 portinfo.rb
+ values = line.chomp.split(FIELD_SEPARATOR)
- if values.size != NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR)
+ if values.size < NFIELDS || values[NFIELDS - 1].index(FIELD_SEPARATOR)
raise ArgumentError, "Port info line must consist of #{NFIELDS} fields."
end
- raise ArgumentError, "Port info line must consist of #{NFIELDS} fields."
- end
+ values.push("") while values.size < NFIELDS
@attr = {}