summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-08-06 01:30:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-08-06 01:31:02 +0200
commit9010047840d810d9ccba3d00b7943a842e125291 (patch)
tree7698717495c9bc52be2bc8ab526071f3063b466d
parentb4f5663d87c16e08aaef66346f4b22eba2de80bd (diff)
downloadtde-packaging-9010047840d810d9ccba3d00b7943a842e125291.tar.gz
tde-packaging-9010047840d810d9ccba3d00b7943a842e125291.zip
FreeBSD: Update for final release R14.0.5r14.0.5
Additional patches due to stricter C++11 in Clang A new mkspec for Clang is used to build TQt Akode is now part of the TDE repository Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--freebsd/applications/abakus/Makefile2
-rw-r--r--freebsd/applications/abakus/distinfo6
-rw-r--r--freebsd/applications/amarok/Makefile2
-rw-r--r--freebsd/applications/amarok/distinfo6
-rw-r--r--freebsd/applications/amarok/files/patch-bp000-fix-ftbfs-on-c++11.diff28
-rw-r--r--freebsd/applications/basket/Makefile2
-rw-r--r--freebsd/applications/basket/distinfo6
-rw-r--r--freebsd/applications/basket/files/patch-bp000-fix-build-dependencies.diff22
-rw-r--r--freebsd/applications/bibletime/Makefile2
-rw-r--r--freebsd/applications/bibletime/distinfo6
-rw-r--r--freebsd/applications/digikam/Makefile2
-rw-r--r--freebsd/applications/digikam/distinfo6
-rw-r--r--freebsd/applications/dolphin/Makefile2
-rw-r--r--freebsd/applications/dolphin/distinfo6
-rw-r--r--freebsd/applications/filelight/Makefile2
-rw-r--r--freebsd/applications/filelight/distinfo6
-rw-r--r--freebsd/applications/filelight/files/patch-bp000-fix-ftbfs-on-c++11.diff13
-rw-r--r--freebsd/applications/gtk-qt-engine/Makefile2
-rw-r--r--freebsd/applications/gtk-qt-engine/distinfo6
-rw-r--r--freebsd/applications/gtk3-tqt-engine/Makefile2
-rw-r--r--freebsd/applications/gtk3-tqt-engine/distinfo6
-rw-r--r--freebsd/applications/gwenview-i18n/Makefile2
-rw-r--r--freebsd/applications/gwenview-i18n/distinfo6
-rw-r--r--freebsd/applications/gwenview/Makefile2
-rw-r--r--freebsd/applications/gwenview/distinfo6
-rw-r--r--freebsd/applications/ksquirrel/Makefile2
-rw-r--r--freebsd/applications/ksquirrel/distinfo6
-rw-r--r--freebsd/dependencies/akode/Makefile9
-rw-r--r--freebsd/dependencies/akode/distinfo6
-rw-r--r--freebsd/dependencies/akode/files/patch-a00-amd64_libflac8_fix.diff11
-rw-r--r--freebsd/dependencies/akode/files/patch-a01-clang.diff61
-rw-r--r--freebsd/dependencies/akode/files/patch-a02-cmake.diff3226
-rw-r--r--freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff86
-rw-r--r--freebsd/dependencies/akode/files/patch-b01-add-pulseaudio-support.diff134
-rw-r--r--freebsd/dependencies/akode/files/patch-b02-rename-polyp-to-pulse.diff687
-rw-r--r--freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff91
-rw-r--r--freebsd/dependencies/akode/files/patch-b04-fix-ftbfs-on-ptrdiff_t-redefinition.diff20
-rw-r--r--freebsd/dependencies/arts/Makefile2
-rw-r--r--freebsd/dependencies/arts/distinfo6
-rw-r--r--freebsd/dependencies/arts/files/patch-bp000-fix-ftbfs-on-c++11.diff52
-rw-r--r--freebsd/dependencies/avahi-tqt/Makefile2
-rw-r--r--freebsd/dependencies/avahi-tqt/distinfo6
-rw-r--r--freebsd/dependencies/dbus-1-tqt/Makefile2
-rw-r--r--freebsd/dependencies/dbus-1-tqt/distinfo6
-rw-r--r--freebsd/dependencies/dbus-tqt/Makefile2
-rw-r--r--freebsd/dependencies/dbus-tqt/distinfo6
-rw-r--r--freebsd/dependencies/libart-lgpl/Makefile2
-rw-r--r--freebsd/dependencies/libart-lgpl/distinfo6
-rw-r--r--freebsd/dependencies/libcaldav/Makefile2
-rw-r--r--freebsd/dependencies/libcaldav/distinfo6
-rw-r--r--freebsd/dependencies/libcarddav/Makefile2
-rw-r--r--freebsd/dependencies/libcarddav/distinfo6
-rw-r--r--freebsd/dependencies/tqca-tls/Makefile2
-rw-r--r--freebsd/dependencies/tqca-tls/distinfo6
-rw-r--r--freebsd/dependencies/tqmake/Makefile9
-rw-r--r--freebsd/dependencies/tqmake/distinfo6
-rw-r--r--freebsd/dependencies/tqmake/files/Makefile.bsd2
-rw-r--r--freebsd/dependencies/tqmake/files/patch-bp000-fix-ftbfs-on-c++11.diff78
-rw-r--r--freebsd/dependencies/tqmake/pkg-plist4
-rw-r--r--freebsd/dependencies/tqt3-ibase-plugin/Makefile2
-rw-r--r--freebsd/dependencies/tqt3-ibase-plugin/distinfo6
-rw-r--r--freebsd/dependencies/tqt3-mysql-plugin/Makefile2
-rw-r--r--freebsd/dependencies/tqt3-mysql-plugin/distinfo6
-rw-r--r--freebsd/dependencies/tqt3-odbc-plugin/Makefile2
-rw-r--r--freebsd/dependencies/tqt3-odbc-plugin/distinfo6
-rw-r--r--freebsd/dependencies/tqt3-pgsql-plugin/Makefile2
-rw-r--r--freebsd/dependencies/tqt3-pgsql-plugin/distinfo6
-rw-r--r--freebsd/dependencies/tqt3-sqlite-plugin/Makefile2
-rw-r--r--freebsd/dependencies/tqt3-sqlite-plugin/distinfo6
-rw-r--r--freebsd/dependencies/tqt3-sqlite3-plugin/Makefile2
-rw-r--r--freebsd/dependencies/tqt3-sqlite3-plugin/distinfo6
-rw-r--r--freebsd/dependencies/tqt3/Makefile10
-rw-r--r--freebsd/dependencies/tqt3/distinfo6
-rw-r--r--freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff38
-rw-r--r--freebsd/dependencies/tqtinterface/Makefile2
-rw-r--r--freebsd/dependencies/tqtinterface/distinfo6
-rw-r--r--freebsd/libraries/kipi-plugins/Makefile2
-rw-r--r--freebsd/libraries/kipi-plugins/distinfo6
-rw-r--r--freebsd/libraries/libkdcraw/Makefile2
-rw-r--r--freebsd/libraries/libkdcraw/distinfo6
-rw-r--r--freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff74
-rw-r--r--freebsd/libraries/libkexiv2/Makefile2
-rw-r--r--freebsd/libraries/libkexiv2/distinfo6
-rw-r--r--freebsd/libraries/libkipi/Makefile2
-rw-r--r--freebsd/libraries/libkipi/distinfo6
-rw-r--r--freebsd/libraries/libksquirrel/Makefile4
-rw-r--r--freebsd/libraries/libksquirrel/distinfo6
-rw-r--r--freebsd/libraries/libksquirrel/files/patch-bp000-fix-ftbfs-on-c++11.diff13
-rw-r--r--freebsd/libraries/libtdeldap/Makefile2
-rw-r--r--freebsd/libraries/libtdeldap/distinfo6
-rw-r--r--freebsd/tde-i18n-af/Makefile2
-rw-r--r--freebsd/tde-i18n-af/distinfo6
-rw-r--r--freebsd/tde-i18n-ar/Makefile2
-rw-r--r--freebsd/tde-i18n-ar/distinfo6
-rw-r--r--freebsd/tde-i18n-az/Makefile2
-rw-r--r--freebsd/tde-i18n-az/distinfo6
-rw-r--r--freebsd/tde-i18n-be/Makefile2
-rw-r--r--freebsd/tde-i18n-be/distinfo6
-rw-r--r--freebsd/tde-i18n-bg/Makefile2
-rw-r--r--freebsd/tde-i18n-bg/distinfo6
-rw-r--r--freebsd/tde-i18n-bn/Makefile2
-rw-r--r--freebsd/tde-i18n-bn/distinfo6
-rw-r--r--freebsd/tde-i18n-br/Makefile2
-rw-r--r--freebsd/tde-i18n-br/distinfo6
-rw-r--r--freebsd/tde-i18n-bs/Makefile2
-rw-r--r--freebsd/tde-i18n-bs/distinfo6
-rw-r--r--freebsd/tde-i18n-ca/Makefile2
-rw-r--r--freebsd/tde-i18n-ca/distinfo6
-rw-r--r--freebsd/tde-i18n-cs/Makefile2
-rw-r--r--freebsd/tde-i18n-cs/distinfo6
-rw-r--r--freebsd/tde-i18n-csb/Makefile2
-rw-r--r--freebsd/tde-i18n-csb/distinfo6
-rw-r--r--freebsd/tde-i18n-cy/Makefile2
-rw-r--r--freebsd/tde-i18n-cy/distinfo6
-rw-r--r--freebsd/tde-i18n-da/Makefile2
-rw-r--r--freebsd/tde-i18n-da/distinfo6
-rw-r--r--freebsd/tde-i18n-de/Makefile2
-rw-r--r--freebsd/tde-i18n-de/distinfo6
-rw-r--r--freebsd/tde-i18n-el/Makefile2
-rw-r--r--freebsd/tde-i18n-el/distinfo6
-rw-r--r--freebsd/tde-i18n-en_GB/Makefile2
-rw-r--r--freebsd/tde-i18n-en_GB/distinfo6
-rw-r--r--freebsd/tde-i18n-eo/Makefile2
-rw-r--r--freebsd/tde-i18n-eo/distinfo6
-rw-r--r--freebsd/tde-i18n-es/Makefile2
-rw-r--r--freebsd/tde-i18n-es/distinfo6
-rw-r--r--freebsd/tde-i18n-et/Makefile2
-rw-r--r--freebsd/tde-i18n-et/distinfo6
-rw-r--r--freebsd/tde-i18n-eu/Makefile2
-rw-r--r--freebsd/tde-i18n-eu/distinfo6
-rw-r--r--freebsd/tde-i18n-fa/Makefile2
-rw-r--r--freebsd/tde-i18n-fa/distinfo6
-rw-r--r--freebsd/tde-i18n-fi/Makefile2
-rw-r--r--freebsd/tde-i18n-fi/distinfo6
-rw-r--r--freebsd/tde-i18n-fr/Makefile2
-rw-r--r--freebsd/tde-i18n-fr/distinfo6
-rw-r--r--freebsd/tde-i18n-fy/Makefile2
-rw-r--r--freebsd/tde-i18n-fy/distinfo6
-rw-r--r--freebsd/tde-i18n-ga/Makefile2
-rw-r--r--freebsd/tde-i18n-ga/distinfo6
-rw-r--r--freebsd/tde-i18n-gl/Makefile2
-rw-r--r--freebsd/tde-i18n-gl/distinfo6
-rw-r--r--freebsd/tde-i18n-he/Makefile2
-rw-r--r--freebsd/tde-i18n-he/distinfo6
-rw-r--r--freebsd/tde-i18n-hi/Makefile2
-rw-r--r--freebsd/tde-i18n-hi/distinfo6
-rw-r--r--freebsd/tde-i18n-hr/Makefile2
-rw-r--r--freebsd/tde-i18n-hr/distinfo6
-rw-r--r--freebsd/tde-i18n-hu/Makefile2
-rw-r--r--freebsd/tde-i18n-hu/distinfo6
-rw-r--r--freebsd/tde-i18n-is/Makefile2
-rw-r--r--freebsd/tde-i18n-is/distinfo6
-rw-r--r--freebsd/tde-i18n-it/Makefile2
-rw-r--r--freebsd/tde-i18n-it/distinfo6
-rw-r--r--freebsd/tde-i18n-ja/Makefile2
-rw-r--r--freebsd/tde-i18n-ja/distinfo6
-rw-r--r--freebsd/tde-i18n-kk/Makefile2
-rw-r--r--freebsd/tde-i18n-kk/distinfo6
-rw-r--r--freebsd/tde-i18n-km/Makefile2
-rw-r--r--freebsd/tde-i18n-km/distinfo6
-rw-r--r--freebsd/tde-i18n-ko/Makefile2
-rw-r--r--freebsd/tde-i18n-ko/distinfo6
-rw-r--r--freebsd/tde-i18n-lt/Makefile2
-rw-r--r--freebsd/tde-i18n-lt/distinfo6
-rw-r--r--freebsd/tde-i18n-lv/Makefile2
-rw-r--r--freebsd/tde-i18n-lv/distinfo6
-rw-r--r--freebsd/tde-i18n-mk/Makefile2
-rw-r--r--freebsd/tde-i18n-mk/distinfo6
-rw-r--r--freebsd/tde-i18n-mn/Makefile2
-rw-r--r--freebsd/tde-i18n-mn/distinfo6
-rw-r--r--freebsd/tde-i18n-ms/Makefile2
-rw-r--r--freebsd/tde-i18n-ms/distinfo6
-rw-r--r--freebsd/tde-i18n-nb/Makefile2
-rw-r--r--freebsd/tde-i18n-nb/distinfo6
-rw-r--r--freebsd/tde-i18n-nds/Makefile2
-rw-r--r--freebsd/tde-i18n-nds/distinfo6
-rw-r--r--freebsd/tde-i18n-nl/Makefile2
-rw-r--r--freebsd/tde-i18n-nl/distinfo6
-rw-r--r--freebsd/tde-i18n-nn/Makefile2
-rw-r--r--freebsd/tde-i18n-nn/distinfo6
-rw-r--r--freebsd/tde-i18n-pa/Makefile2
-rw-r--r--freebsd/tde-i18n-pa/distinfo6
-rw-r--r--freebsd/tde-i18n-pl/Makefile2
-rw-r--r--freebsd/tde-i18n-pl/distinfo6
-rw-r--r--freebsd/tde-i18n-pt/Makefile2
-rw-r--r--freebsd/tde-i18n-pt/distinfo6
-rw-r--r--freebsd/tde-i18n-pt_BR/Makefile2
-rw-r--r--freebsd/tde-i18n-pt_BR/distinfo6
-rw-r--r--freebsd/tde-i18n-ro/Makefile2
-rw-r--r--freebsd/tde-i18n-ro/distinfo6
-rw-r--r--freebsd/tde-i18n-ru/Makefile2
-rw-r--r--freebsd/tde-i18n-ru/distinfo6
-rw-r--r--freebsd/tde-i18n-rw/Makefile2
-rw-r--r--freebsd/tde-i18n-rw/distinfo6
-rw-r--r--freebsd/tde-i18n-se/Makefile2
-rw-r--r--freebsd/tde-i18n-se/distinfo6
-rw-r--r--freebsd/tde-i18n-sk/Makefile2
-rw-r--r--freebsd/tde-i18n-sk/distinfo6
-rw-r--r--freebsd/tde-i18n-sl/Makefile2
-rw-r--r--freebsd/tde-i18n-sl/distinfo6
-rw-r--r--freebsd/tde-i18n-sr/Makefile2
-rw-r--r--freebsd/tde-i18n-sr/distinfo6
-rw-r--r--freebsd/tde-i18n-sr@Latn/Makefile2
-rw-r--r--freebsd/tde-i18n-sr@Latn/distinfo6
-rw-r--r--freebsd/tde-i18n-ss/Makefile2
-rw-r--r--freebsd/tde-i18n-ss/distinfo6
-rw-r--r--freebsd/tde-i18n-sv/Makefile2
-rw-r--r--freebsd/tde-i18n-sv/distinfo6
-rw-r--r--freebsd/tde-i18n-ta/Makefile2
-rw-r--r--freebsd/tde-i18n-ta/distinfo6
-rw-r--r--freebsd/tde-i18n-te/Makefile2
-rw-r--r--freebsd/tde-i18n-te/distinfo6
-rw-r--r--freebsd/tde-i18n-tg/Makefile2
-rw-r--r--freebsd/tde-i18n-tg/distinfo6
-rw-r--r--freebsd/tde-i18n-th/Makefile2
-rw-r--r--freebsd/tde-i18n-th/distinfo6
-rw-r--r--freebsd/tde-i18n-tr/Makefile2
-rw-r--r--freebsd/tde-i18n-tr/distinfo6
-rw-r--r--freebsd/tde-i18n-uk/Makefile2
-rw-r--r--freebsd/tde-i18n-uk/distinfo6
-rw-r--r--freebsd/tde-i18n-uz/Makefile2
-rw-r--r--freebsd/tde-i18n-uz/distinfo6
-rw-r--r--freebsd/tde-i18n-uz@cyrillic/Makefile2
-rw-r--r--freebsd/tde-i18n-uz@cyrillic/distinfo6
-rw-r--r--freebsd/tde-i18n-vi/Makefile2
-rw-r--r--freebsd/tde-i18n-vi/distinfo6
-rw-r--r--freebsd/tde-i18n-wa/Makefile2
-rw-r--r--freebsd/tde-i18n-wa/distinfo6
-rw-r--r--freebsd/tde-i18n-zh_CN/Makefile2
-rw-r--r--freebsd/tde-i18n-zh_CN/distinfo6
-rw-r--r--freebsd/tde-i18n-zh_TW/Makefile2
-rw-r--r--freebsd/tde-i18n-zh_TW/distinfo6
-rw-r--r--freebsd/tdeaccessibility/Makefile2
-rw-r--r--freebsd/tdeaccessibility/distinfo6
-rw-r--r--freebsd/tdeaddons/Makefile2
-rw-r--r--freebsd/tdeaddons/distinfo6
-rw-r--r--freebsd/tdeadmin/Makefile2
-rw-r--r--freebsd/tdeadmin/distinfo6
-rw-r--r--freebsd/tdeadmin/files/patch-bp000-fix-ftbfs-on-c++11.diff13
-rw-r--r--freebsd/tdeartwork/Makefile2
-rw-r--r--freebsd/tdeartwork/distinfo6
-rw-r--r--freebsd/tdeartwork/files/patch-bp000-fix-ftbfs-on-c++11.diff17
-rw-r--r--freebsd/tdebase/Makefile2
-rw-r--r--freebsd/tdebase/distinfo6
-rw-r--r--freebsd/tdebase/files/patch-bp000-fix-ftbfs-on-c++11.diff96
-rw-r--r--freebsd/tdebase/pkg-plist2
-rw-r--r--freebsd/tdeedu/Makefile2
-rw-r--r--freebsd/tdeedu/distinfo6
-rw-r--r--freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff13
-rw-r--r--freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff40
-rw-r--r--freebsd/tdegames/Makefile2
-rw-r--r--freebsd/tdegames/distinfo6
-rw-r--r--freebsd/tdegames/files/patch-bp000-fix-ftbfs-on-c++11.diff13
-rw-r--r--freebsd/tdegraphics/Makefile2
-rw-r--r--freebsd/tdegraphics/distinfo6
-rw-r--r--freebsd/tdegraphics/files/patch-bp000-fix-ftbfs-on-c++11.diff21
-rw-r--r--freebsd/tdelibs/Makefile2
-rw-r--r--freebsd/tdelibs/distinfo6
-rw-r--r--freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff34
-rw-r--r--freebsd/tdelibs/pkg-plist1
-rw-r--r--freebsd/tdemultimedia/Makefile4
-rw-r--r--freebsd/tdemultimedia/distinfo6
-rw-r--r--freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff26
-rw-r--r--freebsd/tdenetwork/Makefile2
-rw-r--r--freebsd/tdenetwork/distinfo6
-rw-r--r--freebsd/tdenetwork/files/patch-bp000-fix-ftbfs-on-c++11.diff65
-rw-r--r--freebsd/tdepim/Makefile2
-rw-r--r--freebsd/tdepim/distinfo6
-rw-r--r--freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff89
-rw-r--r--freebsd/tdesdk/Makefile2
-rw-r--r--freebsd/tdesdk/distinfo6
-rw-r--r--freebsd/tdetoys/Makefile2
-rw-r--r--freebsd/tdetoys/distinfo6
-rw-r--r--freebsd/tdeutils/Makefile2
-rw-r--r--freebsd/tdeutils/distinfo6
-rw-r--r--freebsd/tdeutils/files/patch-bp000-fix-ftbfs-on-c++11.diff13
-rw-r--r--freebsd/tdevelop/Makefile2
-rw-r--r--freebsd/tdevelop/distinfo6
-rw-r--r--freebsd/tdevelop/files/patch-bp000-fix-ftbfs-on-c++11.diff13
-rw-r--r--freebsd/tdewebdev/Makefile2
-rw-r--r--freebsd/tdewebdev/distinfo6
281 files changed, 1286 insertions, 4828 deletions
diff --git a/freebsd/applications/abakus/Makefile b/freebsd/applications/abakus/Makefile
index c038e23e4..d6789540b 100644
--- a/freebsd/applications/abakus/Makefile
+++ b/freebsd/applications/abakus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= abakus-trinity
COMMENT= Calculator for TDE
-TDE_PREVERSION= ~pre6+1089e019
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= a/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11
diff --git a/freebsd/applications/abakus/distinfo b/freebsd/applications/abakus/distinfo
index 696a9201d..2e0309a75 100644
--- a/freebsd/applications/abakus/distinfo
+++ b/freebsd/applications/abakus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992053
-SHA256 (TDE/applications/abakus-trinity_14.0.5~pre6.orig.tar.xz) = e2de5502501cf12ed3f7160a31e67e5458e5a40d46b875ab6cf8b9cab9b4fcb0
-SIZE (TDE/applications/abakus-trinity_14.0.5~pre6.orig.tar.xz) = 476544
+TIMESTAMP = 1533397065
+SHA256 (TDE/applications/abakus-trinity_14.0.5.orig.tar.xz) = 638d0524559e27f86552ffc7eae690506282d03b744b6d2cb75ead5168b2dcc4
+SIZE (TDE/applications/abakus-trinity_14.0.5.orig.tar.xz) = 475856
diff --git a/freebsd/applications/amarok/Makefile b/freebsd/applications/amarok/Makefile
index ed1baefb9..2ee9cca95 100644
--- a/freebsd/applications/amarok/Makefile
+++ b/freebsd/applications/amarok/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amarok-trinity
COMMENT= Versatile and easy to use audio player for Trinity
-TDE_PREVERSION= ~pre12+9421a5e7
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= a/${PORTNAME}
PORTREVISION= 0
CATEGORIES= audio x11
diff --git a/freebsd/applications/amarok/distinfo b/freebsd/applications/amarok/distinfo
index 596a0b5b4..3d8d84b9e 100644
--- a/freebsd/applications/amarok/distinfo
+++ b/freebsd/applications/amarok/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527666505
-SHA256 (TDE/applications/amarok-trinity_14.0.5~pre12.orig.tar.xz) = 905e6ffd0893e21dab0f37cc8a63629579548c5f4dcfb597d8b93984838c3123
-SIZE (TDE/applications/amarok-trinity_14.0.5~pre12.orig.tar.xz) = 10014932
+TIMESTAMP = 1533397102
+SHA256 (TDE/applications/amarok-trinity_14.0.5.orig.tar.xz) = bbcfc2be0da7c25d9ef3469bfee800a2ddb33a399913404cc00cef5bc74a2cc0
+SIZE (TDE/applications/amarok-trinity_14.0.5.orig.tar.xz) = 10014456
diff --git a/freebsd/applications/amarok/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/applications/amarok/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..b7776a207
--- /dev/null
+++ b/freebsd/applications/amarok/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,28 @@
+diff --git a/amarok/src/main.cpp b/amarok/src/main.cpp
+index 66748e2..2141eaf 100644
+--- a/amarok/src/main.cpp
++++ b/amarok/src/main.cpp
+@@ -38,11 +38,11 @@ int main( int argc, char *argv[] )
+ I18N_NOOP( "Developer (illissius)" ), "illissius@gmail.com" );
+ aboutData.addAuthor( "Ian '" I18N_NOOP("The Beard") "' Monroe",
+ I18N_NOOP( "Developer (eean)" ), "ian@monroe.nu", "http://www.monroe.nu/" );
+- aboutData.addAuthor( "Jeff '"I18N_NOOP("IROCKSOHARD") "' Mitchell",
++ aboutData.addAuthor( "Jeff '" I18N_NOOP("IROCKSOHARD") "' Mitchell",
+ I18N_NOOP( "Developer (jefferai)" ), "kde-dev@emailgoeshere.com" );
+- aboutData.addAuthor( "Mark '"I18N_NOOP("It's good, but it's not irssi") "' Kretschmann",
++ aboutData.addAuthor( "Mark '" I18N_NOOP("It's good, but it's not irssi") "' Kretschmann",
+ I18N_NOOP( "Project founder (markey)" ), "kretschmann@kde.org" );
+- aboutData.addAuthor( "Martin '"I18N_NOOP("Easily the most compile-breaks ever!") "' Aumueller",
++ aboutData.addAuthor( "Martin '" I18N_NOOP("Easily the most compile-breaks ever!") "' Aumueller",
+ I18N_NOOP( "Developer (aumuell)" ), "aumuell@reserv.at" );
+ aboutData.addAuthor( "Max '" I18N_NOOP("Turtle-Power") "' Howell",
+ I18N_NOOP( "Cowboy mxcl" ), "max.howell@methylblue.com", "http://www.methylblue.com" );
+@@ -58,7 +58,7 @@ int main( int argc, char *argv[] )
+ I18N_NOOP( "Developer (sebr)" ), "ruiz@kde.org", "http://www.sebruiz.net" );
+ aboutData.addAuthor( "Stanislav '" I18N_NOOP("All you need is DCOP") "' Karchebny",
+ I18N_NOOP( "DCOP, improvements, cleanups, i18n (berkus)" ), "berkus@madfire.net" );
+- aboutData.addAuthor( "Timothy '"I18N_NOOP("HCI nut") "' Pearson",
++ aboutData.addAuthor( "Timothy '" I18N_NOOP("HCI nut") "' Pearson",
+ I18N_NOOP( "Developer (kb9vqf)" ), "kb9vqf@pearsoncomputing.net" );
+
+
diff --git a/freebsd/applications/basket/Makefile b/freebsd/applications/basket/Makefile
index 89309539c..8f4909c05 100644
--- a/freebsd/applications/basket/Makefile
+++ b/freebsd/applications/basket/Makefile
@@ -7,7 +7,7 @@
PORTNAME= basket-trinity
COMMENT= Multi-purpose note-taking application for Trinity
-TDE_PREVERSION= ~pre7+ad7d09ba
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= b/${PORTNAME}
PORTREVISION= 0
CATEGORIES= deskutils x11
diff --git a/freebsd/applications/basket/distinfo b/freebsd/applications/basket/distinfo
index 8c24115a1..ba3e34a8b 100644
--- a/freebsd/applications/basket/distinfo
+++ b/freebsd/applications/basket/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992056
-SHA256 (TDE/applications/basket-trinity_14.0.5~pre7.orig.tar.xz) = 6b9484d4227853f0de15f7c02dbe61f586f57bbaf973f0aa7593de1a67df5ada
-SIZE (TDE/applications/basket-trinity_14.0.5~pre7.orig.tar.xz) = 3857444
+TIMESTAMP = 1533398552
+SHA256 (TDE/applications/basket-trinity_14.0.5.orig.tar.xz) = a63ec1987ed7ffe30cdca9f171bf4cc2320149d579ebb866002142db2f3469d7
+SIZE (TDE/applications/basket-trinity_14.0.5.orig.tar.xz) = 3856092
diff --git a/freebsd/applications/basket/files/patch-bp000-fix-build-dependencies.diff b/freebsd/applications/basket/files/patch-bp000-fix-build-dependencies.diff
new file mode 100644
index 000000000..5c158d9de
--- /dev/null
+++ b/freebsd/applications/basket/files/patch-bp000-fix-build-dependencies.diff
@@ -0,0 +1,22 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7fd533c..aaa1fa8 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -47,6 +47,8 @@ libbasketcommon_la_SOURCES = \
+ basketlistview.cpp debugwindow.cpp systemtray.cpp aboutdata.cpp \
+ basketstatusbar.cpp clickablelabel.cpp basketdcopiface.skel backup.cpp
+
++libbasketcommon_la_COMPILE_FIRST = likeback_private.moc.cpp
++
+ #########################################################################
+ # APPLICATION SECTION
+ #########################################################################
+@@ -68,6 +70,8 @@ rc_DATA = basketui.rc
+
+ basket_SOURCES = main.cpp mainwindow.cpp application.cpp
+
++basket_COMPILE_FIRST = passwordlayout.h
++
+ kde_icon_KDEICON = cr128-app-basket.png cr16-app-basket.png cr22-app-basket.png \
+ cr32-app-basket.png cr48-app-basket.png cr64-app-basket.png hi16-app-basket_old.png \
+ hi32-app-basket_old.png crsc-app-basket.svg \
diff --git a/freebsd/applications/bibletime/Makefile b/freebsd/applications/bibletime/Makefile
index 20c82f54c..ae8ca5871 100644
--- a/freebsd/applications/bibletime/Makefile
+++ b/freebsd/applications/bibletime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bibletime-trinity
COMMENT= A bible study tool for Trinity
-TDE_PREVERSION= ~pre8+c6957b2a
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= b/${PORTNAME}
PORTREVISION= 0
CATEGORIES= misc x11
diff --git a/freebsd/applications/bibletime/distinfo b/freebsd/applications/bibletime/distinfo
index aa445d313..5d48839c6 100644
--- a/freebsd/applications/bibletime/distinfo
+++ b/freebsd/applications/bibletime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992056
-SHA256 (TDE/applications/bibletime-trinity_14.0.5~pre8.orig.tar.xz) = af513a911ec601d06d6c1053605db4705785e203c4dc183b948459cd9a3ef183
-SIZE (TDE/applications/bibletime-trinity_14.0.5~pre8.orig.tar.xz) = 944348
+TIMESTAMP = 1533398605
+SHA256 (TDE/applications/bibletime-trinity_14.0.5.orig.tar.xz) = 9e1c44fbee2d4b6041785c0aa95f3134c71443bfa5c060acfa193f6fa03917c4
+SIZE (TDE/applications/bibletime-trinity_14.0.5.orig.tar.xz) = 943156
diff --git a/freebsd/applications/digikam/Makefile b/freebsd/applications/digikam/Makefile
index 3af0a94ec..70d5eec41 100644
--- a/freebsd/applications/digikam/Makefile
+++ b/freebsd/applications/digikam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= digikam-trinity
COMMENT= Digital photo management application for Trinity
-TDE_PREVERSION= ~pre9+bdc6f039
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= d/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics x11
diff --git a/freebsd/applications/digikam/distinfo b/freebsd/applications/digikam/distinfo
index 5d131d21c..50e6e1256 100644
--- a/freebsd/applications/digikam/distinfo
+++ b/freebsd/applications/digikam/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527560394
-SHA256 (TDE/applications/digikam-trinity_14.0.5~pre9.orig.tar.xz) = d13d8fcce4e8c802addf86589da919d0f7fafce4b7517ba2d8bbc7013c6b5704
-SIZE (TDE/applications/digikam-trinity_14.0.5~pre9.orig.tar.xz) = 54217508
+TIMESTAMP = 1533398695
+SHA256 (TDE/applications/digikam-trinity_14.0.5.orig.tar.xz) = a13ec244c5add483f699a2d0d31aa166a7d79d485fc3e2f4be4a38b3399c4d3c
+SIZE (TDE/applications/digikam-trinity_14.0.5.orig.tar.xz) = 54145532
diff --git a/freebsd/applications/dolphin/Makefile b/freebsd/applications/dolphin/Makefile
index c3e1ee5f5..2e8a0e0be 100644
--- a/freebsd/applications/dolphin/Makefile
+++ b/freebsd/applications/dolphin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dolphin-trinity
COMMENT= File manager for Trinity focusing on usability
-TDE_PREVERSION= ~pre12+5170f360
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= d/${PORTNAME}
PORTREVISION= 0
CATEGORIES= deskutils x11
diff --git a/freebsd/applications/dolphin/distinfo b/freebsd/applications/dolphin/distinfo
index 9e12a0b5f..cb85c3b9a 100644
--- a/freebsd/applications/dolphin/distinfo
+++ b/freebsd/applications/dolphin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527663967
-SHA256 (TDE/applications/dolphin-trinity_14.0.5~pre12.orig.tar.xz) = 2342a7545d2e162ff0c485fe85178fade0a177847fc8a13732431ce7524858e8
-SIZE (TDE/applications/dolphin-trinity_14.0.5~pre12.orig.tar.xz) = 1377228
+TIMESTAMP = 1533399108
+SHA256 (TDE/applications/dolphin-trinity_14.0.5.orig.tar.xz) = c44f7c79f2dda8618333621d9c2ca4f0aa8b90bf0206e3314148649f1acd5b57
+SIZE (TDE/applications/dolphin-trinity_14.0.5.orig.tar.xz) = 1377276
diff --git a/freebsd/applications/filelight/Makefile b/freebsd/applications/filelight/Makefile
index 150fc368e..f979e01b2 100644
--- a/freebsd/applications/filelight/Makefile
+++ b/freebsd/applications/filelight/Makefile
@@ -7,7 +7,7 @@
PORTNAME= filelight-trinity
COMMENT= Show where your diskspace is being used
-TDE_PREVERSION= ~pre7+31ba9546
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= f/${PORTNAME}
PORTREVISION= 0
CATEGORIES= deskutils x11
diff --git a/freebsd/applications/filelight/distinfo b/freebsd/applications/filelight/distinfo
index 8748426b5..a48eb78fa 100644
--- a/freebsd/applications/filelight/distinfo
+++ b/freebsd/applications/filelight/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992066
-SHA256 (TDE/applications/filelight-trinity_14.0.5~pre7.orig.tar.xz) = 9d13351ac965fdfc9d44be8325c74dd351af99b58d53b6e55a4aaad32ac7a57d
-SIZE (TDE/applications/filelight-trinity_14.0.5~pre7.orig.tar.xz) = 680916
+TIMESTAMP = 1533399152
+SHA256 (TDE/applications/filelight-trinity_14.0.5.orig.tar.xz) = 2dfa19fa13f3fb6384da519f8073550687c14d7b0493c65d97a032b78fdeb8de
+SIZE (TDE/applications/filelight-trinity_14.0.5.orig.tar.xz) = 680004
diff --git a/freebsd/applications/filelight/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/applications/filelight/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..de573e049
--- /dev/null
+++ b/freebsd/applications/filelight/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,13 @@
+diff --git a/src/part/radialMap/map.cpp b/src/part/radialMap/map.cpp
+index 72d105d..e564969 100644
+--- a/src/part/radialMap/map.cpp
++++ b/src/part/radialMap/map.cpp
+@@ -351,7 +351,7 @@ RadialMap::Map::paint( unsigned int scaleFactor )
+ //draw arrow head to indicate undisplayed files/directories
+ TQPointArray pts( 3 );
+ TQPoint pos, cpos = rect.center();
+- int a[3] = { (*it)->start(), (*it)->length(), 0 };
++ unsigned int a[3] = { (*it)->start(), (*it)->length(), 0 };
+
+ a[2] = a[0] + (a[1] / 2); //assign to halfway between
+ if( a[1] > a_max )
diff --git a/freebsd/applications/gtk-qt-engine/Makefile b/freebsd/applications/gtk-qt-engine/Makefile
index 0b1f4ec08..999f4c77b 100644
--- a/freebsd/applications/gtk-qt-engine/Makefile
+++ b/freebsd/applications/gtk-qt-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-qt-engine-trinity
COMMENT= Theme engine using TQt for GTK+ 2.x and Trinity
-TDE_PREVERSION= ~pre8+1e9cf264
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= g/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11-themes
diff --git a/freebsd/applications/gtk-qt-engine/distinfo b/freebsd/applications/gtk-qt-engine/distinfo
index 23bc23704..f49e28dee 100644
--- a/freebsd/applications/gtk-qt-engine/distinfo
+++ b/freebsd/applications/gtk-qt-engine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517758905
-SHA256 (TDE/applications/gtk-qt-engine-trinity_14.0.5~pre8.orig.tar.xz) = f1781e80a0ccfbaa05a3e17837b2c7284d0e2d74c9a7573e15edef567d6c685e
-SIZE (TDE/applications/gtk-qt-engine-trinity_14.0.5~pre8.orig.tar.xz) = 293580
+TIMESTAMP = 1533399451
+SHA256 (TDE/applications/gtk-qt-engine-trinity_14.0.5.orig.tar.xz) = a5d9a3aa9e9fc920ce40d13f7c5fc9cabaebc346f62b4f1d1e7eed3e90ca623e
+SIZE (TDE/applications/gtk-qt-engine-trinity_14.0.5.orig.tar.xz) = 293220
diff --git a/freebsd/applications/gtk3-tqt-engine/Makefile b/freebsd/applications/gtk3-tqt-engine/Makefile
index b44ef44f1..f7f8e33fa 100644
--- a/freebsd/applications/gtk3-tqt-engine/Makefile
+++ b/freebsd/applications/gtk3-tqt-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk3-tqt-engine-trinity
COMMENT= GTK3 theme engine for Trinity
-TDE_PREVERSION= ~pre7+04dad585
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= g/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11-themes
diff --git a/freebsd/applications/gtk3-tqt-engine/distinfo b/freebsd/applications/gtk3-tqt-engine/distinfo
index ada0cc875..f9da82910 100644
--- a/freebsd/applications/gtk3-tqt-engine/distinfo
+++ b/freebsd/applications/gtk3-tqt-engine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517758949
-SHA256 (TDE/applications/gtk3-tqt-engine-trinity_14.0.5~pre7.orig.tar.xz) = 668f190e8fa0c8c1027b4dec698b5bba9b3e265b2f21ad0edf0dd67b1b8dd079
-SIZE (TDE/applications/gtk3-tqt-engine-trinity_14.0.5~pre7.orig.tar.xz) = 338652
+TIMESTAMP = 1533399476
+SHA256 (TDE/applications/gtk3-tqt-engine-trinity_14.0.5.orig.tar.xz) = fbf2dc26bdbe462e9d90879ad954fbb60ea6e8b91ff95a736a454f9dbe15a00a
+SIZE (TDE/applications/gtk3-tqt-engine-trinity_14.0.5.orig.tar.xz) = 338796
diff --git a/freebsd/applications/gwenview-i18n/Makefile b/freebsd/applications/gwenview-i18n/Makefile
index 819d75735..a186ad33d 100644
--- a/freebsd/applications/gwenview-i18n/Makefile
+++ b/freebsd/applications/gwenview-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gwenview-i18n-trinity
COMMENT= Internationalization (i18n) for Gwenview, an image viewer for Trinity
-TDE_PREVERSION= ~pre6+485cf3e4
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= g/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics x11
diff --git a/freebsd/applications/gwenview-i18n/distinfo b/freebsd/applications/gwenview-i18n/distinfo
index de1f0bbf3..a76a56731 100644
--- a/freebsd/applications/gwenview-i18n/distinfo
+++ b/freebsd/applications/gwenview-i18n/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992067
-SHA256 (TDE/applications/gwenview-i18n-trinity_14.0.5~pre6.orig.tar.xz) = 969fd3ac7990baeacae2e32bf16bc27b4d005f119ebc7a5f6dea01f82a43ccc1
-SIZE (TDE/applications/gwenview-i18n-trinity_14.0.5~pre6.orig.tar.xz) = 1638744
+TIMESTAMP = 1533399619
+SHA256 (TDE/applications/gwenview-i18n-trinity_14.0.5.orig.tar.xz) = 54d8d23a8a66a67f1d25612bd363bf8b8d1496915743c7f44eb7c022cb3838af
+SIZE (TDE/applications/gwenview-i18n-trinity_14.0.5.orig.tar.xz) = 1637544
diff --git a/freebsd/applications/gwenview/Makefile b/freebsd/applications/gwenview/Makefile
index ea529a4a7..018f1a0c8 100644
--- a/freebsd/applications/gwenview/Makefile
+++ b/freebsd/applications/gwenview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gwenview-trinity
COMMENT= Image viewer for Trinity
-TDE_PREVERSION= ~pre6+6e4357a8
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= g/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics x11
diff --git a/freebsd/applications/gwenview/distinfo b/freebsd/applications/gwenview/distinfo
index 41ef6c373..05195d3c8 100644
--- a/freebsd/applications/gwenview/distinfo
+++ b/freebsd/applications/gwenview/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992066
-SHA256 (TDE/applications/gwenview-trinity_14.0.5~pre6.orig.tar.xz) = 94f0ee177302e234294f9053b547cd244e4853b9093e55d7d664f3a0b8a89a89
-SIZE (TDE/applications/gwenview-trinity_14.0.5~pre6.orig.tar.xz) = 744900
+TIMESTAMP = 1533399541
+SHA256 (TDE/applications/gwenview-trinity_14.0.5.orig.tar.xz) = 6e7a68ef8596ad3e210828c08c455e6f07388227cfb1555ae277517731538d7d
+SIZE (TDE/applications/gwenview-trinity_14.0.5.orig.tar.xz) = 743136
diff --git a/freebsd/applications/ksquirrel/Makefile b/freebsd/applications/ksquirrel/Makefile
index f3aeefe59..0efff8d57 100644
--- a/freebsd/applications/ksquirrel/Makefile
+++ b/freebsd/applications/ksquirrel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ksquirrel-trinity
COMMENT= Powerful Trinity image viewer
-TDE_PREVERSION= ~pre11+2686879a
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= k/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics x11
diff --git a/freebsd/applications/ksquirrel/distinfo b/freebsd/applications/ksquirrel/distinfo
index 856e74bb5..b9da550d3 100644
--- a/freebsd/applications/ksquirrel/distinfo
+++ b/freebsd/applications/ksquirrel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527664028
-SHA256 (TDE/applications/ksquirrel-trinity_14.0.5~pre11.orig.tar.xz) = d49a17ed73197d84f23286acaf72132cc97a8df4a0e30952d57f319424370513
-SIZE (TDE/applications/ksquirrel-trinity_14.0.5~pre11.orig.tar.xz) = 782516
+TIMESTAMP = 1533399697
+SHA256 (TDE/applications/ksquirrel-trinity_14.0.5.orig.tar.xz) = ad836e13d3c6201f6c6c133c785fa6a4eb24bcb1a45074a608ee6c6140e4de50
+SIZE (TDE/applications/ksquirrel-trinity_14.0.5.orig.tar.xz) = 782520
diff --git a/freebsd/dependencies/akode/Makefile b/freebsd/dependencies/akode/Makefile
index 84a26dd35..880fbebb5 100644
--- a/freebsd/dependencies/akode/Makefile
+++ b/freebsd/dependencies/akode/Makefile
@@ -7,14 +7,11 @@
PORTNAME= akode
COMMENT= akode plugin for aRts
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= a/${PORTNAME}
-PORTVERSION= 2.0.2
-PORTREVISION= 7
-PORTEPOCH= 1
+PORTREVISION= 0
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_TDE_DEPS}
-DISTNAME= ${PORTNAME}_${PORTVERSION}
-DISTSRC= ${PORTNAME}-${PORTVERSION}
+DISTSRC= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
DIST_SUBDIR= TDE/dependencies
PREFIX= ${LOCALBASE}
diff --git a/freebsd/dependencies/akode/distinfo b/freebsd/dependencies/akode/distinfo
index a2dd4463e..6371412c1 100644
--- a/freebsd/dependencies/akode/distinfo
+++ b/freebsd/dependencies/akode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991804
-SHA256 (TDE/dependencies/akode_2.0.2.orig.tar.xz) = f49cde4083d8bc2a2128f8f5f5e322daa887170b761bf71def475bd366774b11
-SIZE (TDE/dependencies/akode_2.0.2.orig.tar.xz) = 326116
+TIMESTAMP = 1532796157
+SHA256 (TDE/dependencies/akode_14.0.5.orig.tar.xz) = 4cbef6ee7dbb13ab73c19605762b59333da9cdd3c0b5ecddd0514c20eda7ccac
+SIZE (TDE/dependencies/akode_14.0.5.orig.tar.xz) = 166928
diff --git a/freebsd/dependencies/akode/files/patch-a00-amd64_libflac8_fix.diff b/freebsd/dependencies/akode/files/patch-a00-amd64_libflac8_fix.diff
deleted file mode 100644
index d0334a3a4..000000000
--- a/freebsd/dependencies/akode/files/patch-a00-amd64_libflac8_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/akode/plugins/xiph_decoder/flac113_decoder.cpp
-+++ b/akode/plugins/xiph_decoder/flac113_decoder.cpp
-@@ -108,7 +108,7 @@
- static FLAC__StreamDecoderReadStatus flac_read_callback(
- const FLAC__StreamDecoder *,
- FLAC__byte buffer[],
-- unsigned *bytes,
-+ size_t *bytes,
- void *client_data)
- {
- FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data;
diff --git a/freebsd/dependencies/akode/files/patch-a01-clang.diff b/freebsd/dependencies/akode/files/patch-a01-clang.diff
deleted file mode 100644
index 309665bab..000000000
--- a/freebsd/dependencies/akode/files/patch-a01-clang.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: b/akode/lib/converter.cpp
-===================================================================
---- a/akode/lib/converter.cpp
-+++ b/akode/lib/converter.cpp
-@@ -26,7 +26,7 @@
-
- Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
-
--template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
-+template<typename T, typename S, template<typename T_Type> class ArithmT, template<typename S_Type> class ArithmS>
- static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
- {
- AudioConfiguration config = *in;
-Index: b/akode/lib/crossfader.cpp
-===================================================================
---- a/akode/lib/crossfader.cpp
-+++ b/akode/lib/crossfader.cpp
-@@ -27,7 +27,7 @@
- CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
-
- // T is the input/output type, S is the fast arithmetics type, Div is a division method
--template<typename T, typename S, template<typename S> class Arithm>
-+template<typename T, typename S, template<typename S_Type> class Arithm>
- static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
- {
- T** indata1 = (T**)in->data;
-@@ -66,7 +66,7 @@
- }
-
- // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
--template<typename T, typename S, template<typename S> class Arithm>
-+template<typename T, typename S, template<typename S_Type> class Arithm>
- static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
- {
- T** indata = (T**)frame->data;
-Index: b/akode/lib/fast_resampler.cpp
-===================================================================
---- a/akode/lib/fast_resampler.cpp
-+++ b/akode/lib/fast_resampler.cpp
-@@ -37,7 +37,7 @@
- // A fast resampling by linear interpolation
- // I assume you know binary arithmetics and convertions if you're reading this
- // T is the input/output type, Arithm defines the used arithmetic
--template<typename T, typename S, template<typename S> class Arithm>
-+template<typename T, typename S, template<typename S_Type> class Arithm>
- static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
- {
- unsigned long vt_pos_start = 0; // virtual positions of new sample
-Index: b/akode/lib/volumefilter.cpp
-===================================================================
---- a/akode/lib/volumefilter.cpp
-+++ b/akode/lib/volumefilter.cpp
-@@ -29,7 +29,7 @@
- VolumeFilter::VolumeFilter() : m_volume(0) {}
-
- // T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
--template<typename T, typename S, template<typename S> class Arithm>
-+template<typename T, typename S, template<typename S_Type> class Arithm>
- static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
- {
- T** indata = (T**)in->data;
diff --git a/freebsd/dependencies/akode/files/patch-a02-cmake.diff b/freebsd/dependencies/akode/files/patch-a02-cmake.diff
deleted file mode 100644
index accd12478..000000000
--- a/freebsd/dependencies/akode/files/patch-a02-cmake.diff
+++ /dev/null
@@ -1,3226 +0,0 @@
-Index: b/akode/akodeplay/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/akodeplay/CMakeLists.txt
-@@ -0,0 +1,30 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+)
-+
-+
-+##### akodeplay #################################
-+
-+set( target akodeplay )
-+
-+tde_add_executable(
-+ ${target}
-+ SOURCES ${target}.cpp
-+ LINK akode-shared
-+ DESTINATION ${BIN_INSTALL_DIR}
-+)
-+
-Index: b/akode/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/CMakeLists.txt
-@@ -0,0 +1,31 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+#### pkg-config #################################
-+
-+set( prefix ${CMAKE_INSTALL_PREFIX} )
-+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}"
-+ exec_prefix ${EXEC_INSTALL_PREFIX} )
-+string( REGEX REPLACE "^${EXEC_INSTALL_PREFIX}" "\${exec_prefix}"
-+ libdir ${LIB_INSTALL_DIR} )
-+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}"
-+ includedir ${INCLUDE_INSTALL_DIR} )
-+
-+configure_file( akode-config.in akode-config @ONLY )
-+install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/akode-config
-+ DESTINATION ${BIN_INSTALL_DIR} )
-+
-+
-+##### build #####################################
-+
-+tde_auto_add_subdirectories()
-+
-Index: b/akode/lib/akode_export.h.cmake
-===================================================================
---- /dev/null
-+++ b/akode/lib/akode_export.h.cmake
-@@ -0,0 +1,53 @@
-+/* This file is part of the KDE libraries
-+ Copyright (c) 2002-2003 KDE Team
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with this library; see the file COPYING.LIB. If not, write to
-+ the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-+ Boston, MA 02110-1301, USA.
-+*/
-+
-+#ifndef AKODE_EXPORT_H
-+#define AKODE_EXPORT_H
-+
-+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
-+
-+/**
-+ * The ARTS_NO_EXPORT macro marks the symbol of the given variable
-+ * to be hidden. A hidden symbol is stripped during the linking step,
-+ * so it can't be used from outside the resulting library, which is similar
-+ * to static. However, static limits the visibility to the current
-+ * compilation unit. hidden symbols can still be used in multiple compilation
-+ * units.
-+ *
-+ * \code
-+ * int AKODE_NO_EXPORT foo;
-+ * int AKODE_EXPORT bar;
-+ * \end
-+ */
-+
-+#if defined(__KDE_HAVE_GCC_VISIBILITY)
-+/* Visibility is available for GCC newer than 3.4.
-+ * See: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9283
-+ */
-+#define AKODE_NO_EXPORT __attribute__ ((visibility("hidden")))
-+#define AKODE_EXPORT __attribute__ ((visibility("default")))
-+#elif defined(_WIN32)
-+#define AKODE_NO_EXPORT
-+#define AKODE_EXPORT __declspec(dllexport)
-+#else
-+#define AKODE_NO_EXPORT
-+#define AKODE_EXPORT
-+#endif
-+
-+#endif /* AKODE_EXPORTS */
-Index: b/akode/lib/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/lib/CMakeLists.txt
-@@ -0,0 +1,100 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
-+if( UNIX )
-+ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden" )
-+ set( __KDE_HAVE_GCC_VISIBILITY 1 )
-+endif( UNIX )
-+configure_file( akode_export.h.cmake akode_export.h @ONLY )
-+
-+
-+##### library ###################################
-+
-+set( target akode )
-+
-+set( ${target}_SRCS
-+ bytebuffer.cpp
-+ audiobuffer.cpp
-+ pluginhandler.cpp
-+ decoderpluginhandler.cpp
-+ resamplerpluginhandler.cpp
-+ sinkpluginhandler.cpp
-+ encoderpluginhandler.cpp
-+ fast_resampler.cpp
-+ crossfader.cpp
-+ volumefilter.cpp
-+ localfile.cpp
-+ mmapfile.cpp
-+ wav_decoder.cpp
-+ auto_sink.cpp
-+ void_sink.cpp
-+ converter.cpp
-+ buffered_decoder.cpp
-+ player.cpp
-+ magic.cpp
-+)
-+
-+tde_add_library(
-+ ${target} SHARED
-+ VERSION 2.0.0
-+ SOURCES ${${target}_SRCS}
-+ LINK ${CMAKE_THREAD_LIBS_INIT} ${AKODE_LIBDL} ${SEM_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-+set_property(
-+ TARGET ${target}-shared
-+ APPEND PROPERTY COMPILE_DEFINITIONS
-+ AKODE_SEARCHDIR="${LIB_INSTALL_DIR}"
-+)
-+
-+
-+##### headers ###################################
-+
-+set( ${target}_INCLUDES
-+ ${CMAKE_CURRENT_BINARY_DIR}/akode_export.h
-+ akodelib.h
-+ decoder.h
-+ sink.h
-+ encoder.h
-+ audioconfiguration.h
-+ audioframe.h
-+ audiobuffer.h
-+ bytebuffer.h
-+ file.h
-+ localfile.h
-+ mmapfile.h
-+ pluginhandler.h
-+ crossfader.h
-+ volumefilter.h
-+ resampler.h
-+ fast_resampler.h
-+ buffered_decoder.h
-+ wav_decoder.h
-+ auto_sink.h
-+ void_sink.h
-+ player.h
-+ magic.h
-+ converter.h
-+ framedecoder.h
-+)
-+
-+install(
-+ FILES ${${target}_INCLUDES}
-+ DESTINATION ${INCLUDE_INSTALL_DIR}/akode
-+)
-+
-Index: b/akode/plugins/alsa_sink/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/alsa_sink/CMakeLists.txt
-@@ -0,0 +1,31 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_alsa_sink )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES alsa_sink.cpp
-+ LINK akode-shared ${ALSA_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/CMakeLists.txt
-@@ -0,0 +1,26 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+##### build #####################################
-+
-+tde_conditional_add_subdirectory( WITH_ALSA_SINK alsa_sink )
-+tde_conditional_add_subdirectory( WITH_JACK_SINK jack_sink )
-+tde_conditional_add_subdirectory( WITH_OSS_SINK oss_sink )
-+tde_conditional_add_subdirectory( WITH_POLYP_SINK polyp_sink )
-+tde_conditional_add_subdirectory( WITH_SUN_SINK sun_sink )
-+
-+tde_conditional_add_subdirectory( WITH_FFMPEG_DECODER ffmpeg_decoder )
-+tde_conditional_add_subdirectory( WITH_MPC_DECODER mpc_decoder )
-+tde_conditional_add_subdirectory( WITH_MPEG_DECODER mpeg_decoder )
-+tde_conditional_add_subdirectory( WITH_SRC_RESAMPLER src_resampler )
-+tde_conditional_add_subdirectory( WITH_XIPH_DECODER xiph_decoder )
-+
-Index: b/akode/plugins/ffmpeg_decoder/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/ffmpeg_decoder/CMakeLists.txt
-@@ -0,0 +1,33 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${AVFORMAT_INCLUDE_DIRS}
-+ ${AVCODEC_INCLUDE_DIRS}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_ffmpeg_decoder )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES ffmpeg_decoder.cpp
-+ LINK akode-shared ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/jack_sink/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/jack_sink/CMakeLists.txt
-@@ -0,0 +1,32 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${JACK_INCLUDE_DIRS}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_jack_sink )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES jack_sink.cpp
-+ LINK akode-shared ${JACK_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/mpc_decoder/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/mpc_decoder/CMakeLists.txt
-@@ -0,0 +1,36 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}/mppdec
-+)
-+
-+
-+##### mppdec ####################################
-+add_subdirectory( mppdec )
-+
-+
-+##### library ###################################
-+
-+set( target libakode_mpc_decoder )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES mpc_decoder.cpp
-+ LINK akode-shared akode_mppdec-static
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/mpc_decoder/mppdec/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/mpc_decoder/mppdec/CMakeLists.txt
-@@ -0,0 +1,40 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target akode_mppdec )
-+
-+set( ${target}_SRCS
-+ bitstream.cpp
-+ huffsv46.cpp
-+ huffsv7.cpp
-+ idtag.cpp
-+ mpc_dec.cpp
-+ requant.cpp
-+ streaminfo.cpp
-+ synth_filter.cpp
-+)
-+
-+tde_add_library(
-+ ${target} STATIC_PIC
-+ SOURCES ${${target}_SRCS}
-+)
-+
-Index: b/akode/plugins/mpeg_decoder/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/mpeg_decoder/CMakeLists.txt
-@@ -0,0 +1,31 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_mpeg_decoder )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES mpeg_decoder.cpp
-+ LINK akode-shared ${MAD_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/oss_sink/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/oss_sink/CMakeLists.txt
-@@ -0,0 +1,31 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_oss_sink )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES oss_sink.cpp
-+ LINK akode-shared ${OSSAUDIO_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/polyp_sink/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/polyp_sink/CMakeLists.txt
-@@ -0,0 +1,32 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${POLYP_INCLUDE_DIRS}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_polyp_sink )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES polyp_sink.cpp
-+ LINK akode-shared ${POLYP_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/src_resampler/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/src_resampler/CMakeLists.txt
-@@ -0,0 +1,31 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_src_resampler )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES src_resampler.cpp
-+ LINK akode-shared ${SAMPLERATE_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/sun_sink/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/sun_sink/CMakeLists.txt
-@@ -0,0 +1,31 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_sun_sink )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES sun_sink.cpp
-+ LINK akode-shared
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/akode/plugins/xiph_decoder/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/akode/plugins/xiph_decoder/CMakeLists.txt
-@@ -0,0 +1,44 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${SPEEX_INCLUDE_DIRS}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_xiph_decoder )
-+
-+set( ${target}_SRCS
-+ flac_decoder.cpp
-+ flac113_decoder.cpp
-+ speex_decoder.cpp
-+ vorbis_decoder.cpp
-+ xiph_decoder.cpp
-+)
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES ${${target}_SRCS}
-+ LINK
-+ akode-shared
-+ ${FLAC_LIBRARIES} ${OGGFLAC_LIBRARIES}
-+ ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}
-+ ${SPEEX_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-Index: b/cmake/generate_apidox
-===================================================================
---- /dev/null
-+++ b/cmake/generate_apidox
-@@ -0,0 +1,17 @@
-+#!/bin/bash
-+
-+top_srcdir=${1}
-+top_builddir=${2}
-+kde_libs_htmldir=${3}
-+export QTDOCDIR=${4}
-+
-+if [[ ! -d "${top_srcdir}/doc/common/" ]]; then
-+ export DOXDATA=${kde_libs_htmldir}/en/common
-+fi
-+
-+abs_top_srcdir=$(cd ${top_srcdir} && pwd)
-+
-+rm -rf ${top_builddir}/${kde_libs_htmldir}/en
-+mkdir -p ${top_builddir}/${kde_libs_htmldir}/en
-+cd ${top_builddir}/${kde_libs_htmldir}/en
-+${abs_top_srcdir}/admin/doxygen.sh --modulename --installdir=${top_builddir}/${kde_libs_htmldir}/en ${abs_top_srcdir}
-Index: b/cmake/install_apidox
-===================================================================
---- /dev/null
-+++ b/cmake/install_apidox
-@@ -0,0 +1,12 @@
-+#!/bin/bash
-+
-+top_srcdir=${1}
-+top_builddir=${2}
-+kde_libs_htmldir=${3}
-+installdir=${DESTDIR}
-+
-+abs_top_srcdir=$(cd ${top_srcdir} && pwd)
-+
-+cd ${top_builddir}
-+mkdir -p ${installdir}/${kde_libs_htmldir}/en
-+cp -Rp ${top_builddir}/${kde_libs_htmldir}/en ${installdir}/${kde_libs_htmldir}/
-Index: b/cmake/modules/FindTDE.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/FindTDE.cmake
-@@ -0,0 +1,101 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+if( NOT TDE_FOUND )
-+
-+ message( STATUS "checking for 'TDE'")
-+
-+ pkg_search_module( TDE tqt )
-+
-+ if( NOT TDE_FOUND )
-+ tde_message_fatal( "Unable to find tdelibs!\n Try adding the directory in which the tdelibs.pc file is located\nto the PKG_CONFIG_PATH variable." )
-+ endif( )
-+
-+ # if the path is not already defined by user,
-+ # find tde-config executable
-+ if( NOT DEFINED KDECONFIG_EXECUTABLE )
-+ find_program( KDECONFIG_EXECUTABLE
-+ NAMES tde-config
-+ HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR} )
-+ if( NOT KDECONFIG_EXECUTABLE )
-+ tde_message_fatal( "tde-config are NOT found." )
-+ endif( NOT KDECONFIG_EXECUTABLE )
-+ endif( NOT DEFINED KDECONFIG_EXECUTABLE )
-+
-+ set( ENV{LD_LIBRARY_PATH} "${TDE_LIBDIR}:$ENV{LD_LIBRARY_PATH}" )
-+ # check for installed trinity version
-+ tde_execute_process(
-+ COMMAND ${KDECONFIG_EXECUTABLE} --version
-+ OUTPUT_VARIABLE _version
-+ RESULT_VARIABLE _result
-+ OUTPUT_STRIP_TRAILING_WHITESPACE
-+ MESSAGE "Unable to run tde-config!\n TDELIBS are correctly installed?\n Path to tde-config are corect?" )
-+
-+ # parse tde-config output, to extract TDE version
-+ string( REGEX MATCH "TDE: R([0-9\\.]+).*" __dummy "${_version}" )
-+ set( TDE_VERSION "${CMAKE_MATCH_1}" )
-+
-+ # ask tde-config for few paths
-+ macro( __internal_get_path __type __var )
-+ tde_execute_process(
-+ COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type}
-+ OUTPUT_VARIABLE ${__var}
-+ CACHE INTERNAL "TDE ${__type} path" FORCE
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )
-+ endmacro( __internal_get_path )
-+
-+ __internal_get_path( include TDE_INCLUDE_DIR )
-+ __internal_get_path( lib TDE_LIB_DIR )
-+ __internal_get_path( exe TDE_BIN_DIR )
-+ __internal_get_path( data TDE_DATA_DIR )
-+ __internal_get_path( config TDE_CONFIG_DIR )
-+ __internal_get_path( html TDE_HTML_DIR )
-+ __internal_get_path( cmake TDE_CMAKE_DIR )
-+ __internal_get_path( qtplugins TDE_QTPLUGINS_DIR )
-+
-+ # find kde tools
-+ macro( __internal_find_program __prog __var )
-+ find_program( ${__var}
-+ NAMES ${__prog}
-+ HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR}
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )
-+ if( NOT ${__var} )
-+ tde_message_fatal( "${__prog} are NOT found.\n TDELIBS are correctly installed?" )
-+ endif( NOT ${__var} )
-+ set( ${__var} ${${__var}} CACHE INTERNAL "${__prog} executable" FORCE )
-+ endmacro( __internal_find_program )
-+
-+ __internal_find_program( dcopidl KDE3_DCOPIDL_EXECUTABLE )
-+ __internal_find_program( dcopidlng KDE3_DCOPIDLNG_EXECUTABLE )
-+ __internal_find_program( dcopidl2cpp KDE3_DCOPIDL2CPP_EXECUTABLE )
-+ __internal_find_program( meinproc KDE3_MEINPROC_EXECUTABLE )
-+ __internal_find_program( tdeconfig_compiler KDE3_KCFGC_EXECUTABLE )
-+ __internal_find_program( maketdewidgets KDE3_MAKETDEWIDGETS_EXECUTABLE )
-+
-+ # dcopidlng is a bash script which using tde-config;
-+ # if PATH to tde-config is not set, dcopidlng will fail;
-+ # for this reason we set KDECONFIG environment variable before running dcopidlng
-+ set( KDE3_DCOPIDLNG_EXECUTABLE env KDECONFIG=${KDECONFIG_EXECUTABLE} ${KDE3_DCOPIDLNG_EXECUTABLE}
-+ CACHE INTERNAL "dcopidlng executable" FORCE )
-+
-+ # look for SCM data if present
-+ if( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmmodule" )
-+ file( STRINGS "${CMAKE_SOURCE_DIR}/.tdescmmodule" TDE_SCM_MODULE_NAME )
-+ endif( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmmodule" )
-+ if( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmrevision" )
-+ file( STRINGS "${CMAKE_SOURCE_DIR}/.tdescmrevision" TDE_SCM_MODULE_REVISION )
-+ endif( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmrevision" )
-+
-+ message( STATUS " found 'TDE', version ${TDE_VERSION}" )
-+
-+endif( NOT TDE_FOUND )
-+
-+include( "${TDE_CMAKE_DIR}/tdelibs.cmake" )
-Index: b/cmake/modules/FindTQt.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/FindTQt.cmake
-@@ -0,0 +1,95 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+macro( tqt_message )
-+ message( STATUS "${ARGN}" )
-+endmacro( )
-+
-+pkg_search_module( TQT tqt )
-+
-+if( NOT TQT_FOUND )
-+ tde_message_fatal( "Unable to find tqt!\n Try adding the directory in which the tqt.pc file is located\nto the PKG_CONFIG_PATH variable." )
-+endif( )
-+
-+# tmoc_executable
-+tde_execute_process(
-+ COMMAND pkg-config tqt --variable=tmoc_executable
-+ OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
-+
-+if( NOT EXISTS ${TMOC_EXECUTABLE} )
-+ tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" )
-+endif( )
-+
-+tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" )
-+
-+
-+# moc_executable
-+tde_execute_process(
-+ COMMAND pkg-config tqt --variable=moc_executable
-+ OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
-+
-+if( NOT EXISTS ${MOC_EXECUTABLE} )
-+ tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )
-+endif( )
-+
-+tqt_message( " moc path: ${MOC_EXECUTABLE}" )
-+
-+
-+# uic_executable
-+tde_execute_process(
-+ COMMAND pkg-config tqt --variable=uic_executable
-+ OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
-+
-+if( NOT EXISTS ${UIC_EXECUTABLE} )
-+ tde_message_fatal( "uic not found!\n tqt is correctly installed?" )
-+endif( )
-+
-+tqt_message( " uic path: ${UIC_EXECUTABLE}" )
-+
-+
-+# tqt-replace script
-+set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace" )
-+
-+if( NOT EXISTS ${TQT_REPLACE_SCRIPT} )
-+ tde_message_fatal( "tqt-replace not found!\n Check tqt installation." )
-+endif( )
-+
-+tqt_message( " tqt-replace path: ${TQT_REPLACE_SCRIPT}" )
-+
-+
-+# check if tqt is usable
-+tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-+set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
-+foreach( _dirs ${TQT_LIBRARY_DIRS} )
-+ list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
-+endforeach()
-+list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} )
-+
-+check_cxx_source_compiles("
-+ #include <tqapplication.h>
-+ int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } "
-+ HAVE_USABLE_TQT )
-+
-+if( NOT HAVE_USABLE_TQT )
-+ tde_message_fatal( "Unable to build a simple tqt test." )
-+endif( )
-+
-+tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-+
-+
-+# TQT_CXX_FLAGS
-+foreach( _flag ${TQT_CFLAGS} ${TQT_CFLAGS_OTHER} )
-+ set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS} ${_flag}" )
-+endforeach()
-+
-+# Set compiler flags according to build type
-+set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG" )
-+set( CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG" )
-Index: b/cmake/modules/FindTQtQUI.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/FindTQtQUI.cmake
-@@ -0,0 +1,45 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+macro( tqtqui_message )
-+ message( STATUS "${ARGN}" )
-+endmacro( )
-+
-+pkg_search_module( TQTQUI tqtqui )
-+
-+if( NOT TQTQUI_FOUND )
-+ tde_message_fatal( "Unable to find tqtqui!\n Try adding the directory in which the tqtqui.pc file is located\nto the PKG_CONFIG_PATH variable." )
-+endif( )
-+
-+# check if tqtqui is usable
-+tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-+set( CMAKE_REQUIRED_INCLUDES ${TQTQUI_INCLUDE_DIRS} )
-+foreach( _dirs ${TQTQUI_LIBRARY_DIRS} )
-+ list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
-+endforeach()
-+list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQTQUI_LIBRARIES} )
-+
-+check_cxx_source_compiles("
-+ #include <tqapplication.h>
-+ int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } "
-+ HAVE_USABLE_TQTQUI )
-+
-+if( NOT HAVE_USABLE_TQTQUI )
-+ tde_message_fatal( "Unable to build a simple tqtqui test." )
-+endif( )
-+
-+tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-+
-+
-+# TQTQUI_CXX_FLAGS
-+foreach( _flag ${TQTQUI_CFLAGS_OTHER} )
-+ set( TQTQUI_CXX_FLAGS "${TQTQUI_CXX_FLAGS} ${_flag}" )
-+endforeach()
-Index: b/cmake/modules/TDEMacros.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/TDEMacros.cmake
-@@ -0,0 +1,1568 @@
-+#################################################
-+#
-+# (C) 2010-2012 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# (C) 2011-2012 Timothy Pearson
-+# kb9vqf (AT) pearsoncomputing.net
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include( KDE3Macros ) # we will need this module for a while
-+include( CheckCXXCompilerFlag )
-+
-+
-+#################################################
-+#####
-+##### tde_message_fatal
-+
-+macro( tde_message_fatal )
-+ message( FATAL_ERROR
-+ "#################################################\n"
-+ " ${ARGV}\n"
-+ "#################################################" )
-+endmacro( tde_message_fatal )
-+
-+
-+#################################################
-+#####
-+##### tde_get_arg( <ARG_NAME> <COUNT> <RETURN> <REST> <ARGS...> )
-+##### ARG_NAME(string): name of an argument to find in ARGS
-+##### COUNT(number): argument dimension, a number of items returned in RETURN
-+##### RETURN(list ref): items returned for argument as they found in ARGS
-+##### REST(list ref): rest of items except argument name and items returned in RETURN
-+##### ARGS(list): source list of arguments
-+
-+macro( tde_get_arg ARG_NAME COUNT RETURN REST )
-+ unset( ${RETURN} )
-+ unset( ${REST} )
-+ list( APPEND ${REST} ${ARGN} )
-+ list( FIND ${REST} ${ARG_NAME} _arg_idx)
-+ if( NOT ${_arg_idx} EQUAL -1 )
-+ list( REMOVE_AT ${REST} ${_arg_idx} )
-+ set( _i 0 )
-+ while( ${_i} LESS ${COUNT} )
-+ list( GET ${REST} ${_arg_idx} _arg )
-+ list( REMOVE_AT ${REST} ${_arg_idx} )
-+ list( APPEND ${RETURN} ${_arg} )
-+ math( EXPR _i "${_i} + 1" )
-+ endwhile()
-+ endif()
-+endmacro( tde_get_arg )
-+
-+
-+################################################
-+#####
-+##### tde_execute_process( <ARGS...> [MESSAGE <MSG>] )
-+##### MSG: fatal error message (standard message will be written if not supplied)
-+##### ARGS: execute_process arguments
-+
-+macro( tde_execute_process )
-+ tde_get_arg( MESSAGE 1 _message _rest_args ${ARGV} )
-+ tde_get_arg( RESULT_VARIABLE 1 _result_variable _tmp ${_rest_args} )
-+ tde_get_arg( COMMAND 1 _command _tmp ${_rest_args} )
-+ tde_get_arg( OUTPUT_VARIABLE 1 _output_variable _tmp ${_rest_args} )
-+ tde_get_arg( CACHE 3 _cache _rest_args2 ${_rest_args} )
-+
-+ # handle optional FORCE parameter
-+ if( DEFINED _cache )
-+ list( GET _cache 2 _tmp )
-+ if( _tmp STREQUAL FORCE )
-+ set( _rest_args ${_rest_args2} )
-+ else()
-+ tde_get_arg( CACHE 2 _cache _rest_args ${_rest_args} )
-+ endif()
-+ endif()
-+
-+ if( NOT DEFINED _result_variable )
-+ list( APPEND _rest_args RESULT_VARIABLE _exec_result )
-+ set( _result_variable _exec_result )
-+ endif()
-+
-+ execute_process( ${_rest_args} )
-+
-+ if( DEFINED _output_variable AND DEFINED _cache )
-+ set( ${_output_variable} ${${_output_variable}} CACHE ${_cache} )
-+ endif()
-+
-+ if( ${_result_variable} )
-+ if( DEFINED _message )
-+ tde_message_fatal( ${_message} )
-+ else()
-+ if( ${${_result_variable}} MATCHES "^[0-9]+$" )
-+ set( ${_result_variable} "status ${${_result_variable}} returned!" )
-+ endif()
-+ tde_message_fatal( "Error executing '${_command}': ${${_result_variable}}" )
-+ endif()
-+ endif()
-+endmacro( tde_execute_process )
-+
-+
-+if( DEFINED MASTER_SOURCE_DIR )
-+ return( )
-+endif( )
-+########### slave part ends here ###############
-+
-+
-+################################################
-+#####
-+##### CMP0026 states we should not read the LOCATION property of a target,
-+##### and should be using generators instead. We can't do that here however
-+##### because we need the value of the property at configure time.
-+
-+if( POLICY CMP0026 )
-+ cmake_policy( PUSH )
-+ cmake_policy( SET CMP0026 OLD )
-+endif( POLICY CMP0026 )
-+
-+
-+################################################
-+#####
-+##### tde_install_icons( <icons...> THEME <svgicons> DESTINATION <destdir> )
-+##### default theme: hicolor
-+##### default destination: ${SHARE_INSTALL_DIR}/icons
-+
-+macro( tde_install_icons )
-+ tde_get_arg( DESTINATION 1 _dest _args ${ARGV} )
-+ tde_get_arg( THEME 1 _req_theme _icons ${_args} )
-+
-+ #defaults
-+ if( NOT _icons )
-+ set( _icons "*" )
-+ endif( NOT _icons )
-+ if( NOT _dest )
-+ set( _dest "${ICON_INSTALL_DIR}" )
-+ endif( NOT _dest )
-+
-+ foreach( _icon ${_icons} )
-+ unset( _theme ) # clearing
-+
-+ file(GLOB _icon_files *-${_icon}.png *-${_icon}.mng _icon_files *-${_icon}.svg* )
-+ foreach( _icon_file ${_icon_files} )
-+ # FIXME need a review
-+ string( REGEX MATCH "^.*/([a-zA-Z][a-zA-Z])([0-9a-zA-Z]+)\\-([a-z]+)\\-([^/]+)$" _dummy "${_icon_file}" )
-+ set( _type "${CMAKE_MATCH_1}" )
-+ set( _size "${CMAKE_MATCH_2}" )
-+ set( _group "${CMAKE_MATCH_3}" )
-+ set( _name "${CMAKE_MATCH_4}" )
-+
-+ # we must ignore invalid icon names
-+ if( _type AND _size AND _group AND _name )
-+
-+ # autodetect theme
-+ if( NOT _req_theme )
-+ unset( _theme )
-+ if( "${_type}" STREQUAL "cr" )
-+ set( _theme crystalsvg )
-+ elseif( "${_type}" STREQUAL "lo" )
-+ set( _theme locolor )
-+ endif( "${_type}" STREQUAL "cr" )
-+ # defaulting
-+ if( NOT _theme )
-+ set( _theme hicolor )
-+ endif( NOT _theme )
-+ else( NOT _req_theme )
-+ set( _theme ${_req_theme} )
-+ endif( NOT _req_theme )
-+
-+ # fix "group" name
-+ if( "${_group}" STREQUAL "mime" )
-+ set( _group "mimetypes" )
-+ endif( "${_group}" STREQUAL "mime" )
-+ if( "${_group}" STREQUAL "filesys" )
-+ set( _group "places" )
-+ endif( "${_group}" STREQUAL "filesys" )
-+ if( "${_group}" STREQUAL "category" )
-+ set( _group "categories" )
-+ endif( "${_group}" STREQUAL "category" )
-+ if( "${_group}" STREQUAL "device" )
-+ set( _group "devices" )
-+ endif( "${_group}" STREQUAL "device" )
-+ if( "${_group}" STREQUAL "app" )
-+ set( _group "apps" )
-+ endif( "${_group}" STREQUAL "app" )
-+ if( "${_group}" STREQUAL "action" )
-+ set( _group "actions" )
-+ endif( "${_group}" STREQUAL "action" )
-+
-+ if( "${_size}" STREQUAL "sc" )
-+ install( FILES ${_icon_file} DESTINATION ${_dest}/${_theme}/scalable/${_group}/ RENAME ${_name} )
-+ else( "${_size}" STREQUAL "sc" )
-+ install( FILES ${_icon_file} DESTINATION ${_dest}/${_theme}/${_size}x${_size}/${_group}/ RENAME ${_name} )
-+ endif( "${_size}" STREQUAL "sc" )
-+
-+ endif( _type AND _size AND _group AND _name )
-+
-+ endforeach( _icon_file )
-+ endforeach( _icon )
-+
-+endmacro( tde_install_icons )
-+
-+
-+#################################################
-+#####
-+##### tde_add_lut( <source> <result> [depends] )
-+##### default depends: source
-+
-+macro( tde_add_lut _src _lut _dep )
-+ set( create_hash_table ${CMAKE_SOURCE_DIR}/kjs/create_hash_table )
-+ if( NOT _dep )
-+ set( _dep ${_src} )
-+ endif( NOT _dep )
-+ add_custom_command( OUTPUT ${_lut}
-+ COMMAND perl ARGS ${create_hash_table} ${CMAKE_CURRENT_SOURCE_DIR}/${_src} -i > ${_lut}
-+ DEPENDS ${_src} )
-+ set_source_files_properties( ${_dep} PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_lut} )
-+ unset( _dep )
-+endmacro( tde_add_lut )
-+
-+
-+#################################################
-+#####
-+##### tde_add_luts( <sources...> )
-+
-+macro( tde_add_luts )
-+ foreach( _src ${ARGV} )
-+ get_filename_component( _lut ${_src} NAME_WE )
-+ set( _lut "${_lut}.lut.h" )
-+ tde_add_lut( ${_src} ${_lut} ${_src} )
-+ endforeach( _src )
-+endmacro( tde_add_luts )
-+
-+
-+#################################################
-+#####
-+##### tde_file_to_cpp( <source> <destination> <variable> )
-+
-+macro( tde_file_to_cpp _src _dst _var )
-+ if( IS_ABSOLUTE ${_dst} )
-+ set( dst ${_dst} )
-+ else( )
-+ set( dst "${CMAKE_CURRENT_BINARY_DIR}/${_dst}" )
-+ endif( )
-+ file( READ ${_src} text )
-+ string( REGEX REPLACE "\n" "\\\\n\"\n\"" text "${text}" )
-+ set( text "/* Generated by CMake */\n\nconst char *${_var} = \n\n\"${text}\";\n" )
-+ string( REGEX REPLACE "\n\"\";\n$" ";\n" text "${text}" )
-+ file( WRITE ${dst} "${text}" )
-+endmacro( )
-+
-+
-+#################################################
-+#####
-+##### tde_install_la_file( <target> <destination> )
-+
-+macro( tde_install_la_file _target _destination )
-+
-+ get_target_property( _target_location ${_target} LOCATION )
-+ get_filename_component( _laname ${_target_location} NAME_WE )
-+ get_filename_component( _soname ${_target_location} NAME )
-+ set( _laname ${CMAKE_CURRENT_BINARY_DIR}/${_laname}.la )
-+
-+ file( WRITE ${_laname}
-+"# ${_laname} - a libtool library file, generated by cmake
-+# The name that we can dlopen(3).
-+dlname='${_soname}'
-+# Names of this library
-+library_names='${_soname} ${_soname} ${_soname}'
-+# The name of the static archive
-+old_library=''
-+# Libraries that this one depends upon.
-+dependency_libs=''
-+# Version information.\ncurrent=0\nage=0\nrevision=0
-+# Is this an already installed library?\ninstalled=yes
-+# Should we warn about portability when linking against -modules?\nshouldnotlink=yes
-+# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''
-+# Directory that this library needs to be installed in:
-+libdir='${_destination}'
-+" )
-+
-+ install( FILES ${_laname} DESTINATION ${_destination} )
-+
-+endmacro( tde_install_la_file )
-+
-+
-+#################################################
-+#####
-+##### tde_add_ui_files
-+
-+macro( tde_add_ui_files _sources )
-+ foreach( _ui_file ${ARGN} )
-+
-+ get_filename_component( _ui_basename ${_ui_file} NAME_WE )
-+ get_filename_component( _ui_absolute_path ${_ui_file} ABSOLUTE )
-+
-+ list( APPEND ${_sources} ${_ui_basename}.cpp )
-+
-+ add_custom_command( OUTPUT ${_ui_basename}.h ${_ui_basename}.cpp
-+ COMMAND ${CMAKE_COMMAND}
-+ -DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
-+ -DTQT_REPLACE_SCRIPT:FILEPATH=${TQT_REPLACE_SCRIPT}
-+ -DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}
-+ -DUI_FILE:FILEPATH=${_ui_absolute_path}
-+ -DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}
-+ -DMASTER_BINARY_DIR:FILEPATH=${CMAKE_BINARY_DIR}
-+ -P ${CMAKE_MODULE_PATH}/tde_uic.cmake
-+ COMMAND ${MOC_EXECUTABLE} ${_ui_basename}.h >> ${_ui_basename}.cpp
-+ DEPENDS ${_ui_absolute_path} )
-+
-+ endforeach( _ui_file )
-+endmacro( tde_add_ui_files )
-+
-+
-+#################################################
-+#####
-+##### tde_moc
-+
-+macro( tde_moc _sources )
-+ foreach( _input_file ${ARGN} )
-+
-+ get_filename_component( _input_file "${_input_file}" ABSOLUTE )
-+ get_filename_component( _basename ${_input_file} NAME_WE )
-+ set( _output_file "${_basename}.moc.cpp" )
-+ add_custom_command( OUTPUT ${_output_file}
-+ COMMAND
-+ ${TMOC_EXECUTABLE} ${_input_file} -o ${_output_file}
-+ DEPENDS
-+ ${_input_file} )
-+ list( APPEND ${_sources} ${_output_file} )
-+
-+ endforeach( )
-+endmacro( )
-+
-+
-+#################################################
-+#####
-+##### tde_automoc
-+
-+macro( tde_automoc )
-+ foreach( _src_file ${ARGN} )
-+
-+ get_filename_component( _src_file "${_src_file}" ABSOLUTE )
-+
-+ if( EXISTS "${_src_file}" )
-+
-+ # read source file and check if have moc include
-+ file( READ "${_src_file}" _src_content )
-+ string( REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _moc_includes "${_src_content}" )
-+
-+ # found included moc(s)?
-+ if( _moc_includes )
-+ foreach( _moc_file ${_moc_includes} )
-+
-+ # extracting moc filename
-+ string( REGEX MATCH "[^ <\"]+\\.moc" _moc_file "${_moc_file}" )
-+ set( _moc_file "${CMAKE_CURRENT_BINARY_DIR}/${_moc_file}" )
-+
-+ # create header filename
-+ get_filename_component( _src_path "${_src_file}" ABSOLUTE )
-+ get_filename_component( _src_path "${_src_path}" PATH )
-+ get_filename_component( _src_header "${_moc_file}" NAME_WE )
-+ set( _header_file "${_src_path}/${_src_header}.h" )
-+
-+ # if header doesn't exists, check in META_INCLUDES
-+ if( NOT EXISTS "${_header_file}" )
-+ unset( _found )
-+ foreach( _src_path ${_meta_includes} )
-+ set( _header_file "${_src_path}/${_src_header}.h" )
-+ if( EXISTS "${_header_file}" )
-+ set( _found 1 )
-+ break( )
-+ endif( )
-+ endforeach( )
-+ if( NOT _found )
-+ get_filename_component( _moc_file "${_moc_file}" NAME )
-+ tde_message_fatal( "AUTOMOC error: '${_moc_file}' cannot be generated.\n Reason: '${_src_file}.h' not found." )
-+ endif( )
-+ endif( )
-+
-+ # moc-ing header
-+ add_custom_command( OUTPUT ${_moc_file}
-+ COMMAND ${TMOC_EXECUTABLE} ${_header_file} -o ${_moc_file}
-+ DEPENDS ${_header_file} )
-+
-+ # create dependency between source file and moc file
-+ set_property( SOURCE ${_src_file} APPEND PROPERTY OBJECT_DEPENDS ${_moc_file} )
-+
-+ endforeach( _moc_file )
-+
-+ endif( _moc_includes )
-+
-+ endif( EXISTS "${_src_file}" )
-+
-+ endforeach( _src_file )
-+endmacro( tde_automoc )
-+
-+
-+#################################################
-+#####
-+##### __tde_internal_process_sources
-+
-+macro( __tde_internal_process_sources _sources )
-+
-+ unset( ${_sources} )
-+
-+ foreach( _arg ${ARGN} )
-+ get_filename_component( _ext ${_arg} EXT )
-+ get_filename_component( _name ${_arg} NAME_WE )
-+ get_filename_component( _path ${_arg} PATH )
-+
-+ # if not path, set it to "."
-+ if( NOT _path )
-+ set( _path "./" )
-+ endif( NOT _path )
-+
-+ # handle .ui files
-+ if( ${_ext} STREQUAL ".ui" )
-+ tde_add_ui_files( ${_sources} ${_arg} )
-+
-+ # handle .skel files
-+ elseif( ${_ext} STREQUAL ".skel" )
-+ kde3_add_dcop_skels( ${_sources} ${_path}/${_name}.h )
-+
-+ # handle .stub files
-+ elseif( ${_ext} STREQUAL ".stub" )
-+ kde3_add_dcop_stubs( ${_sources} ${_path}/${_name}.h )
-+
-+ # handle .kcfgc files
-+ elseif( ${_ext} STREQUAL ".kcfgc" )
-+ kde3_add_kcfg_files( ${_sources} ${_arg} )
-+
-+ # handle any other files
-+ else( ${_ext} STREQUAL ".ui" )
-+ list(APPEND ${_sources} ${_arg} )
-+ endif( ${_ext} STREQUAL ".ui" )
-+ endforeach( _arg )
-+
-+endmacro( __tde_internal_process_sources )
-+
-+
-+#################################################
-+#####
-+##### tde_install_libtool_file
-+
-+macro( tde_install_libtool_file _target _destination )
-+
-+ get_target_property( _target_location ${_target} LOCATION )
-+
-+ # get name of target
-+ get_filename_component( _name ${_target_location} NAME_WE )
-+
-+ # get .la name
-+ set( _laname ${_name}.la )
-+
-+ # get .so name
-+ get_filename_component( _soname ${_target_location} NAME )
-+
-+ # get version of target
-+ get_target_property( _target_version ${_target} VERSION )
-+ get_target_property( _target_soversion ${_target} SOVERSION )
-+
-+ # we have so version
-+ if( _target_version )
-+ set( _library_name_1 "${_soname}.${_target_version}" )
-+ set( _library_name_2 "${_soname}.${_target_soversion}" )
-+ set( _library_name_3 "${_soname}" )
-+
-+ string( REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" _dummy "${_target_version}" )
-+ set( _version_current "${CMAKE_MATCH_1}" )
-+ set( _version_age "${CMAKE_MATCH_2}" )
-+ set( _version_revision "${CMAKE_MATCH_3}" )
-+
-+ # we have no so version (module?)
-+ else( _target_version )
-+ set( _library_name_1 "${_soname}" )
-+ set( _library_name_2 "${_soname}" )
-+ set( _library_name_3 "${_soname}" )
-+ set( _version_current "0" )
-+ set( _version_age "0" )
-+ set( _version_revision "0" )
-+ endif( _target_version )
-+
-+ if( IS_ABSOLUTE ${_destination} )
-+ set( _libdir "${_destination}" )
-+ else( IS_ABSOLUTE ${_destination} )
-+ set( _libdir "${CMAKE_INSTALL_PREFIX}/${_destination}" )
-+ endif( IS_ABSOLUTE ${_destination} )
-+
-+ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_libtool_file.cmake "${_laname}" @ONLY )
-+
-+ install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${_laname}" DESTINATION ${_destination} )
-+
-+endmacro( tde_install_libtool_file )
-+
-+
-+#################################################
-+#####
-+##### tde_install_export / tde_import
-+
-+function( tde_install_export )
-+ file( GLOB export_files ${CMAKE_CURRENT_BINARY_DIR}/export-*.cmake )
-+
-+ set( mode "WRITE" )
-+ foreach( filename ${export_files} )
-+ file( READ ${filename} content )
-+ file( ${mode} "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.cmake" "${content}" )
-+ set( mode "APPEND" )
-+ endforeach( )
-+
-+ install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.cmake" DESTINATION ${CMAKE_INSTALL_DIR} )
-+endfunction( )
-+
-+
-+macro( tde_import _library )
-+ message( STATUS "checking for '${_library}'" )
-+ string( TOUPPER "BUILD_${_library}" _build )
-+ if( ${_build} )
-+ message( STATUS " ok, activated for build" )
-+ else()
-+ if( EXISTS "${TDE_CMAKE_DIR}/${_library}.cmake" )
-+ include( "${TDE_CMAKE_DIR}/${_library}.cmake" )
-+ message( STATUS " ok, found import file" )
-+ else()
-+ tde_message_fatal( "'${_library}' are required,\n but is not installed nor selected for build" )
-+ endif()
-+ endif()
-+endmacro()
-+
-+
-+#################################################
-+#####
-+##### tde_add_library
-+
-+macro( tde_add_library _arg_target )
-+
-+ unset( _target )
-+ unset( _type )
-+ unset( _static_pic )
-+ unset( _automoc )
-+ unset( _meta_includes )
-+ unset( _no_libtool_file )
-+ unset( _no_export )
-+ unset( _version )
-+ unset( _sources )
-+ unset( _destination )
-+ unset( _embed )
-+ unset( _link )
-+ unset( _dependencies )
-+ unset( _storage )
-+
-+ set( _shouldnotlink no )
-+
-+ # metadata
-+ unset( _description )
-+ unset( _license )
-+ unset( _copyright )
-+ unset( _authors )
-+ unset( _product )
-+ unset( _organization )
-+ unset( _version )
-+ unset( _datetime )
-+ unset( _notes )
-+
-+ # default metadata
-+ set( _product "Trinity Desktop Environment" )
-+ tde_curdatetime( _datetime )
-+
-+ foreach( _arg ${ARGV} )
-+
-+ # this variable help us to skip
-+ # storing unapropriate values (i.e. directives)
-+ unset( _skip_store )
-+
-+ # found one of directives: "SHARED", "STATIC", "MODULE"
-+ if( "+${_arg}" STREQUAL "+SHARED" OR "+${_arg}" STREQUAL "+STATIC" OR "+${_arg}" STREQUAL "+MODULE" )
-+ set( _skip_store 1 )
-+ set( _type "${_arg}" )
-+ endif( "+${_arg}" STREQUAL "+SHARED" OR "+${_arg}" STREQUAL "+STATIC" OR "+${_arg}" STREQUAL "+MODULE" )
-+
-+ # found directive "STATIC_PIC"
-+ if( "+${_arg}" STREQUAL "+STATIC_PIC" )
-+ set( _skip_store 1 )
-+ set( _type "STATIC" )
-+ set( _static_pic 1 )
-+ endif( "+${_arg}" STREQUAL "+STATIC_PIC" )
-+
-+ # found directive "AUTOMOC"
-+ if( "+${_arg}" STREQUAL "+AUTOMOC" )
-+ set( _skip_store 1 )
-+ set( _automoc 1 )
-+ endif( "+${_arg}" STREQUAL "+AUTOMOC" )
-+
-+ # found directive "META_INCLUDES"
-+ if( "+${_arg}" STREQUAL "+META_INCLUDES" )
-+ set( _skip_store 1 )
-+ set( _storage "_meta_includes" )
-+ endif( )
-+
-+ # found directive "NO_LIBTOOL_FILE"
-+ if( "+${_arg}" STREQUAL "+NO_LIBTOOL_FILE" )
-+ set( _skip_store 1 )
-+ set( _no_libtool_file 1 )
-+ endif( "+${_arg}" STREQUAL "+NO_LIBTOOL_FILE" )
-+
-+ # found directive "NO_EXPORT"
-+ if( "+${_arg}" STREQUAL "+NO_EXPORT" )
-+ set( _skip_store 1 )
-+ set( _no_export 1 )
-+ endif( "+${_arg}" STREQUAL "+NO_EXPORT" )
-+
-+ # found directive "VERSION"
-+ if( "+${_arg}" STREQUAL "+VERSION" )
-+ set( _skip_store 1 )
-+ set( _storage "_version" )
-+ endif( "+${_arg}" STREQUAL "+VERSION" )
-+
-+ # found directive "SOURCES"
-+ if( "+${_arg}" STREQUAL "+SOURCES" )
-+ set( _skip_store 1 )
-+ set( _storage "_sources" )
-+ endif( "+${_arg}" STREQUAL "+SOURCES" )
-+
-+ # found directive "EMBED"
-+ if( "+${_arg}" STREQUAL "+EMBED" )
-+ set( _skip_store 1 )
-+ set( _storage "_embed" )
-+ endif( "+${_arg}" STREQUAL "+EMBED" )
-+
-+ # found directive "LINK"
-+ if( "+${_arg}" STREQUAL "+LINK" )
-+ set( _skip_store 1 )
-+ set( _storage "_link" )
-+ endif( "+${_arg}" STREQUAL "+LINK" )
-+
-+ # found directive "DEPENDENCIES"
-+ if( "+${_arg}" STREQUAL "+DEPENDENCIES" )
-+ set( _skip_store 1 )
-+ set( _storage "_dependencies" )
-+ endif( "+${_arg}" STREQUAL "+DEPENDENCIES" )
-+
-+ # found directive "DESTINATION"
-+ if( "+${_arg}" STREQUAL "+DESTINATION" )
-+ set( _skip_store 1 )
-+ set( _storage "_destination" )
-+ unset( ${_storage} )
-+ endif( "+${_arg}" STREQUAL "+DESTINATION" )
-+
-+ # metadata
-+ if( "+${_arg}" STREQUAL "+DESCRIPTION" )
-+ set( _skip_store 1 )
-+ set( _storage "_description" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+LICENSE" )
-+ set( _skip_store 1 )
-+ set( _storage "_license" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+COPYRIGHT" )
-+ set( _skip_store 1 )
-+ set( _storage "_copyright" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+AUTHORS" )
-+ set( _skip_store 1 )
-+ set( _storage "_authors" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+PRODUCT" )
-+ set( _skip_store 1 )
-+ set( _storage "_product" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+ORGANIZATION" )
-+ set( _skip_store 1 )
-+ set( _storage "_organization" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+VERSION" )
-+ set( _skip_store 1 )
-+ set( _storage "_version" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+DATETIME" )
-+ set( _skip_store 1 )
-+ set( _storage "_datetime" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+NOTES" )
-+ set( _skip_store 1 )
-+ set( _storage "_notes" )
-+ endif( )
-+
-+ # storing value
-+ if( _storage AND NOT _skip_store )
-+ list( APPEND ${_storage} ${_arg} )
-+ list( REMOVE_DUPLICATES ${_storage} )
-+ endif( _storage AND NOT _skip_store )
-+
-+ endforeach( _arg )
-+
-+ # if no type is set, we choose one
-+ # based on BUILD_SHARED_LIBS
-+ if( NOT _type )
-+ if( BUILD_SHARED_LIBS )
-+ set( _type "SHARED" )
-+ else( BUILD_SHARED_LIBS )
-+ set( _type "STATIC" )
-+ endif( BUILD_SHARED_LIBS )
-+ endif( NOT _type )
-+
-+ # change target name, based on type
-+ string( TOLOWER "${_type}" _type_lower )
-+ set( _target "${_arg_target}-${_type_lower}" )
-+
-+ # create variables like "LIB_xxx" for convenience
-+ if( ${_type} STREQUAL "SHARED" )
-+ string( TOUPPER "${_arg_target}" _tmp )
-+ set( LIB_${_tmp} ${_target} CACHE INTERNAL LIB_${tmp} FORCE )
-+ endif( ${_type} STREQUAL "SHARED" )
-+
-+ # disallow target without sources
-+ if( NOT _sources )
-+ message( FATAL_ERROR "\nTarget [$_target] have no sources." )
-+ endif( NOT _sources )
-+
-+ # processing different types of sources
-+ __tde_internal_process_sources( _sources ${_sources} )
-+
-+ # set automoc
-+ if( _automoc )
-+ tde_automoc( ${_sources} )
-+ endif( _automoc )
-+
-+ # add target
-+ add_library( ${_target} ${_type} ${_sources} )
-+
-+ # we assume that modules have no prefix and no version
-+ # also, should not link
-+ if( ${_type} STREQUAL "MODULE" )
-+ set_target_properties( ${_target} PROPERTIES PREFIX "" )
-+ unset( _version )
-+ set( _shouldnotlink yes )
-+ endif( ${_type} STREQUAL "MODULE" )
-+
-+ # set real name of target
-+ set_target_properties( ${_target} PROPERTIES OUTPUT_NAME ${_arg_target} )
-+
-+ # set -fPIC flag for static libraries
-+ if( _static_pic )
-+ set_target_properties( ${_target} PROPERTIES COMPILE_FLAGS -fPIC )
-+ endif( _static_pic )
-+
-+ # set version
-+ if( _version )
-+ if( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
-+ # OpenBSD: _soversion and _version both contains only major and minor
-+ string( REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" _dummy "${_version}" )
-+ set( _version "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" )
-+ set( _soversion "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" )
-+ else( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
-+ # General (Linux) case: _soversion contains only the major number of version
-+ string( REGEX MATCH "^[0-9]+" _soversion ${_version} )
-+ endif( ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
-+ set_target_properties( ${_target} PROPERTIES VERSION ${_version} SOVERSION ${_soversion} )
-+ endif( _version )
-+
-+ # set interface libraries (only for shared)
-+ unset( _shared_libs )
-+ if( NOT ${_type} STREQUAL "STATIC" )
-+ foreach( _lib ${_link} )
-+ #get_target_property( _lib_type ${_lib} TYPE )
-+ #if( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" )
-+ if( NOT ${_lib} MATCHES ".+-static" )
-+ list( APPEND _shared_libs ${_lib} )
-+ endif( NOT ${_lib} MATCHES ".+-static" )
-+ #endif( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" )
-+ endforeach( _lib )
-+ endif( NOT ${_type} STREQUAL "STATIC" )
-+
-+ # set embedded archives
-+ if( _embed )
-+ list( INSERT _link 0 -Wl,-whole-archive ${_embed} -Wl,-no-whole-archive )
-+ endif( _embed )
-+
-+ # set link libraries
-+ if( _link )
-+ if( _embed AND ${CMAKE_VERSION} VERSION_EQUAL "2.8.12.0" )
-+ # hack for broken CMake 2.8.12.0
-+ set_target_properties( ${_target} PROPERTIES LINK_LIBRARIES "${_link}" )
-+ else( _embed AND ${CMAKE_VERSION} VERSION_EQUAL "2.8.12.0" )
-+ target_link_libraries( ${_target} ${_link} )
-+ endif( _embed AND ${CMAKE_VERSION} VERSION_EQUAL "2.8.12.0" )
-+ endif( )
-+ if( _shared_libs )
-+ set_target_properties( ${_target} PROPERTIES
-+ LINK_INTERFACE_LIBRARIES "${_shared_libs}"
-+ INTERFACE_LINK_LIBRARIES "${_shared_libs}" )
-+ endif( _shared_libs )
-+
-+ # set dependencies
-+ if( _dependencies )
-+ add_dependencies( ${_target} ${_dependencies} )
-+ endif( _dependencies )
-+
-+ # if destination directory is set
-+ if( _destination )
-+
-+ # we export only shared libs (no static, no modules);
-+ # also, do not export targets marked as "NO_EXPORT" (usually for tdeinit)
-+ if( "SHARED" STREQUAL ${_type} AND NOT _no_export )
-+
-+ # get target properties: output name, version, soversion
-+ get_target_property( _output ${_target} LOCATION )
-+ get_filename_component( _output ${_output} NAME )
-+ get_target_property( _version ${_target} VERSION )
-+ get_target_property( _soversion ${_target} SOVERSION )
-+
-+ if( _version )
-+ set( _location "${_destination}/${_output}.${_version}" )
-+ set( _soname "${_output}.${_soversion}" )
-+ else( )
-+ set( _location "${_destination}/${_output}" )
-+ set( _soname "${_output}" )
-+ endif( )
-+
-+ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_export_library.cmake "${PROJECT_BINARY_DIR}/export-${_target}.cmake" @ONLY )
-+ endif( )
-+
-+ # install target
-+ install( TARGETS ${_target} DESTINATION ${_destination} )
-+
-+ # install .la files for dynamic libraries
-+ if( NOT "STATIC" STREQUAL ${_type} AND NOT _no_libtool_file )
-+ tde_install_libtool_file( ${_target} ${_destination} )
-+ endif( )
-+
-+ endif( _destination )
-+
-+ # embed name and metadata
-+ set( ELF_EMBEDDING_METADATA "\"${_target}\" \"${_description}\" \"${_license}\" \"${_copyright}\" \"${_authors}\" \"${_product}\" \"${_organization}\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"${_notes}\"" )
-+ separate_arguments( ELF_EMBEDDING_METADATA )
-+ if( EXISTS ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor )
-+ add_custom_command(
-+ TARGET ${_target}
-+ POST_BUILD
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -m ${CMAKE_CURRENT_BINARY_DIR}/${_soname} ${ELF_EMBEDDING_METADATA} || true
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -e ${CMAKE_CURRENT_BINARY_DIR}/${_soname} || true
-+ )
-+ if( _version )
-+ add_custom_command(
-+ TARGET ${_target}
-+ POST_BUILD
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -m ${CMAKE_CURRENT_BINARY_DIR}/${_soname}.${_version} ${ELF_EMBEDDING_METADATA} || true
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -e ${CMAKE_CURRENT_BINARY_DIR}/${_soname}.${_version} || true
-+ )
-+ endif( )
-+ endif( EXISTS ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor )
-+
-+endmacro( tde_add_library )
-+
-+
-+#################################################
-+#####
-+##### tde_add_kpart
-+
-+macro( tde_add_kpart _target )
-+ tde_add_library( ${_target} ${ARGN} MODULE )
-+endmacro( tde_add_kpart )
-+
-+
-+#################################################
-+#####
-+##### tde_curdatetime
-+macro( tde_curdatetime result )
-+ tde_execute_process( COMMAND "date" "+%m/%d/%Y %H:%M:%S" OUTPUT_VARIABLE ${result} )
-+ string( REGEX REPLACE "(..)/(..)/(....) (........).*" "\\1/\\2/\\3 \\4" ${result} ${${result}} )
-+endmacro( tde_curdatetime )
-+
-+
-+#################################################
-+#####
-+##### tde_add_executable
-+
-+macro( tde_add_executable _arg_target )
-+
-+ unset( _target )
-+ unset( _automoc )
-+ unset( _meta_includes )
-+ unset( _setuid )
-+ unset( _sources )
-+ unset( _destination )
-+ unset( _link )
-+ unset( _dependencies )
-+ unset( _storage )
-+
-+ # metadata
-+ unset( _description )
-+ unset( _license )
-+ unset( _copyright )
-+ unset( _authors )
-+ unset( _product )
-+ unset( _organization )
-+ unset( _version )
-+ unset( _datetime )
-+ unset( _notes )
-+
-+ # default metadata
-+ set( _product "Trinity Desktop Environment" )
-+ set( _version "${TDE_VERSION}" )
-+ tde_curdatetime( _datetime )
-+
-+ foreach( _arg ${ARGV} )
-+
-+ # this variable help us to skip
-+ # storing unapropriate values (i.e. directives)
-+ unset( _skip_store )
-+
-+ # found directive "AUTOMOC"
-+ if( "+${_arg}" STREQUAL "+AUTOMOC" )
-+ set( _skip_store 1 )
-+ set( _automoc 1 )
-+ endif( "+${_arg}" STREQUAL "+AUTOMOC" )
-+
-+ # found directive "META_INCLUDES"
-+ if( "+${_arg}" STREQUAL "+META_INCLUDES" )
-+ set( _skip_store 1 )
-+ set( _storage "_meta_includes" )
-+ endif( )
-+
-+ # found directive "SETUID"
-+ if( "+${_arg}" STREQUAL "+SETUID" )
-+ set( _skip_store 1 )
-+ set( _setuid 1 )
-+ endif( "+${_arg}" STREQUAL "+SETUID" )
-+
-+ # found directive "SOURCES"
-+ if( "+${_arg}" STREQUAL "+SOURCES" )
-+ set( _skip_store 1 )
-+ set( _storage "_sources" )
-+ endif( "+${_arg}" STREQUAL "+SOURCES" )
-+
-+ # found directive "LINK"
-+ if( "+${_arg}" STREQUAL "+LINK" )
-+ set( _skip_store 1 )
-+ set( _storage "_link" )
-+ endif( "+${_arg}" STREQUAL "+LINK" )
-+
-+ # found directive "DEPENDENCIES"
-+ if( "+${_arg}" STREQUAL "+DEPENDENCIES" )
-+ set( _skip_store 1 )
-+ set( _storage "_dependencies" )
-+ endif( "+${_arg}" STREQUAL "+DEPENDENCIES" )
-+
-+ # found directive "DESTINATION"
-+ if( "+${_arg}" STREQUAL "+DESTINATION" )
-+ set( _skip_store 1 )
-+ set( _storage "_destination" )
-+ unset( ${_storage} )
-+ endif( "+${_arg}" STREQUAL "+DESTINATION" )
-+
-+ # metadata
-+ if( "+${_arg}" STREQUAL "+DESCRIPTION" )
-+ set( _skip_store 1 )
-+ set( _storage "_description" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+LICENSE" )
-+ set( _skip_store 1 )
-+ set( _storage "_license" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+COPYRIGHT" )
-+ set( _skip_store 1 )
-+ set( _storage "_copyright" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+AUTHORS" )
-+ set( _skip_store 1 )
-+ set( _storage "_authors" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+PRODUCT" )
-+ set( _skip_store 1 )
-+ set( _storage "_product" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+ORGANIZATION" )
-+ set( _skip_store 1 )
-+ set( _storage "_organization" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+VERSION" )
-+ set( _skip_store 1 )
-+ set( _storage "_version" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+DATETIME" )
-+ set( _skip_store 1 )
-+ set( _storage "_datetime" )
-+ endif( )
-+ if( "+${_arg}" STREQUAL "+NOTES" )
-+ set( _skip_store 1 )
-+ set( _storage "_notes" )
-+ endif( )
-+
-+ # storing value
-+ if( _storage AND NOT _skip_store )
-+ #set( ${_storage} "${${_storage}} ${_arg}" )
-+ list( APPEND ${_storage} ${_arg} )
-+ endif( _storage AND NOT _skip_store )
-+
-+ endforeach( _arg )
-+
-+ set( _target "${_arg_target}" )
-+
-+ # disallow target without sources
-+ if( NOT _sources )
-+ message( FATAL_ERROR "\nTarget [$_target] have no sources." )
-+ endif( NOT _sources )
-+
-+ # processing different types of sources
-+ __tde_internal_process_sources( _sources ${_sources} )
-+
-+ # set automoc
-+ if( _automoc )
-+ tde_automoc( ${_sources} )
-+ endif( _automoc )
-+
-+ # add target
-+ add_executable( ${_target} ${_sources} )
-+
-+ # set link libraries
-+ if( _link )
-+ target_link_libraries( ${_target} ${_link} )
-+ endif( _link )
-+
-+ # set dependencies
-+ if( _dependencies )
-+ add_dependencies( ${_target} ${_dependencies} )
-+ endif( _dependencies )
-+
-+ # set PIE flags for setuid binaries
-+ if( _setuid )
-+ set_target_properties( ${_target} PROPERTIES COMPILE_FLAGS "${TDE_PIE_CFLAGS}" )
-+ set_target_properties( ${_target} PROPERTIES LINK_FLAGS "${TDE_PIE_LDFLAGS}" )
-+ endif( _setuid )
-+
-+ # set destination directory
-+ if( _destination )
-+ if( _setuid )
-+ install( TARGETS ${_target} DESTINATION ${_destination} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE SETUID )
-+ else( _setuid )
-+ install( TARGETS ${_target} DESTINATION ${_destination} )
-+ endif( _setuid )
-+ endif( _destination )
-+
-+ # embed icon, name, and metadata
-+ set( ELF_EMBEDDING_METADATA "\"${_target}\" \"${_description}\" \"${_license}\" \"${_copyright}\" \"${_authors}\" \"${_product}\" \"${_organization}\" \"${_version}\" \"${_datetime}\" \"${_target}\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"${_notes}\"" )
-+ separate_arguments( ELF_EMBEDDING_METADATA )
-+ if( EXISTS ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor )
-+ add_custom_command(
-+ TARGET ${_target}
-+ POST_BUILD
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -m ${CMAKE_CURRENT_BINARY_DIR}/${_target} ${ELF_EMBEDDING_METADATA} || true
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -e ${CMAKE_CURRENT_BINARY_DIR}/${_target} || true
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -t ${CMAKE_CURRENT_BINARY_DIR}/${_target} ${_target} || true
-+ )
-+ endif( EXISTS ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor )
-+
-+endmacro( tde_add_executable )
-+
-+
-+#################################################
-+#####
-+##### tde_add_tdeinit_executable
-+
-+macro( tde_add_tdeinit_executable _target )
-+
-+ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_tdeinit_executable.cmake ${_target}_tdeinit_executable.cpp COPYONLY )
-+ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_tdeinit_module.cmake ${_target}_tdeinit_module.cpp COPYONLY )
-+
-+ unset( _sources )
-+ unset( _runtime_destination )
-+ unset( _library_destination )
-+ unset( _plugin_destination )
-+
-+ # default storage is _sources
-+ set( _storage _sources )
-+
-+ # set default export to NO_EXPORT
-+ set( _export "NO_EXPORT" )
-+
-+ foreach( _arg ${ARGN} )
-+
-+ # this variable help us to skip
-+ # storing unapropriate values (i.e. directives)
-+ unset( _skip_store )
-+
-+ # found directive "EXPORT"
-+ if( "+${_arg}" STREQUAL "+EXPORT" )
-+ set( _skip_store 1 )
-+ unset( _export )
-+ endif( "+${_arg}" STREQUAL "+EXPORT" )
-+
-+ # found directive "RUNTIME_DESTINATION"
-+ if( "+${_arg}" STREQUAL "+RUNTIME_DESTINATION" )
-+ set( _skip_store 1 )
-+ set( _storage "_runtime_destination" )
-+ unset( ${_storage} )
-+ endif( "+${_arg}" STREQUAL "+RUNTIME_DESTINATION" )
-+
-+ # found directive "LIBRARY_DESTINATION"
-+ if( "+${_arg}" STREQUAL "+LIBRARY_DESTINATION" )
-+ set( _skip_store 1 )
-+ set( _storage "_library_destination" )
-+ unset( ${_storage} )
-+ endif( "+${_arg}" STREQUAL "+LIBRARY_DESTINATION" )
-+
-+ # found directive "PLUGIN_DESTINATION"
-+ if( "+${_arg}" STREQUAL "+PLUGIN_DESTINATION" )
-+ set( _skip_store 1 )
-+ set( _storage "_plugin_destination" )
-+ unset( ${_storage} )
-+ endif( "+${_arg}" STREQUAL "+PLUGIN_DESTINATION" )
-+
-+ # storing value
-+ if( _storage AND NOT _skip_store )
-+ list( APPEND ${_storage} ${_arg} )
-+ set( _storage "_sources" )
-+ endif( _storage AND NOT _skip_store )
-+
-+ endforeach( _arg )
-+
-+ # if destinations are not set, we using some defaults
-+ # we assume that tdeinit executable MUST be installed
-+ # (otherwise why we build it?)
-+ if( NOT _runtime_destination )
-+ set( _runtime_destination ${BIN_INSTALL_DIR} )
-+ endif( NOT _runtime_destination )
-+ if( NOT _library_destination )
-+ set( _library_destination ${LIB_INSTALL_DIR} )
-+ endif( NOT _library_destination )
-+ if( NOT _plugin_destination )
-+ set( _plugin_destination ${PLUGIN_INSTALL_DIR} )
-+ endif( NOT _plugin_destination )
-+
-+ # create the library
-+ tde_add_library( tdeinit_${_target} ${_sources} SHARED ${_export}
-+ DESTINATION ${_library_destination}
-+ )
-+
-+ # create the executable
-+ tde_add_executable( ${_target}
-+ SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${_target}_tdeinit_executable.cpp
-+ LINK tdeinit_${_target}-shared
-+ DESTINATION ${_runtime_destination}
-+ )
-+
-+ # create the plugin
-+ tde_add_kpart( ${_target}
-+ SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${_target}_tdeinit_module.cpp
-+ LINK tdeinit_${_target}-shared
-+ DESTINATION ${_plugin_destination}
-+ )
-+
-+endmacro( tde_add_tdeinit_executable )
-+
-+
-+#################################################
-+#####
-+##### tde_create_translation
-+
-+macro( tde_create_translation )
-+
-+ unset( _srcs )
-+ unset( _lang )
-+ unset( _dest )
-+ unset( _out_name )
-+ unset( _directive )
-+ unset( _var )
-+
-+ foreach( _arg ${ARGN} )
-+
-+ # found directive "FILES"
-+ if( "+${_arg}" STREQUAL "+FILES" )
-+ unset( _srcs )
-+ set( _var _srcs )
-+ set( _directive 1 )
-+ endif( )
-+
-+ # found directive "LANG"
-+ if( "+${_arg}" STREQUAL "+LANG" )
-+ unset( _lang )
-+ set( _var _lang )
-+ set( _directive 1 )
-+ endif( )
-+
-+ # found directive "DESTINATION"
-+ if( "+${_arg}" STREQUAL "+DESTINATION" )
-+ unset( _dest )
-+ set( _var _dest )
-+ set( _directive 1 )
-+ endif( )
-+
-+ # found directive "DESTINATION"
-+ if( "+${_arg}" STREQUAL "+OUTPUT_NAME" )
-+ unset( _proj )
-+ set( _var _out_name )
-+ set( _directive 1 )
-+ endif( )
-+
-+ # collect data
-+ if( _directive )
-+ unset( _directive )
-+ elseif( _var )
-+ list( APPEND ${_var} ${_arg} )
-+ endif()
-+
-+ endforeach( )
-+
-+ if( NOT MSGFMT_EXECUTABLE )
-+ tde_message_fatal( "MSGFMT_EXECUTABLE variable is not defined" )
-+ elseif( NOT _lang )
-+ tde_message_fatal( "missing LANG directive" )
-+ endif( )
-+
-+ # if no file specified, include all *.po files
-+ if( NOT _srcs )
-+ file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
-+ endif( )
-+ if( NOT _srcs )
-+ tde_message_fatal( "no source files" )
-+ endif( )
-+
-+ if( NOT _lang STREQUAL "auto")
-+ set( _real_lang ${_lang} )
-+
-+ if( NOT _dest )
-+ set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" )
-+ endif( )
-+
-+ # OUTPUT_NAME can only be used if we have only one file
-+ list( LENGTH _srcs _srcs_num)
-+ if( _out_name AND _srcs_num GREATER 1 )
-+ tde_message_fatal( "OUTPUT_NAME can be supplied only with single file or LANG=auto" )
-+ endif( )
-+
-+ elseif( NOT _out_name )
-+ tde_message_fatal( "LANG=auto reqires OUTPUT_NAME directive to be set" )
-+ elseif( _dest )
-+ tde_message_fatal( "DESTINATION cannot be used with LANG=auto" )
-+ endif( )
-+
-+ # generate *.mo files
-+ foreach( _src ${_srcs} )
-+
-+ get_filename_component( _src ${_src} ABSOLUTE )
-+
-+ if( _out_name )
-+ set( _out ${_out_name} )
-+ if( _lang STREQUAL "auto" )
-+ get_filename_component( _real_lang ${_src} NAME_WE )
-+ set( _dest "${LOCALE_INSTALL_DIR}/${_real_lang}/LC_MESSAGES" )
-+ endif( )
-+ else( )
-+ get_filename_component( _out ${_src} NAME_WE )
-+ endif( )
-+
-+ string( REPLACE "@" "_" _target ${_real_lang} )
-+ set( _out_filename "${_out}-${_real_lang}.mo" )
-+ set( _install_filename "${_out}.mo" )
-+
-+ add_custom_command(
-+ OUTPUT ${_out_filename}
-+ COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_filename}
-+ DEPENDS ${_src} )
-+ add_custom_target( "${_out}-${_target}-translation" ALL DEPENDS ${_out_filename} )
-+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_filename} RENAME ${_install_filename} DESTINATION ${_dest} )
-+
-+ endforeach( )
-+
-+endmacro( )
-+
-+
-+#################################################
-+#####
-+##### tde_create_handbook
-+
-+macro( tde_create_handbook )
-+
-+ unset( _target )
-+ unset( _dest )
-+ unset( _noindex )
-+ unset( _srcs )
-+ unset( _extra )
-+ unset( _srcdir )
-+
-+ set( _lang en )
-+ set( _first_arg 1 )
-+ set( _var _target )
-+
-+ foreach( _arg ${ARGN} )
-+
-+ # found directive "NOINDEX"
-+ if( "+${_arg}" STREQUAL "+NOINDEX" )
-+ set( _noindex 1 )
-+ set( _directive 1 )
-+ endif()
-+
-+ # found directive "FILES"
-+ if( "+${_arg}" STREQUAL "+FILES" )
-+ unset( _srcs )
-+ set( _var _srcs )
-+ set( _directive 1 )
-+ endif()
-+
-+ # found directive "EXTRA"
-+ if( "+${_arg}" STREQUAL "+EXTRA" )
-+ unset( _extra )
-+ set( _var _extra )
-+ set( _directive 1 )
-+ endif()
-+
-+ # found directive "SRCDIR"
-+ if( "+${_arg}" STREQUAL "+SRCDIR" )
-+ unset( _srcdir )
-+ set( _var _srcdir )
-+ set( _directive 1 )
-+ endif()
-+
-+ # found directive DESTINATION
-+ if( "+${_arg}" STREQUAL "+DESTINATION" )
-+ unset( _dest )
-+ set( _var _dest )
-+ set( _directive 1 )
-+ endif()
-+
-+ # found directive "LANG"
-+ if( "+${_arg}" STREQUAL "+LANG" )
-+ unset( _lang )
-+ set( _var _lang )
-+ set( _directive 1 )
-+ endif()
-+
-+ # collect data
-+ if( _directive )
-+ unset( _directive )
-+ elseif( _var )
-+ if( _first_arg )
-+ set( _target "${_arg}" )
-+ else()
-+ list( APPEND ${_var} ${_arg} )
-+ endif()
-+ endif()
-+
-+ unset( _first_arg )
-+
-+ endforeach()
-+
-+ # if no target specified, try to guess it from DESTINATION
-+ if( NOT _target )
-+ if( NOT _dest )
-+ tde_message_fatal( "target name cannot be determined because DESTINATION is not set" )
-+ endif()
-+ string( REPLACE "/" "-" _target "${_dest}" )
-+ endif()
-+
-+ set( _target "${_target}-${_lang}-handbook" )
-+
-+ # if no file specified, include all docbooks, stylesheets and images
-+ if( NOT _srcs )
-+ file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.docbook *.css *.png )
-+ endif()
-+
-+ # if no destination specified, defaulting to HTML_INSTALL_DIR
-+ if( NOT _dest )
-+ set( _dest "${HTML_INSTALL_DIR}/${_lang}" )
-+ # if destination is NOT absolute path,
-+ # we assume that is relative to HTML_INSTALL_DIR
-+ elseif( NOT IS_ABSOLUTE ${_dest} )
-+ set( _dest "${HTML_INSTALL_DIR}/${_lang}/${_dest}" )
-+ endif()
-+
-+ if( NOT _srcs )
-+ tde_message_fatal( "no source files" )
-+ endif()
-+
-+ if( NOT _noindex )
-+
-+ # check for index.docbook
-+ list( FIND _srcs "index.docbook" _find_index )
-+ if( -1 EQUAL _find_index )
-+ tde_message_fatal( "missing index.docbook file" )
-+ endif()
-+
-+ # check for srcdir
-+ if( _srcdir )
-+ set( _srcdir "--srcdir=${_srcdir}" )
-+ endif()
-+
-+ add_custom_command(
-+ OUTPUT index.cache.bz2
-+ COMMAND ${KDE3_MEINPROC_EXECUTABLE} ${_srcdir} --check --cache index.cache.bz2 ${CMAKE_CURRENT_SOURCE_DIR}/index.docbook
-+ DEPENDS ${_srcs} )
-+
-+ add_custom_target( ${_target} ALL DEPENDS index.cache.bz2 )
-+
-+ list( APPEND _srcs ${CMAKE_CURRENT_BINARY_DIR}/index.cache.bz2 )
-+
-+ if( NOT TDE_HTML_DIR )
-+ set( TDE_HTML_DIR ${HTML_INSTALL_DIR} )
-+ endif( )
-+
-+ tde_install_empty_directory( ${_dest} )
-+ tde_install_symlink( ${TDE_HTML_DIR}/${_lang}/common ${_dest} )
-+
-+ endif()
-+
-+ install( FILES ${_srcs} ${_extra} DESTINATION ${_dest} )
-+
-+endmacro( )
-+
-+
-+#################################################
-+#####
-+##### tde_include_tqt
-+
-+macro( tde_include_tqt )
-+ foreach( _cpp ${ARGN} )
-+ set_source_files_properties( ${_cpp} PROPERTIES COMPILE_FLAGS "-include tqt.h" )
-+ endforeach()
-+endmacro( )
-+
-+
-+#################################################
-+#####
-+##### tde_install_symlink
-+
-+macro( tde_install_symlink _target _link )
-+
-+ # if path is relative, we must to prefix it with CMAKE_INSTALL_PREFIX
-+ if( IS_ABSOLUTE "${_link}" )
-+ set( _destination "${_link}" )
-+ else( IS_ABSOLUTE "${_link}" )
-+ set( _destination "${CMAKE_INSTALL_PREFIX}/${_link}" )
-+ endif( IS_ABSOLUTE "${_link}" )
-+
-+ get_filename_component( _path "${_destination}" PATH )
-+ if( NOT IS_DIRECTORY "\$ENV{DESTDIR}${_path}" )
-+ install( CODE "file( MAKE_DIRECTORY \"\$ENV{DESTDIR}${_path}\" )" )
-+ endif( NOT IS_DIRECTORY "\$ENV{DESTDIR}${_path}" )
-+
-+ install( CODE "execute_process( COMMAND ln -s ${_target} \$ENV{DESTDIR}${_destination} )" )
-+
-+endmacro( tde_install_symlink )
-+
-+
-+#################################################
-+#####
-+##### tde_install_empty_directory
-+
-+macro( tde_install_empty_directory _path )
-+
-+ # if path is relative, we must to prefix it with CMAKE_INSTALL_PREFIX
-+ if( IS_ABSOLUTE "${_path}" )
-+ set( _destination "${_path}" )
-+ else( IS_ABSOLUTE "${_path}" )
-+ set( _destination "${CMAKE_INSTALL_PREFIX}/${_path}" )
-+ endif( IS_ABSOLUTE "${_path}" )
-+
-+ install( CODE "file( MAKE_DIRECTORY \"\$ENV{DESTDIR}${_destination}\" )" )
-+
-+endmacro( tde_install_empty_directory )
-+
-+
-+#################################################
-+#####
-+##### tde_conditional_add_subdirectory
-+
-+macro( tde_conditional_add_subdirectory _cond _path )
-+
-+ if( ${_cond} )
-+ add_subdirectory( "${_path}" )
-+ endif( ${_cond} )
-+
-+endmacro( tde_conditional_add_subdirectory )
-+
-+
-+#################################################
-+#####
-+##### tde_auto_add_subdirectories
-+
-+macro( tde_auto_add_subdirectories )
-+ file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
-+ foreach( _dir ${_dirs} )
-+ if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} )
-+ if( NOT ${_dir} STREQUAL ".svn" AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
-+ add_subdirectory( ${_dir} )
-+ endif()
-+ endif()
-+ endforeach()
-+endmacro()
-+
-+
-+#################################################
-+#####
-+##### tde_save / tde_restore
-+
-+macro( tde_save )
-+ foreach( _var ${ARGN} )
-+ set( __bak_${_var} ${${_var}} )
-+ endforeach()
-+endmacro()
-+
-+macro( tde_save_and_set _var )
-+ set( __bak_${_var} ${${_var}} )
-+ set( ${_var} ${ARGN} )
-+endmacro( )
-+
-+macro( tde_restore )
-+ foreach( _var ${ARGN} )
-+ set( ${_var} ${__bak_${_var}} )
-+ unset( __bak_${_var} )
-+ endforeach()
-+endmacro()
-+
-+
-+#################################################
-+#####
-+##### tde_setup_install_path
-+
-+macro( tde_setup_install_path _path _default )
-+ if( DEFINED ${_path} )
-+ set( ${_path} "${${_path}}" CACHE INTERNAL "" FORCE )
-+ else( )
-+ set( ${_path} "${_default}" )
-+ endif( )
-+endmacro( )
-+
-+
-+##################################################
-+
-+if( ${CMAKE_SOURCE_DIR} MATCHES ${CMAKE_BINARY_DIR} )
-+ tde_message_fatal( "Please use out-of-source building, like this:
-+ \n rm ${CMAKE_SOURCE_DIR}/CMakeCache.txt
-+ mkdir /tmp/${PROJECT_NAME}.build
-+ cd /tmp/${PROJECT_NAME}.build
-+ cmake ${CMAKE_SOURCE_DIR} [arguments...]" )
-+endif( )
-+
-+#################################################
-+#####
-+##### tde_setup_architecture_flags
-+
-+macro( tde_setup_architecture_flags )
-+ message( STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} CPU architecture" )
-+ ## Immediate symbol binding is available only for gcc but not on ARM architectures
-+ if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES arm* AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" )
-+ set( LINKER_IMMEDIATE_BINDING_FLAGS "-z\ now" CACHE INTERNAL "" FORCE )
-+ else( )
-+ set( LINKER_IMMEDIATE_BINDING_FLAGS "" CACHE INTERNAL "" FORCE )
-+ endif( )
-+
-+ check_cxx_compiler_flag( -fPIE HAVE_PIE_SUPPORT )
-+ if( HAVE_PIE_SUPPORT )
-+ set( TDE_PIE_CFLAGS -fPIE )
-+ set( TDE_PIE_LDFLAGS -pie )
-+ endif( HAVE_PIE_SUPPORT )
-+endmacro( )
-+
-+
-+################################################
-+#####
-+##### Restore CMP0026 policy
-+
-+if( POLICY CMP0026 )
-+ cmake_policy( POP )
-+endif( POLICY CMP0026 )
-+
-Index: b/cmake/modules/TDESetupPaths.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/TDESetupPaths.cmake
-@@ -0,0 +1,68 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+#################################################
-+#####
-+##### tde_internal_setup_path
-+
-+macro( _tde_internal_setup_path _path _default _comment )
-+ if( DEFINED ${_path} )
-+ set( ${_path} "${${_path}}" CACHE PATH "${_comment}" )
-+ else( DEFINED ${_path} )
-+ set( ${_path} "${_default}" )
-+ endif( DEFINED ${_path} )
-+endmacro( _tde_internal_setup_path )
-+
-+
-+#################################################
-+#####
-+##### tde_setup_paths
-+
-+macro( tde_setup_paths )
-+
-+ # install paths
-+ _tde_internal_setup_path( EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" "Base directory for executables and libraries" )
-+ _tde_internal_setup_path( SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" "Base directory for files which go to share/" )
-+ _tde_internal_setup_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)" )
-+ _tde_internal_setup_path( SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/sbin" "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)" )
-+ _tde_internal_setup_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})" )
-+ _tde_internal_setup_path( LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity/libexec" "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/trinity/libexec)" )
-+ _tde_internal_setup_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" "The install dir for pkg-config metadata files" )
-+ _tde_internal_setup_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" "The subdirectory to the header prefix" )
-+
-+ _tde_internal_setup_path( CMAKE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/cmake" "The install dir for cmake import modules" )
-+ _tde_internal_setup_path( PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity" "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" )
-+ _tde_internal_setup_path( CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" "The config file install dir" )
-+ _tde_internal_setup_path( DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" "The parent directory where applications can install their data" )
-+ _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/tde/HTML" "The HTML install dir for documentation" )
-+ _tde_internal_setup_path( ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" )
-+ _tde_internal_setup_path( KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for tdeconfig files" )
-+ _tde_internal_setup_path( LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "The install dir for translations" )
-+ _tde_internal_setup_path( APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applnk" "The install dir for the application desktop files" )
-+ _tde_internal_setup_path( MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mimelnk" "The install dir for the mimetype desktop files" )
-+ _tde_internal_setup_path( SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/services" "The install dir for service (desktop, protocol, ...) files" )
-+ _tde_internal_setup_path( SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/servicetypes" "The install dir for servicestypes desktop files" )
-+ _tde_internal_setup_path( SOUND_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/sounds" "The install dir for sound files" )
-+ _tde_internal_setup_path( TEMPLATES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/templates" "The install dir for templates (Create new file...)" )
-+ _tde_internal_setup_path( WALLPAPER_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/wallpapers" "The install dir for wallpapers" )
-+ _tde_internal_setup_path( KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/tdeconf_update" "The tdeconf_update install dir" )
-+ _tde_internal_setup_path( AUTOSTART_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/autostart" "The install dir for autostart files" )
-+
-+ _tde_internal_setup_path( SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "The sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)" )
-+ _tde_internal_setup_path( MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man" "The man install dir (default ${SHARE_INSTALL_PREFIX}/man/)" )
-+ _tde_internal_setup_path( INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info" "The info install dir (default ${SHARE_INSTALL_PREFIX}/info)" )
-+
-+ _tde_internal_setup_path( XDG_MENU_INSTALL_DIR "${SYSCONF_INSTALL_DIR}/xdg/menus" "The XDG menus dir" )
-+ _tde_internal_setup_path( XDG_APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applications/tde" "The XDG apps dir" )
-+ _tde_internal_setup_path( XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories" "The XDG directory" )
-+ _tde_internal_setup_path( XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes" )
-+
-+endmacro( tde_setup_paths )
-Index: b/cmake/modules/tde_uic.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/tde_uic.cmake
-@@ -0,0 +1,61 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+set( CMAKE_MODULE_PATH "${MASTER_SOURCE_DIR}/cmake/modules" )
-+include( TDEMacros )
-+
-+get_filename_component( _ui_basename ${UI_FILE} NAME_WE )
-+
-+# FIXME this will working only on out-of-source mode
-+set( local_ui_file ${_ui_basename}.ui )
-+configure_file( ${UI_FILE} ${local_ui_file} COPYONLY )
-+tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file} )
-+
-+# ui.h extension file, if exists
-+if( EXISTS "${UI_FILE}.h" )
-+ configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY )
-+ tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file}.h )
-+endif( )
-+
-+if( TDE_QTPLUGINS_DIR )
-+ set( L -L ${TDE_QTPLUGINS_DIR} )
-+endif( )
-+
-+tde_execute_process( COMMAND ${UIC_EXECUTABLE}
-+ -nounload -tr tr2i18n
-+ ${L}
-+ ${local_ui_file}
-+ OUTPUT_VARIABLE _ui_h_content )
-+
-+if( _ui_h_content )
-+ string( REGEX REPLACE "#ifndef " "#ifndef UI_" _ui_h_content "${_ui_h_content}" )
-+ string( REGEX REPLACE "#define " "#define UI_" _ui_h_content "${_ui_h_content}" )
-+ string( REGEX REPLACE "public TQWizard" "public KWizard" _ui_h_content "${_ui_h_content}" )
-+ string( REGEX REPLACE "public QWizard" "public KWizard" _ui_h_content "${_ui_h_content}" )
-+ string( REGEX REPLACE "#include <ntqwizard.h>" "#include <kwizard.h>" _ui_h_content "${_ui_h_content}" )
-+ string( REGEX REPLACE "#include <qwizard.h>" "#include <kwizard.h>" _ui_h_content "${_ui_h_content}" )
-+ file( WRITE ${_ui_basename}.h "${_ui_h_content}" )
-+endif( )
-+
-+tde_execute_process( COMMAND ${UIC_EXECUTABLE}
-+ -nounload -tr tr2i18n
-+ ${L}
-+ -impl ${_ui_basename}.h
-+ ${local_ui_file}
-+ OUTPUT_VARIABLE _ui_cpp_content )
-+
-+if( _ui_cpp_content )
-+ string( REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _ui_cpp_content "${_ui_cpp_content}" )
-+ string( REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _ui_cpp_content "${_ui_cpp_content}" )
-+ string( REGEX REPLACE ": TQWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" )
-+ string( REGEX REPLACE ": QWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" )
-+ file( WRITE ${_ui_basename}.cpp "#include <kdialog.h>\n#include <tdelocale.h>\n\n${_ui_cpp_content}" )
-+endif( )
-Index: b/cmake/modules/template_dummy_cpp.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/template_dummy_cpp.cmake
-@@ -0,0 +1,5 @@
-+#ifdef _AIX
-+ namespace {
-+ void *not_empty_file;
-+ }
-+#endif
-Index: b/cmake/modules/template_export_library.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/template_export_library.cmake
-@@ -0,0 +1,7 @@
-+add_library( @_target@ @_type@ IMPORTED )
-+
-+set_target_properties( @_target@ PROPERTIES
-+ IMPORTED_LINK_INTERFACE_LIBRARIES "@_shared_libs@"
-+ IMPORTED_LOCATION "@_location@"
-+ IMPORTED_SONAME "@_soname@" )
-+
-Index: b/cmake/modules/template_libtool_file.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/template_libtool_file.cmake
-@@ -0,0 +1,35 @@
-+# @_laname@ - a libtool library file
-+# Generated by CMake - GNU libtool
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname='@_library_name_2@'
-+
-+# Names of this library.
-+library_names='@_library_name_1@ @_library_name_2@ @_library_name_3@'
-+
-+# The name of the static archive.
-+old_library=''
-+
-+# Libraries that this one depends upon.
-+dependency_libs=''
-+
-+# Version information for @_name@.
-+current=@_version_current@
-+age=@_version_age@
-+revision=@_version_revision@
-+
-+# Is this an already installed library?
-+installed=yes
-+
-+# Should we warn about portability when linking against -modules?
-+shouldnotlink=@_shouldnotlink@
-+
-+# Files to dlopen/dlpreopen
-+dlopen=''
-+dlpreopen=''
-+
-+# Directory that this library needs to be installed in:
-+libdir='@_libdir@'
-Index: b/cmake/modules/template_tdeinit_executable.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/template_tdeinit_executable.cmake
-@@ -0,0 +1,2 @@
-+extern "C" int kdemain(int argc, char* argv[]);
-+int main(int argc, char* argv[]) { return kdemain(argc,argv); }
-Index: b/cmake/modules/template_tdeinit_module.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/template_tdeinit_module.cmake
-@@ -0,0 +1,3 @@
-+#include <kdemacros.h>
-+extern "C" int kdemain(int argc, char* argv[]);
-+extern "C" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }
-Index: b/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ b/CMakeLists.txt
-@@ -0,0 +1,73 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+cmake_minimum_required( VERSION 2.6 )
-+
-+
-+##### general package setup #####################
-+
-+project( akode )
-+set( PACKAGE akode )
-+set( VERSION 2.0.2 )
-+
-+
-+##### include essential cmake modules ###########
-+
-+include( FindPkgConfig )
-+include( CheckCXXSourceCompiles )
-+include( CheckFunctionExists )
-+include( CheckIncludeFile )
-+include( CheckLibraryExists )
-+
-+
-+##### include our cmake modules #################
-+
-+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
-+include( TDEMacros )
-+tde_setup_architecture_flags( )
-+
-+
-+##### setup install paths #######################
-+
-+include( TDESetupPaths )
-+tde_setup_paths( )
-+
-+
-+##### optional stuff ############################
-+
-+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
-+
-+OPTION( WITH_LIBLTDL "Build with libltdl" ${WITH_ALL_OPTIONS} )
-+
-+OPTION( WITH_ALSA_SINK "Build with alsa sink" ${WITH_ALL_OPTIONS} )
-+OPTION( WITH_JACK_SINK "Build with jack sink" ${WITH_ALL_OPTIONS} )
-+OPTION( WITH_POLYP_SINK "Build with polyp sink" OFF )
-+OPTION( WITH_OSS_SINK "Build with oss sink" ${WITH_ALL_OPTIONS} )
-+OPTION( WITH_SUN_SINK "Build with sun sink" OFF )
-+
-+OPTION( WITH_FFMPEG_DECODER "Build with ffmeeg decoder" OFF )
-+option( WITH_MPC_DECODER "Build with mpc decoder" ON )
-+option( WITH_MPEG_DECODER "Build with mpeg decoder" ${WITH_ALL_OPTIONS} )
-+OPTION( WITH_SRC_RESAMPLER "Build with src resampler" ${WITH_ALL_OPTIONS} )
-+option( WITH_XIPH_DECODER "Build with xiph decoder" ${WITH_ALL_OPTIONS} )
-+
-+
-+##### configure checks ##########################
-+
-+include( ConfigureChecks.cmake )
-+add_definitions( -DHAVE_CONFIG_H )
-+configure_file( config.h.cmake config.h @ONLY )
-+
-+
-+##### build #####################################
-+
-+tde_auto_add_subdirectories()
-+
-Index: b/config.h.cmake
-===================================================================
---- /dev/null
-+++ b/config.h.cmake
-@@ -0,0 +1,62 @@
-+
-+/* defined if you have libltdl library and header */
-+#cmakedefine HAVE_LIBLTDL
-+
-+/* Define if your platform has posix_madvise */
-+#cmakedefine HAVE_POSIX_MADVISE
-+
-+/* Define if your platform has posix_fadvise */
-+#cmakedefine HAVE_POSIX_FADVISE
-+
-+/* Define if your platform has fadvise */
-+#cmakedefine HAVE_FADVISE
-+
-+/* Define if your platform has madvise */
-+#cmakedefine HAVE_MADVISE
-+
-+/* Define if madvise has no usefull prototype */
-+#cmakedefine NEED_MADVISE_PROTOTYPE
-+
-+/* Define if your platform has getopt_long from glibc */
-+#cmakedefine HAVE_GNU_GETOPT
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#cmakedefine HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#cmakedefine HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#cmakedefine HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <soundcard.h> header file. */
-+#cmakedefine HAVE_SOUNDCARD_H
-+
-+/* Define to 1 if you have the <sys/soundcard.h> header file. */
-+#cmakedefine HAVE_SYS_SOUNDCARD_H
-+
-+/* Define if you have libavcodec and libavformat from FFMPEG (required for WMA
-+ and RealAudio decoding) */
-+#cmakedefine HAVE_FFMPEG
-+
-+/* Define if you have libFLAC 1.1.3 or newer */
-+#cmakedefine HAVE_LIBFLAC113
-+
-+/* Define if you have libFLAC 1.1.1 or 1.1.2 */
-+#cmakedefine HAVE_LIBFLAC
-+
-+/* Define if you have libOggFLAC (required for loading OggFLAC files) */
-+#cmakedefine HAVE_LIBOGGFLAC
-+
-+/* Define if you have speex installed */
-+#cmakedefine HAVE_SPEEX
-+
-+/* Define if you have libspeex 1.1.x installed */
-+#cmakedefine HAVE_SPEEX11
-+
-+/* Define if you have one of the broken libspeex 1.1.x < 1.1.5 */
-+#cmakedefine BROKEN_SPEEX11
-+
-+/* Define if you have ogg/vorbis installed */
-+#cmakedefine HAVE_OGG_VORBIS
-+
-Index: b/ConfigureChecks.cmake
-===================================================================
---- /dev/null
-+++ b/ConfigureChecks.cmake
-@@ -0,0 +1,300 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+##### check for system libraries ################
-+
-+if( WITH_LIBLTDL )
-+ # check libltdl
-+ check_include_file( "ltdl.h" HAVE_LTDL_H )
-+ if( HAVE_LTDL_H )
-+ set( AKODE_LIBDL ltdl )
-+ check_library_exists( ${AKODE_LIBDL} lt_dlopen "" HAVE_LIBLTDL )
-+ endif( HAVE_LTDL_H)
-+ if( NOT HAVE_LIBLTDL )
-+ tde_message_fatal( "libltdl are required, but not found on your system" )
-+ endif( NOT HAVE_LIBLTDL )
-+
-+else( WITH_LIBLTDL )
-+ # check libdl
-+ set( AKODE_LIBDL dl )
-+ check_library_exists( ${AKODE_LIBDL} dlopen /lib HAVE_LIBDL )
-+ if( NOT HAVE_LIBDL )
-+ unset( AKODE_LIBDL )
-+ check_function_exists( dlopen HAVE_DLOPEN )
-+ if( NOT HAVE_DLOPEN )
-+ tde_message_fatal( "libdl are required, but not found on your system" )
-+ endif( NOT HAVE_DLOPEN )
-+ endif( NOT HAVE_LIBDL )
-+endif( WITH_LIBLTDL )
-+
-+
-+find_package( Threads )
-+
-+
-+check_include_file( "semaphore.h" HAVE_SEM )
-+check_library_exists( rt sem_init "" HAVE_LIBRT )
-+if( HAVE_LIBRT )
-+ set( SEM_LIBRARIES rt )
-+endif( HAVE_LIBRT )
-+
-+
-+check_library_exists( c posix_madvise "" HAVE_POSIX_MADVISE )
-+check_library_exists( c posix_fadvise "" HAVE_POSIX_FADVISE )
-+check_library_exists( c madvise "" HAVE_MADVISE )
-+check_library_exists( c fadvise "" HAVE_FADVISE )
-+check_cxx_source_compiles( "
-+ #include <sys/types.h>
-+ #include <sys/mman.h>
-+ int main() { ::madvise((char*)0,0, MADV_SEQUENTIAL); return 0; }"
-+ HAVE_MADVISE_PROTOTYPE )
-+if( NOT HAVE_MADVISE_PROTOTYPE )
-+ set( NEED_MADVISE_PROTOTYPE 1 )
-+endif( NOT HAVE_MADVISE_PROTOTYPE )
-+
-+
-+check_include_file( "getopt.h" HAVE_GETOPT_H )
-+check_library_exists( c getopt_long "" HAVE_GNU_GETOPT )
-+check_include_file( "stdint.h" HAVE_STDINT_H )
-+if( NOT HAVE_STDINT_H )
-+ check_include_file( "inttypes.h" HAVE_INTTYPES_H )
-+endif( NOT HAVE_STDINT_H )
-+check_include_file( "sys/types.h" HAVE_SYS_TYPES_H )
-+
-+
-+##### check alsa support ########################
-+
-+if( WITH_ALSA_SINK )
-+
-+ pkg_search_module( ALSA alsa>=0.90 )
-+
-+ if( NOT ALSA_FOUND )
-+ tde_message_fatal( "alsa >= 0.90 are required, but not found on your system" )
-+ endif( NOT ALSA_FOUND )
-+
-+endif( WITH_ALSA_SINK )
-+
-+
-+##### check jack support ########################
-+
-+if( WITH_JACK_SINK )
-+
-+ pkg_search_module( JACK jack>=0.90 )
-+
-+ if( NOT JACK_FOUND )
-+ tde_message_fatal( "jack >= 0.90 are required, but not found on your system" )
-+ endif( NOT JACK_FOUND )
-+
-+endif( WITH_JACK_SINK )
-+
-+
-+##### check oss support #########################
-+
-+if( WITH_OSS_SINK )
-+
-+ check_include_file( "soundcard.h" HAVE_SOUNDCARD_H )
-+ if( NOT HAVE_SOUNDCARD_H )
-+ check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
-+ if( NOT HAVE_SYS_SOUNDCARD_H )
-+ tde_message_fatal( "soundcard.h are required, but not found on your system" )
-+ endif( NOT HAVE_SYS_SOUNDCARD_H )
-+ endif( NOT HAVE_SOUNDCARD_H )
-+
-+ check_library_exists( ossaudio _oss_ioctl "" HAVE_OSSAUDIO )
-+ if( HAVE_OSSAUDIO )
-+ set( OSSAUDIO_LIBRARIES "-lossaudio" )
-+ endif( HAVE_OSSAUDIO )
-+
-+endif( WITH_OSS_SINK )
-+
-+
-+##### check polyp support #######################
-+
-+if( WITH_POLYP_SINK )
-+
-+ pkg_search_module( POLYP polyplib-simple>=0.70 )
-+
-+ if( NOT POLYP_FOUND )
-+ tde_message_fatal( "polyplib-simple >= 0.70 are required, but not found on your system" )
-+ endif( NOT POLYP_FOUND )
-+
-+endif( WITH_POLYP_SINK )
-+
-+
-+##### check sun support #########################
-+
-+if( WITH_SUN_SINK )
-+
-+ check_include_file( "sys/audioio.h" HAVE_AUDIOIO_H )
-+ if( NOT HAVE_AUDIOIO_H )
-+ tde_message_fatal( "sun audioio are required, but not found on your system" )
-+ endif( NOT HAVE_AUDIOIO_H )
-+
-+endif( WITH_SUN_SINK )
-+
-+
-+##### check ffmpeg support ######################
-+
-+if( WITH_FFMPEG_DECODER )
-+
-+ pkg_search_module( AVFORMAT libavformat>=50 )
-+ if( NOT AVFORMAT_FOUND )
-+ tde_message_fatal( "libavformat >= 50 are required, but not found on your system" )
-+ endif( NOT AVFORMAT_FOUND )
-+
-+ pkg_search_module( AVCODEC libavcodec>=50 )
-+ if( NOT AVCODEC_FOUND )
-+ tde_message_fatal( "libavcodec >= 50 are required, but not found on your system" )
-+ endif( NOT AVCODEC_FOUND )
-+
-+ set( HAVE_FFMPEG 1 )
-+
-+endif( WITH_FFMPEG_DECODER )
-+
-+
-+##### check mad support #########################
-+
-+if( WITH_MPEG_DECODER )
-+
-+ pkg_search_module( MAD mad )
-+
-+ if( NOT MAD_FOUND )
-+ find_library( MAD_LIBRARIES NAMES mad )
-+ find_path( MAD_INCLUDE_DIRS mad.h )
-+ if( NOT MAD_LIBRARIES )
-+ tde_message_fatal( "mad are required, but not found on your system" )
-+ endif( NOT MAD_LIBRARIES )
-+ endif( NOT MAD_FOUND )
-+
-+endif( WITH_MPEG_DECODER )
-+
-+
-+##### check FLAC support ########################
-+
-+if( WITH_XIPH_DECODER )
-+
-+ # check for FLAC module
-+ pkg_search_module( FLAC flac>=1.1.3 )
-+ if( FLAC_FOUND )
-+ set( HAVE_LIBFLAC113 1 )
-+ else( FLAC_FOUND )
-+ # check for FLAC 1.1.3
-+ check_include_file( "FLAC/metadata.h" HAVE_FLAC113_H )
-+ if( HAVE_FLAC113_H )
-+ tde_save_and_set( CMAKE_REQUIRED_LIBRARIES ogg )
-+ check_library_exists( FLAC FLAC__stream_decoder_seek_absolute "" HAVE_LIBFLAC113 )
-+ tde_restore( CMAKE_REQUIRED_LIBRARIES )
-+ if( HAVE_LIBFLAC113 )
-+ set( FLAC_LIBRARIES "-lFLAC -logg" )
-+ endif( HAVE_LIBFLAC113 )
-+ endif( HAVE_FLAC113_H )
-+
-+ # check for FLAC 1.1.1 or 1.1.2
-+ if( NOT HAVE_LIBFLAC113 )
-+ check_include_file( "FLAC/seekable_stream_decoder.h" HAVE_FLAC_H )
-+ if( HAVE_FLAC_H )
-+ check_library_exists( FLAC FLAC__seekable_stream_decoder_process_single "" HAVE_LIBFLAC )
-+ if( HAVE_LIBFLAC )
-+ set( FLAC_LIBRARIES "-lFLAC" )
-+ endif( HAVE_LIBFLAC )
-+ endif( HAVE_FLAC_H )
-+
-+ check_include_file( "OggFLAC/seekable_stream_decoder.h" HAVE_OGGFLAC_H )
-+ if( HAVE_OGGFLAC_H )
-+ tde_save_and_set( CMAKE_REQUIRED_LIBRARIES m OggFLAC FLAC )
-+ check_library_exits( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC )
-+ tde_restore( CMAKE_REQUIRED_LIBRARIES )
-+ if( HAVE_LIBOGGFLAC )
-+ set( OGGFLAC_LIBRARIES "-lOggFLAC" )
-+ endif( HAVE_LIBFLAC )
-+ endif( HAVE_OGGFLAC_H )
-+ endif( NOT HAVE_LIBFLAC113 )
-+ endif( FLAC_FOUND )
-+
-+ if( NOT FLAC_LIBRARIES )
-+ tde_message_fatal( "FLAC >= 1.1.1 are required, but not found on your system" )
-+ endif( NOT FLAC_LIBRARIES )
-+
-+endif( WITH_XIPH_DECODER )
-+
-+
-+##### check speex support #######################
-+
-+if( WITH_XIPH_DECODER )
-+
-+ # check for speex module
-+ pkg_search_module( SPEEX speex>=1.2 )
-+ if( NOT SPEEX_FOUND )
-+ # check for speex >= 1.1
-+ pkg_search_module( SPEEX speex>=1.1 )
-+ if( SPEEX_FOUND )
-+ set( HAVE_SPEEX11 1 )
-+ check_library_exits( speex speex_decode_int "" HAVE_SPEEX_DECODE_INT )
-+ if( NOT HAVE_SPEEX_DECODE_INT )
-+ set( BROKEN_SPEEX11 1 )
-+ endif( )
-+ else( )
-+ pkg_search_module( SPEEX speex )
-+ endif( )
-+
-+ endif( )
-+
-+ if( SPEEX_FOUND )
-+ set( HAVE_SPEEX 1 )
-+ if( NOT EXISTS ${SPEEX_INCLUDEDIR}/speex.h )
-+ find_path( SPEEX_EXTRA_INCLUDEDIR "speex.h" ${SPEEX_INCLUDEDIR}/speex )
-+ if( NOT SPEEX_EXTRA_INCLUDEDIR )
-+ tde_message_fatal( "speex are required, but header not found on your system" )
-+ endif( NOT SPEEX_EXTRA_INCLUDEDIR )
-+ list( APPEND SPEEX_INCLUDE_DIRS "${SPEEX_EXTRA_INCLUDEDIR}" )
-+ endif( NOT EXISTS ${SPEEX_INCLUDEDIR}/speex.h )
-+ else( SPEEX_FOUND )
-+ tde_message_fatal( "speex are required, but not found on your system" )
-+ endif( SPEEX_FOUND )
-+
-+endif( WITH_XIPH_DECODER )
-+
-+
-+##### check ogg/vorbis support ##################
-+
-+if( WITH_XIPH_DECODER )
-+
-+ pkg_search_module( VORBIS vorbis )
-+ if( NOT VORBIS_FOUND )
-+ tde_message_fatal( "ogg/vorbis are required, but not found on your system" )
-+ endif( NOT VORBIS_FOUND )
-+
-+ pkg_search_module( VORBISFILE vorbisfile )
-+ if( NOT VORBISFILE_FOUND )
-+ tde_message_fatal( "ogg/vorbisfile are required, but not found on your system" )
-+ endif( NOT VORBISFILE_FOUND )
-+
-+ set( HAVE_OGG_VORBIS 1 )
-+
-+endif( WITH_XIPH_DECODER )
-+
-+
-+##### check samplerate support ##################
-+
-+if( WITH_SRC_RESAMPLER )
-+
-+ pkg_search_module( SAMPLERATE samplerate )
-+
-+ if( NOT SAMPLERATE_FOUND )
-+ find_library( SAMPLERATE_LIBRARIES NAMES samplerate )
-+ find_path( SAMPLERATE_INCLUDE_DIRS samplerate.h )
-+ if( NOT SAMPLERATE_LIBRARIES )
-+ tde_message_fatal( "samplerate are required, but not found on your system" )
-+ endif( NOT SAMPLERATE_LIBRARIES )
-+ endif( NOT SAMPLERATE_FOUND )
-+
-+endif( WITH_SRC_RESAMPLER )
-+
diff --git a/freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff b/freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff
deleted file mode 100644
index 3ff08a2ec..000000000
--- a/freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-commit 386d5647da414c477f7f045c2850bfb1854e2302
-Author: François Andriot <francois.andriot@free.fr>
-Date: Thu Oct 15 04:40:52 2015 +0200
-
- Fix OGG detection on openSUSE
-
- Signed-off-by: François Andriot <francois.andriot@free.fr>
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 1fa37d7..df4d86a 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -210,11 +210,11 @@ if( WITH_XIPH_DECODER )
- check_include_file( "OggFLAC/seekable_stream_decoder.h" HAVE_OGGFLAC_H )
- if( HAVE_OGGFLAC_H )
- tde_save_and_set( CMAKE_REQUIRED_LIBRARIES m OggFLAC FLAC )
-- check_library_exits( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC )
-+ check_library_exists( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC )
- tde_restore( CMAKE_REQUIRED_LIBRARIES )
- if( HAVE_LIBOGGFLAC )
- set( OGGFLAC_LIBRARIES "-lOggFLAC" )
-- endif( HAVE_LIBFLAC )
-+ endif( HAVE_LIBOGGFLAC )
- endif( HAVE_OGGFLAC_H )
- endif( NOT HAVE_LIBFLAC113 )
- endif( FLAC_FOUND )
-@@ -237,7 +237,7 @@ if( WITH_XIPH_DECODER )
- pkg_search_module( SPEEX speex>=1.1 )
- if( SPEEX_FOUND )
- set( HAVE_SPEEX11 1 )
-- check_library_exits( speex speex_decode_int "" HAVE_SPEEX_DECODE_INT )
-+ check_library_exists( speex speex_decode_int "" HAVE_SPEEX_DECODE_INT )
- if( NOT HAVE_SPEEX_DECODE_INT )
- set( BROKEN_SPEEX11 1 )
- endif( )
-@@ -267,6 +267,11 @@ endif( WITH_XIPH_DECODER )
-
- if( WITH_XIPH_DECODER )
-
-+ pkg_search_module( OGG ogg )
-+ if( NOT OGG_FOUND )
-+ tde_message_fatal( "ogg are required, but not found on your system" )
-+ endif( NOT OGG_FOUND )
-+
- pkg_search_module( VORBIS vorbis )
- if( NOT VORBIS_FOUND )
- tde_message_fatal( "ogg/vorbis are required, but not found on your system" )
-diff --git a/akode/configure.in.in b/akode/configure.in.in
-index f18e6c5..80338d5 100644
---- a/akode/configure.in.in
-+++ b/akode/configure.in.in
-@@ -1,7 +1,7 @@
- dnl don't remove the below
- dnl AC_OUTPUT(akode/akode-config)
-
--AM_CONFIG_HEADER(akode/lib/akode_export.h)
-+AC_CONFIG_HEADER(akode/lib/akode_export.h)
-
- AC_DEFUN([AC_CHECK_LIBFLAC],
- [
-diff --git a/akode/plugins/xiph_decoder/CMakeLists.txt b/akode/plugins/xiph_decoder/CMakeLists.txt
-index a0d1f28..4e6693b 100644
---- a/akode/plugins/xiph_decoder/CMakeLists.txt
-+++ b/akode/plugins/xiph_decoder/CMakeLists.txt
-@@ -38,7 +38,7 @@ tde_add_library(
- akode-shared
- ${FLAC_LIBRARIES} ${OGGFLAC_LIBRARIES}
- ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}
-- ${SPEEX_LIBRARIES}
-+ ${SPEEX_LIBRARIES} ${OGG_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
-diff --git a/configure.in.in b/configure.in.in
-index a6fae9f..0eaed3d 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -55,7 +55,7 @@ KDE_CONF_FILES
-
- dnl without this order in this file, automake will be confused!
- dnl
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
-
- dnl checks for programs.
- dnl first check for c/c++ compilers
diff --git a/freebsd/dependencies/akode/files/patch-b01-add-pulseaudio-support.diff b/freebsd/dependencies/akode/files/patch-b01-add-pulseaudio-support.diff
deleted file mode 100644
index 4cc158086..000000000
--- a/freebsd/dependencies/akode/files/patch-b01-add-pulseaudio-support.diff
+++ /dev/null
@@ -1,134 +0,0 @@
-commit cf18d66ac5c3904f3f932848f761ec5d103a470c
-Author: François Andriot <francois.andriot@free.fr>
-Date: Thu Oct 15 04:42:48 2015 +0200
-
- Add pulseaudio support
- [taken from Fedora patches]
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8e2d94..df5b7ea 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ OPTION( WITH_LIBLTDL "Build with libltdl" ${WITH_ALL_OPTIONS} )
-
- OPTION( WITH_ALSA_SINK "Build with alsa sink" ${WITH_ALL_OPTIONS} )
- OPTION( WITH_JACK_SINK "Build with jack sink" ${WITH_ALL_OPTIONS} )
--OPTION( WITH_POLYP_SINK "Build with polyp sink" OFF )
-+OPTION( WITH_PULSE_SINK "Build with pulseaudio sink" OFF )
- OPTION( WITH_OSS_SINK "Build with oss sink" ${WITH_ALL_OPTIONS} )
- OPTION( WITH_SUN_SINK "Build with sun sink" OFF )
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index df4d86a..635db2e 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -118,15 +118,15 @@ endif( WITH_OSS_SINK )
-
- ##### check polyp support #######################
-
--if( WITH_POLYP_SINK )
-+if( WITH_PULSE_SINK )
-
-- pkg_search_module( POLYP polyplib-simple>=0.70 )
-+ pkg_search_module( PULSE libpulse-simple>=0.9.2 )
-
-- if( NOT POLYP_FOUND )
-- tde_message_fatal( "polyplib-simple >= 0.70 are required, but not found on your system" )
-- endif( NOT POLYP_FOUND )
-+ if( NOT PULSE_FOUND )
-+ tde_message_fatal( "libpulse-simple >= 0.9.2 are required, but not found on your system" )
-+ endif( NOT PULSE_FOUND )
-
--endif( WITH_POLYP_SINK )
-+endif( WITH_PULSE_SINK )
-
-
- ##### check sun support #########################
-diff --git a/akode/plugins/CMakeLists.txt b/akode/plugins/CMakeLists.txt
-index ce0f3a4..6e11f1a 100644
---- a/akode/plugins/CMakeLists.txt
-+++ b/akode/plugins/CMakeLists.txt
-@@ -15,7 +15,7 @@
- tde_conditional_add_subdirectory( WITH_ALSA_SINK alsa_sink )
- tde_conditional_add_subdirectory( WITH_JACK_SINK jack_sink )
- tde_conditional_add_subdirectory( WITH_OSS_SINK oss_sink )
--tde_conditional_add_subdirectory( WITH_POLYP_SINK polyp_sink )
-+tde_conditional_add_subdirectory( WITH_PULSE_SINK polyp_sink )
- tde_conditional_add_subdirectory( WITH_SUN_SINK sun_sink )
-
- tde_conditional_add_subdirectory( WITH_FFMPEG_DECODER ffmpeg_decoder )
-diff --git a/akode/plugins/polyp_sink/CMakeLists.txt b/akode/plugins/polyp_sink/CMakeLists.txt
-index 90c4f3c..28a940e 100644
---- a/akode/plugins/polyp_sink/CMakeLists.txt
-+++ b/akode/plugins/polyp_sink/CMakeLists.txt
-@@ -15,7 +15,7 @@ include_directories(
- ${CMAKE_SOURCE_DIR}/akode/lib
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
-- ${POLYP_INCLUDE_DIRS}
-+ ${PULSE_INCLUDE_DIRS}
- )
-
-
-@@ -26,7 +26,7 @@ set( target libakode_polyp_sink )
- tde_add_library(
- ${target} MODULE
- SOURCES polyp_sink.cpp
-- LINK akode-shared ${POLYP_LIBRARIES}
-+ LINK akode-shared ${PULSE_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
-diff --git a/akode/plugins/polyp_sink/Makefile.am b/akode/plugins/polyp_sink/Makefile.am
-index b67602a..a58b04c 100644
---- a/akode/plugins/polyp_sink/Makefile.am
-+++ b/akode/plugins/polyp_sink/Makefile.am
-@@ -1,7 +1,7 @@
--INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
-+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
-
- lib_LTLIBRARIES = libakode_polyp_sink.la
-
- libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
--libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS)
--libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
-+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
-+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
-diff --git a/akode/plugins/polyp_sink/polyp_sink.cpp b/akode/plugins/polyp_sink/polyp_sink.cpp
-index 9376dac..b48b63e 100644
---- a/akode/plugins/polyp_sink/polyp_sink.cpp
-+++ b/akode/plugins/polyp_sink/polyp_sink.cpp
-@@ -25,7 +25,7 @@
- #elif defined(HAVE_INTTYPES_H)
- #include <inttypes.h>
- #endif
--#include <polyp/polyplib-simple.h>
-+#include <pulse/simple.h>
-
- #include "audioframe.h"
- #include "audiobuffer.h"
-@@ -59,7 +59,7 @@ PolypSink::PolypSink()
-
- bool PolypSink::open() {
- int error = 0;
-- m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error );
-+ m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error );
- if (!m_data->server || error != 0) {
- m_data->error = true;
- close();
-diff --git a/config.h.in b/config.h.in
-index 7fe6faf..eed77f8 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -43,9 +43,9 @@
- /* Define if you have libOggFLAC (required for loading OggFLAC files) */
- #undef HAVE_LIBOGGFLAC
-
--/* Define if you have polyplib (required if you want Polypaudio server
-+/* Define if you have libpulse (required if you want PulseAudio server
- support) */
--#undef HAVE_LIBPOLYP
-+#undef HAVE_LIBPULSE
-
- /* defined if you have libsamplerate library and header */
- #undef HAVE_LIBSAMPLERATE
diff --git a/freebsd/dependencies/akode/files/patch-b02-rename-polyp-to-pulse.diff b/freebsd/dependencies/akode/files/patch-b02-rename-polyp-to-pulse.diff
deleted file mode 100644
index 695c4e1fa..000000000
--- a/freebsd/dependencies/akode/files/patch-b02-rename-polyp-to-pulse.diff
+++ /dev/null
@@ -1,687 +0,0 @@
-commit b4697bcfd6567f704e01927fdaf77f3ab5b9112b
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Thu Oct 15 04:46:45 2015 +0200
-
- Rename completely from polyp to pulse
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 635db2e..838fb28 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -116,7 +116,7 @@ if( WITH_OSS_SINK )
- endif( WITH_OSS_SINK )
-
-
--##### check polyp support #######################
-+##### check pulse support #######################
-
- if( WITH_PULSE_SINK )
-
-diff --git a/PACKAGING b/PACKAGING
-index da75139..8cbd9f1 100644
---- a/PACKAGING
-+++ b/PACKAGING
-@@ -7,9 +7,9 @@ Take especially note of the following:
- - If you wish to install plugins in a non-standard place, you can change the
- AKODE_SEARCHDIR definition in lib/pluginhandler.cpp.
- - You SHOULD not install sinks for backends you don't use. Thus jack_sink
-- should only be installed when jackd is available, polyp_sink only when
-- the polypaudio server is used and alsa_sink only when using a Linux kernel
-+ should only be installed when jackd is available, pulse_sink only when
-+ the PulseAudio server is used and alsa_sink only when using a Linux kernel
- with ALSA drivers.
- When using direct aKode playback sinks will be autodetected by loading and
-- probing plugins in this order: polyp, jack, alsa, oss
-+ probing plugins in this order: pulse, jack, alsa, oss
-
-diff --git a/akode/PACKAGING b/akode/PACKAGING
-index da75139..8cbd9f1 100644
---- a/akode/PACKAGING
-+++ b/akode/PACKAGING
-@@ -7,9 +7,9 @@ Take especially note of the following:
- - If you wish to install plugins in a non-standard place, you can change the
- AKODE_SEARCHDIR definition in lib/pluginhandler.cpp.
- - You SHOULD not install sinks for backends you don't use. Thus jack_sink
-- should only be installed when jackd is available, polyp_sink only when
-- the polypaudio server is used and alsa_sink only when using a Linux kernel
-+ should only be installed when jackd is available, pulse_sink only when
-+ the PulseAudio server is used and alsa_sink only when using a Linux kernel
- with ALSA drivers.
- When using direct aKode playback sinks will be autodetected by loading and
-- probing plugins in this order: polyp, jack, alsa, oss
-+ probing plugins in this order: pulse, jack, alsa, oss
-
-diff --git a/akode/configure.in.in b/akode/configure.in.in
-index 80338d5..80d0114 100644
---- a/akode/configure.in.in
-+++ b/akode/configure.in.in
-@@ -270,24 +270,24 @@ AC_SUBST(JACK_LIBADD)
- AC_SUBST(JACK_LDFLAGS)
- fi
-
--AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])
--
--if test "x$polypaudio_test" = "xyes" ; then
--AC_MSG_CHECKING(for Polypaudio 0.7 or later)
--if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
-- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
-- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
-- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
-- have_polyp=yes
-+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
-+
-+if test "x$pulseaudio_test" = "xyes" ; then
-+AC_MSG_CHECKING(for pulseaudio 0.9.2 or later)
-+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
-+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
-+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
-+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
-+ have_pulse=yes
- AC_MSG_RESULT(yes)
-- AC_DEFINE(HAVE_LIBPOLYP, 1,
-- [Define if you have polyplib (required if you want Polypaudio server support)])
-+ AC_DEFINE(HAVE_LIBPULSE, 1,
-+ [Define if you have libpulse (required if you want PulseAudio server support)])
- else
- AC_MSG_RESULT(not installed)
- fi
--AC_SUBST(POLYP_CFLAGS)
--AC_SUBST(POLYP_LIBADD)
--AC_SUBST(POLYP_LDFLAGS)
-+AC_SUBST(PULSE_CFLAGS)
-+AC_SUBST(PULSE_LIBADD)
-+AC_SUBST(PULSE_LDFLAGS)
- fi
-
- AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
-@@ -482,7 +482,7 @@ AM_CONDITIONAL(include_alsa_sink, test x$have_alsa = xyes)
- AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
- AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
- AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
--AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)
-+AM_CONDITIONAL(include_pulse_sink, test x$have_pulse = xyes)
- AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
-
- AC_MSG_CHECKING(for compilable aKode)
-diff --git a/akode/lib/auto_sink.cpp b/akode/lib/auto_sink.cpp
-index bcc1250..bee17b1 100644
---- a/akode/lib/auto_sink.cpp
-+++ b/akode/lib/auto_sink.cpp
-@@ -65,8 +65,8 @@ AutoSink::~AutoSink()
- bool AutoSink::open()
- {
- // Try Polypaudio
-- if (getenv("POLYP_SERVER"))
-- if (m_data->tryOpen("polyp")) return true;
-+ if (getenv("PULSE_SERVER"))
-+ if (m_data->tryOpen("pulse")) return true;
- // Try Jack
- if (m_data->tryOpen("jack")) return true;
- // Try ALSA
-diff --git a/akode/plugins/CMakeLists.txt b/akode/plugins/CMakeLists.txt
-index 6e11f1a..89bcfd1 100644
---- a/akode/plugins/CMakeLists.txt
-+++ b/akode/plugins/CMakeLists.txt
-@@ -15,7 +15,7 @@
- tde_conditional_add_subdirectory( WITH_ALSA_SINK alsa_sink )
- tde_conditional_add_subdirectory( WITH_JACK_SINK jack_sink )
- tde_conditional_add_subdirectory( WITH_OSS_SINK oss_sink )
--tde_conditional_add_subdirectory( WITH_PULSE_SINK polyp_sink )
-+tde_conditional_add_subdirectory( WITH_PULSE_SINK pulse_sink )
- tde_conditional_add_subdirectory( WITH_SUN_SINK sun_sink )
-
- tde_conditional_add_subdirectory( WITH_FFMPEG_DECODER ffmpeg_decoder )
-diff --git a/akode/plugins/Makefile.am b/akode/plugins/Makefile.am
-index 74f27e5..4a13c85 100644
---- a/akode/plugins/Makefile.am
-+++ b/akode/plugins/Makefile.am
-@@ -32,12 +32,12 @@ if include_jack_sink
- AKODE_JACK_SINK=jack_sink
- endif
-
--if include_polyp_sink
--AKODE_POLYP_SINK=polyp_sink
-+if include_pulse_sink
-+AKODE_PULSE_SINK=pulse_sink
- endif
-
- SUBDIRS= $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \
- $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \
- $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
-- $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \
-+ $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \
- $(AKODE_SRC_RESAMPLER)
-diff --git a/akode/plugins/polyp_sink/CMakeLists.txt b/akode/plugins/polyp_sink/CMakeLists.txt
-deleted file mode 100644
-index 28a940e..0000000
---- a/akode/plugins/polyp_sink/CMakeLists.txt
-+++ /dev/null
-@@ -1,32 +0,0 @@
--#################################################
--#
--# (C) 2015 Slávek Banko
--# slavek (DOT) banko (AT) axis.cz
--#
--# Improvements and feedback are welcome
--#
--# This file is released under GPL >= 2
--#
--#################################################
--
--include_directories(
-- ${CMAKE_BINARY_DIR}
-- ${CMAKE_BINARY_DIR}/akode/lib
-- ${CMAKE_SOURCE_DIR}/akode/lib
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${CMAKE_CURRENT_SOURCE_DIR}
-- ${PULSE_INCLUDE_DIRS}
--)
--
--
--##### library ###################################
--
--set( target libakode_polyp_sink )
--
--tde_add_library(
-- ${target} MODULE
-- SOURCES polyp_sink.cpp
-- LINK akode-shared ${PULSE_LIBRARIES}
-- DESTINATION ${LIB_INSTALL_DIR}
--)
--
-diff --git a/akode/plugins/polyp_sink/Makefile.am b/akode/plugins/polyp_sink/Makefile.am
-deleted file mode 100644
-index a58b04c..0000000
---- a/akode/plugins/polyp_sink/Makefile.am
-+++ /dev/null
-@@ -1,7 +0,0 @@
--INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
--
--lib_LTLIBRARIES = libakode_polyp_sink.la
--
--libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
--libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
--libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
-diff --git a/akode/plugins/polyp_sink/polyp_sink.cpp b/akode/plugins/polyp_sink/polyp_sink.cpp
-deleted file mode 100644
-index b48b63e..0000000
---- a/akode/plugins/polyp_sink/polyp_sink.cpp
-+++ /dev/null
-@@ -1,143 +0,0 @@
--/* aKode: Polyp-Sink
--
-- Copyright (C) 2004 Allan Sandfeld Jensen <kde@carewolf.com>
--
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Library General Public
-- License as published by the Free Software Foundation; either
-- version 2 of the License, or (at your option) any later version.
--
-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Library General Public License for more details.
--
-- You should have received a copy of the GNU Library General Public License
-- along with this library; see the file COPYING.LIB. If not, write to
-- the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-- Boston, MA 02110-1301, USA.
--*/
--
--#include "config.h"
--
--#ifdef HAVE_STDINT_H
--#include <stdint.h>
--#elif defined(HAVE_INTTYPES_H)
--#include <inttypes.h>
--#endif
--#include <pulse/simple.h>
--
--#include "audioframe.h"
--#include "audiobuffer.h"
--#include "polyp_sink.h"
--
--#include <iostream>
--
--namespace aKode {
--
--extern "C" { PolypSinkPlugin polyp_sink; };
--
--struct PolypSink::private_data
--{
-- private_data() : server(0), error(false) {};
--
-- pa_simple *server;
-- pa_sample_spec sample_spec;
--
-- bool error;
--
-- AudioConfiguration config;
--};
--
--PolypSink::PolypSink()
--{
-- m_data = new private_data;
-- m_data->sample_spec.rate = 44100;
-- m_data->sample_spec.channels = 2;
-- m_data->sample_spec.format = PA_SAMPLE_S16NE;
--}
--
--bool PolypSink::open() {
-- int error = 0;
-- m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error );
-- if (!m_data->server || error != 0) {
-- m_data->error = true;
-- close();
-- std::cout << "Cannot open client\n";
-- return false;
-- }
--
--
-- return true;
--}
--
--void PolypSink::close() {
-- if (m_data->server) {
-- pa_simple_free(m_data->server);
-- m_data->server = 0;
-- }
--}
--
--PolypSink::~PolypSink()
--{
-- close();
-- delete m_data;
--}
--
--int PolypSink::setAudioConfiguration(const AudioConfiguration* config)
--{
-- if (m_data->error) return -1;
--
-- int res = 0;
-- if (*config == m_data->config) return 0;
-- m_data->config = *config;
--
-- if (config->channel_config != MonoStereo ) return -1;
-- m_data->sample_spec.channels = config->channels;
--
-- if (config->sample_width != 16) {
-- res = 1;
-- m_data->config.sample_width = 16;
-- }
--
-- m_data->sample_spec.rate = config->sample_rate;
--
-- // create new connection
-- close();
-- open();
--
-- return res;
--}
--
--const AudioConfiguration* PolypSink::audioConfiguration() const
--{
-- return &m_data->config;
--}
--
--bool PolypSink::writeFrame(AudioFrame* frame)
--{
-- if ( m_data->error ) return false;
--
-- if ( frame->channels != m_data->config.channels || frame->sample_rate != m_data->config.sample_rate)
-- {
-- if (setAudioConfiguration(frame)!=0)
-- return false;
-- }
--
-- int channels = m_data->config.channels;
-- int length = frame->length;
--
-- int16_t *buffer = new int16_t[length*channels];
-- int16_t** data = (int16_t**)frame->data;
-- for(int i = 0; i<length; i++)
-- for(int j=0; j<channels; j++)
-- buffer[i*channels+j] = data[j][i];
--
-- int error = 0;
-- pa_simple_write(m_data->server, buffer, channels*length*2, &error);
-- delete[] buffer;
--
-- return (error == 0);
--}
--
--} // namespace
-diff --git a/akode/plugins/polyp_sink/polyp_sink.h b/akode/plugins/polyp_sink/polyp_sink.h
-deleted file mode 100644
-index e279ff6..0000000
---- a/akode/plugins/polyp_sink/polyp_sink.h
-+++ /dev/null
-@@ -1,60 +0,0 @@
--/* aKode: Polyp-Sink
--
-- Copyright (C) 2004 Allan Sandfeld Jensen <kde@carewolf.com>
--
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Library General Public
-- License as published by the Free Software Foundation; either
-- version 2 of the License, or (at your option) any later version.
--
-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Library General Public License for more details.
--
-- You should have received a copy of the GNU Library General Public License
-- along with this library; see the file COPYING.LIB. If not, write to
-- the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-- Boston, MA 02110-1301, USA.
--*/
--
--#ifndef _AKODE_POLYP_SINK_H
--#define _AKODE_POLYP_SINK_H
--
--#include "sink.h"
--
--#include "akode_export.h"
--
--namespace aKode {
--
--class AudioConfiguration;
--class AudioFrame;
--
--class PolypSink : public Sink {
--public:
-- PolypSink();
-- ~PolypSink();
-- bool open();
-- void close();
-- int setAudioConfiguration(const AudioConfiguration *config);
-- const AudioConfiguration* audioConfiguration() const;
-- // Writes blocking
-- bool writeFrame(AudioFrame *frame);
--
-- struct private_data;
--private:
-- private_data *m_data;
--};
--
--class PolypSinkPlugin : public SinkPlugin {
--public:
-- virtual PolypSink* openSink() {
-- return new PolypSink();
-- }
--};
--
--extern "C" AKODE_EXPORT PolypSinkPlugin polyp_sink;
--
--} // namespace
--
--#endif
-diff --git a/akode/plugins/pulse_sink/CMakeLists.txt b/akode/plugins/pulse_sink/CMakeLists.txt
-new file mode 100644
-index 0000000..04026d3
---- /dev/null
-+++ b/akode/plugins/pulse_sink/CMakeLists.txt
-@@ -0,0 +1,32 @@
-+#################################################
-+#
-+# (C) 2015 Slávek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/akode/lib
-+ ${CMAKE_SOURCE_DIR}/akode/lib
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${PULSE_INCLUDE_DIRS}
-+)
-+
-+
-+##### library ###################################
-+
-+set( target libakode_pulse_sink )
-+
-+tde_add_library(
-+ ${target} MODULE
-+ SOURCES pulse_sink.cpp
-+ LINK akode-shared ${PULSE_LIBRARIES}
-+ DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
-diff --git a/akode/plugins/pulse_sink/Makefile.am b/akode/plugins/pulse_sink/Makefile.am
-new file mode 100644
-index 0000000..9f38245
---- /dev/null
-+++ b/akode/plugins/pulse_sink/Makefile.am
-@@ -0,0 +1,7 @@
-+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
-+
-+lib_LTLIBRARIES = libakode_pulse_sink.la
-+
-+libakode_pulse_sink_la_SOURCES = pulse_sink.cpp
-+libakode_pulse_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
-+libakode_pulse_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
-diff --git a/akode/plugins/pulse_sink/pulse_sink.cpp b/akode/plugins/pulse_sink/pulse_sink.cpp
-new file mode 100644
-index 0000000..395bfb3
---- /dev/null
-+++ b/akode/plugins/pulse_sink/pulse_sink.cpp
-@@ -0,0 +1,143 @@
-+/* aKode: Pulse-Sink
-+
-+ Copyright (C) 2004 Allan Sandfeld Jensen <kde@carewolf.com>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with this library; see the file COPYING.LIB. If not, write to
-+ the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-+ Boston, MA 02110-1301, USA.
-+*/
-+
-+#include "config.h"
-+
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#elif defined(HAVE_INTTYPES_H)
-+#include <inttypes.h>
-+#endif
-+#include <pulse/simple.h>
-+
-+#include "audioframe.h"
-+#include "audiobuffer.h"
-+#include "pulse_sink.h"
-+
-+#include <iostream>
-+
-+namespace aKode {
-+
-+extern "C" { PulseSinkPlugin pulse_sink; };
-+
-+struct PulseSink::private_data
-+{
-+ private_data() : server(0), error(false) {};
-+
-+ pa_simple *server;
-+ pa_sample_spec sample_spec;
-+
-+ bool error;
-+
-+ AudioConfiguration config;
-+};
-+
-+PulseSink::PulseSink()
-+{
-+ m_data = new private_data;
-+ m_data->sample_spec.rate = 44100;
-+ m_data->sample_spec.channels = 2;
-+ m_data->sample_spec.format = PA_SAMPLE_S16NE;
-+}
-+
-+bool PulseSink::open() {
-+ int error = 0;
-+ m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error );
-+ if (!m_data->server || error != 0) {
-+ m_data->error = true;
-+ close();
-+ std::cout << "Cannot open client\n";
-+ return false;
-+ }
-+
-+
-+ return true;
-+}
-+
-+void PulseSink::close() {
-+ if (m_data->server) {
-+ pa_simple_free(m_data->server);
-+ m_data->server = 0;
-+ }
-+}
-+
-+PulseSink::~PulseSink()
-+{
-+ close();
-+ delete m_data;
-+}
-+
-+int PulseSink::setAudioConfiguration(const AudioConfiguration* config)
-+{
-+ if (m_data->error) return -1;
-+
-+ int res = 0;
-+ if (*config == m_data->config) return 0;
-+ m_data->config = *config;
-+
-+ if (config->channel_config != MonoStereo ) return -1;
-+ m_data->sample_spec.channels = config->channels;
-+
-+ if (config->sample_width != 16) {
-+ res = 1;
-+ m_data->config.sample_width = 16;
-+ }
-+
-+ m_data->sample_spec.rate = config->sample_rate;
-+
-+ // create new connection
-+ close();
-+ open();
-+
-+ return res;
-+}
-+
-+const AudioConfiguration* PulseSink::audioConfiguration() const
-+{
-+ return &m_data->config;
-+}
-+
-+bool PulseSink::writeFrame(AudioFrame* frame)
-+{
-+ if ( m_data->error ) return false;
-+
-+ if ( frame->channels != m_data->config.channels || frame->sample_rate != m_data->config.sample_rate)
-+ {
-+ if (setAudioConfiguration(frame)!=0)
-+ return false;
-+ }
-+
-+ int channels = m_data->config.channels;
-+ int length = frame->length;
-+
-+ int16_t *buffer = new int16_t[length*channels];
-+ int16_t** data = (int16_t**)frame->data;
-+ for(int i = 0; i<length; i++)
-+ for(int j=0; j<channels; j++)
-+ buffer[i*channels+j] = data[j][i];
-+
-+ int error = 0;
-+ pa_simple_write(m_data->server, buffer, channels*length*2, &error);
-+ delete[] buffer;
-+
-+ return (error == 0);
-+}
-+
-+} // namespace
-diff --git a/akode/plugins/pulse_sink/pulse_sink.h b/akode/plugins/pulse_sink/pulse_sink.h
-new file mode 100644
-index 0000000..e890e4a
---- /dev/null
-+++ b/akode/plugins/pulse_sink/pulse_sink.h
-@@ -0,0 +1,60 @@
-+/* aKode: Pulse-Sink
-+
-+ Copyright (C) 2004 Allan Sandfeld Jensen <kde@carewolf.com>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with this library; see the file COPYING.LIB. If not, write to
-+ the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-+ Boston, MA 02110-1301, USA.
-+*/
-+
-+#ifndef _AKODE_PULSE_SINK_H
-+#define _AKODE_PULSE_SINK_H
-+
-+#include "sink.h"
-+
-+#include "akode_export.h"
-+
-+namespace aKode {
-+
-+class AudioConfiguration;
-+class AudioFrame;
-+
-+class PulseSink : public Sink {
-+public:
-+ PulseSink();
-+ ~PulseSink();
-+ bool open();
-+ void close();
-+ int setAudioConfiguration(const AudioConfiguration *config);
-+ const AudioConfiguration* audioConfiguration() const;
-+ // Writes blocking
-+ bool writeFrame(AudioFrame *frame);
-+
-+ struct private_data;
-+private:
-+ private_data *m_data;
-+};
-+
-+class PulseSinkPlugin : public SinkPlugin {
-+public:
-+ virtual PulseSink* openSink() {
-+ return new PulseSink();
-+ }
-+};
-+
-+extern "C" AKODE_EXPORT PulseSinkPlugin pulse_sink;
-+
-+} // namespace
-+
-+#endif
diff --git a/freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff b/freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff
deleted file mode 100644
index ee2a58b08..000000000
--- a/freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-commit d67c4c24d28fb80653b1d499dcb7cd36284883fd
-Author: François Andriot <francois.andriot@free.fr>
-Date: Thu Oct 15 04:47:35 2015 +0200
-
- Add multilib support
- [taken from Fedora patches]
-
-diff --git a/akode/CMakeLists.txt b/akode/CMakeLists.txt
-index 26cc5c0..b7ab6a5 100644
---- a/akode/CMakeLists.txt
-+++ b/akode/CMakeLists.txt
-@@ -24,6 +24,10 @@ configure_file( akode-config.in akode-config @ONLY )
- install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/akode-config
- DESTINATION ${BIN_INSTALL_DIR} )
-
-+configure_file( akode.pc.in akode.pc @ONLY )
-+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/akode.pc
-+ DESTINATION ${PKGCONFIG_INSTALL_DIR} )
-+
-
- ##### build #####################################
-
-diff --git a/akode/Makefile.am b/akode/Makefile.am
-index 99455d5..a30cdd8 100644
---- a/akode/Makefile.am
-+++ b/akode/Makefile.am
-@@ -1,3 +1,8 @@
- bin_SCRIPTS = akode-config
-
- SUBDIRS= lib plugins akodeplay
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = akode.pc
-+
-+EXTRA_DIST = akode.pc.in
-diff --git a/akode/akode-config.in b/akode/akode-config.in
-index b4263be..d1d8457 100644
---- a/akode/akode-config.in
-+++ b/akode/akode-config.in
-@@ -15,9 +15,8 @@ EOH
- }
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+akode_libs="`pkg-config --libs akode`"
-+akode_cflags="`pkg-config --cflags akode`"
-
- flags=""
-
-@@ -29,10 +28,10 @@ while test $# -gt 0
- do
- case $1 in
- --libs)
-- flags="$flags -L$libdir -lakode"
-+ flags="$flags $akode_libs"
- ;;
- --cflags)
-- flags="$flags -I$includedir"
-+ flags="$flags $akode_cflags"
- ;;
- --version)
- echo 2.0.2
-diff --git a/akode/akode.pc.in b/akode/akode.pc.in
-new file mode 100644
-index 0000000..d17b2ea
---- /dev/null
-+++ b/akode/akode.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: akode
-+Description: aKode is a simple audio-decoding frame-work
-+Version: 2.0.2
-+Libs: -L${libdir} -lakode
-+Cflags: -I${includedir}
-diff --git a/akode/configure.in.in b/akode/configure.in.in
-index 80d0114..2b0ef60 100644
---- a/akode/configure.in.in
-+++ b/akode/configure.in.in
-@@ -1,5 +1,6 @@
- dnl don't remove the below
- dnl AC_OUTPUT(akode/akode-config)
-+dnl AC_OUTPUT(akode/akode.pc)
-
- AC_CONFIG_HEADER(akode/lib/akode_export.h)
-
diff --git a/freebsd/dependencies/akode/files/patch-b04-fix-ftbfs-on-ptrdiff_t-redefinition.diff b/freebsd/dependencies/akode/files/patch-b04-fix-ftbfs-on-ptrdiff_t-redefinition.diff
deleted file mode 100644
index c587fe075..000000000
--- a/freebsd/dependencies/akode/files/patch-b04-fix-ftbfs-on-ptrdiff_t-redefinition.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 6c3892f0e0939e0b40a9d46142a30005ecaab77f
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Fri May 26 09:59:08 2017 +0200
-
- Fix FTBFS on ptrdiff_t redefinition
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-
-diff --git a/akode/plugins/mpc_decoder/mppdec/synth_filter.cpp b/akode/plugins/mpc_decoder/mppdec/synth_filter.cpp
-index 256417a..2ea7a08 100644
---- a/akode/plugins/mpc_decoder/mppdec/synth_filter.cpp
-+++ b/akode/plugins/mpc_decoder/mppdec/synth_filter.cpp
-@@ -1,7 +1,5 @@
- #include "stdafx.h"
-
--typedef int ptrdiff_t;
--
-
- /* C O N S T A N T S */
- #undef _
diff --git a/freebsd/dependencies/arts/Makefile b/freebsd/dependencies/arts/Makefile
index 9e634cb2b..7fd31df17 100644
--- a/freebsd/dependencies/arts/Makefile
+++ b/freebsd/dependencies/arts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= arts-trinity
COMMENT= aRts (analog realtime synthesizer) - the TDE sound system
-TDE_PREVERSION= ~pre9+8999284f
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= a/${PORTNAME}
PORTREVISION= 0
CATEGORIES= audio
diff --git a/freebsd/dependencies/arts/distinfo b/freebsd/dependencies/arts/distinfo
index 291705b98..7c3b50e4e 100644
--- a/freebsd/dependencies/arts/distinfo
+++ b/freebsd/dependencies/arts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527511629
-SHA256 (TDE/dependencies/arts-trinity_14.0.5~pre9.orig.tar.xz) = 25dfcaa6dcebeeaed32d89d3351f797d212fceaaf47893a7a635ba7353e5e01f
-SIZE (TDE/dependencies/arts-trinity_14.0.5~pre9.orig.tar.xz) = 674020
+TIMESTAMP = 1532796393
+SHA256 (TDE/dependencies/arts-trinity_14.0.5.orig.tar.xz) = 8dcf7755b189ddd3b32928e8fb200c08aadafd76e3940201da300b8d9424a875
+SIZE (TDE/dependencies/arts-trinity_14.0.5.orig.tar.xz) = 673208
diff --git a/freebsd/dependencies/arts/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/dependencies/arts/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..ff4c818b7
--- /dev/null
+++ b/freebsd/dependencies/arts/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,52 @@
+diff --git a/mcop/tcpserver.cc b/mcop/tcpserver.cc
+index 5ce3532..c2cffee 100644
+--- a/mcop/tcpserver.cc
++++ b/mcop/tcpserver.cc
+@@ -121,7 +121,7 @@ bool TCPServer::initSocket()
+ socket_addr.sin_family = AF_INET;
+ socket_addr.sin_port = htons( TCPServerPort ); // 0 = choose port freely
+ socket_addr.sin_addr.s_addr = htonl( inet_addr("0.0.0.0") );
+- if ( bind( theSocket, (struct sockaddr *) &socket_addr,
++ if ( ::bind( theSocket, (struct sockaddr *) &socket_addr,
+ sizeof(struct sockaddr_in) ) < 0 )
+ {
+ arts_warning("MCOP TCPServer: can't bind to port/address");
+diff --git a/mcop/unixserver.cc b/mcop/unixserver.cc
+index acb3496..d70fe8e 100644
+--- a/mcop/unixserver.cc
++++ b/mcop/unixserver.cc
+@@ -98,7 +98,7 @@ bool UnixServer::initSocket(const string& serverID)
+
+ xserverpath = socket_addr.sun_path;
+
+- if ( bind( theSocket, (struct sockaddr *) &socket_addr,
++ if ( ::bind( theSocket, (struct sockaddr *) &socket_addr,
+ sizeof(struct sockaddr_un) ) < 0 )
+ {
+ arts_warning("MCOP UnixServer: can't bind to file \"%s\"",
+diff --git a/soundserver/gslplayobject_impl.cc b/soundserver/gslplayobject_impl.cc
+index 217fe80..aafb41c 100644
+--- a/soundserver/gslplayobject_impl.cc
++++ b/soundserver/gslplayobject_impl.cc
+@@ -134,7 +134,7 @@ public:
+ */
+ std::string description()
+ {
+- return "no description available (see "__FILE__")";
++ return "no description available (see " __FILE__ ")";
+ }
+
+ poTime currentTime()
+diff --git a/soundserver/wavplayobject_impl.cc b/soundserver/wavplayobject_impl.cc
+index 6109f7c..8f5f2f1 100644
+--- a/soundserver/wavplayobject_impl.cc
++++ b/soundserver/wavplayobject_impl.cc
+@@ -74,7 +74,7 @@ public:
+ * KMedia2 interface
+ */
+ string description() {
+- return "no description (see "__FILE__")";
++ return "no description (see " __FILE__ ")";
+ }
+
+ poTime currentTime() {
diff --git a/freebsd/dependencies/avahi-tqt/Makefile b/freebsd/dependencies/avahi-tqt/Makefile
index 09c7f06e4..e3021cceb 100644
--- a/freebsd/dependencies/avahi-tqt/Makefile
+++ b/freebsd/dependencies/avahi-tqt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= avahi-tqt
COMMENT= Avahi TQt integration library
-TDE_PREVERSION= ~pre5+fce57a51
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= a/${PORTNAME}
DISTSRC= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
PORTREVISION= 0
diff --git a/freebsd/dependencies/avahi-tqt/distinfo b/freebsd/dependencies/avahi-tqt/distinfo
index 7c27bd053..44c6bc210 100644
--- a/freebsd/dependencies/avahi-tqt/distinfo
+++ b/freebsd/dependencies/avahi-tqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991804
-SHA256 (TDE/dependencies/avahi-tqt_14.0.5~pre5.orig.tar.xz) = 277b205f228e195215ea49b2f7794d552e2c5b10059ae30f6d10e44923345ecd
-SIZE (TDE/dependencies/avahi-tqt_14.0.5~pre5.orig.tar.xz) = 213048
+TIMESTAMP = 1532798106
+SHA256 (TDE/dependencies/avahi-tqt_14.0.5.orig.tar.xz) = 2ec0ceb8a336987d3e6c0aed6087480a75edf38efb239ed3d2b9e5f39fc5fd9e
+SIZE (TDE/dependencies/avahi-tqt_14.0.5.orig.tar.xz) = 212712
diff --git a/freebsd/dependencies/dbus-1-tqt/Makefile b/freebsd/dependencies/dbus-1-tqt/Makefile
index 0440a746f..28eca468d 100644
--- a/freebsd/dependencies/dbus-1-tqt/Makefile
+++ b/freebsd/dependencies/dbus-1-tqt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dbus-1-tqt
COMMENT= D-Bus bindings for the Trinity Qt interface
-TDE_PREVERSION= ~pre7+bb5a36fe
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= d/${PORTNAME}
DISTSRC= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
PORTREVISION= 0
diff --git a/freebsd/dependencies/dbus-1-tqt/distinfo b/freebsd/dependencies/dbus-1-tqt/distinfo
index cedbf6524..711a91764 100644
--- a/freebsd/dependencies/dbus-1-tqt/distinfo
+++ b/freebsd/dependencies/dbus-1-tqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991804
-SHA256 (TDE/dependencies/dbus-1-tqt_14.0.5~pre7.orig.tar.xz) = 9bcf8f48a16d9c3e2af33102a20c1bf398651d96511284b6006aa02f0599f0be
-SIZE (TDE/dependencies/dbus-1-tqt_14.0.5~pre7.orig.tar.xz) = 306800
+TIMESTAMP = 1532798157
+SHA256 (TDE/dependencies/dbus-1-tqt_14.0.5.orig.tar.xz) = 2e3de6eba3598226f55c87bb2fa8fbcf5b58a51c83b1a99b342c9a276dcc25a8
+SIZE (TDE/dependencies/dbus-1-tqt_14.0.5.orig.tar.xz) = 306316
diff --git a/freebsd/dependencies/dbus-tqt/Makefile b/freebsd/dependencies/dbus-tqt/Makefile
index f39e15d27..e4fd6d256 100644
--- a/freebsd/dependencies/dbus-tqt/Makefile
+++ b/freebsd/dependencies/dbus-tqt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dbus-tqt
COMMENT= TQt D-Bus inter-process communication module
-TDE_PREVERSION= ~pre7+1f4814bf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= d/${PORTNAME}
DISTSRC= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
PORTREVISION= 0
diff --git a/freebsd/dependencies/dbus-tqt/distinfo b/freebsd/dependencies/dbus-tqt/distinfo
index f689ef589..bdd95599e 100644
--- a/freebsd/dependencies/dbus-tqt/distinfo
+++ b/freebsd/dependencies/dbus-tqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991804
-SHA256 (TDE/dependencies/dbus-tqt_14.0.5~pre7.orig.tar.xz) = 05c9070ba190d39d02b4f7813a961c46d384075385dac732e04d39d3cb78f6b6
-SIZE (TDE/dependencies/dbus-tqt_14.0.5~pre7.orig.tar.xz) = 382120
+TIMESTAMP = 1532798132
+SHA256 (TDE/dependencies/dbus-tqt_14.0.5.orig.tar.xz) = 22a036366256cb12e85111acef22dc181db4eb59262de31a71691044470301f5
+SIZE (TDE/dependencies/dbus-tqt_14.0.5.orig.tar.xz) = 380944
diff --git a/freebsd/dependencies/libart-lgpl/Makefile b/freebsd/dependencies/libart-lgpl/Makefile
index 2a623395a..1789aa381 100644
--- a/freebsd/dependencies/libart-lgpl/Makefile
+++ b/freebsd/dependencies/libart-lgpl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libart_lgpl
COMMENT= Library for high-performance 2D graphics
-TDE_PREVERSION= ~pre0+e041d2bb
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= liba/libart-lgpl
DISTNAME= libart-lgpl_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= libart-lgpl-trinity-${TDE_VERSION}${TDE_PREVERSION}
diff --git a/freebsd/dependencies/libart-lgpl/distinfo b/freebsd/dependencies/libart-lgpl/distinfo
index 813c0e2e5..031ae3338 100644
--- a/freebsd/dependencies/libart-lgpl/distinfo
+++ b/freebsd/dependencies/libart-lgpl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991805
-SHA256 (TDE/dependencies/libart-lgpl_14.0.5~pre0.orig.tar.xz) = 5beb54864bdbbb29f523a19b4357e165d5d6e6647e2d042984173c84a52b1445
-SIZE (TDE/dependencies/libart-lgpl_14.0.5~pre0.orig.tar.xz) = 277460
+TIMESTAMP = 1532798310
+SHA256 (TDE/dependencies/libart-lgpl_14.0.5.orig.tar.xz) = 9c88429e84dd41ef1f6bc904f0de83d0370866024280346c4bbf61afa774825b
+SIZE (TDE/dependencies/libart-lgpl_14.0.5.orig.tar.xz) = 277504
diff --git a/freebsd/dependencies/libcaldav/Makefile b/freebsd/dependencies/libcaldav/Makefile
index def2a2652..f40a10a61 100644
--- a/freebsd/dependencies/libcaldav/Makefile
+++ b/freebsd/dependencies/libcaldav/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libcaldav
COMMENT= libcaldav provides a C interface for caldav PIM clients
-TDE_PREVERSION= ~pre0+074fd775
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= libc/${PORTNAME}
DISTSRC= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
PORTREVISION= 0
diff --git a/freebsd/dependencies/libcaldav/distinfo b/freebsd/dependencies/libcaldav/distinfo
index 28dfc9f72..e39f9e08a 100644
--- a/freebsd/dependencies/libcaldav/distinfo
+++ b/freebsd/dependencies/libcaldav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991805
-SHA256 (TDE/dependencies/libcaldav_14.0.5~pre0.orig.tar.xz) = 2573df7b5f7661e54694083aa337b3034b5023db2b883d6f6fc8d9b6d4e42e25
-SIZE (TDE/dependencies/libcaldav_14.0.5~pre0.orig.tar.xz) = 203368
+TIMESTAMP = 1532798340
+SHA256 (TDE/dependencies/libcaldav_14.0.5.orig.tar.xz) = fa091ed03446dd822cc373c11697b3b8fb231005a0adeb54f4a7b11aaab0d000
+SIZE (TDE/dependencies/libcaldav_14.0.5.orig.tar.xz) = 203380
diff --git a/freebsd/dependencies/libcarddav/Makefile b/freebsd/dependencies/libcarddav/Makefile
index 8eca62533..c77d7ca65 100644
--- a/freebsd/dependencies/libcarddav/Makefile
+++ b/freebsd/dependencies/libcarddav/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libcarddav
COMMENT= libcarddav provides a C interface for carddav PIM clients
-TDE_PREVERSION= ~pre0+8a582438
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= libc/${PORTNAME}
PORTREVISION= 0
CATEGORIES= devel
diff --git a/freebsd/dependencies/libcarddav/distinfo b/freebsd/dependencies/libcarddav/distinfo
index 22110537f..a8af3354a 100644
--- a/freebsd/dependencies/libcarddav/distinfo
+++ b/freebsd/dependencies/libcarddav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991805
-SHA256 (TDE/dependencies/libcarddav_14.0.5~pre0.orig.tar.xz) = 28a2f8387f9429a334793c7d625d206b54f45e64ebc649cba0d59f1932d6a942
-SIZE (TDE/dependencies/libcarddav_14.0.5~pre0.orig.tar.xz) = 380236
+TIMESTAMP = 1532798372
+SHA256 (TDE/dependencies/libcarddav_14.0.5.orig.tar.xz) = 0a87e93cf1d14dc67f50cc0dd0cfc72a0fb3f3fb5ea4fb092497416ea1281f01
+SIZE (TDE/dependencies/libcarddav_14.0.5.orig.tar.xz) = 380208
diff --git a/freebsd/dependencies/tqca-tls/Makefile b/freebsd/dependencies/tqca-tls/Makefile
index 934d0e9dc..bf9ccda5a 100644
--- a/freebsd/dependencies/tqca-tls/Makefile
+++ b/freebsd/dependencies/tqca-tls/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tqca-tls
COMMENT= TLS plugin for the TQt Cryptographic Architecture (TQCA)
-TDE_PREVERSION= ~pre1+da4ed256
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= devel
diff --git a/freebsd/dependencies/tqca-tls/distinfo b/freebsd/dependencies/tqca-tls/distinfo
index 8ce18e4d5..1b37a1e1d 100644
--- a/freebsd/dependencies/tqca-tls/distinfo
+++ b/freebsd/dependencies/tqca-tls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495986008
-SHA256 (TDE/dependencies/tqca-tls_14.0.5~pre1.orig.tar.xz) = 5c081c03dec94573a9a965533877b46241afb98d3f46c3cf105bd5fa5d1c8856
-SIZE (TDE/dependencies/tqca-tls_14.0.5~pre1.orig.tar.xz) = 23136
+TIMESTAMP = 1532798423
+SHA256 (TDE/dependencies/tqca-tls_14.0.5.orig.tar.xz) = 457f8836691b313e32515cbdd6397e9ab7e7a3fb5e24e8779f3ca00ffb98c640
+SIZE (TDE/dependencies/tqca-tls_14.0.5.orig.tar.xz) = 23080
diff --git a/freebsd/dependencies/tqmake/Makefile b/freebsd/dependencies/tqmake/Makefile
index 613bac150..fe669c105 100644
--- a/freebsd/dependencies/tqmake/Makefile
+++ b/freebsd/dependencies/tqmake/Makefile
@@ -5,7 +5,7 @@
PORTNAME= tqmake
COMMENT= The build utility of the TQt from Trinity
-TDE_PREVERSION= ~pre6+77ba1370
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= tqt3-trinity-${TDE_VERSION}${TDE_PREVERSION}
@@ -43,17 +43,14 @@ PLIST_SUB+= DOCSDIR="${DOCSDIR}"
post-patch:
@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
@${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \
- -e 's|gcc|${CC}|' \
- -e 's|g++|${CXX}|' \
-e 's|/usr/local|${LOCALBASE}|' \
-e 's|/usr/X11R6|${LOCALBASE}|' \
-e 's|$$(QTDIR)/bin|${PREFIX}/bin|g' \
-e 's|$$(QTDIR)/include|${PREFIX}/include/tqt3|g' \
-e 's|$$(QTDIR)/lib|${PREFIX}/lib|g' \
-e 's|$$(QTDIR)|${PREFIX}/share/tqt3|' \
- -e 's|release|release thread|' \
- ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf
- ${LN} -s freebsd-g++ ${WRKSRC}/../mkspecs/default
+ ${WRKSRC}/../mkspecs/freebsd-clang/qmake.conf
+ ${LN} -s freebsd-clang ${WRKSRC}/../mkspecs/default
@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
do-configure:
diff --git a/freebsd/dependencies/tqmake/distinfo b/freebsd/dependencies/tqmake/distinfo
index a172e1f40..e8e085970 100644
--- a/freebsd/dependencies/tqmake/distinfo
+++ b/freebsd/dependencies/tqmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527510429
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53
-SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680
+TIMESTAMP = 1531032635
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a
+SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072
diff --git a/freebsd/dependencies/tqmake/files/Makefile.bsd b/freebsd/dependencies/tqmake/files/Makefile.bsd
index 7f14700ed..8db711ce1 100644
--- a/freebsd/dependencies/tqmake/files/Makefile.bsd
+++ b/freebsd/dependencies/tqmake/files/Makefile.bsd
@@ -8,7 +8,7 @@ SRCS:= ${_OBJS:.o=.cpp}
NO_MAN= true # qmake.1 anyone?
.PATH: ${.CURDIR} ${.CURDIR:H}/src/tools
-CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++
+CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-clang
.for s in tools kernel codecs
CXXFLAGS+=-I${.CURDIR:H}/src/$s
diff --git a/freebsd/dependencies/tqmake/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/dependencies/tqmake/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..23797c5f4
--- /dev/null
+++ b/freebsd/dependencies/tqmake/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,78 @@
+diff --git a/generators/win32/borland_bmake.cpp b/generators/win32/borland_bmake.cpp
+index b7ca9c1a..41666e3a 100644
+--- a/generators/win32/borland_bmake.cpp
++++ b/generators/win32/borland_bmake.cpp
+@@ -386,7 +386,7 @@ BorlandMakefileGenerator::init()
+ if(project->isEmpty("QMAKE_INSTALL_DIR"))
+ project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+
+- bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "qtmt"TQTDLL_POSTFIX);
++ bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "qtmt" TQTDLL_POSTFIX);
+ TQStringList &configs = project->variables()["CONFIG"];
+ if (project->isActiveConfig("shared"))
+ project->variables()["DEFINES"].append("QT_DLL");
+diff --git a/generators/win32/mingw_make.cpp b/generators/win32/mingw_make.cpp
+index 06cc0f76..a082a4aa 100644
+--- a/generators/win32/mingw_make.cpp
++++ b/generators/win32/mingw_make.cpp
+@@ -397,7 +397,7 @@ MingwMakefileGenerator::init()
+ if(project->isEmpty("QMAKE_INSTALL_DIR"))
+ project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+
+- bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
++ bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX);
+ project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+ // LIBS defined in Profile comes first for gcc
+diff --git a/generators/win32/msvc_dsp.cpp b/generators/win32/msvc_dsp.cpp
+index 01000737..f28969be 100644
+--- a/generators/win32/msvc_dsp.cpp
++++ b/generators/win32/msvc_dsp.cpp
+@@ -623,7 +623,7 @@ DspMakefileGenerator::init()
+ if ( project->variables()["QMAKESPEC"].isEmpty() )
+ project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
+
+- bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
++ bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX);
+ project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+ TQStringList &configs = project->variables()["CONFIG"];
+diff --git a/generators/win32/msvc_nmake.cpp b/generators/win32/msvc_nmake.cpp
+index 2422a8a6..75138b6c 100644
+--- a/generators/win32/msvc_nmake.cpp
++++ b/generators/win32/msvc_nmake.cpp
+@@ -482,7 +482,7 @@ NmakeMakefileGenerator::init()
+ if(project->isEmpty("QMAKE_INSTALL_DIR"))
+ project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+
+- bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
++ bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX);
+ project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+ TQString targetfilename = project->variables()["TARGET"].first();
+diff --git a/generators/win32/msvc_vcproj.cpp b/generators/win32/msvc_vcproj.cpp
+index ae0657ac..625ccf37 100644
+--- a/generators/win32/msvc_vcproj.cpp
++++ b/generators/win32/msvc_vcproj.cpp
+@@ -459,8 +459,8 @@ void VcprojGenerator::init()
+
+ // Are we building TQt?
+ bool is_qt =
+- ( project->first("TARGET") == "qt"TQTDLL_POSTFIX ||
+- project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX );
++ ( project->first("TARGET") == "qt" TQTDLL_POSTFIX ||
++ project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX );
+
+ // Are we using TQt?
+ bool isTQtActive = project->isActiveConfig("qt");
+@@ -1097,8 +1097,8 @@ void VcprojGenerator::initOld()
+ project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
+
+ bool is_qt =
+- ( project->first("TARGET") == "qt"TQTDLL_POSTFIX ||
+- project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX );
++ ( project->first("TARGET") == "qt" TQTDLL_POSTFIX ||
++ project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX );
+
+ TQStringList &configs = project->variables()["CONFIG"];
+
diff --git a/freebsd/dependencies/tqmake/pkg-plist b/freebsd/dependencies/tqmake/pkg-plist
index 1bf4208aa..1075de326 100644
--- a/freebsd/dependencies/tqmake/pkg-plist
+++ b/freebsd/dependencies/tqmake/pkg-plist
@@ -17,6 +17,8 @@ share/tqt3/mkspecs/darwin-g++/qplatformdefs.h
share/tqt3/mkspecs/default
share/tqt3/mkspecs/dgux-g++/qmake.conf
share/tqt3/mkspecs/dgux-g++/qplatformdefs.h
+share/tqt3/mkspecs/freebsd-clang/qmake.conf
+share/tqt3/mkspecs/freebsd-clang/qplatformdefs.h
share/tqt3/mkspecs/freebsd-g++/qmake.conf
share/tqt3/mkspecs/freebsd-g++/qplatformdefs.h
share/tqt3/mkspecs/freebsd-g++34/qmake.conf
@@ -49,6 +51,8 @@ share/tqt3/mkspecs/irix-cc/qmake.conf
share/tqt3/mkspecs/irix-cc/qplatformdefs.h
share/tqt3/mkspecs/irix-g++/qmake.conf
share/tqt3/mkspecs/irix-g++/qplatformdefs.h
+share/tqt3/mkspecs/linux-clang/qmake.conf
+share/tqt3/mkspecs/linux-clang/qplatformdefs.h
share/tqt3/mkspecs/linux-cxx/qmake.conf
share/tqt3/mkspecs/linux-cxx/qplatformdefs.h
share/tqt3/mkspecs/linux-ecc-64/qmake.conf
diff --git a/freebsd/dependencies/tqt3-ibase-plugin/Makefile b/freebsd/dependencies/tqt3-ibase-plugin/Makefile
index aa204893e..752000863 100644
--- a/freebsd/dependencies/tqt3-ibase-plugin/Makefile
+++ b/freebsd/dependencies/tqt3-ibase-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tqt3-${DB}-plugin
COMMENT= TQt3 Firebird/IBase database plugin
-TDE_PREVERSION= ~pre6+77ba1370
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= tqt3-trinity-${TDE_VERSION}${TDE_PREVERSION}
diff --git a/freebsd/dependencies/tqt3-ibase-plugin/distinfo b/freebsd/dependencies/tqt3-ibase-plugin/distinfo
index 131c66253..696238d35 100644
--- a/freebsd/dependencies/tqt3-ibase-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-ibase-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527511534
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53
-SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680
+TIMESTAMP = 1531038375
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a
+SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072
diff --git a/freebsd/dependencies/tqt3-mysql-plugin/Makefile b/freebsd/dependencies/tqt3-mysql-plugin/Makefile
index c54f0a26e..acd44be11 100644
--- a/freebsd/dependencies/tqt3-mysql-plugin/Makefile
+++ b/freebsd/dependencies/tqt3-mysql-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tqt3-${DB}-plugin
COMMENT= TQt3 MySQL database plugin
-TDE_PREVERSION= ~pre6+77ba1370
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= tqt3-trinity-${TDE_VERSION}${TDE_PREVERSION}
diff --git a/freebsd/dependencies/tqt3-mysql-plugin/distinfo b/freebsd/dependencies/tqt3-mysql-plugin/distinfo
index 2715e5d94..03b42b066 100644
--- a/freebsd/dependencies/tqt3-mysql-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527511543
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53
-SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680
+TIMESTAMP = 1531038495
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a
+SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072
diff --git a/freebsd/dependencies/tqt3-odbc-plugin/Makefile b/freebsd/dependencies/tqt3-odbc-plugin/Makefile
index cb8d677b2..10dbc964c 100644
--- a/freebsd/dependencies/tqt3-odbc-plugin/Makefile
+++ b/freebsd/dependencies/tqt3-odbc-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tqt3-${DB}-plugin
COMMENT= TQt3 ODBC database plugin
-TDE_PREVERSION= ~pre6+77ba1370
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= tqt3-trinity-${TDE_VERSION}${TDE_PREVERSION}
diff --git a/freebsd/dependencies/tqt3-odbc-plugin/distinfo b/freebsd/dependencies/tqt3-odbc-plugin/distinfo
index 84fcc49a5..920f91e8a 100644
--- a/freebsd/dependencies/tqt3-odbc-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-odbc-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527511559
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53
-SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680
+TIMESTAMP = 1531038512
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a
+SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072
diff --git a/freebsd/dependencies/tqt3-pgsql-plugin/Makefile b/freebsd/dependencies/tqt3-pgsql-plugin/Makefile
index e3a3a0f46..1a14b91bf 100644
--- a/freebsd/dependencies/tqt3-pgsql-plugin/Makefile
+++ b/freebsd/dependencies/tqt3-pgsql-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tqt3-${DB}-plugin
COMMENT= TQt3 PostgreSQL database plugin
-TDE_PREVERSION= ~pre6+77ba1370
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= tqt3-trinity-${TDE_VERSION}${TDE_PREVERSION}
diff --git a/freebsd/dependencies/tqt3-pgsql-plugin/distinfo b/freebsd/dependencies/tqt3-pgsql-plugin/distinfo
index e722cc771..c477f9c13 100644
--- a/freebsd/dependencies/tqt3-pgsql-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-pgsql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527511568
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53
-SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680
+TIMESTAMP = 1531038528
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a
+SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072
diff --git a/freebsd/dependencies/tqt3-sqlite-plugin/Makefile b/freebsd/dependencies/tqt3-sqlite-plugin/Makefile
index 1bac8dd00..c10eb41ca 100644
--- a/freebsd/dependencies/tqt3-sqlite-plugin/Makefile
+++ b/freebsd/dependencies/tqt3-sqlite-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tqt3-${DB}-plugin
COMMENT= TQt3 SQLite database plugin
-TDE_PREVERSION= ~pre6+77ba1370
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= tqt3-trinity-${TDE_VERSION}${TDE_PREVERSION}
diff --git a/freebsd/dependencies/tqt3-sqlite-plugin/distinfo b/freebsd/dependencies/tqt3-sqlite-plugin/distinfo
index a831606fc..49a1ce06e 100644
--- a/freebsd/dependencies/tqt3-sqlite-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-sqlite-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527511577
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53
-SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680
+TIMESTAMP = 1531038542
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a
+SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072
diff --git a/freebsd/dependencies/tqt3-sqlite3-plugin/Makefile b/freebsd/dependencies/tqt3-sqlite3-plugin/Makefile
index 69b7da397..9269427c3 100644
--- a/freebsd/dependencies/tqt3-sqlite3-plugin/Makefile
+++ b/freebsd/dependencies/tqt3-sqlite3-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tqt3-${DB}-plugin
COMMENT= TQt3 SQLite 3.x database plugin
-TDE_PREVERSION= ~pre6+77ba1370
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= tqt3-trinity-${TDE_VERSION}${TDE_PREVERSION}
diff --git a/freebsd/dependencies/tqt3-sqlite3-plugin/distinfo b/freebsd/dependencies/tqt3-sqlite3-plugin/distinfo
index 8801b1dd1..5b1941aab 100644
--- a/freebsd/dependencies/tqt3-sqlite3-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-sqlite3-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527511589
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53
-SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680
+TIMESTAMP = 1531038560
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a
+SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072
diff --git a/freebsd/dependencies/tqt3/Makefile b/freebsd/dependencies/tqt3/Makefile
index 60f796230..c64b6cbe3 100644
--- a/freebsd/dependencies/tqt3/Makefile
+++ b/freebsd/dependencies/tqt3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tqt3
COMMENT= Multiplatform C++ application framework
-TDE_PREVERSION= ~pre6+77ba1370
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
@@ -28,7 +28,7 @@ LIB_DEPENDS+= libmng.so:${PORTSDIR}/graphics/libmng \
libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo \
libglib-2.0.so:${PORTSDIR}/devel/glib20
-USE_XORG= xcursor xinerama sm inputproto xi
+USE_XORG= xcursor xinerama sm xorgproto xi
REINPLACE_ARGS= -i ""
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -120,16 +120,16 @@ CONFIGURE_ARGS+=-debug
# The new trinity/dependencies/tqmake port installs them under LOCALBASE. We can use
# either one here, but we prefer the newer:
.for d in ${LOCALBASE} ${PREFIX}
-. if exists($d/share/tqt3/mkspecs/freebsd-g++/qplatformdefs.h)
+. if exists($d/share/tqt3/mkspecs/freebsd-clang/qplatformdefs.h)
QTBASE=$d
-PLATFORM=${QTBASE}/share/tqt3/mkspecs/freebsd-g++
+PLATFORM=${QTBASE}/share/tqt3/mkspecs/freebsd-clang
. endif
.endfor
.if defined(PLATFORM)
CONFIGURE_ARGS+=-platform ${PLATFORM}
.else
-CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/tqt3/mkspecs/freebsd-g++
+CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/tqt3/mkspecs/freebsd-clang
.endif
.if ${PORT_OPTIONS:MXRANDR}
diff --git a/freebsd/dependencies/tqt3/distinfo b/freebsd/dependencies/tqt3/distinfo
index 56505bf83..1e45a0470 100644
--- a/freebsd/dependencies/tqt3/distinfo
+++ b/freebsd/dependencies/tqt3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527510563
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53
-SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680
+TIMESTAMP = 1531032682
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a
+SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072
diff --git a/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..5764d9f98
--- /dev/null
+++ b/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,38 @@
+diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
+index f4fb7d78..135e6b81 100644
+--- a/src/kernel/ntqgplugin.h
++++ b/src/kernel/ntqgplugin.h
+@@ -81,10 +81,10 @@
+ #ifndef Q_PLUGIN_VERIFICATION_DATA
+ # define Q_PLUGIN_VERIFICATION_DATA \
+ static const char *qt_ucm_verification_data = \
+- "pattern=""QT_UCM_VERIFICATION_DATA""\n" \
+- "version="TQT_VERSION_STR"\n" \
+- "flags="Q_PLUGIN_FLAGS_STRING"\n" \
+- "buildkey="TQT_BUILD_KEY"\0";
++ "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \
++ "version=" TQT_VERSION_STR "\n" \
++ "flags=" Q_PLUGIN_FLAGS_STRING "\n" \
++ "buildkey=" TQT_BUILD_KEY "\0";
+ #endif // Q_PLUGIN_VERIFICATION_DATA
+
+ #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \
+diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
+index d59017ca..f3338ca0 100644
+--- a/src/tools/qcom_p.h
++++ b/src/tools/qcom_p.h
+@@ -296,10 +296,10 @@ public: \
+ #ifndef Q_UCM_VERIFICATION_DATA
+ # define Q_UCM_VERIFICATION_DATA \
+ static const char *qt_ucm_verification_data = \
+- "pattern=""QT_UCM_VERIFICATION_DATA""\n" \
+- "version="TQT_VERSION_STR"\n" \
+- "flags="Q_UCM_FLAGS_STRING"\n" \
+- "buildkey="TQT_BUILD_KEY"\0";
++ "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \
++ "version=" TQT_VERSION_STR "\n" \
++ "flags=" Q_UCM_FLAGS_STRING "\n" \
++ "buildkey=" TQT_BUILD_KEY "\0";
+ #endif // Q_UCM_VERIFICATION_DATA
+
+ // This macro expands to the default implementation of ucm_instantiate.
diff --git a/freebsd/dependencies/tqtinterface/Makefile b/freebsd/dependencies/tqtinterface/Makefile
index 2e93bcaca..7d6fe22fe 100644
--- a/freebsd/dependencies/tqtinterface/Makefile
+++ b/freebsd/dependencies/tqtinterface/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libtqtinterface
COMMENT= Trinity TQt Interface
-TDE_PREVERSION= ~pre7+af29ce34
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= libt/${PORTNAME}
DISTSRC= tqtinterface-trinity-${TDE_VERSION}${TDE_PREVERSION}
PORTREVISION= 0
diff --git a/freebsd/dependencies/tqtinterface/distinfo b/freebsd/dependencies/tqtinterface/distinfo
index 6000b859b..9c5d4b4ea 100644
--- a/freebsd/dependencies/tqtinterface/distinfo
+++ b/freebsd/dependencies/tqtinterface/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991804
-SHA256 (TDE/dependencies/libtqtinterface_14.0.5~pre7.orig.tar.xz) = 12b752cf92006ed8cac7f1fb2c538d26b2ef604fbd3db2f15279784eb04cf3a7
-SIZE (TDE/dependencies/libtqtinterface_14.0.5~pre7.orig.tar.xz) = 812416
+TIMESTAMP = 1531038583
+SHA256 (TDE/dependencies/libtqtinterface_14.0.5.orig.tar.xz) = fc15601e630afc3e22e8d1250b0c0caf3cb7f530928b969c9397833fecd4f989
+SIZE (TDE/dependencies/libtqtinterface_14.0.5.orig.tar.xz) = 812936
diff --git a/freebsd/libraries/kipi-plugins/Makefile b/freebsd/libraries/kipi-plugins/Makefile
index 8fed25933..1a9be126c 100644
--- a/freebsd/libraries/kipi-plugins/Makefile
+++ b/freebsd/libraries/kipi-plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kipi-plugins-trinity
COMMENT= Trinity image manipulation/handling plugins for KIPI aware programs
-TDE_PREVERSION= ~pre9+d366d7ef
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= k/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics
diff --git a/freebsd/libraries/kipi-plugins/distinfo b/freebsd/libraries/kipi-plugins/distinfo
index 14d16ac34..b055fe80c 100644
--- a/freebsd/libraries/kipi-plugins/distinfo
+++ b/freebsd/libraries/kipi-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527561205
-SHA256 (TDE/libraries/kipi-plugins-trinity_14.0.5~pre9.orig.tar.xz) = db99e4fd5b5b57b36688dbf24fac4d0fe148c9383a6293e66fa67a96cf2b81e9
-SIZE (TDE/libraries/kipi-plugins-trinity_14.0.5~pre9.orig.tar.xz) = 6593000
+TIMESTAMP = 1533395951
+SHA256 (TDE/libraries/kipi-plugins-trinity_14.0.5.orig.tar.xz) = af5636b7ee225112335bedb75b6a434d25a86cd9dda386c2952f55cb1171a728
+SIZE (TDE/libraries/kipi-plugins-trinity_14.0.5.orig.tar.xz) = 6589728
diff --git a/freebsd/libraries/libkdcraw/Makefile b/freebsd/libraries/libkdcraw/Makefile
index 1e3214bc1..71f09f293 100644
--- a/freebsd/libraries/libkdcraw/Makefile
+++ b/freebsd/libraries/libkdcraw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libkdcraw-trinity
COMMENT= Trinity RAW picture decoding C++ library
-TDE_PREVERSION= ~pre7+5a187761
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= libk/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics devel
diff --git a/freebsd/libraries/libkdcraw/distinfo b/freebsd/libraries/libkdcraw/distinfo
index 28b2419e4..96e2cf140 100644
--- a/freebsd/libraries/libkdcraw/distinfo
+++ b/freebsd/libraries/libkdcraw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992051
-SHA256 (TDE/libraries/libkdcraw-trinity_14.0.5~pre7.orig.tar.xz) = cc7e402f023f600fa5ed76b9232808324405b1e7e5cbcd020943d2e8145cfb0b
-SIZE (TDE/libraries/libkdcraw-trinity_14.0.5~pre7.orig.tar.xz) = 525212
+TIMESTAMP = 1533394932
+SHA256 (TDE/libraries/libkdcraw-trinity_14.0.5.orig.tar.xz) = 978242c5a015bf2a60d035681e4ba9ea937359363d25f8713341a3bd78cc8b59
+SIZE (TDE/libraries/libkdcraw-trinity_14.0.5.orig.tar.xz) = 524936
diff --git a/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..f820774f8
--- /dev/null
+++ b/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,74 @@
+diff --git a/libkdcraw/libraw/internal/dcraw_common.cpp b/libkdcraw/libraw/internal/dcraw_common.cpp
+index 868f676..13fa1df 100644
+--- a/libkdcraw/libraw/internal/dcraw_common.cpp
++++ b/libkdcraw/libraw/internal/dcraw_common.cpp
+@@ -3595,28 +3595,28 @@ void CLASS lin_interpolate()
+ void CLASS vng_interpolate()
+ {
+ static const signed char *cp, terms[] = {
+- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01,
+- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01,
+- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
+- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
+- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
+- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
+- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
+- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
+- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
+- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
+- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
+- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
+- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
+- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
+- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
+- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
+- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
+- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
+- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
+- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
+- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
+- +1,+0,+2,+1,0,0x10
++ -2,-2,+0,-1,0,'\x01', -2,-2,+0,+0,1,'\x01', -2,-1,-1,+0,0,'\x01',
++ -2,-1,+0,-1,0,'\x02', -2,-1,+0,+0,0,'\x03', -2,-1,+0,+1,1,'\x01',
++ -2,+0,+0,-1,0,'\x06', -2,+0,+0,+0,1,'\x02', -2,+0,+0,+1,0,'\x03',
++ -2,+1,-1,+0,0,'\x04', -2,+1,+0,-1,1,'\x04', -2,+1,+0,+0,0,'\x06',
++ -2,+1,+0,+1,0,'\x02', -2,+2,+0,+0,1,'\x04', -2,+2,+0,+1,0,'\x04',
++ -1,-2,-1,+0,0,'\x80', -1,-2,+0,-1,0,'\x01', -1,-2,+1,-1,0,'\x01',
++ -1,-2,+1,+0,1,'\x01', -1,-1,-1,+1,0,'\x88', -1,-1,+1,-2,0,'\x40',
++ -1,-1,+1,-1,0,'\x22', -1,-1,+1,+0,0,'\x33', -1,-1,+1,+1,1,'\x11',
++ -1,+0,-1,+2,0,'\x08', -1,+0,+0,-1,0,'\x44', -1,+0,+0,+1,0,'\x11',
++ -1,+0,+1,-2,1,'\x40', -1,+0,+1,-1,0,'\x66', -1,+0,+1,+0,1,'\x22',
++ -1,+0,+1,+1,0,'\x33', -1,+0,+1,+2,1,'\x10', -1,+1,+1,-1,1,'\x44',
++ -1,+1,+1,+0,0,'\x66', -1,+1,+1,+1,0,'\x22', -1,+1,+1,+2,0,'\x10',
++ -1,+2,+0,+1,0,'\x04', -1,+2,+1,+0,1,'\x04', -1,+2,+1,+1,0,'\x04',
++ +0,-2,+0,+0,1,'\x80', +0,-1,+0,+1,1,'\x88', +0,-1,+1,-2,0,'\x40',
++ +0,-1,+1,+0,0,'\x11', +0,-1,+2,-2,0,'\x40', +0,-1,+2,-1,0,'\x20',
++ +0,-1,+2,+0,0,'\x30', +0,-1,+2,+1,1,'\x10', +0,+0,+0,+2,1,'\x08',
++ +0,+0,+2,-2,1,'\x40', +0,+0,+2,-1,0,'\x60', +0,+0,+2,+0,1,'\x20',
++ +0,+0,+2,+1,0,'\x30', +0,+0,+2,+2,1,'\x10', +0,+1,+1,+0,0,'\x44',
++ +0,+1,+1,+2,0,'\x10', +0,+1,+2,-1,1,'\x40', +0,+1,+2,+0,0,'\x60',
++ +0,+1,+2,+1,0,'\x20', +0,+1,+2,+2,0,'\x10', +1,-2,+1,+0,0,'\x80',
++ +1,-1,+1,+1,0,'\x88', +1,+0,+1,+2,0,'\x08', +1,+0,+2,-1,0,'\x40',
++ +1,+0,+2,+1,0,'\x10'
+ }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
+ ushort (*brow[5])[4], *pix;
+ int prow=7, pcol=1, *ip, *code[16][16], gval[8], gmin, gmax, sum[4];
+@@ -5950,7 +5950,8 @@ void CLASS adobe_coeff (char *p_make, char *p_model)
+ {
+ static const struct {
+ const char *prefix;
+- short t_black, t_maximum, trans[12];
++ unsigned short t_black, t_maximum;
++ short trans[12];
+ } table[] = {
+ { "Apple QuickTake", 0, 0, /* DJC */
+ { 17576,-3191,-3318,5210,6733,-1942,9031,1280,-124 } },
+@@ -8189,7 +8190,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
+ strncpy (th->t_desc, desc, 512);
+ strncpy (th->t_make, make, 64);
+ strncpy (th->t_model, model, 64);
+- strcpy (th->soft, "dcraw v"VERSION);
++ strcpy (th->soft, "dcraw v" VERSION);
+ t = gmtime (&timestamp);
+ sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
+ t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
diff --git a/freebsd/libraries/libkexiv2/Makefile b/freebsd/libraries/libkexiv2/Makefile
index b1cd146cd..0a4a82a4f 100644
--- a/freebsd/libraries/libkexiv2/Makefile
+++ b/freebsd/libraries/libkexiv2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libkexiv2-trinity
COMMENT= Trinity TQt like interface for the libexiv2 library
-TDE_PREVERSION= ~pre7+39ff0304
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= libk/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics devel
diff --git a/freebsd/libraries/libkexiv2/distinfo b/freebsd/libraries/libkexiv2/distinfo
index 39d328781..f2168d10a 100644
--- a/freebsd/libraries/libkexiv2/distinfo
+++ b/freebsd/libraries/libkexiv2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992051
-SHA256 (TDE/libraries/libkexiv2-trinity_14.0.5~pre7.orig.tar.xz) = 64e7ab4d4d051852435a7270f277df3696f87767303992b01a95d15d17080c56
-SIZE (TDE/libraries/libkexiv2-trinity_14.0.5~pre7.orig.tar.xz) = 293892
+TIMESTAMP = 1533395807
+SHA256 (TDE/libraries/libkexiv2-trinity_14.0.5.orig.tar.xz) = 3a937029bd1d3740cd7cf55ba28a495af203de2d635bb01460f53b76b372e76a
+SIZE (TDE/libraries/libkexiv2-trinity_14.0.5.orig.tar.xz) = 293864
diff --git a/freebsd/libraries/libkipi/Makefile b/freebsd/libraries/libkipi/Makefile
index dce133142..09daaacb0 100644
--- a/freebsd/libraries/libkipi/Makefile
+++ b/freebsd/libraries/libkipi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libkipi-trinity
COMMENT= Trinity library for apps that want to use kipi-plugins
-TDE_PREVERSION= ~pre7+720aab52
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= libk/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics devel
diff --git a/freebsd/libraries/libkipi/distinfo b/freebsd/libraries/libkipi/distinfo
index 57d26b238..ba728cbb9 100644
--- a/freebsd/libraries/libkipi/distinfo
+++ b/freebsd/libraries/libkipi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992051
-SHA256 (TDE/libraries/libkipi-trinity_14.0.5~pre7.orig.tar.xz) = df6ae9a366bfbdc391f011f33abba3034a1a35a361bbc093571f839e56ad59d4
-SIZE (TDE/libraries/libkipi-trinity_14.0.5~pre7.orig.tar.xz) = 361120
+TIMESTAMP = 1533395891
+SHA256 (TDE/libraries/libkipi-trinity_14.0.5.orig.tar.xz) = d28ec633cf83942b7b91cabd4ff10cd6a1fa7d42d8fec2b569d4ab1320a111fd
+SIZE (TDE/libraries/libkipi-trinity_14.0.5.orig.tar.xz) = 361460
diff --git a/freebsd/libraries/libksquirrel/Makefile b/freebsd/libraries/libksquirrel/Makefile
index c4f13d72f..b9cdbdf7d 100644
--- a/freebsd/libraries/libksquirrel/Makefile
+++ b/freebsd/libraries/libksquirrel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libksquirrel-trinity
COMMENT= Libraries for KSquirrel
-TDE_PREVERSION= ~pre8+03101ede
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= libk/${PORTNAME}
PORTREVISION= 0
CATEGORIES= graphics devel
@@ -37,7 +37,7 @@ LIB_DEPENDS+=\
libtiff.so:${PORTSDIR}/graphics/tiff \
libwmf.so:${PORTSDIR}/graphics/libwmf \
-USE_XORG+= xproto
+USE_XORG+= xorgproto
# Build
post-patch: tde-pathfix
diff --git a/freebsd/libraries/libksquirrel/distinfo b/freebsd/libraries/libksquirrel/distinfo
index 7baa94651..8fc697cf3 100644
--- a/freebsd/libraries/libksquirrel/distinfo
+++ b/freebsd/libraries/libksquirrel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992053
-SHA256 (TDE/libraries/libksquirrel-trinity_14.0.5~pre8.orig.tar.xz) = 9894ba8e11941b9874cea1c3e1682f24826874fced0e6ac51ebcecb1bd064458
-SIZE (TDE/libraries/libksquirrel-trinity_14.0.5~pre8.orig.tar.xz) = 770204
+TIMESTAMP = 1533396218
+SHA256 (TDE/libraries/libksquirrel-trinity_14.0.5.orig.tar.xz) = bdcbc11ecd70d09f936e70a154735442ad8ee49733c47794f5e25ffe0ad4e620
+SIZE (TDE/libraries/libksquirrel-trinity_14.0.5.orig.tar.xz) = 768180
diff --git a/freebsd/libraries/libksquirrel/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/libraries/libksquirrel/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..627f4276f
--- /dev/null
+++ b/freebsd/libraries/libksquirrel/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,13 @@
+diff --git a/kernel/kls_wal/q2pal.h b/kernel/kls_wal/q2pal.h
+index 39530e5..e7ee100 100644
+--- a/kernel/kls_wal/q2pal.h
++++ b/kernel/kls_wal/q2pal.h
+@@ -3,7 +3,7 @@
+
+ /* Quake2 pallette taken from DevIL library (http://imagelib.org) */
+
+-static const s8 q2pal[768] =
++static const u8 q2pal[768] =
+ {
+ 0, 0, 0,
+ 15, 15, 15,
diff --git a/freebsd/libraries/libtdeldap/Makefile b/freebsd/libraries/libtdeldap/Makefile
index aec113d3f..98b80bf26 100644
--- a/freebsd/libraries/libtdeldap/Makefile
+++ b/freebsd/libraries/libtdeldap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libtdeldap-trinity
COMMENT= LDAP interface library for TDE
-TDE_PREVERSION= ~pre6+ce95d4d0
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= libt/${PORTNAME}
PORTREVISION= 0
CATEGORIES= net devel
diff --git a/freebsd/libraries/libtdeldap/distinfo b/freebsd/libraries/libtdeldap/distinfo
index d7c32f42c..73fe25067 100644
--- a/freebsd/libraries/libtdeldap/distinfo
+++ b/freebsd/libraries/libtdeldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495992053
-SHA256 (TDE/libraries/libtdeldap-trinity_14.0.5~pre6.orig.tar.xz) = d6fbf78990031d85c708cd0b0f91c1826d01d6910f845dd7dedd19bef0715e28
-SIZE (TDE/libraries/libtdeldap-trinity_14.0.5~pre6.orig.tar.xz) = 267100
+TIMESTAMP = 1533397018
+SHA256 (TDE/libraries/libtdeldap-trinity_14.0.5.orig.tar.xz) = 805336a718c3b065b691dc0273b2205dd5bbcf9c07c5252642434ece593fad72
+SIZE (TDE/libraries/libtdeldap-trinity_14.0.5.orig.tar.xz) = 267144
diff --git a/freebsd/tde-i18n-af/Makefile b/freebsd/tde-i18n-af/Makefile
index bb51de663..3568ddc56 100644
--- a/freebsd/tde-i18n-af/Makefile
+++ b/freebsd/tde-i18n-af/Makefile
@@ -9,7 +9,7 @@ PORTLANG= af
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-af/distinfo b/freebsd/tde-i18n-af/distinfo
index 0044bae73..45201867e 100644
--- a/freebsd/tde-i18n-af/distinfo
+++ b/freebsd/tde-i18n-af/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991942
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533393375
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ar/Makefile b/freebsd/tde-i18n-ar/Makefile
index 495545dd5..ff97aa90e 100644
--- a/freebsd/tde-i18n-ar/Makefile
+++ b/freebsd/tde-i18n-ar/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ar
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ar/distinfo b/freebsd/tde-i18n-ar/distinfo
index 61cb9da10..19055e8e8 100644
--- a/freebsd/tde-i18n-ar/distinfo
+++ b/freebsd/tde-i18n-ar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991944
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533393470
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-az/Makefile b/freebsd/tde-i18n-az/Makefile
index 54890c9ce..348293af4 100644
--- a/freebsd/tde-i18n-az/Makefile
+++ b/freebsd/tde-i18n-az/Makefile
@@ -9,7 +9,7 @@ PORTLANG= az
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-az/distinfo b/freebsd/tde-i18n-az/distinfo
index ad6d852b2..07850f99a 100644
--- a/freebsd/tde-i18n-az/distinfo
+++ b/freebsd/tde-i18n-az/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991945
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533393642
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-be/Makefile b/freebsd/tde-i18n-be/Makefile
index bf9291dbc..d73421c8b 100644
--- a/freebsd/tde-i18n-be/Makefile
+++ b/freebsd/tde-i18n-be/Makefile
@@ -9,7 +9,7 @@ PORTLANG= be
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-be/distinfo b/freebsd/tde-i18n-be/distinfo
index 0cb0c17eb..41604b158 100644
--- a/freebsd/tde-i18n-be/distinfo
+++ b/freebsd/tde-i18n-be/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991947
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533394094
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-bg/Makefile b/freebsd/tde-i18n-bg/Makefile
index 9fe06c281..9bffa88a0 100644
--- a/freebsd/tde-i18n-bg/Makefile
+++ b/freebsd/tde-i18n-bg/Makefile
@@ -9,7 +9,7 @@ PORTLANG= bg
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-bg/distinfo b/freebsd/tde-i18n-bg/distinfo
index 8422f5b78..f44d2ad09 100644
--- a/freebsd/tde-i18n-bg/distinfo
+++ b/freebsd/tde-i18n-bg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991949
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533394159
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-bn/Makefile b/freebsd/tde-i18n-bn/Makefile
index 7f78ba4ea..b98202e11 100644
--- a/freebsd/tde-i18n-bn/Makefile
+++ b/freebsd/tde-i18n-bn/Makefile
@@ -9,7 +9,7 @@ PORTLANG= bn
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-bn/distinfo b/freebsd/tde-i18n-bn/distinfo
index 0a3195f30..42da732d7 100644
--- a/freebsd/tde-i18n-bn/distinfo
+++ b/freebsd/tde-i18n-bn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991950
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533394234
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-br/Makefile b/freebsd/tde-i18n-br/Makefile
index 1ca6e96df..970b2482f 100644
--- a/freebsd/tde-i18n-br/Makefile
+++ b/freebsd/tde-i18n-br/Makefile
@@ -9,7 +9,7 @@ PORTLANG= br
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-br/distinfo b/freebsd/tde-i18n-br/distinfo
index d1e78aef1..dfb1a23d0 100644
--- a/freebsd/tde-i18n-br/distinfo
+++ b/freebsd/tde-i18n-br/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991952
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533394329
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-bs/Makefile b/freebsd/tde-i18n-bs/Makefile
index 91c1c1313..9dc403177 100644
--- a/freebsd/tde-i18n-bs/Makefile
+++ b/freebsd/tde-i18n-bs/Makefile
@@ -9,7 +9,7 @@ PORTLANG= bs
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-bs/distinfo b/freebsd/tde-i18n-bs/distinfo
index dcf9660ee..030c9b0c2 100644
--- a/freebsd/tde-i18n-bs/distinfo
+++ b/freebsd/tde-i18n-bs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991953
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533394491
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ca/Makefile b/freebsd/tde-i18n-ca/Makefile
index c08ed13dc..e6a50da31 100644
--- a/freebsd/tde-i18n-ca/Makefile
+++ b/freebsd/tde-i18n-ca/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ca
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ca/distinfo b/freebsd/tde-i18n-ca/distinfo
index 68caebd7c..4d9a90281 100644
--- a/freebsd/tde-i18n-ca/distinfo
+++ b/freebsd/tde-i18n-ca/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991955
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533394561
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-cs/Makefile b/freebsd/tde-i18n-cs/Makefile
index b10a762a5..cc720dd37 100644
--- a/freebsd/tde-i18n-cs/Makefile
+++ b/freebsd/tde-i18n-cs/Makefile
@@ -9,7 +9,7 @@ PORTLANG= cs
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-cs/distinfo b/freebsd/tde-i18n-cs/distinfo
index 2ea072081..72f4a7875 100644
--- a/freebsd/tde-i18n-cs/distinfo
+++ b/freebsd/tde-i18n-cs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991956
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533394813
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-csb/Makefile b/freebsd/tde-i18n-csb/Makefile
index abecec9f4..6b70fcd9e 100644
--- a/freebsd/tde-i18n-csb/Makefile
+++ b/freebsd/tde-i18n-csb/Makefile
@@ -9,7 +9,7 @@ PORTLANG= csb
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-csb/distinfo b/freebsd/tde-i18n-csb/distinfo
index 7bb12c186..c8ae5ffbd 100644
--- a/freebsd/tde-i18n-csb/distinfo
+++ b/freebsd/tde-i18n-csb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991958
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533394911
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-cy/Makefile b/freebsd/tde-i18n-cy/Makefile
index 18540b47f..36954b7e2 100644
--- a/freebsd/tde-i18n-cy/Makefile
+++ b/freebsd/tde-i18n-cy/Makefile
@@ -9,7 +9,7 @@ PORTLANG= cy
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-cy/distinfo b/freebsd/tde-i18n-cy/distinfo
index 65b0b744e..049c99649 100644
--- a/freebsd/tde-i18n-cy/distinfo
+++ b/freebsd/tde-i18n-cy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991959
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533395018
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-da/Makefile b/freebsd/tde-i18n-da/Makefile
index 13d63af47..0d7c9d836 100644
--- a/freebsd/tde-i18n-da/Makefile
+++ b/freebsd/tde-i18n-da/Makefile
@@ -9,7 +9,7 @@ PORTLANG= da
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-da/distinfo b/freebsd/tde-i18n-da/distinfo
index 5a7daa596..2ce3612ad 100644
--- a/freebsd/tde-i18n-da/distinfo
+++ b/freebsd/tde-i18n-da/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991961
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533395291
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-de/Makefile b/freebsd/tde-i18n-de/Makefile
index 4da14e635..7fc52cf1e 100644
--- a/freebsd/tde-i18n-de/Makefile
+++ b/freebsd/tde-i18n-de/Makefile
@@ -9,7 +9,7 @@ PORTLANG= de
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-de/distinfo b/freebsd/tde-i18n-de/distinfo
index cf4fac11b..454cfb76c 100644
--- a/freebsd/tde-i18n-de/distinfo
+++ b/freebsd/tde-i18n-de/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991963
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533395768
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-el/Makefile b/freebsd/tde-i18n-el/Makefile
index b26470fa8..5795e5fdd 100644
--- a/freebsd/tde-i18n-el/Makefile
+++ b/freebsd/tde-i18n-el/Makefile
@@ -9,7 +9,7 @@ PORTLANG= el
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-el/distinfo b/freebsd/tde-i18n-el/distinfo
index edea242e7..2337214bd 100644
--- a/freebsd/tde-i18n-el/distinfo
+++ b/freebsd/tde-i18n-el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991964
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533396251
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-en_GB/Makefile b/freebsd/tde-i18n-en_GB/Makefile
index dda049d48..d85988c12 100644
--- a/freebsd/tde-i18n-en_GB/Makefile
+++ b/freebsd/tde-i18n-en_GB/Makefile
@@ -9,7 +9,7 @@ PORTLANG= en_GB
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-en_GB/distinfo b/freebsd/tde-i18n-en_GB/distinfo
index 4800e36d1..98789d3c4 100644
--- a/freebsd/tde-i18n-en_GB/distinfo
+++ b/freebsd/tde-i18n-en_GB/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991966
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533396579
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-eo/Makefile b/freebsd/tde-i18n-eo/Makefile
index 6a41cc161..b43652323 100644
--- a/freebsd/tde-i18n-eo/Makefile
+++ b/freebsd/tde-i18n-eo/Makefile
@@ -9,7 +9,7 @@ PORTLANG= eo
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-eo/distinfo b/freebsd/tde-i18n-eo/distinfo
index 29b08d9d6..28fccc0fd 100644
--- a/freebsd/tde-i18n-eo/distinfo
+++ b/freebsd/tde-i18n-eo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991967
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533396794
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-es/Makefile b/freebsd/tde-i18n-es/Makefile
index 9a344a9cd..cde52b905 100644
--- a/freebsd/tde-i18n-es/Makefile
+++ b/freebsd/tde-i18n-es/Makefile
@@ -9,7 +9,7 @@ PORTLANG= es
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-es/distinfo b/freebsd/tde-i18n-es/distinfo
index c7f2a470d..e8265feaa 100644
--- a/freebsd/tde-i18n-es/distinfo
+++ b/freebsd/tde-i18n-es/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991969
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533396907
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-et/Makefile b/freebsd/tde-i18n-et/Makefile
index f5278d109..9fd47b018 100644
--- a/freebsd/tde-i18n-et/Makefile
+++ b/freebsd/tde-i18n-et/Makefile
@@ -9,7 +9,7 @@ PORTLANG= et
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-et/distinfo b/freebsd/tde-i18n-et/distinfo
index 2b8c0722b..5ea6b223f 100644
--- a/freebsd/tde-i18n-et/distinfo
+++ b/freebsd/tde-i18n-et/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495982088
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533397759
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-eu/Makefile b/freebsd/tde-i18n-eu/Makefile
index 0eada38bc..8161cd28e 100644
--- a/freebsd/tde-i18n-eu/Makefile
+++ b/freebsd/tde-i18n-eu/Makefile
@@ -9,7 +9,7 @@ PORTLANG= eu
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-eu/distinfo b/freebsd/tde-i18n-eu/distinfo
index 232b47ce9..45f6b87e4 100644
--- a/freebsd/tde-i18n-eu/distinfo
+++ b/freebsd/tde-i18n-eu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495984610
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533398296
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-fa/Makefile b/freebsd/tde-i18n-fa/Makefile
index 116ee3766..c34d10c2f 100644
--- a/freebsd/tde-i18n-fa/Makefile
+++ b/freebsd/tde-i18n-fa/Makefile
@@ -9,7 +9,7 @@ PORTLANG= fa
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-fa/distinfo b/freebsd/tde-i18n-fa/distinfo
index 4b5dbc6a7..b3039466b 100644
--- a/freebsd/tde-i18n-fa/distinfo
+++ b/freebsd/tde-i18n-fa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495984792
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533398383
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-fi/Makefile b/freebsd/tde-i18n-fi/Makefile
index 63fda9c24..04e5b0dc0 100644
--- a/freebsd/tde-i18n-fi/Makefile
+++ b/freebsd/tde-i18n-fi/Makefile
@@ -9,7 +9,7 @@ PORTLANG= fi
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-fi/distinfo b/freebsd/tde-i18n-fi/distinfo
index 10f49c3c4..eca541582 100644
--- a/freebsd/tde-i18n-fi/distinfo
+++ b/freebsd/tde-i18n-fi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495984873
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533398461
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-fr/Makefile b/freebsd/tde-i18n-fr/Makefile
index 896d8ce9b..5a1aa8da0 100644
--- a/freebsd/tde-i18n-fr/Makefile
+++ b/freebsd/tde-i18n-fr/Makefile
@@ -9,7 +9,7 @@ PORTLANG= fr
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-fr/distinfo b/freebsd/tde-i18n-fr/distinfo
index adb9dc357..80a536bac 100644
--- a/freebsd/tde-i18n-fr/distinfo
+++ b/freebsd/tde-i18n-fr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495984946
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533398547
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-fy/Makefile b/freebsd/tde-i18n-fy/Makefile
index 1b25a1c1c..643ed0082 100644
--- a/freebsd/tde-i18n-fy/Makefile
+++ b/freebsd/tde-i18n-fy/Makefile
@@ -9,7 +9,7 @@ PORTLANG= fy
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-fy/distinfo b/freebsd/tde-i18n-fy/distinfo
index 1b5416cb4..578787d72 100644
--- a/freebsd/tde-i18n-fy/distinfo
+++ b/freebsd/tde-i18n-fy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495985297
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533398924
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ga/Makefile b/freebsd/tde-i18n-ga/Makefile
index d1537ac53..9058f8458 100644
--- a/freebsd/tde-i18n-ga/Makefile
+++ b/freebsd/tde-i18n-ga/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ga
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ga/distinfo b/freebsd/tde-i18n-ga/distinfo
index 32498db93..d3ef0fd21 100644
--- a/freebsd/tde-i18n-ga/distinfo
+++ b/freebsd/tde-i18n-ga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495985423
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533399004
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-gl/Makefile b/freebsd/tde-i18n-gl/Makefile
index 999e1e5f3..184bb598b 100644
--- a/freebsd/tde-i18n-gl/Makefile
+++ b/freebsd/tde-i18n-gl/Makefile
@@ -9,7 +9,7 @@ PORTLANG= gl
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-gl/distinfo b/freebsd/tde-i18n-gl/distinfo
index d97b1de53..cb906b39f 100644
--- a/freebsd/tde-i18n-gl/distinfo
+++ b/freebsd/tde-i18n-gl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495986040
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533399103
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-he/Makefile b/freebsd/tde-i18n-he/Makefile
index 52c4fa404..fe0e536eb 100644
--- a/freebsd/tde-i18n-he/Makefile
+++ b/freebsd/tde-i18n-he/Makefile
@@ -9,7 +9,7 @@ PORTLANG= he
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-he/distinfo b/freebsd/tde-i18n-he/distinfo
index 8b7f49e1b..5f7fc9d56 100644
--- a/freebsd/tde-i18n-he/distinfo
+++ b/freebsd/tde-i18n-he/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495986123
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533399204
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-hi/Makefile b/freebsd/tde-i18n-hi/Makefile
index 2596436f2..c2c67362a 100644
--- a/freebsd/tde-i18n-hi/Makefile
+++ b/freebsd/tde-i18n-hi/Makefile
@@ -9,7 +9,7 @@ PORTLANG= hi
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-hi/distinfo b/freebsd/tde-i18n-hi/distinfo
index 605d59470..cc080ece0 100644
--- a/freebsd/tde-i18n-hi/distinfo
+++ b/freebsd/tde-i18n-hi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495986208
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533399397
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-hr/Makefile b/freebsd/tde-i18n-hr/Makefile
index 35473595a..3670dacd2 100644
--- a/freebsd/tde-i18n-hr/Makefile
+++ b/freebsd/tde-i18n-hr/Makefile
@@ -9,7 +9,7 @@ PORTLANG= hr
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-hr/distinfo b/freebsd/tde-i18n-hr/distinfo
index 7db1b9095..4733c31a6 100644
--- a/freebsd/tde-i18n-hr/distinfo
+++ b/freebsd/tde-i18n-hr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495986287
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533399489
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-hu/Makefile b/freebsd/tde-i18n-hu/Makefile
index 62c6f6762..531ddf683 100644
--- a/freebsd/tde-i18n-hu/Makefile
+++ b/freebsd/tde-i18n-hu/Makefile
@@ -9,7 +9,7 @@ PORTLANG= hu
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-hu/distinfo b/freebsd/tde-i18n-hu/distinfo
index 61dcf26c4..f9a80403c 100644
--- a/freebsd/tde-i18n-hu/distinfo
+++ b/freebsd/tde-i18n-hu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495986403
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533399572
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-is/Makefile b/freebsd/tde-i18n-is/Makefile
index a748c2982..dbc7e7f8c 100644
--- a/freebsd/tde-i18n-is/Makefile
+++ b/freebsd/tde-i18n-is/Makefile
@@ -9,7 +9,7 @@ PORTLANG= is
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-is/distinfo b/freebsd/tde-i18n-is/distinfo
index 38d0432aa..6d92ad56d 100644
--- a/freebsd/tde-i18n-is/distinfo
+++ b/freebsd/tde-i18n-is/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495986581
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533399785
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-it/Makefile b/freebsd/tde-i18n-it/Makefile
index ce914c536..16cfab420 100644
--- a/freebsd/tde-i18n-it/Makefile
+++ b/freebsd/tde-i18n-it/Makefile
@@ -9,7 +9,7 @@ PORTLANG= it
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-it/distinfo b/freebsd/tde-i18n-it/distinfo
index 7aa5f5337..8e18897d2 100644
--- a/freebsd/tde-i18n-it/distinfo
+++ b/freebsd/tde-i18n-it/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495986934
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533399932
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ja/Makefile b/freebsd/tde-i18n-ja/Makefile
index a4030b4d4..8164d4512 100644
--- a/freebsd/tde-i18n-ja/Makefile
+++ b/freebsd/tde-i18n-ja/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ja
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ja/distinfo b/freebsd/tde-i18n-ja/distinfo
index 8b3c676e9..2a236363f 100644
--- a/freebsd/tde-i18n-ja/distinfo
+++ b/freebsd/tde-i18n-ja/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495987340
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533400305
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-kk/Makefile b/freebsd/tde-i18n-kk/Makefile
index 9afbc2980..f92f266bc 100644
--- a/freebsd/tde-i18n-kk/Makefile
+++ b/freebsd/tde-i18n-kk/Makefile
@@ -9,7 +9,7 @@ PORTLANG= kk
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-kk/distinfo b/freebsd/tde-i18n-kk/distinfo
index f5e334ec5..3fbca1e8a 100644
--- a/freebsd/tde-i18n-kk/distinfo
+++ b/freebsd/tde-i18n-kk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495987501
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533400434
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-km/Makefile b/freebsd/tde-i18n-km/Makefile
index 871badb6b..ccd0323bc 100644
--- a/freebsd/tde-i18n-km/Makefile
+++ b/freebsd/tde-i18n-km/Makefile
@@ -9,7 +9,7 @@ PORTLANG= km
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-km/distinfo b/freebsd/tde-i18n-km/distinfo
index 0603702c0..78f22a77f 100644
--- a/freebsd/tde-i18n-km/distinfo
+++ b/freebsd/tde-i18n-km/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495987572
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533400566
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ko/Makefile b/freebsd/tde-i18n-ko/Makefile
index 112a27e26..bc0c98d04 100644
--- a/freebsd/tde-i18n-ko/Makefile
+++ b/freebsd/tde-i18n-ko/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ko
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ko/distinfo b/freebsd/tde-i18n-ko/distinfo
index bcf363d3d..b71473a95 100644
--- a/freebsd/tde-i18n-ko/distinfo
+++ b/freebsd/tde-i18n-ko/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495987654
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533400689
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-lt/Makefile b/freebsd/tde-i18n-lt/Makefile
index 792c38a57..04ca802bf 100644
--- a/freebsd/tde-i18n-lt/Makefile
+++ b/freebsd/tde-i18n-lt/Makefile
@@ -9,7 +9,7 @@ PORTLANG= lt
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-lt/distinfo b/freebsd/tde-i18n-lt/distinfo
index 51a65b599..07a99986e 100644
--- a/freebsd/tde-i18n-lt/distinfo
+++ b/freebsd/tde-i18n-lt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495987812
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533400787
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-lv/Makefile b/freebsd/tde-i18n-lv/Makefile
index a5e6c6bfb..40d4d6e87 100644
--- a/freebsd/tde-i18n-lv/Makefile
+++ b/freebsd/tde-i18n-lv/Makefile
@@ -9,7 +9,7 @@ PORTLANG= lv
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-lv/distinfo b/freebsd/tde-i18n-lv/distinfo
index d4159bf03..4c9e119af 100644
--- a/freebsd/tde-i18n-lv/distinfo
+++ b/freebsd/tde-i18n-lv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495987957
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533400922
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-mk/Makefile b/freebsd/tde-i18n-mk/Makefile
index cc86caf5b..79efa9ba3 100644
--- a/freebsd/tde-i18n-mk/Makefile
+++ b/freebsd/tde-i18n-mk/Makefile
@@ -9,7 +9,7 @@ PORTLANG= mk
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-mk/distinfo b/freebsd/tde-i18n-mk/distinfo
index 732eb226d..65d87946c 100644
--- a/freebsd/tde-i18n-mk/distinfo
+++ b/freebsd/tde-i18n-mk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495988008
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533400994
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-mn/Makefile b/freebsd/tde-i18n-mn/Makefile
index dda20e8e5..9ec0b611a 100644
--- a/freebsd/tde-i18n-mn/Makefile
+++ b/freebsd/tde-i18n-mn/Makefile
@@ -9,7 +9,7 @@ PORTLANG= mn
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-mn/distinfo b/freebsd/tde-i18n-mn/distinfo
index bf523f087..3e9e0c1ab 100644
--- a/freebsd/tde-i18n-mn/distinfo
+++ b/freebsd/tde-i18n-mn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495988085
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533401158
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ms/Makefile b/freebsd/tde-i18n-ms/Makefile
index a2c1903de..613e76253 100644
--- a/freebsd/tde-i18n-ms/Makefile
+++ b/freebsd/tde-i18n-ms/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ms
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ms/distinfo b/freebsd/tde-i18n-ms/distinfo
index 0174e08d4..1b5648c38 100644
--- a/freebsd/tde-i18n-ms/distinfo
+++ b/freebsd/tde-i18n-ms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495988127
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533401226
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-nb/Makefile b/freebsd/tde-i18n-nb/Makefile
index 992b5807e..833bac509 100644
--- a/freebsd/tde-i18n-nb/Makefile
+++ b/freebsd/tde-i18n-nb/Makefile
@@ -9,7 +9,7 @@ PORTLANG= nb
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-nb/distinfo b/freebsd/tde-i18n-nb/distinfo
index de809538e..e160d70f5 100644
--- a/freebsd/tde-i18n-nb/distinfo
+++ b/freebsd/tde-i18n-nb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495988195
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533401453
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-nds/Makefile b/freebsd/tde-i18n-nds/Makefile
index 07ff364b6..5523a84ab 100644
--- a/freebsd/tde-i18n-nds/Makefile
+++ b/freebsd/tde-i18n-nds/Makefile
@@ -9,7 +9,7 @@ PORTLANG= nds
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-nds/distinfo b/freebsd/tde-i18n-nds/distinfo
index 7b568687a..a347b3f23 100644
--- a/freebsd/tde-i18n-nds/distinfo
+++ b/freebsd/tde-i18n-nds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495988262
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533401552
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-nl/Makefile b/freebsd/tde-i18n-nl/Makefile
index 0cb14386d..3ace1ade2 100644
--- a/freebsd/tde-i18n-nl/Makefile
+++ b/freebsd/tde-i18n-nl/Makefile
@@ -9,7 +9,7 @@ PORTLANG= nl
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-nl/distinfo b/freebsd/tde-i18n-nl/distinfo
index ba7235070..33e9c76a3 100644
--- a/freebsd/tde-i18n-nl/distinfo
+++ b/freebsd/tde-i18n-nl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495988603
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533401669
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-nn/Makefile b/freebsd/tde-i18n-nn/Makefile
index 284f42077..919546be6 100644
--- a/freebsd/tde-i18n-nn/Makefile
+++ b/freebsd/tde-i18n-nn/Makefile
@@ -9,7 +9,7 @@ PORTLANG= nn
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-nn/distinfo b/freebsd/tde-i18n-nn/distinfo
index b1df77afe..e9834a2e5 100644
--- a/freebsd/tde-i18n-nn/distinfo
+++ b/freebsd/tde-i18n-nn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495988894
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533402082
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-pa/Makefile b/freebsd/tde-i18n-pa/Makefile
index ae7d2b741..a5c7a81a1 100644
--- a/freebsd/tde-i18n-pa/Makefile
+++ b/freebsd/tde-i18n-pa/Makefile
@@ -9,7 +9,7 @@ PORTLANG= pa
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-pa/distinfo b/freebsd/tde-i18n-pa/distinfo
index 70312223c..a63af5a0c 100644
--- a/freebsd/tde-i18n-pa/distinfo
+++ b/freebsd/tde-i18n-pa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495989082
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533402266
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-pl/Makefile b/freebsd/tde-i18n-pl/Makefile
index b9767adda..d305adeaa 100644
--- a/freebsd/tde-i18n-pl/Makefile
+++ b/freebsd/tde-i18n-pl/Makefile
@@ -9,7 +9,7 @@ PORTLANG= pl
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-pl/distinfo b/freebsd/tde-i18n-pl/distinfo
index 96fd191d9..ff13a04a7 100644
--- a/freebsd/tde-i18n-pl/distinfo
+++ b/freebsd/tde-i18n-pl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495989165
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533402437
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-pt/Makefile b/freebsd/tde-i18n-pt/Makefile
index 5ac811649..4378e4541 100644
--- a/freebsd/tde-i18n-pt/Makefile
+++ b/freebsd/tde-i18n-pt/Makefile
@@ -9,7 +9,7 @@ PORTLANG= pt
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-pt/distinfo b/freebsd/tde-i18n-pt/distinfo
index 542e8c186..b628f1aaf 100644
--- a/freebsd/tde-i18n-pt/distinfo
+++ b/freebsd/tde-i18n-pt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495989414
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533402714
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-pt_BR/Makefile b/freebsd/tde-i18n-pt_BR/Makefile
index 43549645f..f329c3310 100644
--- a/freebsd/tde-i18n-pt_BR/Makefile
+++ b/freebsd/tde-i18n-pt_BR/Makefile
@@ -9,7 +9,7 @@ PORTLANG= pt_BR
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-pt_BR/distinfo b/freebsd/tde-i18n-pt_BR/distinfo
index f28787037..4f450273a 100644
--- a/freebsd/tde-i18n-pt_BR/distinfo
+++ b/freebsd/tde-i18n-pt_BR/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495989777
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533403112
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ro/Makefile b/freebsd/tde-i18n-ro/Makefile
index 3f3f03c2a..2ebb6b55f 100644
--- a/freebsd/tde-i18n-ro/Makefile
+++ b/freebsd/tde-i18n-ro/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ro
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ro/distinfo b/freebsd/tde-i18n-ro/distinfo
index df9560aa8..8787e72c9 100644
--- a/freebsd/tde-i18n-ro/distinfo
+++ b/freebsd/tde-i18n-ro/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495990103
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533403519
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ru/Makefile b/freebsd/tde-i18n-ru/Makefile
index 5b832eb39..fd3a124f5 100644
--- a/freebsd/tde-i18n-ru/Makefile
+++ b/freebsd/tde-i18n-ru/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ru
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ru/distinfo b/freebsd/tde-i18n-ru/distinfo
index 88ee4a6a3..edaff8045 100644
--- a/freebsd/tde-i18n-ru/distinfo
+++ b/freebsd/tde-i18n-ru/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495990195
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533403658
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-rw/Makefile b/freebsd/tde-i18n-rw/Makefile
index b964b8d74..6960ef045 100644
--- a/freebsd/tde-i18n-rw/Makefile
+++ b/freebsd/tde-i18n-rw/Makefile
@@ -9,7 +9,7 @@ PORTLANG= rw
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-rw/distinfo b/freebsd/tde-i18n-rw/distinfo
index dbb4638e1..2da558912 100644
--- a/freebsd/tde-i18n-rw/distinfo
+++ b/freebsd/tde-i18n-rw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495990600
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533404059
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-se/Makefile b/freebsd/tde-i18n-se/Makefile
index 315acb5d8..7f06b6b9d 100644
--- a/freebsd/tde-i18n-se/Makefile
+++ b/freebsd/tde-i18n-se/Makefile
@@ -9,7 +9,7 @@ PORTLANG= se
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-se/distinfo b/freebsd/tde-i18n-se/distinfo
index c992a8596..cffd96334 100644
--- a/freebsd/tde-i18n-se/distinfo
+++ b/freebsd/tde-i18n-se/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495990669
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533404191
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-sk/Makefile b/freebsd/tde-i18n-sk/Makefile
index 247e960d3..de3201251 100644
--- a/freebsd/tde-i18n-sk/Makefile
+++ b/freebsd/tde-i18n-sk/Makefile
@@ -9,7 +9,7 @@ PORTLANG= sk
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-sk/distinfo b/freebsd/tde-i18n-sk/distinfo
index c67b51fdb..5f5d2d3e4 100644
--- a/freebsd/tde-i18n-sk/distinfo
+++ b/freebsd/tde-i18n-sk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495990729
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533404357
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-sl/Makefile b/freebsd/tde-i18n-sl/Makefile
index 70a73345f..8b3491b24 100644
--- a/freebsd/tde-i18n-sl/Makefile
+++ b/freebsd/tde-i18n-sl/Makefile
@@ -9,7 +9,7 @@ PORTLANG= sl
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-sl/distinfo b/freebsd/tde-i18n-sl/distinfo
index c83bdf550..ccf12782b 100644
--- a/freebsd/tde-i18n-sl/distinfo
+++ b/freebsd/tde-i18n-sl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495990875
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533428336
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-sr/Makefile b/freebsd/tde-i18n-sr/Makefile
index d964e2b76..4332e8d1e 100644
--- a/freebsd/tde-i18n-sr/Makefile
+++ b/freebsd/tde-i18n-sr/Makefile
@@ -9,7 +9,7 @@ PORTLANG= sr
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-sr/distinfo b/freebsd/tde-i18n-sr/distinfo
index c3dc0631c..572d59bd1 100644
--- a/freebsd/tde-i18n-sr/distinfo
+++ b/freebsd/tde-i18n-sr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495990932
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533428629
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-sr@Latn/Makefile b/freebsd/tde-i18n-sr@Latn/Makefile
index 874d99e08..f0af2a2fd 100644
--- a/freebsd/tde-i18n-sr@Latn/Makefile
+++ b/freebsd/tde-i18n-sr@Latn/Makefile
@@ -9,7 +9,7 @@ PORTLANG= sr@Latn
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-sr@Latn/distinfo b/freebsd/tde-i18n-sr@Latn/distinfo
index 69f63f332..4d49e6961 100644
--- a/freebsd/tde-i18n-sr@Latn/distinfo
+++ b/freebsd/tde-i18n-sr@Latn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991020
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533428782
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ss/Makefile b/freebsd/tde-i18n-ss/Makefile
index c6a4492c5..c005d453d 100644
--- a/freebsd/tde-i18n-ss/Makefile
+++ b/freebsd/tde-i18n-ss/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ss
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ss/distinfo b/freebsd/tde-i18n-ss/distinfo
index 39dac6fdc..1cb09600e 100644
--- a/freebsd/tde-i18n-ss/distinfo
+++ b/freebsd/tde-i18n-ss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991025
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533428923
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-sv/Makefile b/freebsd/tde-i18n-sv/Makefile
index 575ee580e..5f9f292b7 100644
--- a/freebsd/tde-i18n-sv/Makefile
+++ b/freebsd/tde-i18n-sv/Makefile
@@ -9,7 +9,7 @@ PORTLANG= sv
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-sv/distinfo b/freebsd/tde-i18n-sv/distinfo
index 35d2df9e6..908d11fa8 100644
--- a/freebsd/tde-i18n-sv/distinfo
+++ b/freebsd/tde-i18n-sv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991073
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533429014
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-ta/Makefile b/freebsd/tde-i18n-ta/Makefile
index d92db8f01..da83aeef9 100644
--- a/freebsd/tde-i18n-ta/Makefile
+++ b/freebsd/tde-i18n-ta/Makefile
@@ -9,7 +9,7 @@ PORTLANG= ta
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-ta/distinfo b/freebsd/tde-i18n-ta/distinfo
index 336fdbf3c..449955012 100644
--- a/freebsd/tde-i18n-ta/distinfo
+++ b/freebsd/tde-i18n-ta/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991109
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533429678
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-te/Makefile b/freebsd/tde-i18n-te/Makefile
index 878cd1621..bb8c802f0 100644
--- a/freebsd/tde-i18n-te/Makefile
+++ b/freebsd/tde-i18n-te/Makefile
@@ -9,7 +9,7 @@ PORTLANG= te
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-te/distinfo b/freebsd/tde-i18n-te/distinfo
index 22552b5be..ac2289c3b 100644
--- a/freebsd/tde-i18n-te/distinfo
+++ b/freebsd/tde-i18n-te/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991190
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533429910
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-tg/Makefile b/freebsd/tde-i18n-tg/Makefile
index cd377b17b..afb24b58f 100644
--- a/freebsd/tde-i18n-tg/Makefile
+++ b/freebsd/tde-i18n-tg/Makefile
@@ -9,7 +9,7 @@ PORTLANG= tg
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-tg/distinfo b/freebsd/tde-i18n-tg/distinfo
index 2d5ee5e32..bae0985d2 100644
--- a/freebsd/tde-i18n-tg/distinfo
+++ b/freebsd/tde-i18n-tg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991245
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533429968
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-th/Makefile b/freebsd/tde-i18n-th/Makefile
index 2b2273847..12bcb3c48 100644
--- a/freebsd/tde-i18n-th/Makefile
+++ b/freebsd/tde-i18n-th/Makefile
@@ -9,7 +9,7 @@ PORTLANG= th
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-th/distinfo b/freebsd/tde-i18n-th/distinfo
index 02a061ca3..7cdd8ba37 100644
--- a/freebsd/tde-i18n-th/distinfo
+++ b/freebsd/tde-i18n-th/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991309
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430074
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-tr/Makefile b/freebsd/tde-i18n-tr/Makefile
index 2258d9819..199900b29 100644
--- a/freebsd/tde-i18n-tr/Makefile
+++ b/freebsd/tde-i18n-tr/Makefile
@@ -9,7 +9,7 @@ PORTLANG= tr
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-tr/distinfo b/freebsd/tde-i18n-tr/distinfo
index e472aba70..79353211d 100644
--- a/freebsd/tde-i18n-tr/distinfo
+++ b/freebsd/tde-i18n-tr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991375
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430184
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-uk/Makefile b/freebsd/tde-i18n-uk/Makefile
index d92440152..67603aab2 100644
--- a/freebsd/tde-i18n-uk/Makefile
+++ b/freebsd/tde-i18n-uk/Makefile
@@ -9,7 +9,7 @@ PORTLANG= uk
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-uk/distinfo b/freebsd/tde-i18n-uk/distinfo
index 43a39a6c2..5988af02f 100644
--- a/freebsd/tde-i18n-uk/distinfo
+++ b/freebsd/tde-i18n-uk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991422
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430364
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-uz/Makefile b/freebsd/tde-i18n-uz/Makefile
index 8d04b01f4..769002263 100644
--- a/freebsd/tde-i18n-uz/Makefile
+++ b/freebsd/tde-i18n-uz/Makefile
@@ -9,7 +9,7 @@ PORTLANG= uz
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-uz/distinfo b/freebsd/tde-i18n-uz/distinfo
index b7163f1ce..cdc22cd41 100644
--- a/freebsd/tde-i18n-uz/distinfo
+++ b/freebsd/tde-i18n-uz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991472
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430499
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-uz@cyrillic/Makefile b/freebsd/tde-i18n-uz@cyrillic/Makefile
index cb614bf26..41d40332b 100644
--- a/freebsd/tde-i18n-uz@cyrillic/Makefile
+++ b/freebsd/tde-i18n-uz@cyrillic/Makefile
@@ -9,7 +9,7 @@ PORTLANG= uz@cyrillic
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-uz@cyrillic/distinfo b/freebsd/tde-i18n-uz@cyrillic/distinfo
index 2ed20f259..91550b284 100644
--- a/freebsd/tde-i18n-uz@cyrillic/distinfo
+++ b/freebsd/tde-i18n-uz@cyrillic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991502
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430599
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-vi/Makefile b/freebsd/tde-i18n-vi/Makefile
index 3d1eb91ae..b152e6027 100644
--- a/freebsd/tde-i18n-vi/Makefile
+++ b/freebsd/tde-i18n-vi/Makefile
@@ -9,7 +9,7 @@ PORTLANG= vi
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-vi/distinfo b/freebsd/tde-i18n-vi/distinfo
index 27c03409f..1ed745c2e 100644
--- a/freebsd/tde-i18n-vi/distinfo
+++ b/freebsd/tde-i18n-vi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991529
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430699
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-wa/Makefile b/freebsd/tde-i18n-wa/Makefile
index abe3b42ea..d2443325f 100644
--- a/freebsd/tde-i18n-wa/Makefile
+++ b/freebsd/tde-i18n-wa/Makefile
@@ -9,7 +9,7 @@ PORTLANG= wa
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-wa/distinfo b/freebsd/tde-i18n-wa/distinfo
index d911b5226..ab67f7c7a 100644
--- a/freebsd/tde-i18n-wa/distinfo
+++ b/freebsd/tde-i18n-wa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991561
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430775
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-zh_CN/Makefile b/freebsd/tde-i18n-zh_CN/Makefile
index a70475bea..2e623cf9c 100644
--- a/freebsd/tde-i18n-zh_CN/Makefile
+++ b/freebsd/tde-i18n-zh_CN/Makefile
@@ -9,7 +9,7 @@ PORTLANG= zh_CN
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-zh_CN/distinfo b/freebsd/tde-i18n-zh_CN/distinfo
index a5b9afd39..269d4f28d 100644
--- a/freebsd/tde-i18n-zh_CN/distinfo
+++ b/freebsd/tde-i18n-zh_CN/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991583
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430832
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tde-i18n-zh_TW/Makefile b/freebsd/tde-i18n-zh_TW/Makefile
index 81a513137..88a39944c 100644
--- a/freebsd/tde-i18n-zh_TW/Makefile
+++ b/freebsd/tde-i18n-zh_TW/Makefile
@@ -9,7 +9,7 @@ PORTLANG= zh_TW
PORTNAME= tde-i18n-trinity
COMMENT= Messages and documentation for TDE - ${PORTLANG}
-TDE_PREVERSION= ~pre7+18617cdf
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tde-i18n-zh_TW/distinfo b/freebsd/tde-i18n-zh_TW/distinfo
index 1df48cadc..c2455bb7e 100644
--- a/freebsd/tde-i18n-zh_TW/distinfo
+++ b/freebsd/tde-i18n-zh_TW/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991605
-SHA256 (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 6d5227e30fd836c334179846d949e76fd7cb6e891b18509e39c224c16614754c
-SIZE (TDE/tde-i18n-trinity_14.0.5~pre7.orig.tar.xz) = 195161540
+TIMESTAMP = 1533430936
+SHA256 (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = b4a2cf8c1ac4527805b56097b0c859f69fea21238ebba23a3a38d5a43d3cfaf2
+SIZE (TDE/tde-i18n-trinity_14.0.5.orig.tar.xz) = 195139700
diff --git a/freebsd/tdeaccessibility/Makefile b/freebsd/tdeaccessibility/Makefile
index 63f3661d5..16bd67c77 100644
--- a/freebsd/tdeaccessibility/Makefile
+++ b/freebsd/tdeaccessibility/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdeaccessibility-trinity
COMMENT= Trinity accessibility apps
-TDE_PREVERSION= ~pre9+022736e3
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 accessibility
diff --git a/freebsd/tdeaccessibility/distinfo b/freebsd/tdeaccessibility/distinfo
index a0fd5b868..6b53d1f83 100644
--- a/freebsd/tdeaccessibility/distinfo
+++ b/freebsd/tdeaccessibility/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498593281
-SHA256 (TDE/tdeaccessibility-trinity_14.0.5~pre9.orig.tar.xz) = 50bf55cc669187914aa52a6739f73a7e5a4078e421f1cdfdfdbd019e77543fcc
-SIZE (TDE/tdeaccessibility-trinity_14.0.5~pre9.orig.tar.xz) = 6267876
+TIMESTAMP = 1533390545
+SHA256 (TDE/tdeaccessibility-trinity_14.0.5.orig.tar.xz) = 8a705b591b0e68c3582034568586b71b572f0abaccc9149d24408b3b61848ba0
+SIZE (TDE/tdeaccessibility-trinity_14.0.5.orig.tar.xz) = 6261916
diff --git a/freebsd/tdeaddons/Makefile b/freebsd/tdeaddons/Makefile
index 5e208c88b..4f35fe7a8 100644
--- a/freebsd/tdeaddons/Makefile
+++ b/freebsd/tdeaddons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdeaddons-trinity
COMMENT= Trinity add-on plugins and applets
-TDE_PREVERSION= ~pre15+fa22b5e8
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tdeaddons/distinfo b/freebsd/tdeaddons/distinfo
index 68ac84a95..2ef5d0587 100644
--- a/freebsd/tdeaddons/distinfo
+++ b/freebsd/tdeaddons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527662351
-SHA256 (TDE/tdeaddons-trinity_14.0.5~pre15.orig.tar.xz) = 979802e58781dc6e514f857cee6af2a8d4eba72eef49524dd1e012de1b1a80ca
-SIZE (TDE/tdeaddons-trinity_14.0.5~pre15.orig.tar.xz) = 1449792
+TIMESTAMP = 1533391527
+SHA256 (TDE/tdeaddons-trinity_14.0.5.orig.tar.xz) = a370b23502d254f276ce7b8dd62d32d9087f2b3a03d3bbcde7b86feaab296162
+SIZE (TDE/tdeaddons-trinity_14.0.5.orig.tar.xz) = 1449964
diff --git a/freebsd/tdeadmin/Makefile b/freebsd/tdeadmin/Makefile
index e595ffdc7..c3afd8fd7 100644
--- a/freebsd/tdeadmin/Makefile
+++ b/freebsd/tdeadmin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdeadmin-trinity
COMMENT= Trinity system administration tools
-TDE_PREVERSION= ~pre8+ad3832f1
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 sysutils
diff --git a/freebsd/tdeadmin/distinfo b/freebsd/tdeadmin/distinfo
index 73d864617..70fe8f476 100644
--- a/freebsd/tdeadmin/distinfo
+++ b/freebsd/tdeadmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498593495
-SHA256 (TDE/tdeadmin-trinity_14.0.5~pre8.orig.tar.xz) = 532e8d8b9f0c0b1292176040921ae63ec132e8c09aa0aa6ae27ed8cd07aad4fd
-SIZE (TDE/tdeadmin-trinity_14.0.5~pre8.orig.tar.xz) = 1512944
+TIMESTAMP = 1533390783
+SHA256 (TDE/tdeadmin-trinity_14.0.5.orig.tar.xz) = 89d802179ca77398d5ac52da19d278819ad8e3d0b0f3086ab3f7a1bd79906d97
+SIZE (TDE/tdeadmin-trinity_14.0.5.orig.tar.xz) = 1511644
diff --git a/freebsd/tdeadmin/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdeadmin/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..164bc8c2a
--- /dev/null
+++ b/freebsd/tdeadmin/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,13 @@
+diff --git a/kuser/globals.h b/kuser/globals.h
+index 5e0e2f1..0af1017 100644
+--- a/kuser/globals.h
++++ b/kuser/globals.h
+@@ -46,7 +46,7 @@
+ #include <pwd.h>
+ #define PASSWORD_FILE _PATH_MASTERPASSWD
+ #define PASSWORD_FILE_MASK S_IRUSR | S_IWUSR
+- #define PWMKDB _PATH_PWD_MKDB" -p "PASSWORD_FILE
++ #define PWMKDB _PATH_PWD_MKDB " -p " PASSWORD_FILE
+ #define SKELDIR "/usr/share/skel"
+ #define SKEL_FILE_PREFIX "dot"
+ #define CRONTAB_DIR "/var/cron/tabs"
diff --git a/freebsd/tdeartwork/Makefile b/freebsd/tdeartwork/Makefile
index 66ab3b0b6..a054b1610 100644
--- a/freebsd/tdeartwork/Makefile
+++ b/freebsd/tdeartwork/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdeartwork-trinity
COMMENT= Trinity themes, styles and more
-TDE_PREVERSION= ~pre7+5cfb78bc
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11-themes
diff --git a/freebsd/tdeartwork/distinfo b/freebsd/tdeartwork/distinfo
index 67be8b231..baa8b08f1 100644
--- a/freebsd/tdeartwork/distinfo
+++ b/freebsd/tdeartwork/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991871
-SHA256 (TDE/tdeartwork-trinity_14.0.5~pre7.orig.tar.xz) = 82b0359451d68bd90c877381fccd91739a0f2f1693427c0a1e83db5cb254fb3c
-SIZE (TDE/tdeartwork-trinity_14.0.5~pre7.orig.tar.xz) = 32358128
+TIMESTAMP = 1533391741
+SHA256 (TDE/tdeartwork-trinity_14.0.5.orig.tar.xz) = f6562f3f1356b35934b97008d3ba0a691383e506fb480c20d5207bedd9f26844
+SIZE (TDE/tdeartwork-trinity_14.0.5.orig.tar.xz) = 32353680
diff --git a/freebsd/tdeartwork/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdeartwork/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..fa74bbc4a
--- /dev/null
+++ b/freebsd/tdeartwork/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,17 @@
+diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp
+index d285d2cf..83f77d70 100644
+--- a/tdescreensaver/kdesavers/pendulum.cpp
++++ b/tdescreensaver/kdesavers/pendulum.cpp
+@@ -227,9 +227,9 @@ void PendulumGLWidget::initializeGL(void)
+ glLoadIdentity();
+ // set positon of light0
+ GLfloat lightPos[4]=
+- {lightR * sin(lightTheta) * sin(lightPhi),
+- lightR * sin(lightTheta) * cos(lightPhi),
+- lightR * cos(lightTheta),
++ {(GLfloat)(lightR * sin(lightTheta) * sin(lightPhi)),
++ (GLfloat)(lightR * sin(lightTheta) * cos(lightPhi)),
++ (GLfloat)(lightR * cos(lightTheta)),
+ 0};
+ glLightfv(GL_LIGHT0, GL_POSITION, lightPos);
+ // set positon of light1
diff --git a/freebsd/tdebase/Makefile b/freebsd/tdebase/Makefile
index 709054a35..45a9d893b 100644
--- a/freebsd/tdebase/Makefile
+++ b/freebsd/tdebase/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdebase-trinity
COMMENT= Trinity Base Programs
-TDE_PREVERSION= ~pre36+9c625e0c
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11
diff --git a/freebsd/tdebase/distinfo b/freebsd/tdebase/distinfo
index 6b6e76b19..adba665f8 100644
--- a/freebsd/tdebase/distinfo
+++ b/freebsd/tdebase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527703072
-SHA256 (TDE/tdebase-trinity_14.0.5~pre36.orig.tar.xz) = 87992540a0128db2f641e7940060fb04bb92bf6219dd1e724c46a0b9a2262b1a
-SIZE (TDE/tdebase-trinity_14.0.5~pre36.orig.tar.xz) = 29968328
+TIMESTAMP = 1532881787
+SHA256 (TDE/tdebase-trinity_14.0.5.orig.tar.xz) = 0149dc4186df36600d7ae9bce7c470bb7f20b9343b6dddd6c4ef26758d0583cf
+SIZE (TDE/tdebase-trinity_14.0.5.orig.tar.xz) = 29984124
diff --git a/freebsd/tdebase/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdebase/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..145b8288d
--- /dev/null
+++ b/freebsd/tdebase/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,96 @@
+diff --git a/kcontrol/tdefontinst/tdefontinst/Main.cpp b/kcontrol/tdefontinst/tdefontinst/Main.cpp
+index 6db9b83c..1b58d1a2 100644
+--- a/kcontrol/tdefontinst/tdefontinst/Main.cpp
++++ b/kcontrol/tdefontinst/tdefontinst/Main.cpp
+@@ -69,22 +69,22 @@ static const char * getFile(const char *entry, const char **posibilities)
+
+ static const char * constXConfigFiles[]=
+ {
+- "/etc/X11/"KFI_XORGCFG,
+- "/etc/X11/"KFI_XORGCFG"-4",
+- "/etc/"KFI_XORGCFG,
+- "/usr/X11R6/etc/X11/"KFI_XORGCFG,
+- "/usr/X11R6/etc/X11/"KFI_XORGCFG"-4",
+- "/usr/X11R6/lib/X11/"KFI_XORGCFG,
+- "/usr/X11R6/lib/X11/"KFI_XORGCFG"-4",
+-
+- "/etc/X11/"KFI_XF86CFG"-4",
+- "/etc/X11/"KFI_XF86CFG,
+- "/etc/"KFI_XF86CFG"-4",
+- "/etc/"KFI_XF86CFG,
+- "/usr/X11R6/etc/X11/"KFI_XF86CFG"-4",
+- "/usr/X11R6/etc/X11/"KFI_XF86CFG,
+- "/usr/X11R6/lib/X11/"KFI_XF86CFG"-4",
+- "/usr/X11R6/lib/X11/"KFI_XF86CFG,
++ "/etc/X11/" KFI_XORGCFG,
++ "/etc/X11/" KFI_XORGCFG "-4",
++ "/etc/" KFI_XORGCFG,
++ "/usr/X11R6/etc/X11/" KFI_XORGCFG,
++ "/usr/X11R6/etc/X11/" KFI_XORGCFG "-4",
++ "/usr/X11R6/lib/X11/" KFI_XORGCFG,
++ "/usr/X11R6/lib/X11/" KFI_XORGCFG "-4",
++
++ "/etc/X11/" KFI_XF86CFG "-4",
++ "/etc/X11/" KFI_XF86CFG,
++ "/etc/" KFI_XF86CFG "-4",
++ "/etc/" KFI_XF86CFG,
++ "/usr/X11R6/etc/X11/" KFI_XF86CFG "-4",
++ "/usr/X11R6/etc/X11/" KFI_XF86CFG,
++ "/usr/X11R6/lib/X11/" KFI_XF86CFG "-4",
++ "/usr/X11R6/lib/X11/" KFI_XF86CFG,
+
+ NULL
+ };
+diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
+index eee3ac80..8dd23dc6 100644
+--- a/tdeioslave/man/man2html.cpp
++++ b/tdeioslave/man/man2html.cpp
+@@ -656,7 +656,7 @@ static void fill_old_character_definitions( void )
+ for (size_t i = 0; i < sizeof(standardchar)/sizeof(CSTRDEF); i++)
+ {
+ const int nr = standardchar[i].nr;
+- const char temp[3] = { nr / 256, nr % 256, 0 };
++ const char temp[3] = { (char)(nr / 256), (char)(nr % 256), 0 };
+ TQCString name( temp );
+ s_characterDefinitionMap.insert( name, StringDefinition( standardchar[i].slen, standardchar[i].st ) );
+ }
+@@ -3713,7 +3713,7 @@ static char *scan_request(char *c)
+ }
+ case REQ_Fo: // mdoc(7) "Function definition Opening"
+ {
+- char* font[2] = { "B", "R" };
++ const char* font[2] = { "B", "R" };
+ c+=j;
+ if (*c=='\n') c++;
+ char *eol=strchr(c,'\n');
+@@ -3748,7 +3748,7 @@ static char *scan_request(char *c)
+ // .Fc has no parameter
+ c+=j;
+ c=skip_till_newline(c);
+- char* font[2] = { "B", "R" };
++ const char* font[2] = { "B", "R" };
+ out_html(set_font(font[i&1]));
+ out_html(")");
+ out_html(set_font("R"));
+@@ -3764,7 +3764,7 @@ static char *scan_request(char *c)
+ }
+ case REQ_Fa: // mdoc(7) "Function definition argument"
+ {
+- char* font[2] = { "B", "R" };
++ const char* font[2] = { "B", "R" };
+ c+=j;
+ if (*c=='\n') c++;
+ sl=fill_words(c, wordlist, &words, true, &c);
+diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
+index 80d44339..637b16bf 100644
+--- a/tdeioslave/media/mediamanager/halbackend.cpp
++++ b/tdeioslave/media/mediamanager/halbackend.cpp
+@@ -1670,7 +1670,7 @@ TQString HALBackend::unmount(const TQString &_udi)
+ if (dbus_error_is_set(&error))
+ {
+ dbus_error_free(&error);
+- return false;
++ return TQString();
+ }
+
+ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi.latin1(),
diff --git a/freebsd/tdebase/pkg-plist b/freebsd/tdebase/pkg-plist
index 02d3db96a..9455c884c 100644
--- a/freebsd/tdebase/pkg-plist
+++ b/freebsd/tdebase/pkg-plist
@@ -1948,6 +1948,7 @@ share/autostart/kdesktop.desktop
share/autostart/klipper.desktop
share/autostart/konqy_preload.desktop
share/autostart/ktip.desktop
+share/autostart/mediabackend.desktop
share/autostart/panel.desktop
share/autostart/release_notes.desktop
share/autostart/tderandrtray-autostart.desktop
@@ -4612,3 +4613,4 @@ share/wallpapers/triplegears.jpg
share/wallpapers/triplegears.jpg.desktop
share/wallpapers/world-desktop.jpg
share/wallpapers/world-desktop.jpg.desktop
+@dir share/templates/.source/emptydir
diff --git a/freebsd/tdeedu/Makefile b/freebsd/tdeedu/Makefile
index a91ff93ba..d0b4131b8 100644
--- a/freebsd/tdeedu/Makefile
+++ b/freebsd/tdeedu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdeedu-trinity
COMMENT= Trinity educational apps
-TDE_PREVERSION= ~pre5+aa394f1f
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tdeedu/distinfo b/freebsd/tdeedu/distinfo
index d7ed5578f..805d2d07c 100644
--- a/freebsd/tdeedu/distinfo
+++ b/freebsd/tdeedu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991862
-SHA256 (TDE/tdeedu-trinity_14.0.5~pre5.orig.tar.xz) = 5439e05c29946c2009bb459931b1b7ece7070b5b4a0ceacd96417a42ff286dc1
-SIZE (TDE/tdeedu-trinity_14.0.5~pre5.orig.tar.xz) = 24718584
+TIMESTAMP = 1533388191
+SHA256 (TDE/tdeedu-trinity_14.0.5.orig.tar.xz) = f97d808eaa3b4ec713a2eea6a0024eba402f23fd6443620999fad9150e565f9b
+SIZE (TDE/tdeedu-trinity_14.0.5.orig.tar.xz) = 24717996
diff --git a/freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff b/freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff
new file mode 100644
index 000000000..1d442f1c8
--- /dev/null
+++ b/freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff
@@ -0,0 +1,13 @@
+diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am
+index 1817b1cb..4d971fbd 100644
+--- a/kmplot/kmplot/Makefile.am
++++ b/kmplot/kmplot/Makefile.am
+@@ -28,6 +28,8 @@ kmplot_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel
+ kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
+ kmplot_LDADD = $(LIB_TDEPARTS)
+
++kmplot_COMPILE_FIRST = FktDlgData.h qminmax.h settings.h
++
+ # this is where the desktop file will go
+ appmimedir = $(kde_mimedir)/application
+ appmime_DATA = x-kmplot.desktop
diff --git a/freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff b/freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..b8fd21342
--- /dev/null
+++ b/freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,40 @@
+diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp
+index acf7ecdb..4ab4300f 100644
+--- a/kmplot/kmplot/xparser.cpp
++++ b/kmplot/kmplot/xparser.cpp
+@@ -521,7 +521,7 @@ TQString XParser::functionMinValue(uint id)
+ {
+ int const ix = ixValue(id);
+ if (ix==-1)
+- return int();
++ return TQString();
+ return ufkt[ix].str_dmin;
+ }
+
+@@ -539,7 +539,7 @@ TQString XParser::functionMaxValue(uint id)
+ {
+ int const ix = ixValue(id);
+ if (ix==-1)
+- return int();
++ return TQString();
+ return ufkt[ix].str_dmax;
+ }
+
+@@ -557,7 +557,7 @@ TQString XParser::functionStartXValue(uint id)
+ {
+ int const ix = ixValue(id);
+ if (ix==-1)
+- return int();
++ return TQString();
+ return ufkt[ix].str_startx;
+ }
+
+@@ -575,7 +575,7 @@ TQString XParser::functionStartYValue(uint id)
+ {
+ int const ix = ixValue(id);
+ if (ix==-1)
+- return int();
++ return TQString();
+ return ufkt[ix].str_starty;
+ }
+
diff --git a/freebsd/tdegames/Makefile b/freebsd/tdegames/Makefile
index d7809ce71..271b01e2d 100644
--- a/freebsd/tdegames/Makefile
+++ b/freebsd/tdegames/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdegames-trinity
COMMENT= Trinity games
-TDE_PREVERSION= ~pre8+0f201513
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 games
diff --git a/freebsd/tdegames/distinfo b/freebsd/tdegames/distinfo
index 6f3d7d354..be42c5b60 100644
--- a/freebsd/tdegames/distinfo
+++ b/freebsd/tdegames/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514319578
-SHA256 (TDE/tdegames-trinity_14.0.5~pre8.orig.tar.xz) = 75ac763b810f50e3be57fd5a831fe491a39e0c77cc731dacb34fd9dc26100baa
-SIZE (TDE/tdegames-trinity_14.0.5~pre8.orig.tar.xz) = 8630592
+TIMESTAMP = 1533388282
+SHA256 (TDE/tdegames-trinity_14.0.5.orig.tar.xz) = bc9042512c6dd299f708959ae4738d0722592afb7fce8c0b83fde5c14f881aae
+SIZE (TDE/tdegames-trinity_14.0.5.orig.tar.xz) = 8629436
diff --git a/freebsd/tdegames/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdegames/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..ae3f37b4b
--- /dev/null
+++ b/freebsd/tdegames/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,13 @@
+diff --git a/kshisen/board.cpp b/kshisen/board.cpp
+index ce8c915..a19f060 100644
+--- a/kshisen/board.cpp
++++ b/kshisen/board.cpp
+@@ -730,7 +730,7 @@ void Board::undrawConnection()
+ // game is over?
+ if(!getHint_I(dummyPath))
+ {
+- time_for_game = (int)difftime( time((time_t)0), starttime);
++ time_for_game = (int)difftime( time(0), starttime);
+ emit endOfGame();
+ }
+ }
diff --git a/freebsd/tdegraphics/Makefile b/freebsd/tdegraphics/Makefile
index 17c6f955c..a489793b1 100644
--- a/freebsd/tdegraphics/Makefile
+++ b/freebsd/tdegraphics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdegraphics-trinity
COMMENT= Trinity graphics apps
-TDE_PREVERSION= ~pre11+da97023d
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 graphics
diff --git a/freebsd/tdegraphics/distinfo b/freebsd/tdegraphics/distinfo
index 0335f516f..2cfbdaaf3 100644
--- a/freebsd/tdegraphics/distinfo
+++ b/freebsd/tdegraphics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514314694
-SHA256 (TDE/tdegraphics-trinity_14.0.5~pre11.orig.tar.xz) = 97a53e45ce3f0d53d44f08916b5528e2d5b15756fd45721ce4467f7edff57e72
-SIZE (TDE/tdegraphics-trinity_14.0.5~pre11.orig.tar.xz) = 5795068
+TIMESTAMP = 1533304970
+SHA256 (TDE/tdegraphics-trinity_14.0.5.orig.tar.xz) = 51190393d969f3f4101504054dceedc953d8252ba47f6b8c3e3c94b69b9040d9
+SIZE (TDE/tdegraphics-trinity_14.0.5.orig.tar.xz) = 5790668
diff --git a/freebsd/tdegraphics/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdegraphics/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..7b0cdff0e
--- /dev/null
+++ b/freebsd/tdegraphics/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,21 @@
+diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp
+index 03b18f06..f46051f5 100644
+--- a/ksvg/plugin/backends/libart/LibartCanvas.cpp
++++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp
+@@ -75,11 +75,11 @@ ArtSVP *art_svp_from_rect(int x0, int y0, int x1, int y1)
+ {
+ ArtVpath vpath[] =
+ {
+- { ART_MOVETO, x0, y0 },
+- { ART_LINETO, x0, y1 },
+- { ART_LINETO, x1, y1 },
+- { ART_LINETO, x1, y0 },
+- { ART_LINETO, x0, y0 },
++ { ART_MOVETO, (double)x0, (double)y0 },
++ { ART_LINETO, (double)x0, (double)y1 },
++ { ART_LINETO, (double)x1, (double)y1 },
++ { ART_LINETO, (double)x1, (double)y0 },
++ { ART_LINETO, (double)x0, (double)y0 },
+ { ART_END, 0, 0}
+ };
+
diff --git a/freebsd/tdelibs/Makefile b/freebsd/tdelibs/Makefile
index c00085080..8f13d7ef2 100644
--- a/freebsd/tdelibs/Makefile
+++ b/freebsd/tdelibs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdelibs-trinity
COMMENT= Core libraries and binaries for all TDE applications
-TDE_PREVERSION= ~pre68+8140cac9
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11
diff --git a/freebsd/tdelibs/distinfo b/freebsd/tdelibs/distinfo
index e9cc73cae..f2b5d8d86 100644
--- a/freebsd/tdelibs/distinfo
+++ b/freebsd/tdelibs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527607987
-SHA256 (TDE/tdelibs-trinity_14.0.5~pre68.orig.tar.xz) = 32366ba03dd2aee43beadffd05fbde66d425ceb553aa940273442fca24140279
-SIZE (TDE/tdelibs-trinity_14.0.5~pre68.orig.tar.xz) = 15105832
+TIMESTAMP = 1532798504
+SHA256 (TDE/tdelibs-trinity_14.0.5.orig.tar.xz) = 2e0f5bdc278b36ebcd39107c0504baf1293f09c7c39a969a8833004a756631d3
+SIZE (TDE/tdelibs-trinity_14.0.5.orig.tar.xz) = 15107820
diff --git a/freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..b53918e8c
--- /dev/null
+++ b/freebsd/tdelibs/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,34 @@
+diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp
+index 576f7192..566a8bda 100644
+--- a/tdeinit/tdeinit.cpp
++++ b/tdeinit/tdeinit.cpp
+@@ -1514,7 +1514,7 @@ static void tdeinit_library_path()
+ TQCString display = getenv(DISPLAY);
+ if (display.isEmpty())
+ {
+- fprintf(stderr, "[tdeinit] Aborting. $"DISPLAY" is not set.\n");
++ fprintf(stderr, "[tdeinit] Aborting. $" DISPLAY " is not set.\n");
+ exit(255);
+ }
+ int i;
+diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
+index ca8dea40..1f93a534 100644
+--- a/tdestyles/keramik/keramik.cpp
++++ b/tdestyles/keramik/keramik.cpp
+@@ -2833,11 +2833,11 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
+
+ //CHECKME: Not sure the rects are perfect..
+ XRectangle rects[5] = {
+- {0, 0, resize->size().width()-2, resize->size().height()-6},
+- {0, resize->size().height()-6, resize->size().width()-2, 1},
+- {1, resize->size().height()-5, resize->size().width()-3, 1},
+- {2, resize->size().height()-4, resize->size().width()-5, 1},
+- {3, resize->size().height()-3, resize->size().width()-7, 1}
++ {0, 0, (unsigned short)(resize->size().width()-2), (unsigned short)(resize->size().height()-6)},
++ {0, (short)(resize->size().height()-6), (unsigned short)(resize->size().width()-2), 1},
++ {1, (short)(resize->size().height()-5), (unsigned short)(resize->size().width()-3), 1},
++ {2, (short)(resize->size().height()-4), (unsigned short)(resize->size().width()-5), 1},
++ {3, (short)(resize->size().height()-3), (unsigned short)(resize->size().width()-7), 1}
+ };
+
+ XShapeCombineRectangles(tqt_xdisplay(), listbox->handle(), ShapeBounding, 0, 0,
diff --git a/freebsd/tdelibs/pkg-plist b/freebsd/tdelibs/pkg-plist
index 033275f9b..4deb68745 100644
--- a/freebsd/tdelibs/pkg-plist
+++ b/freebsd/tdelibs/pkg-plist
@@ -1246,6 +1246,7 @@ share/apps/katepart/syntax/fstab.xml
share/apps/katepart/syntax/ftl.xml
share/apps/katepart/syntax/gap.xml
share/apps/katepart/syntax/gcc.xml
+share/apps/katepart/syntax/gcode.xml
share/apps/katepart/syntax/gdb.xml
share/apps/katepart/syntax/gdl.xml
share/apps/katepart/syntax/gettext.xml
diff --git a/freebsd/tdemultimedia/Makefile b/freebsd/tdemultimedia/Makefile
index a6c7adc38..aa31e85bc 100644
--- a/freebsd/tdemultimedia/Makefile
+++ b/freebsd/tdemultimedia/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdemultimedia-trinity
COMMENT= Trinity multimedia apps
-TDE_PREVERSION= ~pre13+12e51265
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 multimedia
@@ -44,6 +44,8 @@ do-configure: tde-cmake-prepare
do-build: tde-cmake-build
+post-build: tde-cmake-check
+
do-install: tde-cmake-install
.include <bsd.port.mk>
diff --git a/freebsd/tdemultimedia/distinfo b/freebsd/tdemultimedia/distinfo
index 3eb55e01d..68450665f 100644
--- a/freebsd/tdemultimedia/distinfo
+++ b/freebsd/tdemultimedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514726604
-SHA256 (TDE/tdemultimedia-trinity_14.0.5~pre13.orig.tar.xz) = e99db55682bee765d1816f99e9cfe17e50ab5a303daef8163ef44325cc921769
-SIZE (TDE/tdemultimedia-trinity_14.0.5~pre13.orig.tar.xz) = 4820492
+TIMESTAMP = 1533126401
+SHA256 (TDE/tdemultimedia-trinity_14.0.5.orig.tar.xz) = 0609cbc85a744ec41eab0daefe6c23c6ed08b8ba9f0e9c760327f6c81755479b
+SIZE (TDE/tdemultimedia-trinity_14.0.5.orig.tar.xz) = 4817036
diff --git a/freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..e4360656f
--- /dev/null
+++ b/freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,26 @@
+diff --git a/arts/midi/rawmidiport_impl.cc b/arts/midi/rawmidiport_impl.cc
+index 3d82d8b..f8311bd 100644
+--- a/arts/midi/rawmidiport_impl.cc
++++ b/arts/midi/rawmidiport_impl.cc
+@@ -289,7 +289,7 @@ public:
+ }
+ void processCommand(const MidiCommand& command)
+ {
+- char message[3] = { command.status, command.data1, command.data2 };
++ unsigned char message[3] = { command.status, command.data1, command.data2 };
+
+ int len = midiMsgLen(command.status);
+ if(midiMsgLen(command.status))
+diff --git a/mpeglib/lib/mpegplay/mpegVideoStream.cpp b/mpeglib/lib/mpegplay/mpegVideoStream.cpp
+index 5e16b11..a37288e 100644
+--- a/mpeglib/lib/mpegplay/mpegVideoStream.cpp
++++ b/mpeglib/lib/mpegplay/mpegVideoStream.cpp
+@@ -81,7 +81,7 @@ int MpegVideoStream::isStartCode(unsigned int data) {
+ case SEQUENCE_ERROR_CODE:
+ case SYSTEM_HEADER_START_CODE:
+ case ISO_11172_END_CODE:
+- case EOF:
++ case (0U | EOF):
+ return true;
+ }
+ if ((SLICE_MIN_START_CODE < data) && (data < SLICE_MAX_START_CODE)) {
diff --git a/freebsd/tdenetwork/Makefile b/freebsd/tdenetwork/Makefile
index 1465316c5..9af91a3e7 100644
--- a/freebsd/tdenetwork/Makefile
+++ b/freebsd/tdenetwork/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdenetwork-trinity
COMMENT= Trinity network-related apps
-TDE_PREVERSION= ~pre19+70e337ea
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 net
diff --git a/freebsd/tdenetwork/distinfo b/freebsd/tdenetwork/distinfo
index 8685e16e8..42b6714d0 100644
--- a/freebsd/tdenetwork/distinfo
+++ b/freebsd/tdenetwork/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514648824
-SHA256 (TDE/tdenetwork-trinity_14.0.5~pre19.orig.tar.xz) = d29aecc8db02e60da47a668c87ceb2c723502916ee1b846349d9b9220c782ec2
-SIZE (TDE/tdenetwork-trinity_14.0.5~pre19.orig.tar.xz) = 6571268
+TIMESTAMP = 1533237017
+SHA256 (TDE/tdenetwork-trinity_14.0.5.orig.tar.xz) = c0de8398e61cbd37463ec7ff6ef8911e27cd4ffde30b60174631c8c6b41f347a
+SIZE (TDE/tdenetwork-trinity_14.0.5.orig.tar.xz) = 6560012
diff --git a/freebsd/tdenetwork/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdenetwork/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..a190bae9a
--- /dev/null
+++ b/freebsd/tdenetwork/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,65 @@
+diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
+index 4a34ae2f..ecec66d4 100644
+--- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
++++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
+@@ -106,7 +106,7 @@ bool ChatNavServiceTask::take( Transfer* transfer )
+ void ChatNavServiceTask::onGo()
+ {
+ FLAP f = { 0x02, 0, 0x00 };
+- SNAC s = { 0x000D, m_type, 0x0000, client()->snacSequence() };
++ SNAC s = { 0x000D, (unsigned short)m_type, 0x0000, client()->snacSequence() };
+ Buffer* b = new Buffer();
+
+ Transfer* t = createTransfer( f, s, b );
+diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
+index af180be1..0f9c8f5f 100644
+--- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
++++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
+@@ -60,7 +60,7 @@ void SendMessageTask::onGo()
+ snacSubfamily = 0x000B;
+ }
+ FLAP f = { 0x02, 0, 0 };
+- SNAC s = { 0x0004, snacSubfamily, 0x0000, client()->snacSequence() };
++ SNAC s = { 0x0004, (unsigned short)snacSubfamily, 0x0000, client()->snacSequence() };
+ Buffer* b = new Buffer();
+
+ if ( snacSubfamily == 0x0006 )
+diff --git a/lanbrowsing/lisa/main.cpp b/lanbrowsing/lisa/main.cpp
+index fd96d04e..1ef55453 100644
+--- a/lanbrowsing/lisa/main.cpp
++++ b/lanbrowsing/lisa/main.cpp
+@@ -53,7 +53,7 @@
+ void printVersion()
+ {
+ const char * versionInfo=\
+- "\r\nThis is the LAN Information Server LISa "MYVERSION"\r\n"\
++ "\r\nThis is the LAN Information Server LISa " MYVERSION "\r\n"\
+ "It is free software according the GNU General Public License\r\n"\
+ "Copyright (c) 2000-2003 by Alexander Neundorf\r\n"\
+ "email: neundorf@kde.org\r\n";
+diff --git a/lanbrowsing/lisa/netmanager.cpp b/lanbrowsing/lisa/netmanager.cpp
+index 5a21fe5c..cf6a2f76 100644
+--- a/lanbrowsing/lisa/netmanager.cpp
++++ b/lanbrowsing/lisa/netmanager.cpp
+@@ -1033,7 +1033,7 @@ void NetManager::getListFromServerServer( int address)
+
+ void NetManager::printState()
+ {
+- std::cerr<<"LAN Information Server Lisa "MYVERSION"\nAlexander Neundorf <neundorf@kde.org>\n";
++ std::cerr<<"LAN Information Server Lisa " MYVERSION "\nAlexander Neundorf <neundorf@kde.org>\n";
+ std::cerr<<"Reading options from config file: "<<m_usedConfigFileName<<std::endl;
+ std::cerr<<"StrictMode: "<<m_strictMode<<std::endl;
+ std::cerr<<"ServerServer: "<<m_serverServer<<std::endl;
+diff --git a/lanbrowsing/lisa/strictmain.cpp b/lanbrowsing/lisa/strictmain.cpp
+index 07f5b9bc..09f3eda0 100644
+--- a/lanbrowsing/lisa/strictmain.cpp
++++ b/lanbrowsing/lisa/strictmain.cpp
+@@ -52,7 +52,7 @@
+ void printVersion()
+ {
+ const char * versionInfo=\
+- "\r\nThis is the restricted LAN Information Server resLISa "MYVERSION"\r\n"\
++ "\r\nThis is the restricted LAN Information Server resLISa " MYVERSION "\r\n"\
+ "It is free software according the GNU General Public License\r\n"\
+ "Copyright (c) 2000-2003 by Alexander Neundorf\r\n"\
+ "email: neundorf@kde.org\r\n";
diff --git a/freebsd/tdepim/Makefile b/freebsd/tdepim/Makefile
index c19ca8b34..0a718bdc7 100644
--- a/freebsd/tdepim/Makefile
+++ b/freebsd/tdepim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdepim-trinity
COMMENT= Trinity Personal Information Management apps
-TDE_PREVERSION= ~pre14+724a547c
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 deskutils
diff --git a/freebsd/tdepim/distinfo b/freebsd/tdepim/distinfo
index b95e612ea..48067e66d 100644
--- a/freebsd/tdepim/distinfo
+++ b/freebsd/tdepim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527518866
-SHA256 (TDE/tdepim-trinity_14.0.5~pre14.orig.tar.xz) = 6ca91223b726c55a36bbeb5574adad5ecd91fdd3896fc095ca90b4d8ba169e10
-SIZE (TDE/tdepim-trinity_14.0.5~pre14.orig.tar.xz) = 9329768
+TIMESTAMP = 1532918490
+SHA256 (TDE/tdepim-trinity_14.0.5.orig.tar.xz) = ac90555cf9117b2d809ccc1979dcfea32534975f33a45b82fda8991c7bb901ce
+SIZE (TDE/tdepim-trinity_14.0.5.orig.tar.xz) = 9321620
diff --git a/freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..a222aa5eb
--- /dev/null
+++ b/freebsd/tdepim/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,89 @@
+diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
+index b92e3f3e..9ae28740 100644
+--- a/kalarm/functions.cpp
++++ b/kalarm/functions.cpp
+@@ -1053,7 +1053,7 @@ bool runKOrganizer()
+ }
+ if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+ {
+- kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl;
++ kdWarning(5950) << "Unable to access KOrganizer's " KORG_DCOP_OBJECT " DCOP object" << endl;
+ return false;
+ }
+ }
+diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp
+index 834051c5..b06e3afe 100644
+--- a/tderesources/groupwise/soap/stdsoap2.cpp
++++ b/tderesources/groupwise/soap/stdsoap2.cpp
+@@ -1284,7 +1284,7 @@ soap_get(struct soap *soap)
+ case '\'':
+ return SOAP_AP;
+ case '&':
+- return soap_char(soap) | 0x80000000;
++ return soap_char(soap) | (1<<31);
+ }
+ break;
+ }
+@@ -7094,7 +7094,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
+ { soap_unget(soap, c);
+ c = soap_getutf8(soap);
+ if (soap->mode & SOAP_C_UTFSTRING)
+- { if ((c & 0x80000000) && c >= -0x7FFFFF80 && c < SOAP_AP)
++ { if ((c & (1<<31)) && c >= -0x7FFFFF80 && c < SOAP_AP)
+ { c &= 0x7FFFFFFF;
+ t = buf;
+ if (c < 0x0800)
+@@ -7297,7 +7297,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
+ continue;
+ }
+ if (soap->mode & SOAP_C_UTFSTRING)
+- { if (((c = soap_get(soap)) & 0x80000000) && c >= -0x7FFFFF80 && c < SOAP_AP)
++ { if (((c = soap_get(soap)) & (1<<31)) && c >= -0x7FFFFF80 && c < SOAP_AP)
+ { c &= 0x7FFFFFFF;
+ t = buf;
+ if (c < 0x0800)
+@@ -7362,7 +7362,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
+ }
+ *s++ = '/';
+ break;
+- case '<' | 0x80000000:
++ case '<' | (1<<31):
+ if (flag)
+ *s++ = '<';
+ else
+@@ -7371,7 +7371,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
+ m = 3;
+ }
+ break;
+- case '>' | 0x80000000:
++ case '>' | (1<<31):
+ if (flag)
+ *s++ = '>';
+ else
+@@ -7380,7 +7380,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
+ m = 3;
+ }
+ break;
+- case '&' | 0x80000000:
++ case '&' | (1<<31):
+ if (flag)
+ *s++ = '&';
+ else
+@@ -7389,7 +7389,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
+ m = 4;
+ }
+ break;
+- case '"' | 0x80000000:
++ case '"' | (1<<31):
+ if (flag)
+ *s++ = '"';
+ else
+@@ -7398,7 +7398,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
+ m = 5;
+ }
+ break;
+- case '\'' | 0x80000000:
++ case '\'' | (1<<31):
+ if (flag)
+ *s++ = '\'';
+ else
diff --git a/freebsd/tdesdk/Makefile b/freebsd/tdesdk/Makefile
index 6a7f627f3..2b13fb2d7 100644
--- a/freebsd/tdesdk/Makefile
+++ b/freebsd/tdesdk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdesdk-trinity
COMMENT= Trinity software development kit
-TDE_PREVERSION= ~pre8+7091ad8a
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 devel
diff --git a/freebsd/tdesdk/distinfo b/freebsd/tdesdk/distinfo
index 007632bbc..c1e60bdb8 100644
--- a/freebsd/tdesdk/distinfo
+++ b/freebsd/tdesdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991872
-SHA256 (TDE/tdesdk-trinity_14.0.5~pre8.orig.tar.xz) = 153d901557659f01656f9995cd1056864a49d401cb71df5fa80095bf6b2fa0d9
-SIZE (TDE/tdesdk-trinity_14.0.5~pre8.orig.tar.xz) = 3712296
+TIMESTAMP = 1533392275
+SHA256 (TDE/tdesdk-trinity_14.0.5.orig.tar.xz) = 7fa06129f7b32cbbc5dc8f96092b4b5936c20bdcdd7d86c7b237882acdc8016b
+SIZE (TDE/tdesdk-trinity_14.0.5.orig.tar.xz) = 3709040
diff --git a/freebsd/tdetoys/Makefile b/freebsd/tdetoys/Makefile
index 6702c2eb4..3f5ef76b6 100644
--- a/freebsd/tdetoys/Makefile
+++ b/freebsd/tdetoys/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdetoys-trinity
COMMENT= Trinity toys
-TDE_PREVERSION= ~pre2+90fee640
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11-clocks misc
diff --git a/freebsd/tdetoys/distinfo b/freebsd/tdetoys/distinfo
index efac39703..1971ec518 100644
--- a/freebsd/tdetoys/distinfo
+++ b/freebsd/tdetoys/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991858
-SHA256 (TDE/tdetoys-trinity_14.0.5~pre2.orig.tar.xz) = d86098a69591e4c976799d961005aaa3915fb1022dd03c4c8f65945547cf5a0b
-SIZE (TDE/tdetoys-trinity_14.0.5~pre2.orig.tar.xz) = 2493060
+TIMESTAMP = 1533308224
+SHA256 (TDE/tdetoys-trinity_14.0.5.orig.tar.xz) = a997cc5cdfd4ac50375290b3b82c904f6fc433c9dfa08c20f97f383a3aaba4dd
+SIZE (TDE/tdetoys-trinity_14.0.5.orig.tar.xz) = 2492452
diff --git a/freebsd/tdeutils/Makefile b/freebsd/tdeutils/Makefile
index 6e925f4b5..57a50c7da 100644
--- a/freebsd/tdeutils/Makefile
+++ b/freebsd/tdeutils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdeutils-trinity
COMMENT= Trinity general purpose utilities
-TDE_PREVERSION= ~pre18+817ad11e
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tdeutils/distinfo b/freebsd/tdeutils/distinfo
index 38f11fe88..1fc558270 100644
--- a/freebsd/tdeutils/distinfo
+++ b/freebsd/tdeutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527642651
-SHA256 (TDE/tdeutils-trinity_14.0.5~pre18.orig.tar.xz) = 6445971ac1e82c3eeb073ecf278d2c08e5c658bea859bae47ff8bcbe6da1dc67
-SIZE (TDE/tdeutils-trinity_14.0.5~pre18.orig.tar.xz) = 2210244
+TIMESTAMP = 1533308686
+SHA256 (TDE/tdeutils-trinity_14.0.5.orig.tar.xz) = a293b2470e289774f5c3492d02aa02d564420cc1387375666d9c8f9d5abf5256
+SIZE (TDE/tdeutils-trinity_14.0.5.orig.tar.xz) = 2210884
diff --git a/freebsd/tdeutils/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdeutils/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..06634c4c6
--- /dev/null
+++ b/freebsd/tdeutils/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,13 @@
+diff --git a/superkaramba/src/imagelabel_python.cpp b/superkaramba/src/imagelabel_python.cpp
+index 61af3c5..1251cc9 100644
+--- a/superkaramba/src/imagelabel_python.cpp
++++ b/superkaramba/src/imagelabel_python.cpp
+@@ -122,7 +122,7 @@ PyObject* py_createTaskIcon(PyObject *, PyObject *args)
+ {
+ //no task was found
+ tqWarning("Task not found.");
+- return (long)NULL ;
++ return NULL;
+ }
+ //retrieve the TQPixmap that represents this image
+ TQPixmap iconPixmap = KWin::icon(currTask->window());
diff --git a/freebsd/tdevelop/Makefile b/freebsd/tdevelop/Makefile
index e3348c96a..2d8e794d3 100644
--- a/freebsd/tdevelop/Makefile
+++ b/freebsd/tdevelop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdevelop-trinity
COMMENT= Trinity IDE for Unix/X11
-TDE_PREVERSION= ~pre8+2ebea43e
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 misc
diff --git a/freebsd/tdevelop/distinfo b/freebsd/tdevelop/distinfo
index a1e03fe48..abd47801f 100644
--- a/freebsd/tdevelop/distinfo
+++ b/freebsd/tdevelop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495991873
-SHA256 (TDE/tdevelop-trinity_14.0.5~pre8.orig.tar.xz) = 2e7b01d83474d5eaaffcd7f968ffe0ce5e95314c1e2132dd23b97b6a3984bd1d
-SIZE (TDE/tdevelop-trinity_14.0.5~pre8.orig.tar.xz) = 6411820
+TIMESTAMP = 1533393328
+SHA256 (TDE/tdevelop-trinity_14.0.5.orig.tar.xz) = 09e7679d814d465255ae08191195c266ca5cfb5408bae07ad283eba34788f7d5
+SIZE (TDE/tdevelop-trinity_14.0.5.orig.tar.xz) = 6408376
diff --git a/freebsd/tdevelop/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdevelop/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..cbf10c7fc
--- /dev/null
+++ b/freebsd/tdevelop/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,13 @@
+diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
+index f6083feb..1108a299 100644
+--- a/src/simplemainwindow.cpp
++++ b/src/simplemainwindow.cpp
+@@ -97,7 +97,7 @@ void SimpleMainWindow::init()
+ if (help_menu)
+ {
+ help_menu->insertItem(SmallIconSet("contents"), i18n("TDevelop &Programming Handbook"),
+- TQT_TQOBJECT(this), TQT_SLOT(slotProgrammingHandbook()), NULL, -1, 1);
++ TQT_TQOBJECT(this), TQT_SLOT(slotProgrammingHandbook()), 0, -1, 1);
+ }
+
+ menuBar()->setEnabled( false );
diff --git a/freebsd/tdewebdev/Makefile b/freebsd/tdewebdev/Makefile
index e957b780c..74c930a3a 100644
--- a/freebsd/tdewebdev/Makefile
+++ b/freebsd/tdewebdev/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdewebdev-trinity
COMMENT= Trinity web development apps
-TDE_PREVERSION= ~pre12+24d3885b
+TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
PORTREVISION= 0
CATEGORIES= x11 www
diff --git a/freebsd/tdewebdev/distinfo b/freebsd/tdewebdev/distinfo
index cd9151c60..ed8e0203a 100644
--- a/freebsd/tdewebdev/distinfo
+++ b/freebsd/tdewebdev/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527559967
-SHA256 (TDE/tdewebdev-trinity_14.0.5~pre12.orig.tar.xz) = 8c87074283bc4bd49c69c055e2623d6c4fc1d160c7c129b14bbae3ebc54d084b
-SIZE (TDE/tdewebdev-trinity_14.0.5~pre12.orig.tar.xz) = 4974768
+TIMESTAMP = 1533395903
+SHA256 (TDE/tdewebdev-trinity_14.0.5.orig.tar.xz) = 499ea116b799c4d03fbba236365b1a77786cb86505c2e1ca7df79c5c1cbb9e70
+SIZE (TDE/tdewebdev-trinity_14.0.5.orig.tar.xz) = 4976600