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 <[email protected]>

4 files changed, 102 insertions, 4 deletions

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