aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorKoop Mast <kwm@rainbow-runner.nl>2017-01-28 23:24:00 +0800
committerKoop Mast <kwm@rainbow-runner.nl>2017-01-28 23:24:00 +0800
commit60c8dd9677797c8e1448b319fce9316904d9695f (patch)
tree739600b1c713c2d29deaa5a2de4a5725cbea7bcc /x11-toolkits
parent42b88342e0c0925d67f78ace385f1b77b5fe6c03 (diff)
parenta8acd1aec7cb2368438d7df50d21376d7b979578 (diff)
downloadfreebsd-ports-gnome-60c8dd9677797c8e1448b319fce9316904d9695f.tar.gz
freebsd-ports-gnome-60c8dd9677797c8e1448b319fce9316904d9695f.tar.zst
freebsd-ports-gnome-60c8dd9677797c8e1448b319fce9316904d9695f.zip
Merge branch 'master' into gnome-3.22
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/Makefile2
-rw-r--r--x11-toolkits/Xmt/Makefile1
-rw-r--r--x11-toolkits/diorite/Makefile42
-rw-r--r--x11-toolkits/diorite/distinfo3
-rw-r--r--x11-toolkits/diorite/files/patch-src_gtk_application.vala20
-rw-r--r--x11-toolkits/diorite/pkg-descr5
-rw-r--r--x11-toolkits/diorite/pkg-plist11
-rw-r--r--x11-toolkits/flowcanvas/Makefile2
-rw-r--r--x11-toolkits/fltk-devel/Makefile2
-rw-r--r--x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx16
-rw-r--r--x11-toolkits/fltk/Makefile2
-rw-r--r--x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx16
-rw-r--r--x11-toolkits/girara/Makefile6
-rw-r--r--x11-toolkits/girara/distinfo5
-rw-r--r--x11-toolkits/girara/files/patch-girara_callbacks.h19
-rw-r--r--x11-toolkits/girara/files/patch-girara_macros.h15
-rw-r--r--x11-toolkits/girara/pkg-plist1
-rw-r--r--x11-toolkits/gnome-pty-helper/Makefile8
-rw-r--r--x11-toolkits/gtkdatabox/pkg-descr2
-rw-r--r--x11-toolkits/hs-wxc/Makefile4
-rw-r--r--x11-toolkits/irrlicht/Makefile8
-rw-r--r--x11-toolkits/irrlicht/pkg-descr2
-rw-r--r--x11-toolkits/itk/pkg-descr2
-rw-r--r--x11-toolkits/iwidgets/pkg-descr2
-rw-r--r--x11-toolkits/kf5-attica/distinfo6
-rw-r--r--x11-toolkits/kf5-kcompletion/distinfo6
-rw-r--r--x11-toolkits/kf5-kconfigwidgets/distinfo6
-rw-r--r--x11-toolkits/kf5-kdesignerplugin/distinfo6
-rw-r--r--x11-toolkits/kf5-kguiaddons/distinfo6
-rw-r--r--x11-toolkits/kf5-kitemviews/distinfo6
-rw-r--r--x11-toolkits/kf5-kjobwidgets/distinfo6
-rw-r--r--x11-toolkits/kf5-ktextwidgets/distinfo6
-rw-r--r--x11-toolkits/kf5-kwidgetsaddons/distinfo6
-rw-r--r--x11-toolkits/kf5-kwidgetsaddons/pkg-plist2
-rw-r--r--x11-toolkits/kf5-kxmlgui/distinfo6
-rw-r--r--x11-toolkits/kirigami/distinfo6
-rw-r--r--x11-toolkits/linux-c6-gtk2/Makefile2
-rw-r--r--x11-toolkits/linux-c6-openmotif/Makefile2
-rw-r--r--x11-toolkits/linux-c6-pango/Makefile2
-rw-r--r--x11-toolkits/linux-c6-qt47-x11/Makefile2
-rw-r--r--x11-toolkits/linux-c6-tk85/Makefile2
-rw-r--r--x11-toolkits/linux-c7-gtk2/Makefile4
-rw-r--r--x11-toolkits/linux-c7-gtk2/distinfo.i3867
-rw-r--r--x11-toolkits/linux-c7-gtk2/distinfo.x86_6422
-rw-r--r--x11-toolkits/linux-c7-gtk2/pkg-plist.i386150
-rw-r--r--x11-toolkits/linux-c7-openmotif/Makefile17
-rw-r--r--x11-toolkits/linux-c7-openmotif/distinfo.i3865
-rw-r--r--x11-toolkits/linux-c7-openmotif/distinfo.x86_6414
-rw-r--r--x11-toolkits/linux-c7-openmotif/pkg-plist.i3866
-rw-r--r--x11-toolkits/linux-c7-openmotif/pkg-plist.x86_644
-rw-r--r--x11-toolkits/linux-c7-pango/Makefile4
-rw-r--r--x11-toolkits/linux-c7-pango/distinfo.i3865
-rw-r--r--x11-toolkits/linux-c7-pango/distinfo.x86_6414
-rw-r--r--x11-toolkits/linux-c7-pango/pkg-plist.i38627
-rw-r--r--x11-toolkits/linux-c7-qt-x11/Makefile4
-rw-r--r--x11-toolkits/linux-c7-qt-x11/distinfo.i3865
-rw-r--r--x11-toolkits/linux-c7-qt-x11/distinfo.x86_6414
-rw-r--r--x11-toolkits/linux-c7-qt-x11/pkg-plist.i386114
-rw-r--r--x11-toolkits/linux-c7-tk85/Makefile3
-rw-r--r--x11-toolkits/linux-c7-tk85/distinfo.i3865
-rw-r--r--x11-toolkits/linux-c7-tk85/distinfo.x86_6414
-rw-r--r--x11-toolkits/linux-c7-tk85/pkg-plist.i386264
-rw-r--r--x11-toolkits/movingmotif/pkg-descr2
-rw-r--r--x11-toolkits/ocaml-lablgtk2/Makefile1
-rw-r--r--x11-toolkits/ocaml-lablgtk2/files/patch-configure11
-rw-r--r--x11-toolkits/open-motif/Makefile1
-rw-r--r--x11-toolkits/p5-Gtk2/Makefile1
-rw-r--r--x11-toolkits/p5-Prima/Makefile2
-rw-r--r--x11-toolkits/p5-Prima/distinfo6
-rw-r--r--x11-toolkits/p5-Prima/pkg-plist27
-rw-r--r--x11-toolkits/p5-Tk-ToolBar/Makefile7
-rw-r--r--x11-toolkits/p5-Tk-ToolBar/distinfo5
-rw-r--r--x11-toolkits/py-fltk/Makefile13
-rw-r--r--x11-toolkits/py-wax/pkg-descr2
-rw-r--r--x11-toolkits/py-xlib/pkg-descr2
-rw-r--r--x11-toolkits/qt5-canvas3d/Makefile2
-rw-r--r--x11-toolkits/qt5-gui/Makefile4
-rw-r--r--x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp20
-rw-r--r--x11-toolkits/qwt6/Makefile12
-rw-r--r--x11-toolkits/rubygem-poppler/Makefile1
-rw-r--r--x11-toolkits/rubygem-uh/Makefile17
-rw-r--r--x11-toolkits/rubygem-uh/distinfo3
-rw-r--r--x11-toolkits/rubygem-uh/pkg-descr3
-rw-r--r--x11-toolkits/vte3/Makefile17
-rw-r--r--x11-toolkits/xmhtml/pkg-descr2
85 files changed, 311 insertions, 826 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index ca20faa9058c..ce42e2bc4e0d 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -11,6 +11,7 @@
SUBDIR += blt
SUBDIR += bwidget
SUBDIR += c++-gtk-utils
+ SUBDIR += diorite
SUBDIR += flowcanvas
SUBDIR += fltk
SUBDIR += fltk-devel
@@ -249,6 +250,7 @@
SUBDIR += rubygem-gtksourceview3
SUBDIR += rubygem-pango
SUBDIR += rubygem-poppler
+ SUBDIR += rubygem-uh
SUBDIR += rubygem-vte
SUBDIR += rubygem-vte3
SUBDIR += scintilla
diff --git a/x11-toolkits/Xmt/Makefile b/x11-toolkits/Xmt/Makefile
index f1bcb1e1f3fc..76d96af81495 100644
--- a/x11-toolkits/Xmt/Makefile
+++ b/x11-toolkits/Xmt/Makefile
@@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/xmt400
USES= motif imake tar:tgz
USE_LDCONFIG= yes
-MAKE_ENV= LANG=C
post-patch:
${TOUCH} ${WRKSRC}/clients/mockup.man
diff --git a/x11-toolkits/diorite/Makefile b/x11-toolkits/diorite/Makefile
new file mode 100644
index 000000000000..4052058f06f1
--- /dev/null
+++ b/x11-toolkits/diorite/Makefile
@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+PORTNAME= diorite
+PORTVERSION= 0.2.1
+CATEGORIES= x11-toolkits devel
+
+MAINTAINER= avilla@FreeBSD.org
+COMMENT= Utility and widget library based on GLib and GTK+ 3
+
+LICENSE= BSD2CLAUSE
+
+BUILD_DEPENDS= valac:lang/vala
+
+USE_GITHUB= yes
+GH_ACCOUNT= tiliado
+
+USES= gnome pkgconfig shebangfix waf
+USE_GNOME= glib20 gtk30
+USE_XORG= x11
+SHEBANG_LANG= python3
+SHEBANG_FILES= testgen.py
+# --noopt is required to prevent a crash in ipcserver.c, as
+# the argument of diorite_ipc_server_process_connection_co() gets
+# optimized out in diorite_ipc_server_process_connection().
+CONFIGURE_ARGS= --noopt --platform=LINUX
+MAKE_ARGS= --no-ldconfig
+USE_LDCONFIG= yes
+
+.ifdef(WITH_DEBUG)
+CONFIGURE_ARGS+=--debug
+.else
+CONFIGURE_ARGS+=--no-debug
+.endif
+
+pre-configure:
+ @${REINPLACE_CMD} -e '/pkgconfig/ s,$${LIBDIR},${PREFIX}/libdata,' \
+ ${WRKSRC}/wscript
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/diorite/distinfo b/x11-toolkits/diorite/distinfo
new file mode 100644
index 000000000000..611f7fe7c77a
--- /dev/null
+++ b/x11-toolkits/diorite/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483465885
+SHA256 (tiliado-diorite-0.2.1_GH0.tar.gz) = 188335b58e7fea03e81c89d6f2bb1694063bac34483de05ee1e600e1cf696dd0
+SIZE (tiliado-diorite-0.2.1_GH0.tar.gz) = 430369
diff --git a/x11-toolkits/diorite/files/patch-src_gtk_application.vala b/x11-toolkits/diorite/files/patch-src_gtk_application.vala
new file mode 100644
index 000000000000..e74e808d4967
--- /dev/null
+++ b/x11-toolkits/diorite/files/patch-src_gtk_application.vala
@@ -0,0 +1,20 @@
+--- src/gtk/application.vala.orig 2016-10-30 08:24:08 UTC
++++ src/gtk/application.vala
+@@ -26,7 +26,7 @@ private const string G_LOG_DOMAIN="Diori
+ namespace Diorite
+ {
+
+-#if LINUX
++#if __FALSE__
+ [CCode (cheader_filename = "sys/prctl.h", cname = "prctl")]
+ extern int prctl (int option, string arg2, ulong arg3, ulong arg4, ulong arg5);
+ #endif
+@@ -67,7 +67,7 @@ public abstract class Application : Gtk.
+ this.desktop_name = desktop_name;
+ this.app_id = app_id;
+ actions = new ActionsRegistry(this);
+- #if LINUX
++ #if __FALSE__
+ prctl(15, app_id, 0, 0, 0);
+ #endif
+ GLib.Environment.set_prgname(app_id);
diff --git a/x11-toolkits/diorite/pkg-descr b/x11-toolkits/diorite/pkg-descr
new file mode 100644
index 000000000000..db70a5a55ffa
--- /dev/null
+++ b/x11-toolkits/diorite/pkg-descr
@@ -0,0 +1,5 @@
+Diorite is a a grey to dark-grey intermediate intrusive igneous rock.
+Diorite library is a utility and widget library for Nuvola Player
+project based on GLib, GIO and GTK+ 3.
+
+WWW: https://tiliado.eu/diorite/
diff --git a/x11-toolkits/diorite/pkg-plist b/x11-toolkits/diorite/pkg-plist
new file mode 100644
index 000000000000..d18ac6779b30
--- /dev/null
+++ b/x11-toolkits/diorite/pkg-plist
@@ -0,0 +1,11 @@
+bin/diorite-testgen-0.2
+include/diorite-1.0/dioriteglib-0.2.h
+include/diorite-1.0/dioritegtk-0.2.h
+lib/libdioriteglib-0.2.so
+lib/libdioritegtk-0.2.so
+libdata/pkgconfig/dioriteglib-0.2.pc
+libdata/pkgconfig/dioritegtk-0.2.pc
+share/vala/vapi/dioriteglib-0.2.deps
+share/vala/vapi/dioriteglib-0.2.vapi
+share/vala/vapi/dioritegtk-0.2.deps
+share/vala/vapi/dioritegtk-0.2.vapi
diff --git a/x11-toolkits/flowcanvas/Makefile b/x11-toolkits/flowcanvas/Makefile
index 303e66fb31a9..7b9d2f9cc636 100644
--- a/x11-toolkits/flowcanvas/Makefile
+++ b/x11-toolkits/flowcanvas/Makefile
@@ -3,7 +3,7 @@
PORTNAME= flowcanvas
PORTVERSION= 0.7.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= http://download.drobilla.net/
diff --git a/x11-toolkits/fltk-devel/Makefile b/x11-toolkits/fltk-devel/Makefile
index 08e483628a8a..afeaf27730df 100644
--- a/x11-toolkits/fltk-devel/Makefile
+++ b/x11-toolkits/fltk-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fltk
DISTVERSION= 1.3.x-r${SNAPSHOT_VERS}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://fltk.org/pub/${PORTNAME}/snapshots/
PKGNAMESUFFIX= -devel
diff --git a/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx b/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx
new file mode 100644
index 000000000000..08a2c4a364a9
--- /dev/null
+++ b/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx
@@ -0,0 +1,16 @@
+------------------------------------------------------------------------
+r10699 | greg.ercolano | 2015-04-13 16:55:27 +0000 (Mon, 13 Apr 2015) | 3 lines
+
+Fix return value test, as pointed out by Albrecht.
+
+--- src/Fl_Tree_Item.cxx.orig 2014-09-05 02:59:00 UTC
++++ src/Fl_Tree_Item.cxx
+@@ -549,7 +549,7 @@ int Fl_Tree_Item::move(Fl_Tree_Item *ite
+ } else { // different parent?
+ if ( to > to_parent->children() ) // try to prevent a reparent() error
+ return -4;
+- if ( from_parent->deparent(from) < 0 ) // deparent self from current parent
++ if ( from_parent->deparent(from) == NULL ) // deparent self from current parent
+ return -5;
+ if ( to_parent->reparent(this, to) < 0 ) { // reparent self to new parent at position 'to'
+ to_parent->reparent(this, 0); // failed? shouldn't happen, reparent at 0
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 982c66139c48..536f5961327b 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fltk
PORTVERSION= 1.3.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
diff --git a/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx b/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx
new file mode 100644
index 000000000000..08a2c4a364a9
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx
@@ -0,0 +1,16 @@
+------------------------------------------------------------------------
+r10699 | greg.ercolano | 2015-04-13 16:55:27 +0000 (Mon, 13 Apr 2015) | 3 lines
+
+Fix return value test, as pointed out by Albrecht.
+
+--- src/Fl_Tree_Item.cxx.orig 2014-09-05 02:59:00 UTC
++++ src/Fl_Tree_Item.cxx
+@@ -549,7 +549,7 @@ int Fl_Tree_Item::move(Fl_Tree_Item *ite
+ } else { // different parent?
+ if ( to > to_parent->children() ) // try to prevent a reparent() error
+ return -4;
+- if ( from_parent->deparent(from) < 0 ) // deparent self from current parent
++ if ( from_parent->deparent(from) == NULL ) // deparent self from current parent
+ return -5;
+ if ( to_parent->reparent(this, to) < 0 ) { // reparent self to new parent at position 'to'
+ to_parent->reparent(this, 0); // failed? shouldn't happen, reparent at 0
diff --git a/x11-toolkits/girara/Makefile b/x11-toolkits/girara/Makefile
index 0e4526affcd9..34bc575ce39b 100644
--- a/x11-toolkits/girara/Makefile
+++ b/x11-toolkits/girara/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= girara
-PORTVERSION= 0.2.6
-PORTREVISION= 2
+PORTVERSION= 0.2.7
CATEGORIES= x11-toolkits graphics
-MASTER_SITES= http://pwmt.org/projects/girara/download/
+MASTER_SITES= https://pwmt.org/projects/girara/download/ \
+ http://www.madpilot.net/~mad/pwmt.org/
MAINTAINER= madpilot@FreeBSD.org
COMMENT= GTK3 Interface Library for Zathura PDF Viewer
diff --git a/x11-toolkits/girara/distinfo b/x11-toolkits/girara/distinfo
index ac86e6f14b56..035df47f06f4 100644
--- a/x11-toolkits/girara/distinfo
+++ b/x11-toolkits/girara/distinfo
@@ -1,2 +1,3 @@
-SHA256 (girara-0.2.6.tar.gz) = eba69b3522b4d149e06d133de52877913275873c505993fad08b6d7884ec9a0f
-SIZE (girara-0.2.6.tar.gz) = 75841
+TIMESTAMP = 1484228386
+SHA256 (girara-0.2.7.tar.gz) = 98e6a343298ae46869c990bc6e0732555e19af2e386cdc1a911f109b1c5c32e5
+SIZE (girara-0.2.7.tar.gz) = 76723
diff --git a/x11-toolkits/girara/files/patch-girara_callbacks.h b/x11-toolkits/girara/files/patch-girara_callbacks.h
deleted file mode 100644
index a85c2d4339a7..000000000000
--- a/x11-toolkits/girara/files/patch-girara_callbacks.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- girara/callbacks.h.orig 2016-04-18 20:35:34 UTC
-+++ girara/callbacks.h
-@@ -4,6 +4,7 @@
- #define GIRARA_CALLBACKS_H
-
- #include "types.h"
-+#include "macros.h"
- #include <gtk/gtk.h>
-
- /**
-@@ -108,7 +109,7 @@ bool girara_callback_inputbar_activate(G
- * @return FALSE An error occurred
- */
- bool girara_callback_inputbar_key_press_event(GtkWidget* widget,
-- GdkEventKey* event, girara_session_t* session);
-+ GdkEventKey* event, girara_session_t* session) GIRARA_OPTNONE;
-
- /**
- * Default callback if the text of the input bar has changed
diff --git a/x11-toolkits/girara/files/patch-girara_macros.h b/x11-toolkits/girara/files/patch-girara_macros.h
deleted file mode 100644
index 67114da5a086..000000000000
--- a/x11-toolkits/girara/files/patch-girara_macros.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- girara/macros.h.orig 2015-04-13 20:49:26 UTC
-+++ girara/macros.h
-@@ -69,4 +69,12 @@
- GIRARA_DO_PRAGMA(GCC diagnostic pop)
- #endif
-
-+#ifndef GIRARA_OPTNONE
-+# if defined(__clang__)
-+# define GIRARA_OPTNONE __attribute__ ((optnone))
-+# else
-+# define GIRARA_OPTNONE
-+# endif
-+#endif
-+
- #endif
diff --git a/x11-toolkits/girara/pkg-plist b/x11-toolkits/girara/pkg-plist
index b6ce2d9f25fc..3618ffbe99b0 100644
--- a/x11-toolkits/girara/pkg-plist
+++ b/x11-toolkits/girara/pkg-plist
@@ -7,6 +7,7 @@ include/girara/datastructures.h
include/girara/entry.h
include/girara/girara.h
include/girara/input-history.h
+include/girara/log.h
include/girara/macros.h
include/girara/session.h
include/girara/settings.h
diff --git a/x11-toolkits/gnome-pty-helper/Makefile b/x11-toolkits/gnome-pty-helper/Makefile
index ab2a079a361d..71fa369c0435 100644
--- a/x11-toolkits/gnome-pty-helper/Makefile
+++ b/x11-toolkits/gnome-pty-helper/Makefile
@@ -26,15 +26,7 @@ CONFIGURE_WRKSRC= ${WRKSRC}/gnome-pty-helper
BUILD_WRKSRC= ${WRKSRC}/gnome-pty-helper
INSTALL_WRKSRC= ${WRKSRC}/gnome-pty-helper
-.include <bsd.port.options.mk>
-
post-patch:
-# borrowed osversion from bsd.ssp.mk
-.if ${OSVERSION} < 1000036 && ${ARCH} == i386
- @${REINPLACE_CMD} -e 's|-fstack-protector-strong||g; \
- s|-fstack-protector||g' \
- ${WRKSRC}/configure
-.endif
@${REINPLACE_CMD} -e 's|(AM_MAKEFLAGS) install-exec-hook|(AM_MAKEFLAGS)|g' \
${WRKSRC}/gnome-pty-helper/Makefile.in
diff --git a/x11-toolkits/gtkdatabox/pkg-descr b/x11-toolkits/gtkdatabox/pkg-descr
index 458b20843210..8d12d22ca9de 100644
--- a/x11-toolkits/gtkdatabox/pkg-descr
+++ b/x11-toolkits/gtkdatabox/pkg-descr
@@ -3,4 +3,4 @@ sets will have different colors, you may change colors and style of the data
The widget gives the possibility to zoom into and out of the data and to
scroll around. It also offers a grid like on an oscilloscope.
-WWW: http://sourceforge.net/projects/gtkdatabox/
+WWW: https://sourceforge.net/projects/gtkdatabox/
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index 6758400d47da..47b8550ab27a 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -26,10 +26,6 @@ post-patch::
.if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG}
LIB_DEPENDS+= libc++.so.1:devel/libc++
-
-.if ${OSVERSION} < 1000000
-CONFIGURE_ARGS+= --extra-include-dirs=${LOCALBASE}/include/c++/v1
-.endif
.endif
.include <bsd.port.mk>
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index a6c94302e98d..26f5438ead25 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.8.4
CATEGORIES= x11-toolkits graphics
MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= amdmi3@FreeBSD.org
COMMENT= High performance realtime 3D engine
LICENSE= ZLIB
@@ -19,12 +19,12 @@ USES= alias dos2unix gmake jpeg zip
USE_GL= gl
USE_XORG= x11 xxf86vm
USE_LDCONFIG= yes
-MAKE_ENV+= SHLIB_VER=${SHARED_LIB_VER}
+MAKE_ENV= SHLIB_VER=${SHARED_LIB_VER}
CFLAGS_amd64= -fPIC
CFLAGS_ia64= -fPIC
-PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER}
+PLIST_SUB= SHARED_LIB_VER=${SHARED_LIB_VER}
SUB_FILES= pkg-message
BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht
@@ -49,7 +49,7 @@ post-patch:
${WRKSRC}/include/IrrCompileConfig.h
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
${INSTALL_DATA} ${WRKSRC}/include/*.h \
${STAGEDIR}${PREFIX}/include/${PORTNAME}
${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libIrrlicht.a \
diff --git a/x11-toolkits/irrlicht/pkg-descr b/x11-toolkits/irrlicht/pkg-descr
index c4c08441aa0c..5f84bddf431a 100644
--- a/x11-toolkits/irrlicht/pkg-descr
+++ b/x11-toolkits/irrlicht/pkg-descr
@@ -8,4 +8,4 @@ use the engine. You can find enhancements for Irrlicht all over the web, like
alternative terrain renderers, portal renderers, world layers, tutorials,
editors, bindings for java, perl, ruby, python, and so on.
-WWW: http://irrlicht.sf.net/
+WWW: http://irrlicht.sourceforge.net/
diff --git a/x11-toolkits/itk/pkg-descr b/x11-toolkits/itk/pkg-descr
index 74d574f5e3e6..6f69bd852280 100644
--- a/x11-toolkits/itk/pkg-descr
+++ b/x11-toolkits/itk/pkg-descr
@@ -6,4 +6,4 @@ A companion to [incr Tk] called [incr Widgets] provides a widget set,
with many improved widgets. The [incr Widgets] collection is also known
as ``iwidgets'' and is available in x11-toolkits.
-WWW: http://sourceforge.net/projects/incrtcl/
+WWW: https://sourceforge.net/projects/incrtcl/
diff --git a/x11-toolkits/iwidgets/pkg-descr b/x11-toolkits/iwidgets/pkg-descr
index a9bd7183d5b1..7fceb809d1b8 100644
--- a/x11-toolkits/iwidgets/pkg-descr
+++ b/x11-toolkits/iwidgets/pkg-descr
@@ -2,4 +2,4 @@ This package contains [incr Widgets] version 4.0.1, which is a companion
to [incr Tk] and provides a widget set, with many improved widgets. The
[incr Widgets] collection is also known as "iwidgets", or "mega-widgets".
-WWW: http://sourceforge.net/projects/incrtcl/
+WWW: https://sourceforge.net/projects/incrtcl/
diff --git a/x11-toolkits/kf5-attica/distinfo b/x11-toolkits/kf5-attica/distinfo
index c45700e374a7..2f9f6a665069 100644
--- a/x11-toolkits/kf5-attica/distinfo
+++ b/x11-toolkits/kf5-attica/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934881
-SHA256 (KDE/frameworks/5.29.0/attica-5.29.0.tar.xz) = a195e8ef4ae8dfb586c3c0a012797f5d4c358bdf3dde9c4eee10f07330c62af6
-SIZE (KDE/frameworks/5.29.0/attica-5.29.0.tar.xz) = 60196
+TIMESTAMP = 1483950434
+SHA256 (KDE/frameworks/5.30.0/attica-5.30.0.tar.xz) = 5b44207c93f42b84e99fc7e110025059e3023a1dac2e4f5bd019335c7a331eed
+SIZE (KDE/frameworks/5.30.0/attica-5.30.0.tar.xz) = 60244
diff --git a/x11-toolkits/kf5-kcompletion/distinfo b/x11-toolkits/kf5-kcompletion/distinfo
index 87b0c4eb4f01..06bd5aeb7eae 100644
--- a/x11-toolkits/kf5-kcompletion/distinfo
+++ b/x11-toolkits/kf5-kcompletion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934881
-SHA256 (KDE/frameworks/5.29.0/kcompletion-5.29.0.tar.xz) = 6b1acf683de6d4b3ec36f7ddc270cd639268d25bb53217c83c9088a55f695ec0
-SIZE (KDE/frameworks/5.29.0/kcompletion-5.29.0.tar.xz) = 2580112
+TIMESTAMP = 1483950434
+SHA256 (KDE/frameworks/5.30.0/kcompletion-5.30.0.tar.xz) = a667bd28575ba4462ed365ce3ea7d35e3f86b20e6fc034365914949205ee0588
+SIZE (KDE/frameworks/5.30.0/kcompletion-5.30.0.tar.xz) = 116156
diff --git a/x11-toolkits/kf5-kconfigwidgets/distinfo b/x11-toolkits/kf5-kconfigwidgets/distinfo
index b0fef4591b3c..5a8d8b7e50f5 100644
--- a/x11-toolkits/kf5-kconfigwidgets/distinfo
+++ b/x11-toolkits/kf5-kconfigwidgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934881
-SHA256 (KDE/frameworks/5.29.0/kconfigwidgets-5.29.0.tar.xz) = ca9580a1079adcc9f95907ea9355ee9b2ceaf001e7620005d2d0b1f1dd245e75
-SIZE (KDE/frameworks/5.29.0/kconfigwidgets-5.29.0.tar.xz) = 2872180
+TIMESTAMP = 1483950434
+SHA256 (KDE/frameworks/5.30.0/kconfigwidgets-5.30.0.tar.xz) = 021d85537faf01b9a88a9614edf9011a7e2dac752330f4928a287f4832263996
+SIZE (KDE/frameworks/5.30.0/kconfigwidgets-5.30.0.tar.xz) = 371220
diff --git a/x11-toolkits/kf5-kdesignerplugin/distinfo b/x11-toolkits/kf5-kdesignerplugin/distinfo
index 48fedfa9b049..bf587a00ad82 100644
--- a/x11-toolkits/kf5-kdesignerplugin/distinfo
+++ b/x11-toolkits/kf5-kdesignerplugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934882
-SHA256 (KDE/frameworks/5.29.0/kdesignerplugin-5.29.0.tar.xz) = cf0b6ad6d996ff460447c83d382188c10eb01a9ff1e8532866e13050f389a807
-SIZE (KDE/frameworks/5.29.0/kdesignerplugin-5.29.0.tar.xz) = 2552788
+TIMESTAMP = 1483950434
+SHA256 (KDE/frameworks/5.30.0/kdesignerplugin-5.30.0.tar.xz) = bf6db9ebf47c73aa9a2f3175603dfdf0ae15d4f62929352ad9288df61310c741
+SIZE (KDE/frameworks/5.30.0/kdesignerplugin-5.30.0.tar.xz) = 89252
diff --git a/x11-toolkits/kf5-kguiaddons/distinfo b/x11-toolkits/kf5-kguiaddons/distinfo
index 158444138bbd..ad235e648fa5 100644
--- a/x11-toolkits/kf5-kguiaddons/distinfo
+++ b/x11-toolkits/kf5-kguiaddons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934882
-SHA256 (KDE/frameworks/5.29.0/kguiaddons-5.29.0.tar.xz) = f3906d76b48660ab685caf06a71d9bd4d716a8875dc0973157f577632601f8b1
-SIZE (KDE/frameworks/5.29.0/kguiaddons-5.29.0.tar.xz) = 39412
+TIMESTAMP = 1483950434
+SHA256 (KDE/frameworks/5.30.0/kguiaddons-5.30.0.tar.xz) = f55f5b5ffe0e330ae3ee5971cf8d206040d82bd52d677a8478d6a9c88c8ac04e
+SIZE (KDE/frameworks/5.30.0/kguiaddons-5.30.0.tar.xz) = 39820
diff --git a/x11-toolkits/kf5-kitemviews/distinfo b/x11-toolkits/kf5-kitemviews/distinfo
index 38752a5b9d4c..65837e1079f3 100644
--- a/x11-toolkits/kf5-kitemviews/distinfo
+++ b/x11-toolkits/kf5-kitemviews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934882
-SHA256 (KDE/frameworks/5.29.0/kitemviews-5.29.0.tar.xz) = 70dffefe04badc6e0ed7c2bc8009cc6a987c6c511d6e700c60efa688adcfe2a0
-SIZE (KDE/frameworks/5.29.0/kitemviews-5.29.0.tar.xz) = 2512384
+TIMESTAMP = 1483950434
+SHA256 (KDE/frameworks/5.30.0/kitemviews-5.30.0.tar.xz) = 5e8466caa4d27cd78e37c3814e495590158a5a57cbb61e8d07505cea72d3a43b
+SIZE (KDE/frameworks/5.30.0/kitemviews-5.30.0.tar.xz) = 74332
diff --git a/x11-toolkits/kf5-kjobwidgets/distinfo b/x11-toolkits/kf5-kjobwidgets/distinfo
index e703a2df0d97..56db61e0e0c2 100644
--- a/x11-toolkits/kf5-kjobwidgets/distinfo
+++ b/x11-toolkits/kf5-kjobwidgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934882
-SHA256 (KDE/frameworks/5.29.0/kjobwidgets-5.29.0.tar.xz) = c8ee18380c1cae2ab48f007d10b4e85625bf7a2f2d5dba834f4f0bf0bb1e356a
-SIZE (KDE/frameworks/5.29.0/kjobwidgets-5.29.0.tar.xz) = 2537368
+TIMESTAMP = 1483950435
+SHA256 (KDE/frameworks/5.30.0/kjobwidgets-5.30.0.tar.xz) = 0e26aa3d496c6b651f57b11bb2ced5da49538c17be403b4067a7bb5475a09f46
+SIZE (KDE/frameworks/5.30.0/kjobwidgets-5.30.0.tar.xz) = 89416
diff --git a/x11-toolkits/kf5-ktextwidgets/distinfo b/x11-toolkits/kf5-ktextwidgets/distinfo
index d742a6f7b330..86ee5faec344 100644
--- a/x11-toolkits/kf5-ktextwidgets/distinfo
+++ b/x11-toolkits/kf5-ktextwidgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934882
-SHA256 (KDE/frameworks/5.29.0/ktextwidgets-5.29.0.tar.xz) = 47fcec17d6d1d7f9b55e776e8ae0abd55b16de78f74424e7ea5c842ca6623c86
-SIZE (KDE/frameworks/5.29.0/ktextwidgets-5.29.0.tar.xz) = 2804552
+TIMESTAMP = 1483950435
+SHA256 (KDE/frameworks/5.30.0/ktextwidgets-5.30.0.tar.xz) = 5c86dc3d5866d53d2e70bb5321ff74431886c825304db5997f617d6e5e94f8ba
+SIZE (KDE/frameworks/5.30.0/ktextwidgets-5.30.0.tar.xz) = 307384
diff --git a/x11-toolkits/kf5-kwidgetsaddons/distinfo b/x11-toolkits/kf5-kwidgetsaddons/distinfo
index a1e85f18cf34..46396c7d9102 100644
--- a/x11-toolkits/kf5-kwidgetsaddons/distinfo
+++ b/x11-toolkits/kf5-kwidgetsaddons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934883
-SHA256 (KDE/frameworks/5.29.0/kwidgetsaddons-5.29.0.tar.xz) = 4d0c209fae36f0342aeae4f3d2f402a89566eab1cee0afa5e612c88ae5d01ba6
-SIZE (KDE/frameworks/5.29.0/kwidgetsaddons-5.29.0.tar.xz) = 4328936
+TIMESTAMP = 1483950435
+SHA256 (KDE/frameworks/5.30.0/kwidgetsaddons-5.30.0.tar.xz) = 34c322aa53a33ed883d8082e2435cd9464fb9d3f63e50c4a81d87166088fc24a
+SIZE (KDE/frameworks/5.30.0/kwidgetsaddons-5.30.0.tar.xz) = 2165676
diff --git a/x11-toolkits/kf5-kwidgetsaddons/pkg-plist b/x11-toolkits/kf5-kwidgetsaddons/pkg-plist
index c0876486550f..aa7f78ffb2ac 100644
--- a/x11-toolkits/kf5-kwidgetsaddons/pkg-plist
+++ b/x11-toolkits/kf5-kwidgetsaddons/pkg-plist
@@ -60,6 +60,7 @@ include/KF5/KWidgetsAddons/KToggleFullScreenAction
include/KF5/KWidgetsAddons/KToolBarLabelAction
include/KF5/KWidgetsAddons/KToolBarPopupAction
include/KF5/KWidgetsAddons/KToolBarSpacerAction
+include/KF5/KWidgetsAddons/KToolTipWidget
include/KF5/KWidgetsAddons/KUrlLabel
include/KF5/KWidgetsAddons/KViewStateMaintainerBase
include/KF5/KWidgetsAddons/KViewStateSerializer
@@ -127,6 +128,7 @@ include/KF5/KWidgetsAddons/ktogglefullscreenaction.h
include/KF5/KWidgetsAddons/ktoolbarlabelaction.h
include/KF5/KWidgetsAddons/ktoolbarpopupaction.h
include/KF5/KWidgetsAddons/ktoolbarspaceraction.h
+include/KF5/KWidgetsAddons/ktooltipwidget.h
include/KF5/KWidgetsAddons/kurllabel.h
include/KF5/KWidgetsAddons/kviewstatemaintainerbase.h
include/KF5/KWidgetsAddons/kviewstateserializer.h
diff --git a/x11-toolkits/kf5-kxmlgui/distinfo b/x11-toolkits/kf5-kxmlgui/distinfo
index 711a249cf5c5..e342797cdbe9 100644
--- a/x11-toolkits/kf5-kxmlgui/distinfo
+++ b/x11-toolkits/kf5-kxmlgui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480934883
-SHA256 (KDE/frameworks/5.29.0/kxmlgui-5.29.0.tar.xz) = 00bf6c5fad99162e9367d5125aa684a26db7fc9c83fcd44e2e824a547c8405c1
-SIZE (KDE/frameworks/5.29.0/kxmlgui-5.29.0.tar.xz) = 3155408
+TIMESTAMP = 1484047584
+SHA256 (KDE/frameworks/5.30.0/kxmlgui-5.30.0.tar.xz) = da3f6f59aed6d7970f78a040e387fcec6509a2bac3e6efaa965b6600c9b1ac00
+SIZE (KDE/frameworks/5.30.0/kxmlgui-5.30.0.tar.xz) = 879344
diff --git a/x11-toolkits/kirigami/distinfo b/x11-toolkits/kirigami/distinfo
index e9d5bd07000e..62d595381b94 100644
--- a/x11-toolkits/kirigami/distinfo
+++ b/x11-toolkits/kirigami/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480945374
-SHA256 (KDE/frameworks/5.29.0/kirigami-1.1.0.tar.xz) = 6677af0c486a4c9cfefe74a0951e85dad53435010031bf2b7fcdf9c5df6b3edd
-SIZE (KDE/frameworks/5.29.0/kirigami-1.1.0.tar.xz) = 262152
+TIMESTAMP = 1484993614
+SHA256 (KDE/frameworks/5.30.0/kirigami-1.1.0.tar.xz) = 6677af0c486a4c9cfefe74a0951e85dad53435010031bf2b7fcdf9c5df6b3edd
+SIZE (KDE/frameworks/5.30.0/kirigami-1.1.0.tar.xz) = 262152
diff --git a/x11-toolkits/linux-c6-gtk2/Makefile b/x11-toolkits/linux-c6-gtk2/Makefile
index 90119a57a075..a84b44348a43 100644
--- a/x11-toolkits/linux-c6-gtk2/Makefile
+++ b/x11-toolkits/linux-c6-gtk2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtk2
PORTVERSION= 2.24.23
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits linux
LIB_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-engines-2.18.4-5.el6.centos${EXTRACT_SUFX} \
diff --git a/x11-toolkits/linux-c6-openmotif/Makefile b/x11-toolkits/linux-c6-openmotif/Makefile
index da78198b1a0c..d07df747148d 100644
--- a/x11-toolkits/linux-c6-openmotif/Makefile
+++ b/x11-toolkits/linux-c6-openmotif/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openmotif
PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
diff --git a/x11-toolkits/linux-c6-pango/Makefile b/x11-toolkits/linux-c6-pango/Makefile
index bf53734639cf..5e7729891f1e 100644
--- a/x11-toolkits/linux-c6-pango/Makefile
+++ b/x11-toolkits/linux-c6-pango/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pango
PORTVERSION= 1.28.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index 49808eba9415..3eba64195e86 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qt47-x11
PORTVERSION= 4.7.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits linux
MASTER_SITES= https://www.mirrorservice.org/sites/dl.atrpms.net/el6-x86_64/atrpms/testing/\
https://www.mirrorservice.org/sites/dl.atrpms.net/el6-i386/atrpms/testing/ \
diff --git a/x11-toolkits/linux-c6-tk85/Makefile b/x11-toolkits/linux-c6-tk85/Makefile
index d3b8ae046ba6..2641438e7b73 100644
--- a/x11-toolkits/linux-c6-tk85/Makefile
+++ b/x11-toolkits/linux-c6-tk85/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tk
PORTVERSION= 8.5.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits linux
PKGNAMESUFFIX= 85
diff --git a/x11-toolkits/linux-c7-gtk2/Makefile b/x11-toolkits/linux-c7-gtk2/Makefile
index aa2e1a10b111..87ed1df851ca 100644
--- a/x11-toolkits/linux-c7-gtk2/Makefile
+++ b/x11-toolkits/linux-c7-gtk2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtk2
PORTVERSION= 2.24.28
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits linux
LIB_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-immodules-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
@@ -12,7 +12,7 @@ SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
RPMVERSION= 8.el7
USES= linux:c7
diff --git a/x11-toolkits/linux-c7-gtk2/distinfo.i386 b/x11-toolkits/linux-c7-gtk2/distinfo.i386
deleted file mode 100644
index f403d7812350..000000000000
--- a/x11-toolkits/linux-c7-gtk2/distinfo.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1475694975
-SHA256 (rpm/centos/7.2.1511/i386/gtk2-2.24.28-8.el7.i686.rpm) = da549877230a23ae7521bba5f562dd6f98f85e10799377e3f63d5cf8f601d98e
-SIZE (rpm/centos/7.2.1511/i386/gtk2-2.24.28-8.el7.i686.rpm) = 3520508
-SHA256 (rpm/centos/7.2.1511/i386/gtk2-immodules-2.24.28-8.el7.i686.rpm) = f5fcfac28a4d42a72b2ea802981ceabedc85cffd24e841b9448611313d08d02e
-SIZE (rpm/centos/7.2.1511/i386/gtk2-immodules-2.24.28-8.el7.i686.rpm) = 31260
-SHA256 (rpm/centos/7.2.1511/i386/gtk2-2.24.28-8.el7.src.rpm) = b144c45e8314f56f67ff354e6cbd4a3bde17903bd9c9735d834e3c6b1d604fd1
-SIZE (rpm/centos/7.2.1511/i386/gtk2-2.24.28-8.el7.src.rpm) = 18521357
diff --git a/x11-toolkits/linux-c7-gtk2/distinfo.x86_64 b/x11-toolkits/linux-c7-gtk2/distinfo.x86_64
index eaba2dd1f769..6239c3aa7fb1 100644
--- a/x11-toolkits/linux-c7-gtk2/distinfo.x86_64
+++ b/x11-toolkits/linux-c7-gtk2/distinfo.x86_64
@@ -1,11 +1,11 @@
-TIMESTAMP = 1475695012
-SHA256 (rpm/centos/7.2.1511/x86_64/gtk2-2.24.28-8.el7.i686.rpm) = da549877230a23ae7521bba5f562dd6f98f85e10799377e3f63d5cf8f601d98e
-SIZE (rpm/centos/7.2.1511/x86_64/gtk2-2.24.28-8.el7.i686.rpm) = 3520508
-SHA256 (rpm/centos/7.2.1511/x86_64/gtk2-immodules-2.24.28-8.el7.i686.rpm) = f5fcfac28a4d42a72b2ea802981ceabedc85cffd24e841b9448611313d08d02e
-SIZE (rpm/centos/7.2.1511/x86_64/gtk2-immodules-2.24.28-8.el7.i686.rpm) = 31260
-SHA256 (rpm/centos/7.2.1511/x86_64/gtk2-2.24.28-8.el7.x86_64.rpm) = 3df11b550f43f8fc642fd4449b5ff3facb5ebf2b121b4327dcb28e048998fe28
-SIZE (rpm/centos/7.2.1511/x86_64/gtk2-2.24.28-8.el7.x86_64.rpm) = 3546500
-SHA256 (rpm/centos/7.2.1511/x86_64/gtk2-immodules-2.24.28-8.el7.x86_64.rpm) = 7fe5a3488ab307758cad9a6b994bc960ea846f78411ac5e1adc0fc337d64140d
-SIZE (rpm/centos/7.2.1511/x86_64/gtk2-immodules-2.24.28-8.el7.x86_64.rpm) = 31056
-SHA256 (rpm/centos/7.2.1511/x86_64/gtk2-2.24.28-8.el7.src.rpm) = b144c45e8314f56f67ff354e6cbd4a3bde17903bd9c9735d834e3c6b1d604fd1
-SIZE (rpm/centos/7.2.1511/x86_64/gtk2-2.24.28-8.el7.src.rpm) = 18521357
+TIMESTAMP = 1482094112
+SHA256 (centos/gtk2-2.24.28-8.el7.i686.rpm) = da549877230a23ae7521bba5f562dd6f98f85e10799377e3f63d5cf8f601d98e
+SIZE (centos/gtk2-2.24.28-8.el7.i686.rpm) = 3520508
+SHA256 (centos/gtk2-immodules-2.24.28-8.el7.i686.rpm) = f5fcfac28a4d42a72b2ea802981ceabedc85cffd24e841b9448611313d08d02e
+SIZE (centos/gtk2-immodules-2.24.28-8.el7.i686.rpm) = 31260
+SHA256 (centos/gtk2-2.24.28-8.el7.x86_64.rpm) = 3df11b550f43f8fc642fd4449b5ff3facb5ebf2b121b4327dcb28e048998fe28
+SIZE (centos/gtk2-2.24.28-8.el7.x86_64.rpm) = 3546500
+SHA256 (centos/gtk2-immodules-2.24.28-8.el7.x86_64.rpm) = 7fe5a3488ab307758cad9a6b994bc960ea846f78411ac5e1adc0fc337d64140d
+SIZE (centos/gtk2-immodules-2.24.28-8.el7.x86_64.rpm) = 31056
+SHA256 (centos/gtk2-2.24.28-8.el7.src.rpm) = b144c45e8314f56f67ff354e6cbd4a3bde17903bd9c9735d834e3c6b1d604fd1
+SIZE (centos/gtk2-2.24.28-8.el7.src.rpm) = 18521357
diff --git a/x11-toolkits/linux-c7-gtk2/pkg-plist.i386 b/x11-toolkits/linux-c7-gtk2/pkg-plist.i386
deleted file mode 100644
index 2dfddca9b91b..000000000000
--- a/x11-toolkits/linux-c7-gtk2/pkg-plist.i386
+++ /dev/null
@@ -1,150 +0,0 @@
-etc/X11/xinit/xinput.d/im-cedilla.conf
-etc/gtk-2.0/im-multipress.conf
-usr/bin/gtk-query-immodules-2.0-32
-usr/bin/gtk-update-icon-cache
-usr/bin/update-gtk-immodules
-usr/lib/girepository-1.0/Gdk-2.0.typelib
-usr/lib/girepository-1.0/GdkX11-2.0.typelib
-usr/lib/girepository-1.0/Gtk-2.0.typelib
-usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so
-usr/lib/gtk-2.0/2.10.0/immodules/im-viqr.so
-@rmtry usr/lib/gtk-2.0/2.10.0/immodules.cache
-usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
-usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
-usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
-usr/lib/gtk-2.0/modules/libferret.so
-usr/lib/gtk-2.0/modules/libgail.so
-usr/lib/libgailutil.so.18
-usr/lib/libgailutil.so.18.0.1
-usr/lib/libgdk-x11-2.0.so.0
-usr/lib/libgdk-x11-2.0.so.0.2400.28
-usr/lib/libgtk-x11-2.0.so.0
-usr/lib/libgtk-x11-2.0.so.0.2400.28
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-usr/share/locale/af/LC_MESSAGES/gtk20.mo
-usr/share/locale/am/LC_MESSAGES/gtk20.mo
-usr/share/locale/ang/LC_MESSAGES/gtk20.mo
-usr/share/locale/ar/LC_MESSAGES/gtk20.mo
-usr/share/locale/as/LC_MESSAGES/gtk20.mo
-usr/share/locale/ast/LC_MESSAGES/gtk20.mo
-usr/share/locale/az/LC_MESSAGES/gtk20.mo
-usr/share/locale/az_IR/LC_MESSAGES/gtk20.mo
-usr/share/locale/be/LC_MESSAGES/gtk20.mo
-usr/share/locale/be@latin/LC_MESSAGES/gtk20.mo
-usr/share/locale/bg/LC_MESSAGES/gtk20.mo
-usr/share/locale/bn/LC_MESSAGES/gtk20.mo
-usr/share/locale/bn_IN/LC_MESSAGES/gtk20.mo
-usr/share/locale/br/LC_MESSAGES/gtk20.mo
-usr/share/locale/bs/LC_MESSAGES/gtk20.mo
-usr/share/locale/ca/LC_MESSAGES/gtk20.mo
-usr/share/locale/ca@valencia/LC_MESSAGES/gtk20.mo
-usr/share/locale/crh/LC_MESSAGES/gtk20.mo
-usr/share/locale/cs/LC_MESSAGES/gtk20.mo
-usr/share/locale/cy/LC_MESSAGES/gtk20.mo
-usr/share/locale/da/LC_MESSAGES/gtk20.mo
-usr/share/locale/de/LC_MESSAGES/gtk20.mo
-usr/share/locale/dz/LC_MESSAGES/gtk20.mo
-usr/share/locale/el/LC_MESSAGES/gtk20.mo
-usr/share/locale/en_CA/LC_MESSAGES/gtk20.mo
-usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo
-usr/share/locale/eo/LC_MESSAGES/gtk20.mo
-usr/share/locale/es/LC_MESSAGES/gtk20.mo
-usr/share/locale/et/LC_MESSAGES/gtk20.mo
-usr/share/locale/eu/LC_MESSAGES/gtk20.mo
-usr/share/locale/fa/LC_MESSAGES/gtk20.mo
-usr/share/locale/fi/LC_MESSAGES/gtk20.mo
-usr/share/locale/fr/LC_MESSAGES/gtk20.mo
-usr/share/locale/ga/LC_MESSAGES/gtk20.mo
-usr/share/locale/gl/LC_MESSAGES/gtk20.mo
-usr/share/locale/gu/LC_MESSAGES/gtk20.mo
-usr/share/locale/he/LC_MESSAGES/gtk20.mo
-usr/share/locale/hi/LC_MESSAGES/gtk20.mo
-usr/share/locale/hr/LC_MESSAGES/gtk20.mo
-usr/share/locale/hu/LC_MESSAGES/gtk20.mo
-usr/share/locale/hy/LC_MESSAGES/gtk20.mo
-usr/share/locale/ia/LC_MESSAGES/gtk20.mo
-usr/share/locale/id/LC_MESSAGES/gtk20.mo
-usr/share/locale/io/LC_MESSAGES/gtk20.mo
-usr/share/locale/is/LC_MESSAGES/gtk20.mo
-usr/share/locale/it/LC_MESSAGES/gtk20.mo
-usr/share/locale/ja/LC_MESSAGES/gtk20.mo
-usr/share/locale/ka/LC_MESSAGES/gtk20.mo
-usr/share/locale/kk/LC_MESSAGES/gtk20.mo
-usr/share/locale/kn/LC_MESSAGES/gtk20.mo
-usr/share/locale/ko/LC_MESSAGES/gtk20.mo
-usr/share/locale/ku/LC_MESSAGES/gtk20.mo
-usr/share/locale/li/LC_MESSAGES/gtk20.mo
-usr/share/locale/lt/LC_MESSAGES/gtk20.mo
-usr/share/locale/lv/LC_MESSAGES/gtk20.mo
-usr/share/locale/mai/LC_MESSAGES/gtk20.mo
-usr/share/locale/mi/LC_MESSAGES/gtk20.mo
-usr/share/locale/mk/LC_MESSAGES/gtk20.mo
-usr/share/locale/ml/LC_MESSAGES/gtk20.mo
-usr/share/locale/mn/LC_MESSAGES/gtk20.mo
-usr/share/locale/mr/LC_MESSAGES/gtk20.mo
-usr/share/locale/ms/LC_MESSAGES/gtk20.mo
-usr/share/locale/my/LC_MESSAGES/gtk20.mo
-usr/share/locale/nb/LC_MESSAGES/gtk20.mo
-usr/share/locale/nds/LC_MESSAGES/gtk20.mo
-usr/share/locale/ne/LC_MESSAGES/gtk20.mo
-usr/share/locale/nl/LC_MESSAGES/gtk20.mo
-usr/share/locale/nn/LC_MESSAGES/gtk20.mo
-usr/share/locale/nso/LC_MESSAGES/gtk20.mo
-usr/share/locale/oc/LC_MESSAGES/gtk20.mo
-usr/share/locale/or/LC_MESSAGES/gtk20.mo
-usr/share/locale/pa/LC_MESSAGES/gtk20.mo
-usr/share/locale/pl/LC_MESSAGES/gtk20.mo
-usr/share/locale/ps/LC_MESSAGES/gtk20.mo
-usr/share/locale/pt/LC_MESSAGES/gtk20.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo
-usr/share/locale/ro/LC_MESSAGES/gtk20.mo
-usr/share/locale/ru/LC_MESSAGES/gtk20.mo
-usr/share/locale/rw/LC_MESSAGES/gtk20.mo
-usr/share/locale/si/LC_MESSAGES/gtk20.mo
-usr/share/locale/sk/LC_MESSAGES/gtk20.mo
-usr/share/locale/sl/LC_MESSAGES/gtk20.mo
-usr/share/locale/sq/LC_MESSAGES/gtk20.mo
-usr/share/locale/sr/LC_MESSAGES/gtk20.mo
-usr/share/locale/sr@ije/LC_MESSAGES/gtk20.mo
-usr/share/locale/sr@latin/LC_MESSAGES/gtk20.mo
-usr/share/locale/sv/LC_MESSAGES/gtk20.mo
-usr/share/locale/ta/LC_MESSAGES/gtk20.mo
-usr/share/locale/te/LC_MESSAGES/gtk20.mo
-usr/share/locale/th/LC_MESSAGES/gtk20.mo
-usr/share/locale/tk/LC_MESSAGES/gtk20.mo
-usr/share/locale/tr/LC_MESSAGES/gtk20.mo
-usr/share/locale/tt/LC_MESSAGES/gtk20.mo
-usr/share/locale/ug/LC_MESSAGES/gtk20.mo
-usr/share/locale/uk/LC_MESSAGES/gtk20.mo
-usr/share/locale/ur/LC_MESSAGES/gtk20.mo
-usr/share/locale/uz/LC_MESSAGES/gtk20.mo
-usr/share/locale/uz@cyrillic/LC_MESSAGES/gtk20.mo
-usr/share/locale/vi/LC_MESSAGES/gtk20.mo
-usr/share/locale/wa/LC_MESSAGES/gtk20.mo
-usr/share/locale/xh/LC_MESSAGES/gtk20.mo
-usr/share/locale/yi/LC_MESSAGES/gtk20.mo
-usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo
-usr/share/locale/zh_HK/LC_MESSAGES/gtk20.mo
-usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo
-usr/share/man/man1/gtk-query-immodules-2.0-32.1.gz
-usr/share/man/man1/gtk-query-immodules-2.0.1.gz
-usr/share/man/man1/gtk-update-icon-cache.1.gz
-usr/share/man/man1/update-gtk-immodules.1.gz
-usr/share/themes/Default/gtk-2.0-key/gtkrc
-usr/share/themes/Emacs/gtk-2.0-key/gtkrc
-usr/share/themes/Raleigh/gtk-2.0/gtkrc
-@dir usr/lib/gtk-2.0/2.10.0/filesystems
-@dir usr/lib/gtk-2.0/immodules
-@postexec %D/usr/bin/gtk-query-immodules-2.0-32 --update-cache
diff --git a/x11-toolkits/linux-c7-openmotif/Makefile b/x11-toolkits/linux-c7-openmotif/Makefile
index 8deb4f2b7951..8849c630fdb0 100644
--- a/x11-toolkits/linux-c7-openmotif/Makefile
+++ b/x11-toolkits/linux-c7-openmotif/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openmotif
PORTVERSION= 2.3.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
LIB_DISTFILES= motif-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
@@ -11,15 +12,17 @@ COMMENT= Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+RPMVERSION= 8.el7
USES= linux:c7
-RPMVERSION= 7.el7
-USE_LINUX_RPM= yes
-USE_LINUX= xorglibs
USE_LDCONFIG= yes
-DESCR= ${.CURDIR}/../open-motif/pkg-descr
+USE_LINUX= xorglibs
+USE_LINUX_RPM= yes
+
+DESCR= ${.CURDIR}/../open-motif/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/motif-${PORTVERSION}
-post-extract:
- @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/bin ${WRKSRC}/usr/include \
- ${WRKSRC}/usr/share
+post-patch:
+ @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/bin ${WRKSRC}/usr/include \
+ ${WRKSRC}/usr/share/X11 ${WRKSRC}/usr/share/man
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c7-openmotif/distinfo.i386 b/x11-toolkits/linux-c7-openmotif/distinfo.i386
deleted file mode 100644
index 794637dc141f..000000000000
--- a/x11-toolkits/linux-c7-openmotif/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473356002
-SHA256 (rpm/centos/7.2.1511/i386/motif-2.3.4-7.el7.i686.rpm) = 0328b79931a8ec493cb022f7950c2080412dfbc8d7cad5e5fd80565635b61b1b
-SIZE (rpm/centos/7.2.1511/i386/motif-2.3.4-7.el7.i686.rpm) = 1461584
-SHA256 (rpm/centos/7.2.1511/i386/motif-2.3.4-7.el7.src.rpm) = 2e8ebb8e5a7b429a969b4765b0c9af63afb3cfa48f41783e580e43c1c697de6b
-SIZE (rpm/centos/7.2.1511/i386/motif-2.3.4-7.el7.src.rpm) = 9448909
diff --git a/x11-toolkits/linux-c7-openmotif/distinfo.x86_64 b/x11-toolkits/linux-c7-openmotif/distinfo.x86_64
index 7a77a2064b10..20f480fa98e7 100644
--- a/x11-toolkits/linux-c7-openmotif/distinfo.x86_64
+++ b/x11-toolkits/linux-c7-openmotif/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674920
-SHA256 (rpm/centos/7.2.1511/x86_64/motif-2.3.4-7.el7.i686.rpm) = 0328b79931a8ec493cb022f7950c2080412dfbc8d7cad5e5fd80565635b61b1b
-SIZE (rpm/centos/7.2.1511/x86_64/motif-2.3.4-7.el7.i686.rpm) = 1461584
-SHA256 (rpm/centos/7.2.1511/x86_64/motif-2.3.4-7.el7.x86_64.rpm) = e59650393a6c1ab51c370b6f6f9e634a0dfd62d309c60da84cc6bb211cd870fa
-SIZE (rpm/centos/7.2.1511/x86_64/motif-2.3.4-7.el7.x86_64.rpm) = 1478972
-SHA256 (rpm/centos/7.2.1511/x86_64/motif-2.3.4-7.el7.src.rpm) = 2e8ebb8e5a7b429a969b4765b0c9af63afb3cfa48f41783e580e43c1c697de6b
-SIZE (rpm/centos/7.2.1511/x86_64/motif-2.3.4-7.el7.src.rpm) = 9448909
+TIMESTAMP = 1482094365
+SHA256 (centos/motif-2.3.4-8.el7.i686.rpm) = 5d10b29d94de2583bcebe197cc298d90b8bdf153f19945b313782f8b6f4b5572
+SIZE (centos/motif-2.3.4-8.el7.i686.rpm) = 1462440
+SHA256 (centos/motif-2.3.4-8.el7.x86_64.rpm) = 6b737b383df6af745fcb5971cf25fe97113f68ec93d645ce9e0af6a0306a60f6
+SIZE (centos/motif-2.3.4-8.el7.x86_64.rpm) = 1479328
+SHA256 (centos/motif-2.3.4-8.el7.src.rpm) = b84503cb6fcfaf71f7e87b194b9deee167b20ee250c52c3b1815fca64dfa600a
+SIZE (centos/motif-2.3.4-8.el7.src.rpm) = 9450441
diff --git a/x11-toolkits/linux-c7-openmotif/pkg-plist.i386 b/x11-toolkits/linux-c7-openmotif/pkg-plist.i386
deleted file mode 100644
index 24590ee743a8..000000000000
--- a/x11-toolkits/linux-c7-openmotif/pkg-plist.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/libMrm.so.4
-usr/lib/libMrm.so.4.0.4
-usr/lib/libUil.so.4
-usr/lib/libUil.so.4.0.4
-usr/lib/libXm.so.4
-usr/lib/libXm.so.4.0.4
diff --git a/x11-toolkits/linux-c7-openmotif/pkg-plist.x86_64 b/x11-toolkits/linux-c7-openmotif/pkg-plist.x86_64
index bc141ebad3b6..9879af3a90ba 100644
--- a/x11-toolkits/linux-c7-openmotif/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c7-openmotif/pkg-plist.x86_64
@@ -10,3 +10,7 @@ usr/lib64/libUil.so.4
usr/lib64/libUil.so.4.0.4
usr/lib64/libXm.so.4
usr/lib64/libXm.so.4.0.4
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
diff --git a/x11-toolkits/linux-c7-pango/Makefile b/x11-toolkits/linux-c7-pango/Makefile
index a089834f6670..951f44dc9747 100644
--- a/x11-toolkits/linux-c7-pango/Makefile
+++ b/x11-toolkits/linux-c7-pango/Makefile
@@ -3,14 +3,14 @@
PORTNAME= pango
PORTVERSION= 1.36.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Pango library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
RPMVERSION= 2.el7
USES= linux:c7
diff --git a/x11-toolkits/linux-c7-pango/distinfo.i386 b/x11-toolkits/linux-c7-pango/distinfo.i386
deleted file mode 100644
index aa0c5217a01b..000000000000
--- a/x11-toolkits/linux-c7-pango/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355960
-SHA256 (rpm/centos/7.2.1511/i386/pango-1.36.8-2.el7.i686.rpm) = fe08fbb663d201cdd44f59d81edbf9112e6d0c6cb8edaf217377bbb81454fd50
-SIZE (rpm/centos/7.2.1511/i386/pango-1.36.8-2.el7.i686.rpm) = 293428
-SHA256 (rpm/centos/7.2.1511/i386/pango-1.36.8-2.el7.src.rpm) = 65dd6acc50460d2ee6158ac790d519e5af0c0a27eaecb9307178dddc905a2362
-SIZE (rpm/centos/7.2.1511/i386/pango-1.36.8-2.el7.src.rpm) = 1071163
diff --git a/x11-toolkits/linux-c7-pango/distinfo.x86_64 b/x11-toolkits/linux-c7-pango/distinfo.x86_64
index beac32d02fdd..03b5e69758cd 100644
--- a/x11-toolkits/linux-c7-pango/distinfo.x86_64
+++ b/x11-toolkits/linux-c7-pango/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674913
-SHA256 (rpm/centos/7.2.1511/x86_64/pango-1.36.8-2.el7.i686.rpm) = fe08fbb663d201cdd44f59d81edbf9112e6d0c6cb8edaf217377bbb81454fd50
-SIZE (rpm/centos/7.2.1511/x86_64/pango-1.36.8-2.el7.i686.rpm) = 293428
-SHA256 (rpm/centos/7.2.1511/x86_64/pango-1.36.8-2.el7.x86_64.rpm) = 1349734c7fec5787306d9fb3be711ad9a8e1eaca7e7b63c6ede60cff3b05b137
-SIZE (rpm/centos/7.2.1511/x86_64/pango-1.36.8-2.el7.x86_64.rpm) = 293496
-SHA256 (rpm/centos/7.2.1511/x86_64/pango-1.36.8-2.el7.src.rpm) = 65dd6acc50460d2ee6158ac790d519e5af0c0a27eaecb9307178dddc905a2362
-SIZE (rpm/centos/7.2.1511/x86_64/pango-1.36.8-2.el7.src.rpm) = 1071163
+TIMESTAMP = 1482092437
+SHA256 (centos/pango-1.36.8-2.el7.i686.rpm) = fe08fbb663d201cdd44f59d81edbf9112e6d0c6cb8edaf217377bbb81454fd50
+SIZE (centos/pango-1.36.8-2.el7.i686.rpm) = 293428
+SHA256 (centos/pango-1.36.8-2.el7.x86_64.rpm) = 1349734c7fec5787306d9fb3be711ad9a8e1eaca7e7b63c6ede60cff3b05b137
+SIZE (centos/pango-1.36.8-2.el7.x86_64.rpm) = 293496
+SHA256 (centos/pango-1.36.8-2.el7.src.rpm) = 65dd6acc50460d2ee6158ac790d519e5af0c0a27eaecb9307178dddc905a2362
+SIZE (centos/pango-1.36.8-2.el7.src.rpm) = 1071163
diff --git a/x11-toolkits/linux-c7-pango/pkg-plist.i386 b/x11-toolkits/linux-c7-pango/pkg-plist.i386
deleted file mode 100644
index 6130eb3f12a7..000000000000
--- a/x11-toolkits/linux-c7-pango/pkg-plist.i386
+++ /dev/null
@@ -1,27 +0,0 @@
-usr/bin/pango-querymodules-32
-usr/bin/pango-view
-usr/lib/girepository-1.0/Pango-1.0.typelib
-usr/lib/girepository-1.0/PangoCairo-1.0.typelib
-usr/lib/girepository-1.0/PangoFT2-1.0.typelib
-usr/lib/girepository-1.0/PangoXft-1.0.typelib
-usr/lib/libpango-1.0.so.0
-usr/lib/libpango-1.0.so.0.3600.8
-usr/lib/libpangocairo-1.0.so.0
-usr/lib/libpangocairo-1.0.so.0.3600.8
-usr/lib/libpangoft2-1.0.so.0
-usr/lib/libpangoft2-1.0.so.0.3600.8
-usr/lib/libpangoxft-1.0.so.0
-usr/lib/libpangoxft-1.0.so.0.3600.8
-usr/lib/pango/1.8.0/modules/pango-arabic-lang.so
-usr/lib/pango/1.8.0/modules/pango-indic-lang.so
-usr/lib/pango/1.8.0/modules/pango-thai-lang.so
-@postexec %D/usr/bin/pango-querymodules-32 --update-cache
-@rmtry usr/lib/pango/1.8.0/modules.cache
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/HELLO.txt
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-usr/share/man/man1/pango-querymodules-32.1.gz
-usr/share/man/man1/pango-querymodules.1.gz
-usr/share/man/man1/pango-view.1.gz
diff --git a/x11-toolkits/linux-c7-qt-x11/Makefile b/x11-toolkits/linux-c7-qt-x11/Makefile
index fb47b472b536..ec3a78593f1c 100644
--- a/x11-toolkits/linux-c7-qt-x11/Makefile
+++ b/x11-toolkits/linux-c7-qt-x11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qt-x11
PORTVERSION= 4.8.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits linux
SRC_DISTFILES= qt-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
@@ -12,7 +12,7 @@ COMMENT= RPM of QT4 (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-qt47-x11-[0-9]*
-RPMVERSION= 11.el7
+RPMVERSION= 13.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= alsalib dri fontconfig jpeg openssl png qt tiff xorglibs
diff --git a/x11-toolkits/linux-c7-qt-x11/distinfo.i386 b/x11-toolkits/linux-c7-qt-x11/distinfo.i386
deleted file mode 100644
index 43a234b63448..000000000000
--- a/x11-toolkits/linux-c7-qt-x11/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473786412
-SHA256 (rpm/centos/7.2.1511/i386/qt-x11-4.8.5-11.el7.i686.rpm) = 24cb957e8cd0f3b105b164bfca7818f44013e1c218b7c1539695e79c6b378f0b
-SIZE (rpm/centos/7.2.1511/i386/qt-x11-4.8.5-11.el7.i686.rpm) = 13478424
-SHA256 (rpm/centos/7.2.1511/i386/qt-4.8.5-11.el7.src.rpm) = 1069811e6b36ca280f1ec726b9bdcb8e9d6633de1c725a7b9fd67e0b31e4f79f
-SIZE (rpm/centos/7.2.1511/i386/qt-4.8.5-11.el7.src.rpm) = 240683475
diff --git a/x11-toolkits/linux-c7-qt-x11/distinfo.x86_64 b/x11-toolkits/linux-c7-qt-x11/distinfo.x86_64
index b5fe5f665f35..901f385a8e94 100644
--- a/x11-toolkits/linux-c7-qt-x11/distinfo.x86_64
+++ b/x11-toolkits/linux-c7-qt-x11/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473785942
-SHA256 (rpm/centos/7.2.1511/x86_64/qt-x11-4.8.5-11.el7.i686.rpm) = 24cb957e8cd0f3b105b164bfca7818f44013e1c218b7c1539695e79c6b378f0b
-SIZE (rpm/centos/7.2.1511/x86_64/qt-x11-4.8.5-11.el7.i686.rpm) = 13478424
-SHA256 (rpm/centos/7.2.1511/x86_64/qt-x11-4.8.5-11.el7.x86_64.rpm) = 3a77cbd1657072ac4c6ec78a5d825b5952fc25ccc632c9ab6a537a1b2ef8ac44
-SIZE (rpm/centos/7.2.1511/x86_64/qt-x11-4.8.5-11.el7.x86_64.rpm) = 13219316
-SHA256 (rpm/centos/7.2.1511/x86_64/qt-4.8.5-11.el7.src.rpm) = 1069811e6b36ca280f1ec726b9bdcb8e9d6633de1c725a7b9fd67e0b31e4f79f
-SIZE (rpm/centos/7.2.1511/x86_64/qt-4.8.5-11.el7.src.rpm) = 240683475
+TIMESTAMP = 1482092626
+SHA256 (centos/qt-x11-4.8.5-13.el7.i686.rpm) = ba7c4e205dba3c6343716cc13ce34818b0b04ea48e49c227e7b49baad4f6975b
+SIZE (centos/qt-x11-4.8.5-13.el7.i686.rpm) = 13480960
+SHA256 (centos/qt-x11-4.8.5-13.el7.x86_64.rpm) = f00ac8cb89144a8962fb21247f8044e5b27ebf72915268e76bdf0532e92db8d8
+SIZE (centos/qt-x11-4.8.5-13.el7.x86_64.rpm) = 13221408
+SHA256 (centos/qt-4.8.5-13.el7.src.rpm) = 110c784c5379d0f078a6d85284be69b6abf0b545dcd6a8354857c939ca89812c
+SIZE (centos/qt-4.8.5-13.el7.src.rpm) = 240685131
diff --git a/x11-toolkits/linux-c7-qt-x11/pkg-plist.i386 b/x11-toolkits/linux-c7-qt-x11/pkg-plist.i386
deleted file mode 100644
index 18f83c6622f5..000000000000
--- a/x11-toolkits/linux-c7-qt-x11/pkg-plist.i386
+++ /dev/null
@@ -1,114 +0,0 @@
-usr/bin/qmlviewer
-usr/lib/libQt3Support.so.4
-usr/lib/libQt3Support.so.4.8
-usr/lib/libQt3Support.so.4.8.5
-usr/lib/libQtCLucene.so.4
-usr/lib/libQtCLucene.so.4.8
-usr/lib/libQtCLucene.so.4.8.5
-usr/lib/libQtDeclarative.so.4
-usr/lib/libQtDeclarative.so.4.8
-usr/lib/libQtDeclarative.so.4.8.5
-usr/lib/libQtDesigner.so.4
-usr/lib/libQtDesigner.so.4.8
-usr/lib/libQtDesigner.so.4.8.5
-usr/lib/libQtDesignerComponents.so.4
-usr/lib/libQtDesignerComponents.so.4.8
-usr/lib/libQtDesignerComponents.so.4.8.5
-usr/lib/libQtGui.so.4
-usr/lib/libQtGui.so.4.8
-usr/lib/libQtGui.so.4.8.5
-usr/lib/libQtHelp.so.4
-usr/lib/libQtHelp.so.4.8
-usr/lib/libQtHelp.so.4.8.5
-usr/lib/libQtMultimedia.so.4
-usr/lib/libQtMultimedia.so.4.8
-usr/lib/libQtMultimedia.so.4.8.5
-usr/lib/libQtOpenGL.so.4
-usr/lib/libQtOpenGL.so.4.8
-usr/lib/libQtOpenGL.so.4.8.5
-usr/lib/libQtScriptTools.so.4
-usr/lib/libQtScriptTools.so.4.8
-usr/lib/libQtScriptTools.so.4.8.5
-usr/lib/libQtSvg.so.4
-usr/lib/libQtSvg.so.4.8
-usr/lib/libQtSvg.so.4.8.5
-usr/lib/qt4/bin/qmlviewer
-usr/lib/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
-usr/lib/qt4/imports/Qt/labs/folderlistmodel/qmldir
-usr/lib/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so
-usr/lib/qt4/imports/Qt/labs/gestures/qmldir
-usr/lib/qt4/imports/Qt/labs/particles/libqmlparticlesplugin.so
-usr/lib/qt4/imports/Qt/labs/particles/qmldir
-usr/lib/qt4/imports/Qt/labs/shaders/libqmlshadersplugin.so
-usr/lib/qt4/imports/Qt/labs/shaders/qmldir
-usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
-usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
-usr/lib/qt4/plugins/bearer/libqconnmanbearer.so
-usr/lib/qt4/plugins/bearer/libqgenericbearer.so
-usr/lib/qt4/plugins/bearer/libqnmbearer.so
-usr/lib/qt4/plugins/codecs/libqcncodecs.so
-usr/lib/qt4/plugins/codecs/libqjpcodecs.so
-usr/lib/qt4/plugins/codecs/libqkrcodecs.so
-usr/lib/qt4/plugins/codecs/libqtwcodecs.so
-usr/lib/qt4/plugins/designer/libarthurplugin.so
-usr/lib/qt4/plugins/designer/libcontainerextension.so
-usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so
-usr/lib/qt4/plugins/designer/libqdeclarativeview.so
-usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
-usr/lib/qt4/plugins/designer/libtaskmenuextension.so
-usr/lib/qt4/plugins/designer/libworldtimeclockplugin.so
-usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so
-usr/lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
-usr/lib/qt4/plugins/iconengines/libqsvgicon.so
-usr/lib/qt4/plugins/imageformats/libqgif.so
-usr/lib/qt4/plugins/imageformats/libqico.so
-usr/lib/qt4/plugins/imageformats/libqjpeg.so
-usr/lib/qt4/plugins/imageformats/libqmng.so
-usr/lib/qt4/plugins/imageformats/libqsvg.so
-usr/lib/qt4/plugins/imageformats/libqtga.so
-usr/lib/qt4/plugins/imageformats/libqtiff.so
-usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so
-usr/lib/qt4/plugins/qmltooling/libqmldbg_inspector.so
-usr/lib/qt4/plugins/qmltooling/libqmldbg_tcp.so
-usr/lib/qt4/plugins/script/libqtscriptdbus.so
-usr/share/icons/hicolor/128x128/apps/qt4-logo.png
-usr/share/icons/hicolor/48x48/apps/qt4-logo.png
-usr/share/qt4/translations/assistant_cs.qm
-usr/share/qt4/translations/assistant_da.qm
-usr/share/qt4/translations/assistant_de.qm
-usr/share/qt4/translations/assistant_fr.qm
-usr/share/qt4/translations/assistant_hu.qm
-usr/share/qt4/translations/assistant_ja.qm
-usr/share/qt4/translations/assistant_ko.qm
-usr/share/qt4/translations/assistant_pl.qm
-usr/share/qt4/translations/assistant_ru.qm
-usr/share/qt4/translations/assistant_sl.qm
-usr/share/qt4/translations/assistant_uk.qm
-usr/share/qt4/translations/assistant_zh_CN.qm
-usr/share/qt4/translations/assistant_zh_TW.qm
-usr/share/qt4/translations/qt_help_cs.qm
-usr/share/qt4/translations/qt_help_da.qm
-usr/share/qt4/translations/qt_help_de.qm
-usr/share/qt4/translations/qt_help_fr.qm
-usr/share/qt4/translations/qt_help_gl.qm
-usr/share/qt4/translations/qt_help_hu.qm
-usr/share/qt4/translations/qt_help_ja.qm
-usr/share/qt4/translations/qt_help_ko.qm
-usr/share/qt4/translations/qt_help_pl.qm
-usr/share/qt4/translations/qt_help_ru.qm
-usr/share/qt4/translations/qt_help_sl.qm
-usr/share/qt4/translations/qt_help_uk.qm
-usr/share/qt4/translations/qt_help_zh_CN.qm
-usr/share/qt4/translations/qt_help_zh_TW.qm
-usr/share/qt4/translations/qtconfig_hu.qm
-usr/share/qt4/translations/qtconfig_ja.qm
-usr/share/qt4/translations/qtconfig_ko.qm
-usr/share/qt4/translations/qtconfig_pl.qm
-usr/share/qt4/translations/qtconfig_ru.qm
-usr/share/qt4/translations/qtconfig_sl.qm
-usr/share/qt4/translations/qtconfig_uk.qm
-usr/share/qt4/translations/qtconfig_zh_CN.qm
-usr/share/qt4/translations/qtconfig_zh_TW.qm
-@dir usr/lib/qt4/plugins/gui_platform
-@dir usr/lib/qt4/plugins/phonon_backend
-@dir usr/lib/qt4/plugins/styles
diff --git a/x11-toolkits/linux-c7-tk85/Makefile b/x11-toolkits/linux-c7-tk85/Makefile
index f46aa02851a4..9664bdbffce2 100644
--- a/x11-toolkits/linux-c7-tk85/Makefile
+++ b/x11-toolkits/linux-c7-tk85/Makefile
@@ -3,13 +3,14 @@
PORTNAME= tk
PORTVERSION= 8.5.13
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
PKGNAMESUFFIX= 85
MAINTAINER= emulation@FreeBSD.org
COMMENT= Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-${PORTNAME}${PKGNAMESUFFIX}-[0-9]* linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
RPMVERSION= 6.el7
USES= linux:c7
diff --git a/x11-toolkits/linux-c7-tk85/distinfo.i386 b/x11-toolkits/linux-c7-tk85/distinfo.i386
deleted file mode 100644
index 4bd6e6d66a3b..000000000000
--- a/x11-toolkits/linux-c7-tk85/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355881
-SHA256 (rpm/centos/7.2.1511/i386/tk-8.5.13-6.el7.i686.rpm) = a0e569dca16373abb6a3f868c2e1ac4d47699a598239a70d14c08e7151a6d7b7
-SIZE (rpm/centos/7.2.1511/i386/tk-8.5.13-6.el7.i686.rpm) = 1484624
-SHA256 (rpm/centos/7.2.1511/i386/tk-8.5.13-6.el7.src.rpm) = 1b9873b1db022d7f43316dc3dcebad01062cf4ea6a0cf2d82c693d061409ce9f
-SIZE (rpm/centos/7.2.1511/i386/tk-8.5.13-6.el7.src.rpm) = 4112896
diff --git a/x11-toolkits/linux-c7-tk85/distinfo.x86_64 b/x11-toolkits/linux-c7-tk85/distinfo.x86_64
index 8634c808f19a..5766b872911e 100644
--- a/x11-toolkits/linux-c7-tk85/distinfo.x86_64
+++ b/x11-toolkits/linux-c7-tk85/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674871
-SHA256 (rpm/centos/7.2.1511/x86_64/tk-8.5.13-6.el7.i686.rpm) = a0e569dca16373abb6a3f868c2e1ac4d47699a598239a70d14c08e7151a6d7b7
-SIZE (rpm/centos/7.2.1511/x86_64/tk-8.5.13-6.el7.i686.rpm) = 1484624
-SHA256 (rpm/centos/7.2.1511/x86_64/tk-8.5.13-6.el7.x86_64.rpm) = 662547f458a5fac26a9800fd4c2b7836bb20cee3ba857535540cc5cfff72eb33
-SIZE (rpm/centos/7.2.1511/x86_64/tk-8.5.13-6.el7.x86_64.rpm) = 1496732
-SHA256 (rpm/centos/7.2.1511/x86_64/tk-8.5.13-6.el7.src.rpm) = 1b9873b1db022d7f43316dc3dcebad01062cf4ea6a0cf2d82c693d061409ce9f
-SIZE (rpm/centos/7.2.1511/x86_64/tk-8.5.13-6.el7.src.rpm) = 4112896
+TIMESTAMP = 1482094771
+SHA256 (centos/tk-8.5.13-6.el7.i686.rpm) = a0e569dca16373abb6a3f868c2e1ac4d47699a598239a70d14c08e7151a6d7b7
+SIZE (centos/tk-8.5.13-6.el7.i686.rpm) = 1484624
+SHA256 (centos/tk-8.5.13-6.el7.x86_64.rpm) = 662547f458a5fac26a9800fd4c2b7836bb20cee3ba857535540cc5cfff72eb33
+SIZE (centos/tk-8.5.13-6.el7.x86_64.rpm) = 1496732
+SHA256 (centos/tk-8.5.13-6.el7.src.rpm) = 1b9873b1db022d7f43316dc3dcebad01062cf4ea6a0cf2d82c693d061409ce9f
+SIZE (centos/tk-8.5.13-6.el7.src.rpm) = 4112896
diff --git a/x11-toolkits/linux-c7-tk85/pkg-plist.i386 b/x11-toolkits/linux-c7-tk85/pkg-plist.i386
deleted file mode 100644
index 6b155c2b812e..000000000000
--- a/x11-toolkits/linux-c7-tk85/pkg-plist.i386
+++ /dev/null
@@ -1,264 +0,0 @@
-usr/bin/wish
-usr/bin/wish8.5
-usr/lib/libtk8.5.so
-usr/lib/tk8.5/pkgIndex.tcl
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/changes
-%%PORTDOCS%%%%DOCSDIR%%/license.terms
-usr/share/man/man1/wish.1.gz
-usr/share/man/mann/bell.n.gz
-usr/share/man/mann/bind.n.gz
-usr/share/man/mann/bindtags.n.gz
-usr/share/man/mann/bitmap.n.gz
-usr/share/man/mann/button.n.gz
-usr/share/man/mann/canvas.n.gz
-usr/share/man/mann/checkbutton.n.gz
-usr/share/man/mann/clipboard.n.gz
-usr/share/man/mann/colors.n.gz
-usr/share/man/mann/console.n.gz
-usr/share/man/mann/cursors.n.gz
-usr/share/man/mann/destroy.n.gz
-usr/share/man/mann/entry.n.gz
-usr/share/man/mann/event.n.gz
-usr/share/man/mann/focus.n.gz
-usr/share/man/mann/font.n.gz
-usr/share/man/mann/frame.n.gz
-usr/share/man/mann/grab.n.gz
-usr/share/man/mann/grid.n.gz
-usr/share/man/mann/image.n.gz
-usr/share/man/mann/keysyms.n.gz
-usr/share/man/mann/label.n.gz
-usr/share/man/mann/labelframe.n.gz
-usr/share/man/mann/listbox.n.gz
-usr/share/man/mann/loadTk.n.gz
-usr/share/man/mann/lower.n.gz
-usr/share/man/mann/menu.n.gz
-usr/share/man/mann/menubutton.n.gz
-usr/share/man/mann/message.n.gz
-usr/share/man/mann/option.n.gz
-usr/share/man/mann/options.n.gz
-usr/share/man/mann/pack-old.n.gz
-usr/share/man/mann/pack.n.gz
-usr/share/man/mann/panedwindow.n.gz
-usr/share/man/mann/photo.n.gz
-usr/share/man/mann/place.n.gz
-usr/share/man/mann/radiobutton.n.gz
-usr/share/man/mann/raise.n.gz
-usr/share/man/mann/scale.n.gz
-usr/share/man/mann/scrollbar.n.gz
-usr/share/man/mann/selection.n.gz
-usr/share/man/mann/send.n.gz
-usr/share/man/mann/spinbox.n.gz
-usr/share/man/mann/text.n.gz
-usr/share/man/mann/tk.n.gz
-usr/share/man/mann/tk_bindForTraversal.n.gz
-usr/share/man/mann/tk_bisque.n.gz
-usr/share/man/mann/tk_chooseColor.n.gz
-usr/share/man/mann/tk_chooseDirectory.n.gz
-usr/share/man/mann/tk_dialog.n.gz
-usr/share/man/mann/tk_focusFollowsMouse.n.gz
-usr/share/man/mann/tk_focusNext.n.gz
-usr/share/man/mann/tk_focusPrev.n.gz
-usr/share/man/mann/tk_getOpenFile.n.gz
-usr/share/man/mann/tk_getSaveFile.n.gz
-usr/share/man/mann/tk_menuBar.n.gz
-usr/share/man/mann/tk_menuSetFocus.n.gz
-usr/share/man/mann/tk_messageBox.n.gz
-usr/share/man/mann/tk_optionMenu.n.gz
-usr/share/man/mann/tk_popup.n.gz
-usr/share/man/mann/tk_setPalette.n.gz
-usr/share/man/mann/tk_textCopy.n.gz
-usr/share/man/mann/tk_textCut.n.gz
-usr/share/man/mann/tk_textPaste.n.gz
-usr/share/man/mann/tkerror.n.gz
-usr/share/man/mann/tkvars.n.gz
-usr/share/man/mann/tkwait.n.gz
-usr/share/man/mann/toplevel.n.gz
-usr/share/man/mann/ttk::button.n.gz
-usr/share/man/mann/ttk::checkbutton.n.gz
-usr/share/man/mann/ttk::combobox.n.gz
-usr/share/man/mann/ttk::entry.n.gz
-usr/share/man/mann/ttk::frame.n.gz
-usr/share/man/mann/ttk::intro.n.gz
-usr/share/man/mann/ttk::label.n.gz
-usr/share/man/mann/ttk::labelframe.n.gz
-usr/share/man/mann/ttk::menubutton.n.gz
-usr/share/man/mann/ttk::notebook.n.gz
-usr/share/man/mann/ttk::panedwindow.n.gz
-usr/share/man/mann/ttk::progressbar.n.gz
-usr/share/man/mann/ttk::radiobutton.n.gz
-usr/share/man/mann/ttk::scale.n.gz
-usr/share/man/mann/ttk::scrollbar.n.gz
-usr/share/man/mann/ttk::separator.n.gz
-usr/share/man/mann/ttk::sizegrip.n.gz
-usr/share/man/mann/ttk::spinbox.n.gz
-usr/share/man/mann/ttk::style.n.gz
-usr/share/man/mann/ttk::treeview.n.gz
-usr/share/man/mann/ttk::widget.n.gz
-usr/share/man/mann/ttk_image.n.gz
-usr/share/man/mann/ttk_vsapi.n.gz
-usr/share/man/mann/winfo.n.gz
-usr/share/man/mann/wm.n.gz
-%%DATADIR%%/bgerror.tcl
-%%DATADIR%%/button.tcl
-%%DATADIR%%/choosedir.tcl
-%%DATADIR%%/clrpick.tcl
-%%DATADIR%%/comdlg.tcl
-%%DATADIR%%/console.tcl
-%%DATADIR%%/demos/README
-%%DATADIR%%/demos/anilabel.tcl
-%%DATADIR%%/demos/aniwave.tcl
-%%DATADIR%%/demos/arrow.tcl
-%%DATADIR%%/demos/bind.tcl
-%%DATADIR%%/demos/bitmap.tcl
-%%DATADIR%%/demos/browse
-%%DATADIR%%/demos/button.tcl
-%%DATADIR%%/demos/check.tcl
-%%DATADIR%%/demos/clrpick.tcl
-%%DATADIR%%/demos/colors.tcl
-%%DATADIR%%/demos/combo.tcl
-%%DATADIR%%/demos/cscroll.tcl
-%%DATADIR%%/demos/ctext.tcl
-%%DATADIR%%/demos/dialog1.tcl
-%%DATADIR%%/demos/dialog2.tcl
-%%DATADIR%%/demos/en.msg
-%%DATADIR%%/demos/entry1.tcl
-%%DATADIR%%/demos/entry2.tcl
-%%DATADIR%%/demos/entry3.tcl
-%%DATADIR%%/demos/filebox.tcl
-%%DATADIR%%/demos/floor.tcl
-%%DATADIR%%/demos/form.tcl
-%%DATADIR%%/demos/goldberg.tcl
-%%DATADIR%%/demos/hello
-%%DATADIR%%/demos/hscale.tcl
-%%DATADIR%%/demos/icon.tcl
-%%DATADIR%%/demos/image1.tcl
-%%DATADIR%%/demos/image2.tcl
-%%DATADIR%%/demos/images/earth.gif
-%%DATADIR%%/demos/images/earthris.gif
-%%DATADIR%%/demos/images/face.xbm
-%%DATADIR%%/demos/images/flagdown.xbm
-%%DATADIR%%/demos/images/flagup.xbm
-%%DATADIR%%/demos/images/gray25.xbm
-%%DATADIR%%/demos/images/letters.xbm
-%%DATADIR%%/demos/images/noletter.xbm
-%%DATADIR%%/demos/images/pattern.xbm
-%%DATADIR%%/demos/images/tcllogo.gif
-%%DATADIR%%/demos/images/teapot.ppm
-%%DATADIR%%/demos/items.tcl
-%%DATADIR%%/demos/ixset
-%%DATADIR%%/demos/knightstour.tcl
-%%DATADIR%%/demos/label.tcl
-%%DATADIR%%/demos/labelframe.tcl
-%%DATADIR%%/demos/license.terms
-%%DATADIR%%/demos/mclist.tcl
-%%DATADIR%%/demos/menu.tcl
-%%DATADIR%%/demos/menubu.tcl
-%%DATADIR%%/demos/msgbox.tcl
-%%DATADIR%%/demos/nl.msg
-%%DATADIR%%/demos/paned1.tcl
-%%DATADIR%%/demos/paned2.tcl
-%%DATADIR%%/demos/pendulum.tcl
-%%DATADIR%%/demos/plot.tcl
-%%DATADIR%%/demos/puzzle.tcl
-%%DATADIR%%/demos/radio.tcl
-%%DATADIR%%/demos/rmt
-%%DATADIR%%/demos/rolodex
-%%DATADIR%%/demos/ruler.tcl
-%%DATADIR%%/demos/sayings.tcl
-%%DATADIR%%/demos/search.tcl
-%%DATADIR%%/demos/spin.tcl
-%%DATADIR%%/demos/states.tcl
-%%DATADIR%%/demos/style.tcl
-%%DATADIR%%/demos/tclIndex
-%%DATADIR%%/demos/tcolor
-%%DATADIR%%/demos/text.tcl
-%%DATADIR%%/demos/textpeer.tcl
-%%DATADIR%%/demos/timer
-%%DATADIR%%/demos/toolbar.tcl
-%%DATADIR%%/demos/tree.tcl
-%%DATADIR%%/demos/ttkbut.tcl
-%%DATADIR%%/demos/ttkmenu.tcl
-%%DATADIR%%/demos/ttknote.tcl
-%%DATADIR%%/demos/ttkpane.tcl
-%%DATADIR%%/demos/ttkprogress.tcl
-%%DATADIR%%/demos/ttkscale.tcl
-%%DATADIR%%/demos/twind.tcl
-%%DATADIR%%/demos/unicodeout.tcl
-%%DATADIR%%/demos/vscale.tcl
-%%DATADIR%%/demos/widget
-%%DATADIR%%/dialog.tcl
-%%DATADIR%%/entry.tcl
-%%DATADIR%%/focus.tcl
-%%DATADIR%%/images/README
-%%DATADIR%%/images/logo.eps
-%%DATADIR%%/images/logo100.gif
-%%DATADIR%%/images/logo64.gif
-%%DATADIR%%/images/logoLarge.gif
-%%DATADIR%%/images/logoMed.gif
-%%DATADIR%%/images/pwrdLogo.eps
-%%DATADIR%%/images/pwrdLogo100.gif
-%%DATADIR%%/images/pwrdLogo150.gif
-%%DATADIR%%/images/pwrdLogo175.gif
-%%DATADIR%%/images/pwrdLogo200.gif
-%%DATADIR%%/images/pwrdLogo75.gif
-%%DATADIR%%/images/tai-ku.gif
-%%DATADIR%%/listbox.tcl
-%%DATADIR%%/menu.tcl
-%%DATADIR%%/mkpsenc.tcl
-%%DATADIR%%/msgbox.tcl
-%%DATADIR%%/msgs/cs.msg
-%%DATADIR%%/msgs/da.msg
-%%DATADIR%%/msgs/de.msg
-%%DATADIR%%/msgs/el.msg
-%%DATADIR%%/msgs/en.msg
-%%DATADIR%%/msgs/en_gb.msg
-%%DATADIR%%/msgs/eo.msg
-%%DATADIR%%/msgs/es.msg
-%%DATADIR%%/msgs/fr.msg
-%%DATADIR%%/msgs/hu.msg
-%%DATADIR%%/msgs/it.msg
-%%DATADIR%%/msgs/nl.msg
-%%DATADIR%%/msgs/pl.msg
-%%DATADIR%%/msgs/pt.msg
-%%DATADIR%%/msgs/ru.msg
-%%DATADIR%%/msgs/sv.msg
-%%DATADIR%%/obsolete.tcl
-%%DATADIR%%/optMenu.tcl
-%%DATADIR%%/palette.tcl
-%%DATADIR%%/panedwindow.tcl
-%%DATADIR%%/safetk.tcl
-%%DATADIR%%/scale.tcl
-%%DATADIR%%/scrlbar.tcl
-%%DATADIR%%/spinbox.tcl
-%%DATADIR%%/tclIndex
-%%DATADIR%%/tearoff.tcl
-%%DATADIR%%/text.tcl
-%%DATADIR%%/tk.tcl
-%%DATADIR%%/tkfbox.tcl
-%%DATADIR%%/ttk/altTheme.tcl
-%%DATADIR%%/ttk/aquaTheme.tcl
-%%DATADIR%%/ttk/button.tcl
-%%DATADIR%%/ttk/clamTheme.tcl
-%%DATADIR%%/ttk/classicTheme.tcl
-%%DATADIR%%/ttk/combobox.tcl
-%%DATADIR%%/ttk/cursors.tcl
-%%DATADIR%%/ttk/defaults.tcl
-%%DATADIR%%/ttk/entry.tcl
-%%DATADIR%%/ttk/fonts.tcl
-%%DATADIR%%/ttk/menubutton.tcl
-%%DATADIR%%/ttk/notebook.tcl
-%%DATADIR%%/ttk/panedwindow.tcl
-%%DATADIR%%/ttk/progress.tcl
-%%DATADIR%%/ttk/scale.tcl
-%%DATADIR%%/ttk/scrollbar.tcl
-%%DATADIR%%/ttk/sizegrip.tcl
-%%DATADIR%%/ttk/spinbox.tcl
-%%DATADIR%%/ttk/treeview.tcl
-%%DATADIR%%/ttk/ttk.tcl
-%%DATADIR%%/ttk/utils.tcl
-%%DATADIR%%/ttk/vistaTheme.tcl
-%%DATADIR%%/ttk/winTheme.tcl
-%%DATADIR%%/ttk/xpTheme.tcl
-%%DATADIR%%/unsupported.tcl
-%%DATADIR%%/xmfbox.tcl
diff --git a/x11-toolkits/movingmotif/pkg-descr b/x11-toolkits/movingmotif/pkg-descr
index 88290ae19f32..d173dd6dfba4 100644
--- a/x11-toolkits/movingmotif/pkg-descr
+++ b/x11-toolkits/movingmotif/pkg-descr
@@ -4,4 +4,4 @@ Three widgets to display scientific data as dynamic plot :
- WEzdraw dynamix X/Y plotting
- WHistbar bargraph display with time as 3-rd dimension
-WWW: http://sourceforge.net/projects/movingmotif
+WWW: https://sourceforge.net/projects/movingmotif/
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index ef3ef91336ec..00526ceb0677 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lablgtk2
PORTVERSION= 2.18.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1479/ \
LOCAL/bf
diff --git a/x11-toolkits/ocaml-lablgtk2/files/patch-configure b/x11-toolkits/ocaml-lablgtk2/files/patch-configure
new file mode 100644
index 000000000000..e099aa0eccc7
--- /dev/null
+++ b/x11-toolkits/ocaml-lablgtk2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2014-10-29 07:51:05 UTC
++++ configure
+@@ -2677,7 +2677,7 @@ if test "$OCAMLFIND" = no; then
+ FINDLIBDIR=""
+ OCAMLLDCONF=""
+ else
+-FINDLIBDIR="`ocamlfind printconf destdir | tr -d '\\r'`"
++FINDLIBDIR="`ocamlfind printconf destdir | sed 's/:.*//' | tr -d '\\r'`"
+ echo "$OCAMLFIND library path is $FINDLIBDIR"
+ OCAMLLDCONF="`ocamlfind printconf ldconf | tr -d '\\r'`"
+ echo "$OCAMLFIND ldconf path is $OCAMLLDCONF"
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 03300004edd3..5c2b08586b27 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -25,7 +25,6 @@ LIB_DEPENDS= libXp.so:x11/libXp \
libpng16.so:graphics/png
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-MAKE_ENV= LANG=C
CPPFLAGS+= -DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -I${PREFIX}/include
USE_CSTD= gnu89
INSTALL_TARGET= install-strip
diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index 6d39afc9b168..ad3fab57dda0 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= p5-Cairo>=1:graphics/p5-Cairo \
p5-Pango>=1.220:x11-toolkits/p5-Pango
CONFIGURE_ENV= FORCE_MAKE_CMD=yes
-MAKE_ENV= LANG=C
USES= gmake perl5
USE_PERL5= configure
USE_GNOME= gtk20 pango
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index d7b9acb61a19..931a30d1cd42 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Prima
-PORTVERSION= 1.49
+PORTVERSION= 1.50
CATEGORIES= x11-toolkits graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Prima/distinfo b/x11-toolkits/p5-Prima/distinfo
index bbe7fb3f6b65..f29ee6265806 100644
--- a/x11-toolkits/p5-Prima/distinfo
+++ b/x11-toolkits/p5-Prima/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476194720
-SHA256 (Prima-1.49.tar.gz) = 8ab38c7d7596067754d59220ee1ff575035da1a9d85af2005ffb5f1afbe5a4d4
-SIZE (Prima-1.49.tar.gz) = 1514349
+TIMESTAMP = 1483558452
+SHA256 (Prima-1.50.tar.gz) = 2012397cba6d5878bd09d92d571dfefc66721283170b00e2beb0c0d31aefe5d7
+SIZE (Prima-1.50.tar.gz) = 1522254
diff --git a/x11-toolkits/p5-Prima/pkg-plist b/x11-toolkits/p5-Prima/pkg-plist
index f278f3cd1d2b..65083f11a797 100644
--- a/x11-toolkits/p5-Prima/pkg-plist
+++ b/x11-toolkits/p5-Prima/pkg-plist
@@ -1,10 +1,10 @@
bin/VB
-bin/cfgmaint
-bin/fmview
-bin/gencls
-bin/p-class
bin/podview
-bin/tmlink
+bin/prima-cfgmaint
+bin/prima-class
+bin/prima-fmview
+bin/prima-gencls
+bin/prima-tmlink
%%SITE_ARCH%%/Prima.pm
%%SITE_ARCH%%/Prima/Application.pm
%%SITE_ARCH%%/Prima/Bidi.pm
@@ -170,10 +170,10 @@ bin/tmlink
%%SITE_ARCH%%/Prima/VB/VB.pl
%%SITE_ARCH%%/Prima/VB/VBControls.pm
%%SITE_ARCH%%/Prima/VB/VBLoader.pm
-%%SITE_ARCH%%/Prima/VB/cfgmaint.pl
%%SITE_ARCH%%/Prima/VB/classes.gif
%%SITE_ARCH%%/Prima/VB/examples/Sample.fm
%%SITE_ARCH%%/Prima/VB/examples/Widgety.pm
+%%SITE_ARCH%%/Prima/VB/prima-cfgmaint.pl
%%SITE_ARCH%%/Prima/Widget.pod
%%SITE_ARCH%%/Prima/Widget/pack.pod
%%SITE_ARCH%%/Prima/Widget/place.pod
@@ -197,6 +197,7 @@ bin/tmlink
%%SITE_ARCH%%/Prima/examples/detailedoutline.pl
%%SITE_ARCH%%/Prima/examples/dock.pl
%%SITE_ARCH%%/Prima/examples/drivecombo.pl
+%%SITE_ARCH%%/Prima/examples/dwm_blur.pl
%%SITE_ARCH%%/Prima/examples/e.pl
%%SITE_ARCH%%/Prima/examples/edit.pl
%%SITE_ARCH%%/Prima/examples/editor.pl
@@ -279,14 +280,14 @@ bin/tmlink
%%SITE_ARCH%%/Prima/tutorial/menu3.gif
%%SITE_ARCH%%/Prima/windings.gif
%%SITE_ARCH%%/auto/Prima/Prima.so
-%%SITE_ARCH%%/gencls.pod
+%%SITE_ARCH%%/prima-gencls.pod
%%PERL5_MAN1%%/VB.1.gz
-%%PERL5_MAN1%%/cfgmaint.1.gz
-%%PERL5_MAN1%%/fmview.1.gz
-%%PERL5_MAN1%%/gencls.1.gz
-%%PERL5_MAN1%%/p-class.1.gz
%%PERL5_MAN1%%/podview.1.gz
-%%PERL5_MAN1%%/tmlink.1.gz
+%%PERL5_MAN1%%/prima-cfgmaint.1.gz
+%%PERL5_MAN1%%/prima-class.1.gz
+%%PERL5_MAN1%%/prima-fmview.1.gz
+%%PERL5_MAN1%%/prima-gencls.1.gz
+%%PERL5_MAN1%%/prima-tmlink.1.gz
%%PERL5_MAN3%%/Prima.3.gz
%%PERL5_MAN3%%/Prima::Application.3.gz
%%PERL5_MAN3%%/Prima::Bidi.3.gz
@@ -390,4 +391,4 @@ bin/tmlink
%%PERL5_MAN3%%/pod::Prima::image-load.3.gz
%%PERL5_MAN3%%/pod::Prima::internals.3.gz
%%PERL5_MAN3%%/pod::Prima::tutorial.3.gz
-%%PERL5_MAN3%%/pod::gencls.3.gz
+%%PERL5_MAN3%%/pod::prima-gencls.3.gz
diff --git a/x11-toolkits/p5-Tk-ToolBar/Makefile b/x11-toolkits/p5-Tk-ToolBar/Makefile
index d8468c62e599..aab9d2641e93 100644
--- a/x11-toolkits/p5-Tk-ToolBar/Makefile
+++ b/x11-toolkits/p5-Tk-ToolBar/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Tk-ToolBar
-PORTVERSION= 0.10
-PORTREVISION= 3
+PORTVERSION= 0.12
CATEGORIES= x11-toolkits tk perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -14,12 +13,12 @@ COMMENT= Toolbar widget for Perl/Tk
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk-CursorControl>=0:x11-toolkits/p5-Tk-CursorControl
+BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.14:devel/p5-Test-Pod
NO_ARCH= yes
USE_PERL5= configure
-USES= perl5 zip
+USES= perl5
.include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk-ToolBar/distinfo b/x11-toolkits/p5-Tk-ToolBar/distinfo
index 867c0b36bf5d..67dabdf7c604 100644
--- a/x11-toolkits/p5-Tk-ToolBar/distinfo
+++ b/x11-toolkits/p5-Tk-ToolBar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Tk-ToolBar-0.10.zip) = 333fe56b163632360d08d13db9b726378b011b79f7fde79b5f93ba3aaffc8ac1
-SIZE (Tk-ToolBar-0.10.zip) = 64121
+TIMESTAMP = 1483253163
+SHA256 (Tk-ToolBar-0.12.tar.gz) = 463e284ec47137e7c425c9691b02a8dec5ce272b58ea1f6359ae8041a239dd0f
+SIZE (Tk-ToolBar-0.12.tar.gz) = 60682
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index 062276ca715d..2f1705c8149a 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -29,12 +29,6 @@ PORTDOCS= *
PORTEXAMPLES= *
WRKSRC= ${WRKDIR}/pyFltk-${PORTVERSION}
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-USE_GCC= yes
-.endif
-
post-patch:
@${REINPLACE_CMD} -e "s|/usr/X11R6|${LOCALBASE}|g;s|package_data.*},||g;s|sunos5|dragonfly4', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11', 'freebsd12|g" ${WRKSRC}/setup.py
@@ -43,9 +37,14 @@ post-build:
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/fltk/_fltk.so
- ${MKDIR} ${STAGEDIR}${DOCSDIR}/html/ ${STAGEDIR}${EXAMPLESDIR}/
+
+post-install-DOCS-on:
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/html/
cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README TODO ${STAGEDIR}${DOCSDIR}/
cd ${WRKSRC}/fltk/docs/ && ${INSTALL_DATA} *.html *.jpg ${STAGEDIR}${DOCSDIR}/html/
+
+post-install-EXAMPLES-on:
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
cd ${WRKSRC}/fltk/test/ && ${INSTALL_DATA} *.py HelpDialog.html ${STAGEDIR}${EXAMPLESDIR}/
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-wax/pkg-descr b/x11-toolkits/py-wax/pkg-descr
index 9ed9f95ea659..4f0ea0f90718 100644
--- a/x11-toolkits/py-wax/pkg-descr
+++ b/x11-toolkits/py-wax/pkg-descr
@@ -1,4 +1,4 @@
Wax is a user-friendly layer on top of wxPython. It allows for easier
GUI programming in a more "Pythonic" way.
-WWW: http://sourceforge.net/projects/waxgui
+WWW: https://sourceforge.net/projects/waxgui/
diff --git a/x11-toolkits/py-xlib/pkg-descr b/x11-toolkits/py-xlib/pkg-descr
index 7f2d9a76d7f5..91ff00849200 100644
--- a/x11-toolkits/py-xlib/pkg-descr
+++ b/x11-toolkits/py-xlib/pkg-descr
@@ -2,4 +2,4 @@ The Python X Library is a complete X11R6 client-side implementation
written in pure Python. It can be used to write low-level X client
applications in Python.
-WWW: http://sourceforge.net/projects/python-xlib
+WWW: https://sourceforge.net/projects/python-xlib/
diff --git a/x11-toolkits/qt5-canvas3d/Makefile b/x11-toolkits/qt5-canvas3d/Makefile
index a5fed6043122..e2c39c316d2e 100644
--- a/x11-toolkits/qt5-canvas3d/Makefile
+++ b/x11-toolkits/qt5-canvas3d/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTNAME= canvas3d
+PORTNAME= canvas3d
DISTVERSION= ${QT5_VERSION}
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index aebaea1b5e62..e5c4b828186f 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -83,10 +83,6 @@ CFLAGS_powerpc64= -mminimal-toc
CXXFLAGS+= -flax-vector-conversions
.endif
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_gui_painting_qcolor.cpp
-.endif
-
post-build:
.for d in ${MORE_WRKSRCS}
@cd ${WRKSRC}/${d} && \
diff --git a/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp b/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp
deleted file mode 100644
index 7760f66a4034..000000000000
--- a/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-On FreeBSD 9.3 with gcc-4.2 we need to mark the constant as an unsigned long long.
-Else the compiler will choke on it being too large:
-
-c++ -c -O2 -pipe [...] itemmodels/qstandarditemmodel.cpp
-painting/qcolor.cpp:527: error: integer constant is too large for 'long' type
-*** [.obj/qcolor.o] Error code 1
-1 error
-
-
---- src/gui/painting/qcolor.cpp.orig 2016-10-10 16:17:59 UTC
-+++ src/gui/painting/qcolor.cpp
-@@ -524,7 +524,7 @@ QString QColor::name(NameFormat format)
- return QLatin1Char('#') + QString::number(rgba() | 0x1000000, 16).rightRef(6);
- case HexArgb:
- // it's called rgba() but it does return AARRGGBB
-- return QLatin1Char('#') + QString::number(rgba() | 0x100000000, 16).rightRef(8);
-+ return QLatin1Char('#') + QString::number(rgba() | 0x100000000ULL, 16).rightRef(8);
- }
- return QString();
- }
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index 4a3f8c440283..f34b0bb5b1e3 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -11,7 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Qt Widgets for Technical Applications
USES= gmake qmake tar:bzip2
-USE_QT4= gui opengl svg xml moc_build
+USE_QT4= corelib gui opengl svg xml moc_build
+USE_GL= gl
USE_LDCONFIG= yes
DOCSDIR= ${PREFIX}/share/doc/qwt6
@@ -24,12 +25,11 @@ PLIST_SUB= INCLUDEDIR=include/qwt6 \
OPTIONS_DEFINE= DOCS
post-patch:
- cd ${WRKSRC} && \
- ${REINPLACE_CMD} -e 's,qwtAddLibrary(qwt),qwtAddLibrary(qwt6),g' \
- qwt.prf textengines/textengines.pri && \
- ${REINPLACE_CMD} -e '/INSTALLS.*doc/d' doc/doc.pro
+ @${REINPLACE_CMD} -e 's,qwtAddLibrary(qwt),qwtAddLibrary(qwt6),g' \
+ ${WRKSRC}/qwt.prf ${WRKSRC}/textengines/textengines.pri
+ @${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro
post-install-DOCS-on:
- (cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+ @(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-poppler/Makefile b/x11-toolkits/rubygem-poppler/Makefile
index e885cce93c5d..446c90c414fa 100644
--- a/x11-toolkits/rubygem-poppler/Makefile
+++ b/x11-toolkits/rubygem-poppler/Makefile
@@ -2,6 +2,7 @@
PORTNAME= poppler
PORTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits rubygems
MASTER_SITES= RG
diff --git a/x11-toolkits/rubygem-uh/Makefile b/x11-toolkits/rubygem-uh/Makefile
new file mode 100644
index 000000000000..bc95de06dda5
--- /dev/null
+++ b/x11-toolkits/rubygem-uh/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= uh
+PORTVERSION= 2.0.2
+CATEGORIES= x11-toolkits rubygems
+MASTER_SITES= RG
+
+MAINTAINER= tj+freebsd_ports@a13.fr
+COMMENT= Xlib ruby toolkit
+
+LICENSE= BSD3CLAUSE
+
+USE_RUBY= yes
+USES= gem
+USE_XORG= x11 xinerama
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-uh/distinfo b/x11-toolkits/rubygem-uh/distinfo
new file mode 100644
index 000000000000..8c1a9674c31a
--- /dev/null
+++ b/x11-toolkits/rubygem-uh/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1484088691
+SHA256 (rubygem/uh-2.0.2.gem) = 6efc9ce01a296d8123edf8bc7b59c9df4ae3e7691496f0effc3aed1e2486b950
+SIZE (rubygem/uh-2.0.2.gem) = 13312
diff --git a/x11-toolkits/rubygem-uh/pkg-descr b/x11-toolkits/rubygem-uh/pkg-descr
new file mode 100644
index 000000000000..1b4e6ef603cd
--- /dev/null
+++ b/x11-toolkits/rubygem-uh/pkg-descr
@@ -0,0 +1,3 @@
+Xlib ruby toolkit
+
+WWW: https://rubygems.org/gems/uh
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index b06cf223dcd4..c98b58ceef81 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -34,25 +34,8 @@ INSTALL_TARGET= install-strip
PLIST_SUB= VERSION=2.91
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 || ${OPSYS} == DragonFly
-LIBS+= -lz
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
${WRKSRC}/src/Makefile.in
-# zlib.pc only is available on 10.1-R and newer.
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 || ${OPSYS} == DragonFly
- @${REINPLACE_CMD} -e 's|gio-unix-2.0 zlib|gio-unix-2.0|g' \
- ${WRKSRC}/configure
-.endif
-# borrowed osversion from bsd.ssp.mk
-.if ${OSVERSION} < 1000036 && ${ARCH} == i386
- @${REINPLACE_CMD} -e 's|-fstack-protector-strong||g; \
- s|-fstack-protector||g' \
- ${WRKSRC}/configure
-.endif
.include <bsd.port.mk>
diff --git a/x11-toolkits/xmhtml/pkg-descr b/x11-toolkits/xmhtml/pkg-descr
index e00e5ba28056..4ba41519bb83 100644
--- a/x11-toolkits/xmhtml/pkg-descr
+++ b/x11-toolkits/xmhtml/pkg-descr
@@ -10,4 +10,4 @@ highlighting, text justification, full HTML <FRAME> support, HTML
frames and many more. It also comes with four examples demonstrating
possible use of the XmHTML widget.
-WWW: http://sourceforge.net/projects/xmhtml/
+WWW: https://sourceforge.net/projects/xmhtml/