diff options
author | jlam <jlam> | 2002-08-25 19:21:43 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-08-25 19:21:43 +0000 |
commit | 3d80364aa7d569b8fa9e6f1069f1c94550179218 (patch) | |
tree | c69c41be2f3b44bedceeee7e348c2ae58c476c6a /devel/SDL | |
parent | 3bff324aa681cfea59a4a20f4bdd9520a4707593 (diff) | |
download | pkgsrc-3d80364aa7d569b8fa9e6f1069f1c94550179218.tar.gz |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.
Diffstat (limited to 'devel/SDL')
-rw-r--r-- | devel/SDL/Makefile | 2 | ||||
-rw-r--r-- | devel/SDL/buildlink.mk | 2 | ||||
-rw-r--r-- | devel/SDL/buildlink2.mk | 30 | ||||
-rw-r--r-- | devel/SDL/distinfo | 2 | ||||
-rw-r--r-- | devel/SDL/files/SDL_sysjoystick.c | 2 | ||||
-rw-r--r-- | devel/SDL/patches/patch-aj | 2 | ||||
-rw-r--r-- | devel/SDL/patches/patch-am | 2 | ||||
-rw-r--r-- | devel/SDL/patches/patch-ap | 2 | ||||
-rw-r--r-- | devel/SDL/patches/patch-as | 2 |
9 files changed, 38 insertions, 8 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 7cc2d003ad2..7aea9ad0e54 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2002/08/08 16:17:07 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2002/08/25 19:22:17 jlam Exp $ # DISTNAME= SDL-1.2.3 diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk index cb5df31ce7a..795d35d92c7 100644 --- a/devel/SDL/buildlink.mk +++ b/devel/SDL/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.16 2002/08/01 06:40:53 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.17 2002/08/25 19:22:17 jlam Exp $ # # This Makefile fragment is included by packages that use SDL. # diff --git a/devel/SDL/buildlink2.mk b/devel/SDL/buildlink2.mk new file mode 100644 index 00000000000..0fe667c9f09 --- /dev/null +++ b/devel/SDL/buildlink2.mk @@ -0,0 +1,30 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:17 jlam Exp $ + +.if !defined(SDL_BUILDLINK2_MK) +SDL_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= SDL +BUILDLINK_DEPENDS.SDL?= SDL>=1.2.0 +BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL + +EVAL_PREFIX+= BUILDLINK_PREFIX.SDL=SDL +BUILDLINK_PREFIX.SDL_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.SDL= include/SDL/* +BUILDLINK_FILES.SDL+= lib/libSDL.* +BUILDLINK_FILES.SDL+= lib/libSDLmain.* + +.include "../../mk/bsd.prefs.mk" + +.if defined(SDL_USE_NAS) +. include "../../audio/nas/buildlink2.mk" +.endif +.include "../../audio/esound/buildlink2.mk" +.include "../../devel/pth/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/aalib-x11/buildlink2.mk" + +BUILDLINK_TARGETS+= SDL-buildlink + +SDL-buildlink: _BUILDLINK_USE + +.endif # SDL_BUILDLINK2_MK diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index c095695ad4a..794b8832780 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2002/07/15 23:04:20 kristerw Exp $ +$NetBSD: distinfo,v 1.14 2002/08/25 19:22:17 jlam Exp $ SHA1 (SDL-1.2.3.tar.gz) = f74f5bf47a472083da8700d2354cb90062e2a845 Size (SDL-1.2.3.tar.gz) = 1568671 bytes diff --git a/devel/SDL/files/SDL_sysjoystick.c b/devel/SDL/files/SDL_sysjoystick.c index 39a42180c83..bc2d7080090 100644 --- a/devel/SDL/files/SDL_sysjoystick.c +++ b/devel/SDL/files/SDL_sysjoystick.c @@ -29,7 +29,7 @@ #ifdef SAVE_RCSID static char rcsid = - "@(#) $Id: SDL_sysjoystick.c,v 1.1 2002/07/14 07:28:40 kristerw Exp $"; + "@(#) $Id: SDL_sysjoystick.c,v 1.2 2002/08/25 19:22:18 jlam Exp $"; #endif #include <stdio.h> diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj index 945289ef446..cc64d832002 100644 --- a/devel/SDL/patches/patch-aj +++ b/devel/SDL/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.12 2002/07/15 23:04:20 kristerw Exp $ +$NetBSD: patch-aj,v 1.13 2002/08/25 19:22:18 jlam Exp $ --- configure.in.orig Thu Nov 8 08:28:00 2001 +++ configure.in Mon Jul 15 23:28:12 2002 @@ -374,10 +374,7 @@ diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am index 67919b43355..fa336c5b8cb 100644 --- a/devel/SDL/patches/patch-am +++ b/devel/SDL/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.5 2002/07/15 23:04:20 kristerw Exp $ +$NetBSD: patch-am,v 1.6 2002/08/25 19:22:19 jlam Exp $ --- configure.orig Thu Nov 8 08:28:08 2001 +++ configure Mon Jul 15 23:31:06 2002 @@ -3588,10 +3588,7 @@ diff --git a/devel/SDL/patches/patch-ap b/devel/SDL/patches/patch-ap index adf2b569cc0..37d94bf21c5 100644 --- a/devel/SDL/patches/patch-ap +++ b/devel/SDL/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.4 2002/07/13 16:17:33 wiz Exp $ +$NetBSD: patch-ap,v 1.5 2002/08/25 19:22:19 jlam Exp $ --- src/hermes/Makefile.in.orig Thu Nov 8 08:28:07 2001 +++ src/hermes/Makefile.in diff --git a/devel/SDL/patches/patch-as b/devel/SDL/patches/patch-as index a37f7a4ccfe..0542a38a9c3 100644 --- a/devel/SDL/patches/patch-as +++ b/devel/SDL/patches/patch-as @@ -1,4 +1,4 @@ -$NetBSD: patch-as,v 1.1 2002/07/13 16:17:33 wiz Exp $ +$NetBSD: patch-as,v 1.2 2002/08/25 19:22:19 jlam Exp $ --- src/Makefile.in.orig Thu Nov 8 08:28:02 2001 +++ src/Makefile.in |