cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict markers, update problem reported by brad@

Browse Source
This commit is contained in:
sthen 2014-04-09 00:39:49 +00:00
parent 5d519f4c0d
commit 292e928e14
8 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/asterisk-sounds/core-sounds/Makefile.inc
View File

@ -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 MODULES += telephony/asterisk-sounds
MODAS_NAME = asterisk-core-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_DESC = core ${MODAS_LANGNAME} sound files for Asterisk (${MODAS_CODEC})
MODAS_LANGS = en en_AU en_GB es fr it ru MODAS_LANGS = en en_AU en_GB es fr it ru
MODAS_VER = 1.4.25 MODAS_VER = 1.4.25
REVISION = 0
# CC-BY-SA # CC-BY-SA
PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_CDROM = Yes

4
telephony/asterisk-sounds/core-sounds/pkg/PLIST-en
View File

@ -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 @option no-default-conflict
@conflict asterisk-core-sounds-en-*-${MODAS_CODEC} @conflict asterisk-core-sounds-en-${MODAS_CODEC}-*
@conflict asterisk-native-sounds-* @conflict asterisk-native-sounds-*
@conflict asterisk-<1.8.16.0p0 @conflict asterisk-<1.8.16.0p0
@pkgpath telephony/asterisk-native-sounds @pkgpath telephony/asterisk-native-sounds

4
telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_AU
View File

@ -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 @option no-default-conflict
@conflict asterisk-core-sounds-en_AU-*-${MODAS_CODEC} @conflict asterisk-core-sounds-en_AU-${MODAS_CODEC}-*
share/asterisk/ share/asterisk/
share/asterisk/sounds/ share/asterisk/sounds/
${MODAS_INST}/ ${MODAS_INST}/

4
telephony/asterisk-sounds/core-sounds/pkg/PLIST-en_GB
View File

@ -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/
share/asterisk/sounds/ share/asterisk/sounds/
${MODAS_INST}/ ${MODAS_INST}/

4
telephony/asterisk-sounds/core-sounds/pkg/PLIST-es
View File

@ -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 @option no-default-conflict
@conflict asterisk-core-sounds-es-*-${MODAS_CODEC} @conflict asterisk-core-sounds-es-${MODAS_CODEC}-*
share/asterisk/ share/asterisk/
share/asterisk/sounds/ share/asterisk/sounds/
${MODAS_INST}/ ${MODAS_INST}/

4
telephony/asterisk-sounds/core-sounds/pkg/PLIST-fr
View File

@ -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 @option no-default-conflict
@conflict asterisk-core-sounds-fr-*-${MODAS_CODEC} @conflict asterisk-core-sounds-fr-${MODAS_CODEC}-*
share/asterisk/ share/asterisk/
share/asterisk/sounds/ share/asterisk/sounds/
${MODAS_INST}/ ${MODAS_INST}/

4
telephony/asterisk-sounds/core-sounds/pkg/PLIST-it
View File

@ -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/
share/asterisk/sounds/ share/asterisk/sounds/
${MODAS_INST}/ ${MODAS_INST}/

4
telephony/asterisk-sounds/core-sounds/pkg/PLIST-ru
View File

@ -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 @option no-default-conflict
@conflict asterisk-core-sounds-ru-*-${MODAS_CODEC} @conflict asterisk-core-sounds-ru-${MODAS_CODEC}-*
share/asterisk/ share/asterisk/
share/asterisk/sounds/ share/asterisk/sounds/
${MODAS_INST}/ ${MODAS_INST}/