From 79a97a6bc4d4823a95512866c5e15d31144ced5e Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 23 Jun 2011 09:50:25 +0000 Subject: Make mpeg4ip optional, but default on, so no change. Requested by Staffan Thomén on tech-multimedia. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While here, set LICENSE. --- multimedia/fuppes/Makefile | 4 ++-- multimedia/fuppes/options.mk | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'multimedia') diff --git a/multimedia/fuppes/Makefile b/multimedia/fuppes/Makefile index 99a0b330fdb..0f869c78f5d 100644 --- a/multimedia/fuppes/Makefile +++ b/multimedia/fuppes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2011/06/10 09:39:57 obache Exp $ +# $NetBSD: Makefile,v 1.19 2011/06/23 09:50:25 wiz Exp $ # DISTNAME= fuppes-0.640 @@ -9,6 +9,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuppes/} MAINTAINER= tech-multimedia@NetBSD.org HOMEPAGE= http://fuppes.ulrich-voelkel.de/ COMMENT= Free UPnP Entertainment Service +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir @@ -38,5 +39,4 @@ CONFIGURE_ARGS+= --enable-lame .include "../../textproc/libxml2/buildlink3.mk" .include "../../graphics/simage/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" -.include "../../multimedia/mpeg4ip/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/fuppes/options.mk b/multimedia/fuppes/options.mk index 108e3d94124..2fbeeff4e03 100644 --- a/multimedia/fuppes/options.mk +++ b/multimedia/fuppes/options.mk @@ -1,12 +1,17 @@ -# $NetBSD: options.mk,v 1.2 2010/09/27 11:15:23 obache Exp $ +# $NetBSD: options.mk,v 1.3 2011/06/23 09:50:25 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fuppes -PKG_SUPPORTED_OPTIONS= mysql +PKG_SUPPORTED_OPTIONS= mpeg4ip mysql +PKG_SUGGESTED_OPTIONS= mpeg4ip .include "../../mk/bsd.options.mk" PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} +.if !empty(PKG_OPTIONS:Mmpeg4ip) +.include "../../multimedia/mpeg4ip/buildlink3.mk" +.endif + .if !empty(PKG_OPTIONS:Mmysql) PLIST.mysql= yes .include "../../mk/mysql.buildlink3.mk" -- cgit v1.2.3