diff --git a/telephony/asterisk-sounds/core-sounds/Makefile.inc b/telephony/asterisk-sounds/core-sounds/Makefile.inc index 5c9431992b2..82c11324517 100644 --- a/telephony/asterisk-sounds/core-sounds/Makefile.inc +++ b/telephony/asterisk-sounds/core-sounds/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2014/03/09 20:51:26 sthen Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2014/04/09 00:39:49 sthen Exp $ MODULES += telephony/asterisk-sounds MODAS_NAME = asterisk-core-sounds @@ -6,6 +6,7 @@ MODAS_TAG = asterisk-core MODAS_DESC = core ${MODAS_LANGNAME} sound files for Asterisk (${MODAS_CODEC}) MODAS_LANGS = en en_AU en_GB es fr it ru MODAS_VER = 1.4.25 +REVISION = 0 # CC-BY-SA PERMIT_PACKAGE_CDROM = Yes diff --git a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en index 13ae7adc2bb..3163d5a34ba 100644 --- a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en +++ b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST-en,v 1.3 2014/03/09 20:51:26 sthen Exp $ +@comment $OpenBSD: PLIST-en,v 1.4 2014/04/09 00:39:49 sthen Exp $ @option no-default-conflict -@conflict asterisk-core-sounds-en-*-${MODAS_CODEC} +@conflict asterisk-core-sounds-en-${MODAS_CODEC}-* @conflict asterisk-native-sounds-* @conflict asterisk-<1.8.16.0p0 @pkgpath telephony/asterisk-native-sounds diff --git a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_AU b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_AU index 964cdbab5fb..c33fb3ba4d4 100644 --- a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_AU +++ b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_AU @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST-en_AU,v 1.2 2013/05/16 21:53:32 sthen Exp $ +@comment $OpenBSD: PLIST-en_AU,v 1.3 2014/04/09 00:39:49 sthen Exp $ @option no-default-conflict -@conflict asterisk-core-sounds-en_AU-*-${MODAS_CODEC} +@conflict asterisk-core-sounds-en_AU-${MODAS_CODEC}-* share/asterisk/ share/asterisk/sounds/ ${MODAS_INST}/ diff --git a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_GB b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_GB index 4dc67ae9485..73c9a2206c1 100644 --- a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_GB +++ b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_GB @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-en_GB,v 1.1 2014/03/09 20:51:26 sthen Exp $ +@comment $OpenBSD: PLIST-en_GB,v 1.2 2014/04/09 00:39:49 sthen Exp $ +@option no-default-conflict +@conflict asterisk-core-sounds-en_GB-${MODAS_CODEC}-* share/asterisk/ share/asterisk/sounds/ ${MODAS_INST}/ diff --git a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-es b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-es index f5ccac3bc31..ce11d671429 100644 --- a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-es +++ b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-es @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST-es,v 1.2 2013/05/16 21:53:32 sthen Exp $ +@comment $OpenBSD: PLIST-es,v 1.3 2014/04/09 00:39:49 sthen Exp $ @option no-default-conflict -@conflict asterisk-core-sounds-es-*-${MODAS_CODEC} +@conflict asterisk-core-sounds-es-${MODAS_CODEC}-* share/asterisk/ share/asterisk/sounds/ ${MODAS_INST}/ diff --git a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-fr b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-fr index 5f08014fd59..d5785613391 100644 --- a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-fr +++ b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-fr @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST-fr,v 1.3 2014/03/09 20:51:26 sthen Exp $ +@comment $OpenBSD: PLIST-fr,v 1.4 2014/04/09 00:39:49 sthen Exp $ @option no-default-conflict -@conflict asterisk-core-sounds-fr-*-${MODAS_CODEC} +@conflict asterisk-core-sounds-fr-${MODAS_CODEC}-* share/asterisk/ share/asterisk/sounds/ ${MODAS_INST}/ diff --git a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-it b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-it index e53962575db..97df0510078 100644 --- a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-it +++ b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-it @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-it,v 1.2 2014/03/09 20:51:26 sthen Exp $ +@comment $OpenBSD: PLIST-it,v 1.3 2014/04/09 00:39:49 sthen Exp $ +@option no-default-conflict +@conflict asterisk-core-sounds-it-${MODAS_CODEC}-* share/asterisk/ share/asterisk/sounds/ ${MODAS_INST}/ diff --git a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-ru b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-ru index c9024ac0ba6..e7e0d1fd994 100644 --- a/telephony/asterisk-sounds/core-sounds/pkg/PLIST-ru +++ b/telephony/asterisk-sounds/core-sounds/pkg/PLIST-ru @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST-ru,v 1.2 2013/05/16 21:53:32 sthen Exp $ +@comment $OpenBSD: PLIST-ru,v 1.3 2014/04/09 00:39:49 sthen Exp $ @option no-default-conflict -@conflict asterisk-core-sounds-ru-*-${MODAS_CODEC} +@conflict asterisk-core-sounds-ru-${MODAS_CODEC}-* share/asterisk/ share/asterisk/sounds/ ${MODAS_INST}/