mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-30 05:40:06 +00:00
- Fix descriptions in pkgtools.conf to be obviouslier. [1]
- Fix s pointyhat URL for package direcories. PR: ports/102417 [1] Reported by: Ryan Wehler <mindflux98@gmail.com>
This commit is contained in:
Sergey Matveychuk
parent
6dbf258b76
commit
2ace452a38
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=171380
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= portupgrade
|
||||
PORTVERSION= 2.1.3.3
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
|
||||
|
||||
59
ports-mgmt/portupgrade/files/patch-etc-pkgtools.conf
Normal file
59
ports-mgmt/portupgrade/files/patch-etc-pkgtools.conf
Normal file
@ -0,0 +1,59 @@
|
||||
--- etc/pkgtools.conf.orig Tue Jun 13 16:59:00 2006
|
||||
+++ etc/pkgtools.conf Fri Aug 25 16:35:18 2006
|
||||
@@ -30,22 +30,25 @@
|
||||
# x11base()
|
||||
# Returns X11BASE.
|
||||
#
|
||||
-# pkg_site_builder([latest])
|
||||
-# Returns a URI of the packages directory on the package builder site;
|
||||
+# pkg_site_builder(true|false)
|
||||
+# Returns an URI of the packages directory on the package builder site;
|
||||
+# if an argument is true, a 'latest' directory is used for path,
|
||||
+# 'full' is used otherwise.
|
||||
# Equivalent to:
|
||||
# on i386:
|
||||
-# sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-%s/',
|
||||
+# sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-packages-%s/',
|
||||
# OS_PLATFORM, OS_MAJOR, latest ? 'latest' : 'full')
|
||||
#
|
||||
-# pkg_site_mirror([root])
|
||||
-# Returns a URI of the packages directory on the preferred mirror site;
|
||||
+# pkg_site_mirror(root)
|
||||
+# Returns an URI of the packages directory on the preferred mirror site;
|
||||
+# where <root> is any quoted string.
|
||||
# Equivalent to:
|
||||
# sprintf('%s/pub/FreeBSD/ports/%s/packages-%s/',
|
||||
# root || ENV['PACKAGEROOT'] || 'ftp://ftp.FreeBSD.org',
|
||||
# OS_PLATFORM, OS_PKGBRANCH)
|
||||
#
|
||||
# pkg_site_primary()
|
||||
-# Returns a URI of the packages directory on the primary FTP site;
|
||||
+# Returns an URI of the packages directory on the primary FTP site;
|
||||
# Equivalent to:
|
||||
# pkg_site_mirror('ftp://ftp.FreeBSD.org')
|
||||
#
|
||||
@@ -94,7 +97,9 @@
|
||||
# Include and evaluate the file. The file is looked inside PREFIX.
|
||||
#
|
||||
# include_hash(glob)
|
||||
-# Read file(s) and convert them to hash. (path is inside PREFIX).
|
||||
+# Read file(s) and convert them to hash. Files should contain lines
|
||||
+# in a format: 'key' => 'value'
|
||||
+# (Glob path is inside PREFIX).
|
||||
# E.g. ALT_PKGDEP = include_hash('etc/pkgtools/alt_pkgdep/*')
|
||||
#
|
||||
|
||||
@@ -120,6 +125,13 @@
|
||||
# ENV['PKG_TMPDIR'] ||= '/var/tmp'
|
||||
#
|
||||
# ENV['PACKAGES'] ||= ENV['PORTSDIR'] + '/packages'
|
||||
+ #
|
||||
+ # ENV['PKG_DBDRIVER'] ||= 'bdb_btree' and if it's failed to load
|
||||
+ # the driver it will fall to bdb1_btree driver. If the driver
|
||||
+ # failed too, it will fall to 'dbm_hash' that require no external
|
||||
+ # modules.
|
||||
+ # Possible values for ENV['PKG_DBDRIVER'] are bdb_btree, bdb_hash,
|
||||
+ # bdb1_btree, bdb1_hash and dbm_hash.
|
||||
#
|
||||
# e.g.:
|
||||
# ENV['PORTSDIR'] ||= '/export/freebsd/ports'
|
||||
11
ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb
Normal file
11
ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb
Normal file
@ -0,0 +1,11 @@
|
||||
--- lib/pkgtools.rb.orig Fri Aug 25 16:38:16 2006
|
||||
+++ lib/pkgtools.rb Fri Aug 25 16:38:48 2006
|
||||
@@ -1022,7 +1022,7 @@
|
||||
|
||||
case OS_PLATFORM
|
||||
when 'i386', 'sparc64', 'amd64', 'ia64'
|
||||
- sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-%s/',
|
||||
+ sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-packages-%s/',
|
||||
OS_PLATFORM, OS_MAJOR, run)
|
||||
else
|
||||
raise sprintf('There is no official package builder site yet for the %s platform.',
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= portupgrade
|
||||
PORTVERSION= 2.1.3.3
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
|
||||
|
||||
59
sysutils/portupgrade/files/patch-etc-pkgtools.conf
Normal file
59
sysutils/portupgrade/files/patch-etc-pkgtools.conf
Normal file
@ -0,0 +1,59 @@
|
||||
--- etc/pkgtools.conf.orig Tue Jun 13 16:59:00 2006
|
||||
+++ etc/pkgtools.conf Fri Aug 25 16:35:18 2006
|
||||
@@ -30,22 +30,25 @@
|
||||
# x11base()
|
||||
# Returns X11BASE.
|
||||
#
|
||||
-# pkg_site_builder([latest])
|
||||
-# Returns a URI of the packages directory on the package builder site;
|
||||
+# pkg_site_builder(true|false)
|
||||
+# Returns an URI of the packages directory on the package builder site;
|
||||
+# if an argument is true, a 'latest' directory is used for path,
|
||||
+# 'full' is used otherwise.
|
||||
# Equivalent to:
|
||||
# on i386:
|
||||
-# sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-%s/',
|
||||
+# sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-packages-%s/',
|
||||
# OS_PLATFORM, OS_MAJOR, latest ? 'latest' : 'full')
|
||||
#
|
||||
-# pkg_site_mirror([root])
|
||||
-# Returns a URI of the packages directory on the preferred mirror site;
|
||||
+# pkg_site_mirror(root)
|
||||
+# Returns an URI of the packages directory on the preferred mirror site;
|
||||
+# where <root> is any quoted string.
|
||||
# Equivalent to:
|
||||
# sprintf('%s/pub/FreeBSD/ports/%s/packages-%s/',
|
||||
# root || ENV['PACKAGEROOT'] || 'ftp://ftp.FreeBSD.org',
|
||||
# OS_PLATFORM, OS_PKGBRANCH)
|
||||
#
|
||||
# pkg_site_primary()
|
||||
-# Returns a URI of the packages directory on the primary FTP site;
|
||||
+# Returns an URI of the packages directory on the primary FTP site;
|
||||
# Equivalent to:
|
||||
# pkg_site_mirror('ftp://ftp.FreeBSD.org')
|
||||
#
|
||||
@@ -94,7 +97,9 @@
|
||||
# Include and evaluate the file. The file is looked inside PREFIX.
|
||||
#
|
||||
# include_hash(glob)
|
||||
-# Read file(s) and convert them to hash. (path is inside PREFIX).
|
||||
+# Read file(s) and convert them to hash. Files should contain lines
|
||||
+# in a format: 'key' => 'value'
|
||||
+# (Glob path is inside PREFIX).
|
||||
# E.g. ALT_PKGDEP = include_hash('etc/pkgtools/alt_pkgdep/*')
|
||||
#
|
||||
|
||||
@@ -120,6 +125,13 @@
|
||||
# ENV['PKG_TMPDIR'] ||= '/var/tmp'
|
||||
#
|
||||
# ENV['PACKAGES'] ||= ENV['PORTSDIR'] + '/packages'
|
||||
+ #
|
||||
+ # ENV['PKG_DBDRIVER'] ||= 'bdb_btree' and if it's failed to load
|
||||
+ # the driver it will fall to bdb1_btree driver. If the driver
|
||||
+ # failed too, it will fall to 'dbm_hash' that require no external
|
||||
+ # modules.
|
||||
+ # Possible values for ENV['PKG_DBDRIVER'] are bdb_btree, bdb_hash,
|
||||
+ # bdb1_btree, bdb1_hash and dbm_hash.
|
||||
#
|
||||
# e.g.:
|
||||
# ENV['PORTSDIR'] ||= '/export/freebsd/ports'
|
||||
11
sysutils/portupgrade/files/patch-lib-pkgtools.rb
Normal file
11
sysutils/portupgrade/files/patch-lib-pkgtools.rb
Normal file
@ -0,0 +1,11 @@
|
||||
--- lib/pkgtools.rb.orig Fri Aug 25 16:38:16 2006
|
||||
+++ lib/pkgtools.rb Fri Aug 25 16:38:48 2006
|
||||
@@ -1022,7 +1022,7 @@
|
||||
|
||||
case OS_PLATFORM
|
||||
when 'i386', 'sparc64', 'amd64', 'ia64'
|
||||
- sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-%s/',
|
||||
+ sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-packages-%s/',
|
||||
OS_PLATFORM, OS_MAJOR, run)
|
||||
else
|
||||
raise sprintf('There is no official package builder site yet for the %s platform.',
|
||||
Loading…
Reference in New Issue
Block a user