diff options
| author | jlam <jlam> | 2002-08-01 06:40:50 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-01 06:40:50 +0000 |
| commit | ea0f433373ebe680ed1605d61fa08e24e334c6aa (patch) | |
| tree | 93296ffd4e5be2469b397b8d3fd76ecc02856c17 /devel/SDL | |
| parent | 33a84ea7ac2f8f208f9f5743b071424400cf5aa4 (diff) | |
| download | pkgsrc-ea0f433373ebe680ed1605d61fa08e24e334c6aa.tar.gz | |
Convert to use pthread.buildlink.mk.
Diffstat (limited to 'devel/SDL')
| -rw-r--r-- | devel/SDL/Makefile | 5 | ||||
| -rw-r--r-- | devel/SDL/buildlink.mk | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 58d70fd4620..e99300921ba 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2002/07/14 07:28:39 kristerw Exp $ +# $NetBSD: Makefile,v 1.37 2002/08/01 06:40:53 jlam Exp $ # DISTNAME= SDL-1.2.3 @@ -16,6 +16,7 @@ USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES USE_GMAKE= YES +PTHREAD_OPTS+= require USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -55,9 +56,9 @@ post-configure: cd ${WRKSRC}/src/audio && ${CP} *.[ch] netbsd/ .include "../../audio/esound/buildlink.mk" -.include "../../devel/pth/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/aalib-x11/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk index 4aad7335920..cb5df31ce7a 100644 --- a/devel/SDL/buildlink.mk +++ b/devel/SDL/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.15 2002/06/25 06:54:43 tron Exp $ +# $NetBSD: buildlink.mk,v 1.16 2002/08/01 06:40:53 jlam Exp $ # # This Makefile fragment is included by packages that use SDL. # @@ -26,18 +26,18 @@ BUILDLINK_FILES.SDL= include/SDL/* BUILDLINK_FILES.SDL+= lib/libSDL.* BUILDLINK_FILES.SDL+= lib/libSDLmain.* -.include "../../mk/bsd.prefs.mk" - REPLACE_BUILDLINK_SED+= \ -e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g" +PTHREAD_OPTS+= require + .if defined(SDL_USE_NAS) -.include "../../audio/nas/buildlink.mk" +. include "../../audio/nas/buildlink.mk" .endif .include "../../audio/esound/buildlink.mk" -.include "../../devel/pth/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/aalib-x11/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" BUILDLINK_TARGETS.SDL= SDL-buildlink BUILDLINK_TARGETS.SDL+= SDL-buildlink-config-wrapper |