diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2007-03-02 07:46:50 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2007-03-02 07:46:50 +0000 |
| commit | 72e611304a329388bfb2c8a705d82c1160da8070 (patch) | |
| tree | df59153e685136deabfafdf9e2b95608eb386a37 /ports-mgmt/portupgrade | |
| parent | Add a paragraph about ports with sufixes (-nox11) in notes about portupgrade. (diff) | |
- Ignore bsdpan- pseudo ports.
- Add a note about ports with suffixes (e.g. -nox11)
Reported by: David Morgan <morgad_AT_eclipse.co.uk>,
Philip Kizer <pckizer_AT_nostrum.com>
Notes
Notes:
svn path=/head/; revision=186333
Diffstat (limited to 'ports-mgmt/portupgrade')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin-pkgdb | 14 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/pkg-message | 5 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index b7a0e4e40fb4..0f89a5be209b 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.2.6 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/ports-mgmt/portupgrade/files/patch-bin-pkgdb b/ports-mgmt/portupgrade/files/patch-bin-pkgdb index f6c5462e06b3..60c7f8452aef 100644 --- a/ports-mgmt/portupgrade/files/patch-bin-pkgdb +++ b/ports-mgmt/portupgrade/files/patch-bin-pkgdb @@ -1,11 +1,21 @@ Index: bin/pkgdb =================================================================== RCS file: /cvsroot/portupgrade/pkgtools/bin/pkgdb,v -retrieving revision 1.9.2.6 -retrieving revision 1.9.2.7 diff -u -r1.9.2.6 -r1.9.2.7 --- pkgdb 27 Feb 2007 11:30:31 -0000 1.9.2.6 +++ pkgdb 27 Feb 2007 17:58:46 -0000 1.9.2.7 +@@ -314,6 +314,11 @@ + puts "Look for lost dependencies:" + + $pkgnames.each do |pkgname| ++ # Ignore bsdpan- pseudo ports ++ if /^bsdpan-/ =~ pkgname ++ puts "#{pkgname}: ignored" ++ next ++ end + deps = $pkgdb.pkgdep(pkgname, true) or return + real_deps = get_real_run_deps(pkgname) + @@ -700,7 +700,7 @@ hash = config_value(:ALT_PKGDEP) or return nil diff --git a/ports-mgmt/portupgrade/pkg-message b/ports-mgmt/portupgrade/pkg-message index c85eef2b2204..e8f8f58cb1f1 100644 --- a/ports-mgmt/portupgrade/pkg-message +++ b/ports-mgmt/portupgrade/pkg-message @@ -9,4 +9,9 @@ NOTE: If you upgrade, it's recomended to run pkgdb -L to restore lost 'www/apache13' => 'www/apache13-modssl', 'print/ghostscript-afpl' => 'print/ghostscript-gnu', } + + Note also, portupgrade knows nothing how to handle ports with different + suffixes (E.g. -nox11). So you should explicitly define variables + (E.g. WITHOUT_X11=yes) for the ports in /etc/make.conf or pkgtools.conf + (MAKE_ARGS section) files. ----------------------------------------------------------------------- |