Changeset View
Changeset View
Standalone View
Standalone View
MOVED
- This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 9,958 Lines • ▼ Show 20 Lines | |||||
www/mod_security-devel|www/mod_security3|2018-02-12|Renamed, upstream has made a release | www/mod_security-devel|www/mod_security3|2018-02-12|Renamed, upstream has made a release | ||||
devel/pear-channel-htmlpurifier|devel/pear-channel-htmlpurifier.org|2018-02-13|Rename for consistency | devel/pear-channel-htmlpurifier|devel/pear-channel-htmlpurifier.org|2018-02-13|Rename for consistency | ||||
games/lolcat|games/rubygem-lolcat|2018-02-13|Rename to match our rubygems naming | games/lolcat|games/rubygem-lolcat|2018-02-13|Rename to match our rubygems naming | ||||
net-mgmt/prometheus|net-mgmt/prometheus1|2018-02-14|Rename to include major version number in the portname | net-mgmt/prometheus|net-mgmt/prometheus1|2018-02-14|Rename to include major version number in the portname | ||||
textproc/rubygem-tidy||2018-02-14|Has expired: No longer needed and not maintained | textproc/rubygem-tidy||2018-02-14|Has expired: No longer needed and not maintained | ||||
www/rubygem-scrapi||2018-02-14|Has expired: No longer maintained upstream | www/rubygem-scrapi||2018-02-14|Has expired: No longer maintained upstream | ||||
devel/boost-python3-libs|devel/boost-python-libs@py36|2018-02-15|Flavorize | devel/boost-python3-libs|devel/boost-python-libs@py36|2018-02-15|Flavorize | ||||
net/quagga-esr|net/quagga|2018-02-15|Fixes available, go back to the regular quagga | net/quagga-esr|net/quagga|2018-02-15|Fixes available, go back to the regular quagga | ||||
<<<<<<< HEAD | |||||
<<<<<<< HEAD | |||||
tz: Merge conflict? | |||||
sysutils/krename-kde4|sysutils/krename|2018-02-16|Renamed to sysutils/krename | sysutils/krename-kde4|sysutils/krename|2018-02-16|Renamed to sysutils/krename | ||||
net/grive|net/grive2|2018-02-17|Has expired: Unmaintained by upstream, use net/grive2 instead | net/grive|net/grive2|2018-02-17|Has expired: Unmaintained by upstream, use net/grive2 instead | ||||
textproc/rubygem-sass-rails5|textproc/rubygem-sass-rails-rails4|2018-02-18|Rename to match our rubygems naming | textproc/rubygem-sass-rails5|textproc/rubygem-sass-rails-rails4|2018-02-18|Rename to match our rubygems naming | ||||
devel/elixir-exrm||2018-02-19|Has expired: No longer maintained upstream | devel/elixir-exrm||2018-02-19|Has expired: No longer maintained upstream | ||||
devel/elixir-conform_exrm||2018-02-19|Has expired: No longer maintained upstream | devel/elixir-conform_exrm||2018-02-19|Has expired: No longer maintained upstream | ||||
devel/elixir-sorted_set||2018-02-19|Has expired: No longer maintained upstream | devel/elixir-sorted_set||2018-02-19|Has expired: No longer maintained upstream | ||||
devel/elixir-red_black_tree||2018-02-19|Has expired: No longer maintained upstream | devel/elixir-red_black_tree||2018-02-19|Has expired: No longer maintained upstream | ||||
emulators/wine-staging|emulators/wine-devel|2018-02-20|Broken for months, abandoned upstream | emulators/wine-staging|emulators/wine-devel|2018-02-20|Broken for months, abandoned upstream | ||||
databases/php70-memcache|databases/php-memcache@php70|2018-02-20|Merge into a flavorized version | |||||
databases/php71-memcache|databases/php-memcache@php71|2018-02-20|Merge into a flavorized version | |||||
databases/php72-memcache|databases/php-memcache@php72|2018-02-20|Merge into a flavorized version | |||||
ftp/php56-fastdfs|ftp/php-fastdfs@php56|2018-02-19|Metge into flavorized version | |||||
ftp/php70-fastdfs|ftp/php-fastdfs@php70|2018-02-19|Metge into flavorized version | |||||
ftp/php71-fastdfs|ftp/php-fastdfs@php71|2018-02-19|Metge into flavorized version | |||||
ftp/php72-fastdfs|ftp/php-fastdfs@php72|2018-02-19|Metge into flavorized version | |||||
www/unit-php56|www/unit-php@php56|2018-02-19|Metge into flavorized version | |||||
www/unit-php70|www/unit-php@php70|2018-02-19|Metge into flavorized version | |||||
www/unit-php71|www/unit-php@php71|2018-02-19|Metge into flavorized version | |||||
www/unit-php72|www/unit-php@php72|2018-02-19|Metge into flavorized version | |||||
tzUnsubmitted Done Inline ActionsThe 8 lines above: typo. Must be "Merge" instead of "Metge" tz: The 8 lines above: typo. Must be "Merge" instead of "Metge" |
Merge conflict?