pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/rt3 o PKG_SUGGESTED_OPTIONS should be set uncond...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/37f46036a85d
branches:  trunk
changeset: 494631:37f46036a85d
user:      cube <cube%pkgsrc.org@localhost>
date:      Thu May 26 15:00:29 2005 +0000

description:
o PKG_SUGGESTED_OPTIONS should be set unconditionally.
o Really enforce the conflicts between backend-* and frontend-* options,
  as the recent changes in the options framework might confuse people in
  that respect.  You know have to explicitly remove the suggested options
  in your PKG_OPTIONS.rt variable.

diffstat:

 devel/rt3/Makefile.options |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 1b0860299684 -r 37f46036a85d devel/rt3/Makefile.options
--- a/devel/rt3/Makefile.options        Thu May 26 14:33:29 2005 +0000
+++ b/devel/rt3/Makefile.options        Thu May 26 15:00:29 2005 +0000
@@ -1,17 +1,25 @@
-# $NetBSD: Makefile.options,v 1.3 2005/05/24 23:35:49 seb Exp $
+# $NetBSD: Makefile.options,v 1.4 2005/05/26 15:00:29 cube Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rt
 PKG_SUPPORTED_OPTIONS= backend-mysql backend-pgsql             \
                        frontend-modperl1 frontend-modperl2     \
                        frontend-fastcgi
-PKG_SUGGESTED_OPTIONS?=        backend-mysql frontend-fastcgi
+PKG_SUGGESTED_OPTIONS= backend-mysql frontend-fastcgi
 
 .include "../../mk/bsd.options.mk"
 
 # Too bad -1-6's make doesn't have :[#] modifier
 .for _option_ in backend frontend
 . if empty(PKG_OPTIONS:M${_option_}-*)
-PKG_FAIL_REASON+=      "There must one and only one ${_option_} defined."
+PKG_FAIL_REASON+=      "There must be one ${_option_} defined."
+. else
+_RT_DUMMY:=    # empty
+.  for _dummy_ in ${PKG_OPTIONS:M${_option_}-*}
+_RT_DUMMY:=    ${_RT_DUMMY}+
+.  endfor
+.  if ${_RT_DUMMY} != +
+PKG_FAIL_REASON+=       "There must be no more than one ${_option_} defined."
+.  endif
 . endif
 .endfor
 



Home | Main Index | Thread Index | Old Index