summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorabs <abs>2006-02-16 11:45:52 +0000
committerabs <abs>2006-02-16 11:45:52 +0000
commitb6efa6e8d84abc45ffa83401ca2cb1c13530b359 (patch)
treef5ad5e5e6f72384ac4bd59d0e6ca46fe30405ddb /multimedia
parent43106e43e482ec81d5612671926c420e5ec0078e (diff)
downloadpkgsrc-b6efa6e8d84abc45ffa83401ca2cb1c13530b359.tar.gz
pkglint - no functional changes
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile6
-rw-r--r--multimedia/ffmpeg/options.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index e5b6f18b03e..9e9e66c9482 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/16 10:26:30 abs Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/16 11:45:52 abs Exp $
DISTNAME= ffmpeg-0.4.9-pre1
PKGNAME= ffmpeg-0.4.9pre1
@@ -15,7 +15,7 @@ USE_LIBTOOL= YES
CONFLICTS+= ffmpeg-devel-[0-9]*
-REPLACE_PERL= doc/texi2pod.pl
+REPLACE_PERL+= doc/texi2pod.pl
CONF_FILES= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
${PKG_SYSCONFDIR}/ffserver.conf
@@ -24,7 +24,7 @@ MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} \
FFSERVER_CONF=${PKG_SYSCONFDIR}/ffserver.conf \
LOCALBASE=${LOCALBASE:Q}
-CONFIGURE_ARGS= --cc=${CC:Q} --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --cc=${CC:Q} --prefix=${PREFIX:Q}
CONFIGURE_ARGS+= --enable-pp --disable-vhook --disable-debug
CONFIGURE_ARGS+= --enable-gpl
CONFIGURE_ARGS+= --enable-ffplay
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index e2f1a15be00..24f8e1e57b3 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis faac faad a52
.include "../../mk/bsd.prefs.mk"
###
-### MMX support
+### MMX support
###
.include "../../mk/compiler.mk"
@@ -36,7 +36,7 @@ post-extract:
post-patch:
${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/bktr.diff
#TODO
-#Update the documentation
+#Update the documentation
# ${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/ffmpeg.1.diff
.endif