pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Added documentation and error checking.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce07b089002a
branches:  trunk
changeset: 526401:ce07b089002a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Mar 09 02:04:04 2007 +0000

description:
Added documentation and error checking.

diffstat:

 mk/xaw.buildlink3.mk |  30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r 03a21a60910a -r ce07b089002a mk/xaw.buildlink3.mk
--- a/mk/xaw.buildlink3.mk      Fri Mar 09 01:34:50 2007 +0000
+++ b/mk/xaw.buildlink3.mk      Fri Mar 09 02:04:04 2007 +0000
@@ -1,12 +1,22 @@
-# $NetBSD: xaw.buildlink3.mk,v 1.4 2006/11/06 10:51:51 joerg Exp $
+# $NetBSD: xaw.buildlink3.mk,v 1.5 2007/03/09 02:04:04 rillig Exp $
+#
+# This file selects the X Athena Widgets (Xaw) implementation.
+#
+# User-settable variables:
+#
+# XAW_TYPE
+#      The Xaw type to be selected.
+#
+#      Possible: 3d neXtaw standard xpm
+#      Default: standard
+#
 
 .if !defined(XAW_BUILDLINK3_MK)
 XAW_BUILDLINK3_MK=     # defined
 
-# Pull in setting for XAW_TYPE.
-XAW_TYPE?=     standard
+.include "../../mk/bsd.prefs.mk"
 
-.include "../../mk/bsd.prefs.mk"
+BUILD_DEFS+=           XAW_TYPE
 
 .if ${XAW_TYPE} == "xpm"
 .  include "../../x11/Xaw-Xpm/buildlink3.mk"
@@ -17,12 +27,16 @@
 .elif ${XAW_TYPE} == "neXtaw"
 .  include "../../x11/neXtaw/buildlink3.mk"
 BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw}
-.elif ${X11_TYPE} == "modular"
-.include "../../x11/libXaw/buildlink3.mk"
+.elif ${XAW_TYPE} == "standard"
+.  if ${X11_TYPE} == "modular"
+.    include "../../x11/libXaw/buildlink3.mk"
 BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.libXaw}
+.  else
+.    include "../../mk/x11.buildlink3.mk"
+BUILDLINK_PREFIX.Xaw?= ${X11BASE}
+.  endif
 .else
-.  include "../../mk/x11.buildlink3.mk"
-BUILDLINK_PREFIX.Xaw?= ${X11BASE}
+PKG_FAIL_REASON+=      "[xaw.buildlink3.mk] Invalid value ${XAW_TYPE} for XAW_TYPE."
 .endif
 
 MAKE_ENV+=     LIBXAW=${LIBXAW:Q}



Home | Main Index | Thread Index | Old Index