diff options
| -rw-r--r-- | devel/SDL/Makefile | 16 | ||||
| -rw-r--r-- | devel/SDL/buildlink3.mk | 9 | ||||
| -rw-r--r-- | devel/SDL/options.mk | 11 |
3 files changed, 18 insertions, 18 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 22328234cfc..493992f8cd5 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -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 @@ NASMFLAGS_a.out= -f aoutb .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 @@ COCOA_DIRS+= /System /Library /Developer 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 @@ MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q} .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 --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk index 1340c67d788..4edea24facc 100644 --- a/devel/SDL/buildlink3.mk +++ b/devel/SDL/buildlink3.mk @@ -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 @@ PTHREAD_OPTS+= require .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 @@ MAKEFLAGS+= PKG_BUILD_OPTIONS.SDL=${PKG_BUILD_OPTIONS.SDL:Q} .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 --git a/devel/SDL/options.mk b/devel/SDL/options.mk index e98953465a5..15950ae9d2c 100644 --- a/devel/SDL/options.mk +++ b/devel/SDL/options.mk @@ -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" |