[pkgsrc/trunk]: pkgsrc/comms/asterisk16 PR/42612 - Dima Veselov -- build prob...

[jnemeth <jnemeth%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1335268ea032
branches:  trunk
changeset: 569171:1335268ea032
user:      jnemeth <jnemeth%pkgsrc.org@localhost>
date:      Wed Jan 13 20:10:09 2010 +0000

description:
PR/42612 - Dima Veselov -- build problem when no options specified

diffstat:

 comms/asterisk16/Makefile   |  3 +--
 comms/asterisk16/options.mk |  3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r aa40df239899 -r 1335268ea032 comms/asterisk16/Makefile
--- a/comms/asterisk16/Makefile Wed Jan 13 19:28:33 2010 +0000
+++ b/comms/asterisk16/Makefile Wed Jan 13 20:10:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/12/30 04:11:02 jnemeth Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/13 20:10:09 jnemeth Exp $
 #
 
 DISTNAME=      asterisk-1.6.1.12
@@ -79,7 +79,6 @@
 MAKE_FLAGS+=           AGI_DIR=${PREFIX}/libexec/agi-bin
 MAKE_FLAGS+=           ASTEXAMPLEDIR=${ASTEXAMPLEDIR}
 MAKE_FLAGS+=           WRKSRC=${WRKSRC}
-MAKE_FLAGS+=           GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts
 MAKE_FLAGS+=           LDOPTS=${LDFLAGS:M*:Q}
 
 .include "options.mk"
diff -r aa40df239899 -r 1335268ea032 comms/asterisk16/options.mk
--- a/comms/asterisk16/options.mk       Wed Jan 13 19:28:33 2010 +0000
+++ b/comms/asterisk16/options.mk       Wed Jan 13 20:10:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2010/01/02 00:36:54 jnemeth Exp $
+# $NetBSD: options.mk,v 1.3 2010/01/13 20:10:09 jnemeth Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=         zaptel x11 unixodbc ilbc
@@ -52,6 +52,7 @@
 
 .if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Munixodbc) || !empty(PKG_OPTIONS:Milbc)
 RUN_MENUSELECT= # defined
+MAKE_FLAGS+=   GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts
 .endif
 post-configure:
 .if !empty(PKG_OPTIONS:Mx11)