diff options
| -rw-r--r-- | emulators/vice/Makefile | 11 | ||||
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 8be0ac8dbab..c4465ff7ed9 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/04/24 23:34:28 snj Exp $ +# $NetBSD: Makefile,v 1.43 2004/05/25 21:51:42 wiz Exp $ # DISTNAME= vice-1.14 @@ -29,6 +29,12 @@ USE_GCC_SHLIB= YES INFO_FILES= vice.info +.include "../../mk/bsd.prefs.mk" + +.if !empty(VICE_USE_FFMPEG:M[Yy][Ee][Ss]) +CONFIGURE_ARGS+= --enable-ffmpeg +.endif + # These changes are rather common, so sed instead of patch: post-patch: @for file in `${FIND} ${WRKSRC} -name Makefile.in -print` \ @@ -49,5 +55,8 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" +.if !empty(VICE_USE_FFMPEG:M[Yy][Ee][Ss]) +.include "../../multimedia/ffmpeg/buildlink3.mk" +.endif .include "../../mk/bsd.pkg.mk" diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 90e5c26be17..c658452ce68 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.242 2004/05/23 16:01:49 jschauma Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.243 2004/05/25 21:51:42 wiz Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -2119,6 +2119,11 @@ USERPPP_GROUP?= network # Possible: any group name # Default: network +VICE_USE_FFMPEG?= no +# Used in vice package to enable ffmpeg support. +# Possible: yes, no. +# Default: no + #VIM_EXTRA_OPTS= # Used in vim package to build with non-gui extra options # Possible: not defined, see "configure --help" |