Sun Jan 27 00:15:03 2013 UTC ()
Remove vic-gpl option.

With this option, it tries to build against ffmpeg, but all ffmpegs
in pkgsrc are too new.

Bump PKGREVISION for default option change.


(wiz)
diff -r1.9 -r1.10 pkgsrc/mbone/vic-devel/Makefile
diff -r1.2 -r1.3 pkgsrc/mbone/vic-devel/options.mk
cvs diff -r1.9 -r1.10 pkgsrc/mbone/vic-devel/Makefile (expand / switch to unified diff)

--- pkgsrc/mbone/vic-devel/Makefile 2012/10/23 10:24:08 1.9
+++ pkgsrc/mbone/vic-devel/Makefile 2013/01/27 00:15:03 1.10
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:08 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2013/01/27 00:15:03 wiz Exp $
2 2
3DISTNAME= vic-2.8ucl1.4.0beta-4337 3DISTNAME= vic-2.8ucl1.4.0beta-4337
4PKGNAME= vic-devel-2.8.1.4.0beta.4337 4PKGNAME= vic-devel-2.8.1.4.0beta.4337
5PKGREVISION= 5 5PKGREVISION= 6
6CATEGORIES= mbone tk 6CATEGORIES= mbone tk
7MASTER_SITES= http://www.NetBSD.org/~sborrill/snapshots/ 7MASTER_SITES= http://www.NetBSD.org/~sborrill/snapshots/
8 8
9MAKE_JOBS_SAFE= no 9MAKE_JOBS_SAFE= no
10 10
11.include "../../mk/bsd.prefs.mk" 11.include "../../mk/bsd.prefs.mk"
12.include "options.mk" 12.include "options.mk"
13 13
14.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*) 14.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*)
15PATCH_SITES= ${MASTER_SITES} 15PATCH_SITES= ${MASTER_SITES}
16PATCHFILES= vic-2.8ucl1.4.0_ov511.diff.gz 16PATCHFILES= vic-2.8ucl1.4.0_ov511.diff.gz
17.endif 17.endif
18 18
cvs diff -r1.2 -r1.3 pkgsrc/mbone/vic-devel/options.mk (expand / switch to unified diff)

--- pkgsrc/mbone/vic-devel/options.mk 2012/06/12 15:45:59 1.2
+++ pkgsrc/mbone/vic-devel/options.mk 2013/01/27 00:15:03 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:59 wiz Exp $ 1# $NetBSD: options.mk,v 1.3 2013/01/27 00:15:03 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.vic 3PKG_OPTIONS_VAR= PKG_OPTIONS.vic
4PKG_SUPPORTED_OPTIONS= inet6 vic-gpl 4PKG_SUPPORTED_OPTIONS= inet6 # vic-gpl
5PKG_SUGGESTED_OPTIONS= inet6 vic-gpl 5PKG_SUGGESTED_OPTIONS= inet6 # vic-gpl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9## IPv6 support 9## IPv6 support
10.if !empty(PKG_OPTIONS:Minet6) 10.if !empty(PKG_OPTIONS:Minet6)
11CONFIGURE_ARGS+= --enable-ipv6 11CONFIGURE_ARGS+= --enable-ipv6
12.endif 12.endif
13 13
14## mpeg4+x264 support (ffmpeg) 14## mpeg4+x264 support (ffmpeg)
15 15
16.if !empty(PKG_OPTIONS:Mvic-gpl) 16.if !empty(PKG_OPTIONS:Mvic-gpl)
17CONFIGURE_ARGS+= --enable-gpl 17CONFIGURE_ARGS+= --enable-gpl
18CONFIGURE_ARGS+= --disable-ffmpeg-co 18CONFIGURE_ARGS+= --disable-ffmpeg-co