| 1 | diff --git a/audio/speex-devel/Portfile b/audio/speex-devel/Portfile |
|---|
| 2 | index 690f26facd..fd4eb0bcc4 100644 |
|---|
| 3 | --- a/audio/speex-devel/Portfile |
|---|
| 4 | +++ b/audio/speex-devel/Portfile |
|---|
| 5 | @@ -1,7 +1,16 @@ |
|---|
| 6 | # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 |
|---|
| 7 | |
|---|
| 8 | PortSystem 1.0 |
|---|
| 9 | + |
|---|
| 10 | +# speex-devel is the same as speex, and |
|---|
| 11 | +# speexdsp-devel is the same as speexdsp. |
|---|
| 12 | +# Remove them completely on Apr 2, 2018 |
|---|
| 13 | +replaced_by speex |
|---|
| 14 | +PortGroup obsolete 1.0 |
|---|
| 15 | + |
|---|
| 16 | name speex-devel |
|---|
| 17 | +revision 1 |
|---|
| 18 | + |
|---|
| 19 | version 1.2.0 |
|---|
| 20 | categories audio |
|---|
| 21 | license BSD |
|---|
| 22 | @@ -20,38 +29,14 @@ long_description Speex is an Open Source/Free Software \ |
|---|
| 23 | not present in most other codecs. |
|---|
| 24 | |
|---|
| 25 | homepage http://speex.org/ |
|---|
| 26 | -platforms darwin |
|---|
| 27 | - |
|---|
| 28 | -master_sites http://downloads.xiph.org/releases/speex |
|---|
| 29 | - |
|---|
| 30 | -use_parallel_build yes |
|---|
| 31 | |
|---|
| 32 | subport speexDSP-devel {} |
|---|
| 33 | |
|---|
| 34 | -livecheck.regex "speex-((\[0-9rc.\]+)?)${extract.suffix}" |
|---|
| 35 | - |
|---|
| 36 | if {${subport} eq ${name}} { |
|---|
| 37 | conflicts speex |
|---|
| 38 | - |
|---|
| 39 | - checksums rmd160 898a8746130794b2b5778f339ca72f99fb903e72 \ |
|---|
| 40 | - sha256 eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094 |
|---|
| 41 | - |
|---|
| 42 | distname speex-${version} |
|---|
| 43 | - |
|---|
| 44 | - depends_lib port:libogg |
|---|
| 45 | } else { |
|---|
| 46 | - set real_name "speexdsp" |
|---|
| 47 | - |
|---|
| 48 | description Speex audio processing library |
|---|
| 49 | - |
|---|
| 50 | version 1.2rc3 |
|---|
| 51 | - |
|---|
| 52 | conflicts speexDSP |
|---|
| 53 | - |
|---|
| 54 | - checksums rmd160 65b99919abd7d7bd139d50669afffc3823f06e6f \ |
|---|
| 55 | - sha256 4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1 |
|---|
| 56 | - |
|---|
| 57 | - distname ${real_name}-${version} |
|---|
| 58 | - |
|---|
| 59 | - livecheck.regex "${real_name}-((\[0-9rc.\]+)?)${extract.suffix}" |
|---|
| 60 | } |
|---|
| 61 | diff --git a/audio/speex/Portfile b/audio/speex/Portfile |
|---|
| 62 | index 9c1e305e96..e1a472eb7b 100644 |
|---|
| 63 | --- a/audio/speex/Portfile |
|---|
| 64 | +++ b/audio/speex/Portfile |
|---|
| 65 | @@ -22,8 +22,6 @@ long_description Speex is an Open Source/Free Software \ |
|---|
| 66 | homepage http://speex.org/ |
|---|
| 67 | platforms darwin |
|---|
| 68 | |
|---|
| 69 | -conflicts ${subport}-devel |
|---|
| 70 | - |
|---|
| 71 | master_sites http://downloads.xiph.org/releases/speex |
|---|
| 72 | |
|---|
| 73 | use_parallel_build yes |
|---|
