summaryrefslogtreecommitdiff
path: root/www/cherokee
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-08-11 23:09:44 +0000
committerwiz <wiz@pkgsrc.org>2014-08-11 23:09:44 +0000
commit83b00fb2610b5fb54a830ead5530a68b2f177a16 (patch)
treedcf9dd704b954a6166618438d87abbe0365078c1 /www/cherokee
parent3b5b85d1d1ac38ac85d7793e2f0d561ecbe896ab (diff)
downloadpkgsrc-83b00fb2610b5fb54a830ead5530a68b2f177a16.tar.gz
Switch to ffmpeg1 instead of ffmpeg.
Note: some of these packages didn't build for me, e.g. osg, so I couldn't verify them all.
Diffstat (limited to 'www/cherokee')
-rw-r--r--www/cherokee/Makefile4
-rw-r--r--www/cherokee/options.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 92316744cf1..a01261acd46 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2014/05/09 07:37:23 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2014/08/11 23:09:46 wiz Exp $
DISTNAME= cherokee-1.2.101
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= www
MASTER_SITES= http://www.cherokee-project.com/download/1.2/${PKGVERSION_NOREV}/
diff --git a/www/cherokee/options.mk b/www/cherokee/options.mk
index 8c9aecc8133..af350e1e1a2 100644
--- a/www/cherokee/options.mk
+++ b/www/cherokee/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2010/07/11 12:18:55 obache Exp $
+# $NetBSD: options.mk,v 1.2 2014/08/11 23:09:46 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.cherokee
@@ -79,7 +79,7 @@ CONFIGURE_ARGS+= --without-geoip
.if !empty(PKG_OPTIONS:Mffmpeg)
PLIST.ffmpeg= yes
CONFIGURE_ARGS+= --with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg}
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-ffmpeg
.endif