diff options
| author | rh <rh@pkgsrc.org> | 2001-05-06 12:48:56 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2001-05-06 12:48:56 +0000 |
| commit | 681044f11d91845fa93b7e07c5922e69c9904c29 (patch) | |
| tree | 42adf808daf1bdfff0f47a77bc51e805031e34bf | |
| parent | 65e09c5849f811b6103ea8476a6e1e4f6dee32b4 (diff) | |
| download | pkgsrc-681044f11d91845fa93b7e07c5922e69c9904c29.tar.gz | |
Don't let SDL randomly pick up NAS support. Add SDL_USE_NAS variable that,
if present, causes SDL to depend on NAS. Disable NAS support if
SDL_USE_NAS is not defined. Fixes PR 12784 by Eric Mumpower
<nocturne@arepa.co>
| -rw-r--r-- | devel/SDL/Makefile | 8 | ||||
| -rw-r--r-- | mk/mk.conf.example | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 6b5c484ebbd..879487e7b07 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/05/05 13:47:12 rh Exp $ +# $NetBSD: Makefile,v 1.13 2001/05/06 12:48:56 rh Exp $ # DISTNAME= SDL-1.2.0 @@ -30,6 +30,12 @@ NASMFLAGS= -f elf NASMFLAGS= -f aoutb .endif +.ifdef SDL_USE_NAS +DEPENDS+= nas>=1.4:../../audio/nas +.else +CONFIGURE_ARGS+= --disable-nas +.endif + LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --disable-pthread-sem CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -D_POSIX_THREAD_SYSCALL_SOFT=1" diff --git a/mk/mk.conf.example b/mk/mk.conf.example index a2a1ce283a9..db1df6357a1 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.204 2001/04/30 14:39:41 agc Exp $ +# $NetBSD: mk.conf.example,v 1.205 2001/05/06 12:48:56 rh Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -749,6 +749,11 @@ PAPERSIZE= A4 # Possible: 8, 16, 32 # Default: 8 +#SDL_USE_NAS= +# Used in SDL package to enable use of the network audio system +# Possible: defined, not defined +# Default: not defined + #SDIST_PAWD= pawd # If you are using amd you'll want to use pawd instead of pwd to derive # the current working directory. |