[pkgsrc/trunk]: pkgsrc/devel/SDL Make aalib an option, enabled by default

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/45f70782c607
branches:  trunk
changeset: 514619:45f70782c607
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jun 15 09:45:05 2006 +0000

description:
Make aalib an option, enabled by default

diffstat:

 devel/SDL/Makefile      |  16 ++++------------
 devel/SDL/buildlink3.mk |   9 ++++++---
 devel/SDL/options.mk    |  11 ++++++++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diffs (102 lines):

diff -r fa38c625f7ff -r 45f70782c607 devel/SDL/Makefile
--- a/devel/SDL/Makefile        Thu Jun 15 09:29:17 2006 +0000
+++ b/devel/SDL/Makefile        Thu Jun 15 09:45:05 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/06/12 16:20:44 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2006/06/15 09:45:05 adam Exp $
 
 DISTNAME=      SDL-1.2.10
 CATEGORIES=    devel games
@@ -27,7 +27,6 @@
 .endif
 
 CONFIGURE_ARGS+=       --enable-dlopen
-CONFIGURE_ARGS+=       --enable-video-aalib
 CONFIGURE_ENV+=                NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
 MAKE_ENV+=             NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
 
@@ -46,13 +45,6 @@
 BUILDLINK_PASSTHRU_DIRS+=      ${dir}
 .    endif
 .  endfor
-
-# XXX: still necessary after 1.2.10 update?
-SUBST_CLASSES+=                links
-SUBST_MESSAGE.links=   Fixing linking command.
-SUBST_STAGE.links=     pre-configure
-SUBST_FILES.links=     src/Makefile.in
-SUBST_SED.links=       -e 's,tag=CC --mode=link,tag=CXX --mode=link,g'
 .endif
 
 .include "../../mk/oss.buildlink3.mk"
@@ -65,13 +57,13 @@
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .endif
-.include "../../graphics/aalib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
 # Let SDL know that we do not have native pthreads and are using GNU pth.
-CONFIGURE_ARGS+=       --disable-pthreads
-CONFIGURE_ARGS+=       --enable-pth
+CONFIGURE_ARGS+=       --disable-pthreads
+CONFIGURE_ARGS+=       --enable-pth
 .endif
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fa38c625f7ff -r 45f70782c607 devel/SDL/buildlink3.mk
--- a/devel/SDL/buildlink3.mk   Thu Jun 15 09:29:17 2006 +0000
+++ b/devel/SDL/buildlink3.mk   Thu Jun 15 09:45:05 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/06/13 15:28:02 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/06/15 09:45:05 adam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 SDL_BUILDLINK3_MK:=    ${SDL_BUILDLINK3_MK}+
@@ -24,7 +24,6 @@
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .endif
-.include "../../graphics/aalib/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 
@@ -36,8 +35,12 @@
 .endif
 MAKEVARS+=     PKG_BUILD_OPTIONS.SDL
 
+.if !empty(PKG_BUILD_OPTIONS.SDL:Maalib)
+.include "../../graphics/aalib/buildlink3.mk"
+.endif
+
 .if !empty(PKG_BUILD_OPTIONS.SDL:Mnas)
-.  include "../../audio/nas/buildlink3.mk"
+.include "../../audio/nas/buildlink3.mk"
 .endif
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r fa38c625f7ff -r 45f70782c607 devel/SDL/options.mk
--- a/devel/SDL/options.mk      Thu Jun 15 09:29:17 2006 +0000
+++ b/devel/SDL/options.mk      Thu Jun 15 09:45:05 2006 +0000
@@ -1,11 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2006/06/12 16:20:44 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/06/15 09:45:05 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.SDL
-PKG_SUPPORTED_OPTIONS= arts esound nas
-PKG_SUGGESTED_OPTIONS= arts esound nas
+PKG_SUPPORTED_OPTIONS= aalib arts esound nas
+PKG_SUGGESTED_OPTIONS= aalib arts esound nas
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Maalib)
+CONFIGURE_ARGS+=       --enable-video-aalib
+.include "../../graphics/aalib/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Marts)
 CONFIGURE_ARGS+=       --enable-arts
 .include "../../audio/arts/buildlink3.mk"