diff options
| author | delphij <delphij@FreeBSD.org> | 2009-05-09 01:35:27 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-05-09 01:35:27 +0000 |
| commit | 810e5a84b4607c4d0fc76e9a418ae9fd2b0eeeb2 (patch) | |
| tree | 5e0628caeff31611fab89dbdf72053148a59a873 /contrib/less/FREEBSD-upgrade | |
| parent | 8583a840068803e7fd9e0fc2452605bca6e822d8 (diff) | |
| download | FreeBSD-src-810e5a84b4607c4d0fc76e9a418ae9fd2b0eeeb2.zip FreeBSD-src-810e5a84b4607c4d0fc76e9a418ae9fd2b0eeeb2.tar.gz | |
Update to less v429.
Diffstat (limited to 'contrib/less/FREEBSD-upgrade')
| -rw-r--r-- | contrib/less/FREEBSD-upgrade | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/contrib/less/FREEBSD-upgrade b/contrib/less/FREEBSD-upgrade index 59d56a2..6d30dfd 100644 --- a/contrib/less/FREEBSD-upgrade +++ b/contrib/less/FREEBSD-upgrade @@ -2,23 +2,26 @@ $FreeBSD$ 1. Download latest less(1) tarball. The homepage of less(1) is at: http://www.greenwoodsoftware.com/less/ - 2. Export the tarball into a directory, (say "v-less"). - 3. Checkout our contrib/less code into another directory (say "f-less"), - with -rLESS. - 4. Copy v-less/ files over f-less, check if there is any files that is - removed by vendor, or newly added, note them. - 5. do cvs up -A in f-less, resolve the conflicts. - 6. Regenerate defines.h: + 2. Checkout $FSVN/vendor/less/ into less/ + 3. Extract new code to, say, less/lessv429 + 4. cd less/dist + 5. svn list -R | grep -v '/$' | sort >../old + 6. cd ../lessv429 + 7. find . -type f | cut -c 3- | sort >../new + 8. tar cf - . | tar xf - -C ../dist + 9. cd ../dist +10. comm -23 ../old ../new | xargs svn rm +11. comm -13 ../old ../new | xargs svn add +12. Check svn status output and make sure that all changes are appropriate. +13. Commit and tag the result. +14. Resolve any conflicts that happen in head/contrib/less. +15. Regenerate defines.h: ./configure --prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin \ --libexecdir=/usr/libexec --datarootdir=/usr/share - 7. Manually merge changes into src/usr.bin/less/defines.h; adjust +16. Manually merge changes into src/usr.bin/less/defines.h; adjust Makefile glue to reflect added/removed files. - 8. Replace your src/contrib/less with the merged copy, and do a ``make +17. Replace your src/contrib/less with the merged copy, and do a ``make universe'' to make sure that nothing was broken; - 9. If everything goes well, do the actual import from v-less: - cvs -n import src/contrib/less LESS v<version> - Seems everything is fine? Go with: - cvs import src/contrib/less LESS v<version> -10. Resolve the conflicts with the patchset found in step 5. +18. Commit the result. -delphij@FreeBSD.org - Nov 13th, 2007 +delphij@FreeBSD.org - May 08, 2009 |
