diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/ffmpeg/options.mk | 10 | ||||
-rw-r--r-- | multimedia/gmencoder/Makefile | 8 | ||||
-rw-r--r-- | multimedia/mjpegtools/hacks.mk | 4 | ||||
-rw-r--r-- | multimedia/mmg/Makefile | 6 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile | 4 | ||||
-rw-r--r-- | multimedia/ns-flash/Makefile | 6 | ||||
-rw-r--r-- | multimedia/vlc/Makefile | 8 | ||||
-rw-r--r-- | multimedia/vlc07/Makefile | 8 | ||||
-rw-r--r-- | multimedia/xfmedia/Makefile | 12 |
9 files changed, 33 insertions, 33 deletions
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index 24f8e1e57b3..76f829f18ff 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -2,8 +2,8 @@ # Global and legacy options -PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg -PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis faac faad a52 +PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg +PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis faac faad a52 .include "../../mk/bsd.options.mk" @@ -17,12 +17,12 @@ PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis faac faad a52 .if !empty(MACHINE_ARCH:Mi386) . if !empty(PKG_OPTIONS:Mmmx) && !empty(CC_VERSION:Mgcc*) -CFLAGS+= -fomit-frame-pointer +CFLAGS+= -fomit-frame-pointer . else -CONFIGURE_ARGS+= --disable-mmx +CONFIGURE_ARGS+= --disable-mmx . endif .else -CONFIGURE_ARGS+= --disable-mmx +CONFIGURE_ARGS+= --disable-mmx .endif ### diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile index 0efc6c1ea19..ab5a943bd8d 100644 --- a/multimedia/gmencoder/Makefile +++ b/multimedia/gmencoder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2007/01/31 00:04:12 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:51 wiz Exp $ # DISTNAME= gmencoder-0.1.0 @@ -13,11 +13,11 @@ COMMENT= GNOME2 frontend to mencoder BROKEN_IN= pkgsrc-2006Q1 pkgsrc-2006Q4 -DEPENDS+= mencoder>=0.90:../../multimedia/mencoder -DEPENDS+= mplayer>=0.90:../../multimedia/mplayer +DEPENDS+= mencoder>=0.90:../../multimedia/mencoder +DEPENDS+= mplayer>=0.90:../../multimedia/mplayer GNU_CONFIGURE= yes -USE_DIRS+= gnome2-1.5 +USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake msgfmt pkg-config USE_PKGLOCALEDIR= yes diff --git a/multimedia/mjpegtools/hacks.mk b/multimedia/mjpegtools/hacks.mk index 1a26d4f2aba..2e31ce024d5 100644 --- a/multimedia/mjpegtools/hacks.mk +++ b/multimedia/mjpegtools/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.3 2006/01/30 08:44:25 xtraeme Exp $ +# $NetBSD: hacks.mk,v 1.4 2007/02/22 19:26:51 wiz Exp $ .if !defined(MJPEGTOOLS_HACKS_MK) MJPEGTOOLS_HACKS_MK= defined @@ -10,7 +10,7 @@ MJPEGTOOLS_HACKS_MK= defined .include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-4.*) -BUILDLINK_TRANSFORM+= rm:-fmove-all-movables +BUILDLINK_TRANSFORM+= rm:-fmove-all-movables .endif .endif # MJPEGTOOLS_HACKS_MK diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile index 45abd37c2a4..fb9b102ca94 100644 --- a/multimedia/mmg/Makefile +++ b/multimedia/mmg/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.25 2007/01/09 11:35:30 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:51 wiz Exp $ # .include "../../multimedia/mkvtoolnix/Makefile.dist" -PKGNAME= ${DISTNAME:S/mkvtoolnix/mmg/} +PKGNAME= ${DISTNAME:S/mkvtoolnix/mmg/} MAINTAINER= salo@NetBSD.org HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/doc/mkvmerge-gui.html -COMMENT= MKVtoolnix mkvmerge GUI +COMMENT= MKVtoolnix mkvmerge GUI DEPENDS+= ${DISTNAME}{,nb[0-9]*}:../../multimedia/mkvtoolnix diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index b613b464509..f2a32e53713 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2007/01/09 14:49:34 drochner Exp $ +# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:51 wiz Exp $ PKGNAME= mplayer-${MPLAYER_PKG_VERSION} PKGREVISION= 3 @@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer # Solaris/x86 has Xv, but the header files live in /usr/X11R6, not # ${X11_BASE}, so we need to also look for headers in this path. .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386" -CPPFLAGS+= -I/usr/X11R6/include +CPPFLAGS+= -I/usr/X11R6/include BUILDLINK_PASSTHRU_DIRS+= /usr/X11R6/include .endif diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile index 970a08d4e8e..a717a5f5fd7 100644 --- a/multimedia/ns-flash/Makefile +++ b/multimedia/ns-flash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/02/01 13:44:14 ghen Exp $ +# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:51 wiz Exp $ CATEGORIES= multimedia www MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/ @@ -7,7 +7,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.flash.com/ COMMENT= MacroMedia Flash Player Netscape plugin -ONLY_FOR_PLATFORM= *-*-i386 SunOS-*-sparc +ONLY_FOR_PLATFORM= *-*-i386 SunOS-*-sparc NOT_FOR_PLATFORM= SunOS-*-i386 WRKSRC= ${WRKDIR}/${WRKNAME} @@ -40,7 +40,7 @@ CONFLICTS+= communicator<=4.76nb1 CONFLICTS+= navigator<=4.76nb1 LICENSE= flash-license -RESTRICTED= Redistribution not permitted +RESTRICTED= Redistribution not permitted NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 1ec927433e8..85720441005 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2007/01/17 03:11:19 rillig Exp $ +# $NetBSD: Makefile,v 1.44 2007/02/22 19:26:51 wiz Exp $ # DISTNAME= vlc-${VLC_VER} @@ -23,7 +23,7 @@ VLC_VER= 0.8.5 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-vcd +CONFIGURE_ARGS+= --disable-vcd .endif BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.8nb1 # Postprocess fix @@ -70,8 +70,8 @@ pre-install: ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf -SUBST_CLASSES+= oss -SUBST_STAGE.oss= post-patch +SUBST_CLASSES+= oss +SUBST_STAGE.oss= post-patch SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" SUBST_FILES.oss+= modules/access/v4l/v4l.c SUBST_FILES.oss+= modules/audio_output/oss.c diff --git a/multimedia/vlc07/Makefile b/multimedia/vlc07/Makefile index 246b7926cd1..f40ad5bf74c 100644 --- a/multimedia/vlc07/Makefile +++ b/multimedia/vlc07/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/02/02 15:48:58 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:51 wiz Exp $ # DISTNAME= vlc-${VLC_VER} @@ -22,7 +22,7 @@ VLC_VER= 0.7.2 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-vcd +CONFIGURE_ARGS+= --disable-vcd .endif BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.8nb1 # Postprocess fix @@ -59,8 +59,8 @@ pre-install: ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf -SUBST_CLASSES+= oss fnt libav -SUBST_STAGE.oss= post-patch +SUBST_CLASSES+= oss fnt libav +SUBST_STAGE.oss= post-patch SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" SUBST_FILES.oss+= modules/access/v4l/v4l.c SUBST_FILES.oss+= modules/audio_output/oss.c diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile index 687b71ae33d..0464ef1b3f0 100644 --- a/multimedia/xfmedia/Makefile +++ b/multimedia/xfmedia/Makefile @@ -1,21 +1,21 @@ -# $NetBSD: Makefile,v 1.12 2007/02/15 14:50:30 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:52 wiz Exp $ # DISTNAME= xfmedia-0.9.1 PKGREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://spuriousinterrupt.org/projects/xfmedia/files/ -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tar.bz2 MAINTAINER= dhowland@users.sourceforge.net HOMEPAGE= http://spuriousinterrupt.org/projects/xfmedia/ COMMENT= Xfce media player based on xine -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes USE_DIRS+= xdg-1.2 -USE_LIBTOOL= yes -USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake intltool msgfmt pkg-config +USE_LIBTOOL= yes +USE_PKGLOCALEDIR= yes +USE_TOOLS+= gmake intltool msgfmt pkg-config OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/xfmedia |