diff options
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 12 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/distinfo | 6 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-etc-pkgtools.conf | 59 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb | 11 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/pkg-plist | 19 |
5 files changed, 19 insertions, 88 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 6ce91dfefe11..1d5044503ab2 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,12 +6,10 @@ # PORTNAME= portupgrade -PORTVERSION= 2.1.3.3 -PORTREVISION= 1 +PORTVERSION= 2.2.2 PORTEPOCH= 2 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://sunner.elcomnet.ru/~sem/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= pkgtools-${DISTVERSION} @@ -28,9 +26,8 @@ USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 USE_PERL5_RUN= yes -INSTALLS_SHLIB= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg USE_LDCONFIG= ${PREFIX}/lib/compat/pkg +LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" @@ -50,6 +47,9 @@ MLINKS= pkgdb.1 pkg_which.1 \ portsdb.1 ports_glob.1 MANCOMPRESSED= maybe +EXAMPLESDIR= ${PREFIX}/share/examples/pkgtools +DOCSDIR= ${PREFIX}/share/doc/pkgtools + INSTALL_TARGET= install .if !defined(NOPORTDOCS) INSTALL_TARGET+= install-doc diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index 713c6bd1567b..ca67e0223c3d 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1,3 +1,3 @@ -MD5 (pkgtools-2.1.3.3.tar.bz2) = a69852c762fc98928b30e2561990c574 -SHA256 (pkgtools-2.1.3.3.tar.bz2) = 3a4c7c8f543f54e8c24e8181a90ce5786557c16e20b8f682bb41d21f12707df4 -SIZE (pkgtools-2.1.3.3.tar.bz2) = 110181 +MD5 (pkgtools-2.2.2.tar.bz2) = c9e08616c474d776f301ada920735a66 +SHA256 (pkgtools-2.2.2.tar.bz2) = ab5cd8904e69c03be0d37cf71b2d6271ccabed14bca673e5a34a7d21a1af5c02 +SIZE (pkgtools-2.2.2.tar.bz2) = 111055 diff --git a/ports-mgmt/portupgrade/files/patch-etc-pkgtools.conf b/ports-mgmt/portupgrade/files/patch-etc-pkgtools.conf deleted file mode 100644 index 4da1fbadc333..000000000000 --- a/ports-mgmt/portupgrade/files/patch-etc-pkgtools.conf +++ /dev/null @@ -1,59 +0,0 @@ ---- 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' diff --git a/ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb b/ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb deleted file mode 100644 index b823c3f5c67f..000000000000 --- a/ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.', diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index 68369ca611bd..8a14a576c813 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/pkg-plist @@ -15,6 +15,7 @@ sbin/portupgrade sbin/portversion %%RUBY_SITELIBDIR%%/pkg.rb %%RUBY_SITELIBDIR%%/pkgdb.rb +%%RUBY_SITELIBDIR%%/pkgdbtools.rb %%RUBY_SITELIBDIR%%/pkginfo.rb %%RUBY_SITELIBDIR%%/pkgmisc.rb %%RUBY_SITELIBDIR%%/pkgtools.rb @@ -30,12 +31,12 @@ etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true @dirrmtry share/zsh -%%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/NEWS -%%PORTDOCS%%share/doc/pkgtools/README -%%PORTDOCS%%@dirrm share/doc/pkgtools +%%PORTDOCS%%%%EXAMPLESDIR%%/bash/complete.sample +%%PORTDOCS%%%%EXAMPLESDIR%%/tcsh/complete.sample +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bash +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tcsh +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% |