CVS commit: pkgsrc/mk

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Wed Mar  5 16:23:52 UTC 2008

Modified Files:
        pkgsrc/mk: termcap.buildlink3.mk termcap.builtin.mk

Log Message:
+ Fix error in previous commit -- too much of the termcap buildlink
  code was moved to the builtin.mk file.  The buildlink3.mk file should
  contain the bits that always apply to all packages that include it.
  The builtin.mk file should include the bits that only apply if
  "termcap" is listed in ${BUILDLINK_PACKAGES} (this isn't the case
  if we use curses to replace termcap).  As such, redistribute the
  code as follows:

    + Move the parts that remove -l options for terminal libraries we
      don't support, as well as for transforming "-ltermcap" into the
      appropriate libraries, from the builtin.mk back into the
      buildlink3.mk.

    + Leave the parts the remove -lcurses and -lncurses in the
      builtin.mk.  We can remove the ${TERMCAP_TYPE} == "curses" check
      since that part of the file is protected by CHECK_BUILTIN.termcap,
      so it should only be triggered if "termcap" is in BUILDLINK_PACKAGES,
      which only happens if ${TERMCAP_TYPE} isn't "curses".


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/termcap.buildlink3.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/termcap.builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.