[src/trunk]: src/external/bsd/tmux Adjust instructions and import script in p...

[jmmv <jmmv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c22ea56507fc
branches:  trunk
changeset: 768500:c22ea56507fc
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Wed Aug 17 18:37:59 2011 +0000

description:
Adjust instructions and import script in preparation for tmux 1.5.

diffstat:

 external/bsd/tmux/README            |  10 ++++++----
 external/bsd/tmux/prepare-import.sh |  16 +++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diffs (70 lines):

diff -r d52af9e90366 -r c22ea56507fc external/bsd/tmux/README
--- a/external/bsd/tmux/README  Wed Aug 17 18:34:13 2011 +0000
+++ b/external/bsd/tmux/README  Wed Aug 17 18:37:59 2011 +0000
@@ -1,13 +1,15 @@
 To update tmux to a new version:
 
+- Build the package from pkgsrc and write down all -D flags passed to the
+  compiler.  Autoconf is not generating a config.h file, so this is the
+  best we can do to get the build-time settings in place.
 - Use prepare-import.sh to regenerate the dist directory.
-- Use configure from the distfile to generate new config.{h,mk} files.
-- Copy the generated config.h to usr.bin/tmux.
-- Update usr.bin/tmux/Makefile according to config.mk (in particular, the
-  list of files used from compat/ and the required libraries).
+- Update usr.bin/tmux/Makefile to sync the CPPFLAGS to the list of -D flags
+  gathered earlier on.
 - Update the list of source files in usr.bin/tmux/Makefile with the new
   dist/*.c listing.
 - cvs import the contents of the new dist directory.
+- Fix merge conflicts, if any.
 - Commit the changes to the reachover Makefiles.
 - Update doc/3RDPARTY with the new tmux version.
 - Add a note to doc/CHANGES about the new version.
diff -r d52af9e90366 -r c22ea56507fc external/bsd/tmux/prepare-import.sh
--- a/external/bsd/tmux/prepare-import.sh       Wed Aug 17 18:34:13 2011 +0000
+++ b/external/bsd/tmux/prepare-import.sh       Wed Aug 17 18:37:59 2011 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: prepare-import.sh,v 1.1 2011/03/10 09:10:41 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.2 2011/08/17 18:37:59 jmmv Exp $
 #
 # Use this script to recreate the 'dist' subdirectory from a newly released
 # distfile.  The script takes care of unpacking the distfile, removing any
@@ -15,6 +15,8 @@
 
 CLEAN_PATTERNS=
 CLEAN_PATTERNS="${CLEAN_PATTERNS} [A-Z]*"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} aclocal.m4"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} etc"
 CLEAN_PATTERNS="${CLEAN_PATTERNS} configure*"
 
 err() {
@@ -57,13 +59,6 @@
        ( cd dist && rm -rf ${CLEAN_PATTERNS} )
 }
 
-extract_version() {
-       local version=$(grep '^VERSION[ \t]*=' dist/Makefile | \
-           cut -d '=' -f 2 | sed -e 's,[ \t]*,,g')
-       log "Version is ${version}"
-       echo "${version}" >usr.bin/tmux/version.txt
-}
-
 diff_dirs() {
        local old_dir="${1}"; shift
        local new_dir="${1}"; shift
@@ -101,11 +96,10 @@
 
        backup_dist
        extract_distfile "${distfile}" "${distname}"
-       extract_version
        cleanup_dist
        diff_dirs dist.old dist
-       log "Don't forget to validate usr.bin/tmux/version.txt and to update" \
-           "the version in doc/3RDPARTY"
+       log "Don't forget to update the -D flags in usr.bin/tmux/Makefile" \
+           "and to update the version in doc/3RDPARTY"
 }
 
 main "${@}"