diff options
| author | rillig <rillig@pkgsrc.org> | 2007-05-30 08:54:28 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-05-30 08:54:28 +0000 |
| commit | 7f125459d80717a6f65cde59fcdb87bf381dc2d8 (patch) | |
| tree | 9cb9969faf287080cd815dc0b06866755f0b1994 /multimedia | |
| parent | 2b5e22ff4d29ce619700d81749ac6e868c997059 (diff) | |
| download | pkgsrc-7f125459d80717a6f65cde59fcdb87bf381dc2d8.tar.gz | |
Removed some code duplication from the buildlink3 files by using the new
pkg-build-options.mk procedure.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gstreamer0.10/buildlink3.mk | 9 | ||||
| -rw-r--r-- | multimedia/mjpegtools/buildlink3.mk | 11 |
2 files changed, 6 insertions, 14 deletions
diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk index f7898b59e80..f92b146cf66 100644 --- a/multimedia/gstreamer0.10/buildlink3.mk +++ b/multimedia/gstreamer0.10/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/02/08 21:27:14 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2007/05/30 08:54:30 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GSTREAMER0.10_BUILDLINK3_MK:= ${GSTREAMER0.10_BUILDLINK3_MK}+ @@ -20,11 +20,8 @@ PRINT_PLIST_AWK+= /^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \ { print "@comment in gstreamer0.10: " $$0; next; } .endif # GSTREAMER0.10_BUILDLINK3_MK -.if !defined(PKG_BUILD_OPTIONS.gstreamer) -PKG_BUILD_OPTIONS.gstreamer!= \ - cd ${BUILDLINK_PKGSRCDIR.gstreamer0.10} && \ - ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS -.endif +pkgbase := gstreamer +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.gstreamer:Mgstcheck) .include "../../devel/check/buildlink3.mk" diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk index 7558ef11c4c..0ec271666ec 100644 --- a/multimedia/mjpegtools/buildlink3.mk +++ b/multimedia/mjpegtools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2007/05/30 08:54:30 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MJPEGTOOLS_BUILDLINK3_MK:= ${MJPEGTOOLS_BUILDLINK3_MK}+ @@ -23,13 +23,8 @@ BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" -.if !defined(PKG_BUILD_OPTIONS.mjpegtools) -PKG_BUILD_OPTIONS.mjpegtools!= \ - cd ${BUILDLINK_PKGSRCDIR.mjpegtools} && \ - ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS -MAKEFLAGS+= PKG_BUILD_OPTIONS.mjpegtools=${PKG_BUILD_OPTIONS.mjpegtools:Q} -.endif -MAKEVARS+= PKG_BUILD_OPTIONS.mjpegtools +pkgbase := mjpegtools +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.mjpegtools:Mdv) . include "../../multimedia/libdv/buildlink3.mk" |