*/*: sync with upstream

Taken from: FreeBSD
2016-11-30 06:40:24 +01:00 · 2016-11-30 06:40:24 +01:00 · 2b828c8f76
commit 2b828c8f76
parent 82fe404084
138 changed files with 729 additions and 490 deletions
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@ -38,4 +38,10 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/cad/qelectrotech/pkg-plist
+++ b/cad/qelectrotech/pkg-plist
@ -684,11 +684,11 @@ share/mimelnk/application/x-qet-titleblock.desktop
 %%DATADIR%%/elements/10_electric/10_allpole/395_electronics&semiconductors/qet_directory
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/appareil_ferme_cle_prisonniere.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/appareil_ouvert_cle_prisonniere.elmt
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_rentree_manoeuvre_libre.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_sorti.elmt
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_%%QT_LIBDIR%%re_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_%%QT_LIBDIR%%re_pene_sorti.elmt
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisioniere_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_libre_pene_rentree_manoeuvre_libre.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_libre_pene_sorti.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisioniere_pene_rentree_manoeuvre_libre.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisionniere_pene_rentree_manoeuvre_bloquee.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/contacteur_crm.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/contacteur_f_crm.elmt
@ -716,7 +716,7 @@ share/mimelnk/application/x-qet-titleblock.desktop
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/ligne_triphase.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/ligne_triphase_2.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/qet_directory
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_%%QT_LIBDIR%%re.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_libre.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_prisionniere.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/signal_capacitif.elmt
 %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/transf_cm.elmt
@ -1682,7 +1682,7 @@ share/mimelnk/application/x-qet-titleblock.desktop
 %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta301.elmt
 %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta302.elmt
 %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta401.elmt
-%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta%%QT_LIBDIR%%.elmt
+%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xentalib.elmt
 %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/gv2me.elmt
 %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/lc1d.elmt
 %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/lc1k.elmt
@ -2404,7 +2404,7 @@ share/mimelnk/application/x-qet-titleblock.desktop
 %%DATADIR%%/elements/20_logic/40_flowchart/souspgm03.elmt
 %%DATADIR%%/elements/20_logic/40_flowchart/sur_page.elmt
 %%DATADIR%%/elements/20_logic/qet_directory
-%%DATADIR%%/elements/30_hydraulic/21_tanks/bache_a_l_air_%%QT_LIBDIR%%re.elmt
+%%DATADIR%%/elements/30_hydraulic/21_tanks/bache_a_l_air_libre.elmt
 %%DATADIR%%/elements/30_hydraulic/21_tanks/bache_pressurisee.elmt
 %%DATADIR%%/elements/30_hydraulic/21_tanks/qet_directory
 %%DATADIR%%/elements/30_hydraulic/31_control_valves/01_single_parts/11_actuation/bouton.elmt
@ -2811,7 +2811,7 @@ share/mimelnk/application/x-qet-titleblock.desktop
 %%DATADIR%%/elements/60_energy/11_water/schemas/grupo-seg-termo.elmt
 %%DATADIR%%/elements/60_energy/11_water/schemas/intercambiador.elmt
 %%DATADIR%%/elements/60_energy/11_water/schemas/llave-acometida.elmt
-%%DATADIR%%/elements/60_energy/11_water/schemas/llave-equi%%QT_LIBDIR%%rado.elmt
+%%DATADIR%%/elements/60_energy/11_water/schemas/llave-equilibrado.elmt
 %%DATADIR%%/elements/60_energy/11_water/schemas/llave-paso-regul.elmt
 %%DATADIR%%/elements/60_energy/11_water/schemas/llave-vivienda.elmt
 %%DATADIR%%/elements/60_energy/11_water/schemas/llavepaso.elmt
@ -3094,8 +3094,8 @@ share/mimelnk/application/x-qet-titleblock.desktop
 %%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_01.elmt
 %%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_3v_a_secteur_01.elmt
 %%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle.elmt
-%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equi%%QT_LIBDIR%%rage_debimetre_01.elmt
-%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equi%%QT_LIBDIR%%rage_ta_01.elmt
+%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equilibrage_debimetre_01.elmt
+%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equilibrage_ta_01.elmt
 %%DATADIR%%/elements/60_energy/qet_directory
 %%DATADIR%%/examples/741.qet
 %%DATADIR%%/examples/ArduinoLCD.qet
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	DBD-mysql
-PORTVERSION=	4.040
+PORTVERSION=	4.041
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/databases/p5-DBD-mysql/distinfo
+++ b/databases/p5-DBD-mysql/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1479732114
-SHA256 (DBD-mysql-4.040.tar.gz) = a3438bba3cce02b13870b146b9db76a519b98e978d9dfe8516a63daff2989040
-SIZE (DBD-mysql-4.040.tar.gz) = 149783
+TIMESTAMP = 1480439290
+SHA256 (DBD-mysql-4.041.tar.gz) = 4777de11c464b515db9da95c08c225900d0594b65ba3256982dc21f9f9379040
+SIZE (DBD-mysql-4.041.tar.gz) = 150508
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@ -204,6 +204,10 @@ CONFIGURE_ARGS+=--with-krb5
 # For testing files in FILESDIR
 .include <bsd.port.pre.mk>

+.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 .if defined(SERVER_ONLY)
 pre-build:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
--- a/databases/py-alembic/Makefile
+++ b/databases/py-alembic/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	alembic
-PORTVERSION=	0.8.8
+PORTVERSION=	0.8.9
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/databases/py-alembic/distinfo
+++ b/databases/py-alembic/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1476770608
-SHA256 (alembic-0.8.8.tar.gz) = cd6f2192ca2307bfe2a2a61f8a261420addc59a09a6379a6550e0a15693b0b8a
-SIZE (alembic-0.8.8.tar.gz) = 970125
+TIMESTAMP = 1480407925
+SHA256 (alembic-0.8.9.tar.gz) = 0932bed55a4546b8aa6f59b8ad8b92b0161e7bd46adc538d50afb1c96b3571c1
+SIZE (alembic-0.8.9.tar.gz) = 977728
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@ -1,15 +1,13 @@
 # $FreeBSD$

 PORTNAME=	howm
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://howm.sourceforge.jp/a/

 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Write fragmentarily and read collectively

-BROKEN=		fails to build
-
 GNU_CONFIGURE=	yes
 USE_EMACS=	yes
 ELISP=		action-lock.el bcomp.el cheat-font-lock.el \
--- a/deskutils/howm/distinfo
+++ b/deskutils/howm/distinfo
@ -1,2 +1,3 @@
-SHA256 (howm-1.4.2.tar.gz) = 6d4683ff55573e4edefad8bc03ee2714c9f443151936903f0b5ad99d73e73e7f
-SIZE (howm-1.4.2.tar.gz) = 544559
+TIMESTAMP = 1480165897
+SHA256 (howm-1.4.3.tar.gz) = fb7336e0a52df3d5fe72e1bbf4ffb57f1139757f6af2964ee62cc94b4729dcab
+SIZE (howm-1.4.3.tar.gz) = 552747
--- a/deskutils/howm/files/patch-howm-vars.el
+++ b/deskutils/howm/files/patch-howm-vars.el
@ -1,11 +1,11 @@
--- howm-vars.el.orig	2011-08-23 20:48:27.000000000 +0900
-+++ howm-vars.el	2012-03-11 22:18:42.730947048 +0900
-@@ -679,7 +679,7 @@
-   "*Command name for fgrep.
+--- howm-vars.el.orig	2015-12-31 22:41:45.000000000 +0900
+++ howm-vars.el	2016-11-26 22:46:32.596292000 +0900
+@@ -759,7 +759,7 @@
 This variable is obsolete and may be removed in future.")
 (defvar howm-view-grep-default-option
-  (labels ((ed (d) (concat "--exclude-dir=" d)))
-+  (labels ((ed (d) (concat "--exclude=" d)))
-     (let* ((has-ed (condition-case nil
-                        (eq 0 (call-process howm-view-grep-command nil nil nil
-                                            (ed "/") "--version"))
+   ;; "labels" causes a trouble in git-head emacs (d5e3922) [2015-01-31]
+-  (let* ((ed (lambda (d) (concat "--exclude-dir=" d)))
+  (let* ((ed (lambda (d) (concat "--exclude=" d)))
+          (has-ed (condition-case nil
+                      (eq 0 (call-process howm-view-grep-command nil nil nil
+                                          (apply ed "/") "--version"))
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	binutils
 PORTVERSION=	2.27
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases
--- a/devel/binutils/files/patch-bfd_elfnn-aarch64.c
+++ b/devel/binutils/files/patch-bfd_elfnn-aarch64.c
@ -0,0 +1,28 @@
+--- bfd/elfnn-aarch64.c.orig	2016-11-20 12:04:44.613621000 +0000
+++ bfd/elfnn-aarch64.c	2016-11-20 12:05:01.143334000 +0000
+@@ -4369,7 +4369,9 @@
+       off = h->got.offset;
+       BFD_ASSERT (off != (bfd_vma) - 1);
+       if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h)
+-	  || (bfd_link_pic (info)
+	  || ((bfd_link_pic (info)
+	      || (!bfd_link_relocatable (info)
+		  && (info->export_dynamic || info->dynamic)))
+ 	      && SYMBOL_REFERENCES_LOCAL (info, h))
+ 	  || (ELF_ST_VISIBILITY (h->other)
+ 	      && h->root.type == bfd_link_hash_undefweak))
+@@ -8891,6 +8893,14 @@
+ 			   + h->root.u.def.section->output_section->vma
+ 			   + h->root.u.def.section->output_offset);
+ 	}
+      else if (!bfd_link_relocatable (info)
+	    && (info->export_dynamic || info->dynamic)
+	    && SYMBOL_REFERENCES_LOCAL (info, h))
+	{
+	  BFD_ASSERT ((h->got.offset & 1) != 0);
+	  rela.r_info = ELFNN_R_INFO (h->dynindx, AARCH64_R (GLOB_DAT));
+	  rela.r_addend = 0;
+	}
+       else
+ 	{
+ do_glob_dat:
--- a/devel/elfkickers/Makefile
+++ b/devel/elfkickers/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	elfkickers
-PORTVERSION=	3.0
-PORTREVISION=	2
+PORTVERSION=	3.1
 CATEGORIES=	devel sysutils
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/
 DISTNAME=	ELFkickers-${PORTVERSION}
@ -12,15 +11,16 @@ MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Collection of programs to manipulate ELF files

 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		gmake

 ELFBINS=	ebfc elfls elftoc infect objres rebind sstrip
 PORTDOCS=	COPYING Changelog README

+OPTIONS_DEFINE=	DOCS
+
 post-patch:
-	@${GREP} -lR "\/elf.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's,linux/,,g' -e 's,asm/,,g'
 	@${GREP} -lR "gcc" ${WRKSRC}/*/Makefile | ${XARGS} \
 	${REINPLACE_CMD} -e 's,gcc,${CC},g'

@ -30,12 +30,18 @@ do-build:
 .endfor

 do-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
 .for f in ${ELFBINS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${f}/${f} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${f}/${f:S,$,.1,} ${STAGEDIR}${PREFIX}/man/man1
 .endfor

+post-install:
+.for f in ${ELFBINS}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
+.endfor
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
--- a/devel/elfkickers/distinfo
+++ b/devel/elfkickers/distinfo
@ -1,2 +1,3 @@
-SHA256 (ELFkickers-3.0.tar.gz) = 8597dc38ecb1a352f86c5075608547f2c4dcd50f4ba89de70c5494cf6611c6aa
-SIZE (ELFkickers-3.0.tar.gz) = 99527
+TIMESTAMP = 1480450986
+SHA256 (ELFkickers-3.1.tar.gz) = 6d663fb06dd723a078282937052368498e3860d3c42f0d765579d496e5f51a58
+SIZE (ELFkickers-3.1.tar.gz) = 101406
--- a/devel/elfkickers/files/patch-elfrw__elfrw.h
+++ b/devel/elfkickers/files/patch-elfrw__elfrw.h
@ -1,27 +0,0 @@
--- ./elfrw/elfrw.h.orig	2011-05-31 01:47:08.000000000 +0200
-+++ ./elfrw/elfrw.h	2011-06-08 12:16:37.000000000 +0200
-@@ -10,6 +10,24 @@
- #include <stdio.h>
- #include <elf.h>
- 
-+#ifdef __FreeBSD__
-+typedef uint16_t Elf64_Section;
-+
-+#define PT_GNU_STACK	0x6474e551
-+#define PT_GNU_RELRO	0x6474e552
-+
-+#if  __FreeBSD_version < 700022
-+#define SHT_GNU_HASH	0x6ffffff6
-+#define EM_CRIS		76
-+#define EM_M32R		88
-+#define EM_MN10300	89
-+#endif
-+
-+#define ELFCLASSNUM 3
-+#define ELFDATANUM  3
-+#define EV_NUM      2
-+#endif
-+
- /*
-  * The initialization functions. Call one of these to set the flavor
-  * of ELF structures to translate to and from. The library can be
--- a/devel/elfkickers/files/patch-elftoc__mknames.c
+++ b/devel/elfkickers/files/patch-elftoc__mknames.c
@ -1,25 +0,0 @@
--- ./elftoc/mknames.c.orig	2011-06-08 12:17:12.000000000 +0200
-+++ ./elftoc/mknames.c	2011-06-08 12:20:02.000000000 +0200
-@@ -108,17 +108,19 @@
-     _("68K_", EM_68K),
-     _("ALPHA_", EM_ALPHA),
-     _("ARM_", EM_ARM),
-    _("CRIS_", EM_CRIS),
-     __("HP_", "PARISC_", EM_PARISC),
-     __("IA_64_", "IA64_", EM_IA_64),
-    _("M32R_", EM_M32R),
-     _("MIPS_", EM_MIPS),
-    _("MN10300_", EM_MN10300),
-     _("PPC_", EM_PPC),
-     _("PPC64_", EM_PPC64),
-     _("SH_", EM_SH),
-     _("SPARC_", EM_SPARC),
-     _("X86_64_", EM_X86_64),
-+#if __FreeBSD_cc_version_ > 700022
-+    _("CRIS_", EM_CRIS),
-+    _("M32R_", EM_M32R),
-+    _("MN10300_", EM_MN10300)
-+#endif
- };
- 
- #define machineidcount ((int)(sizeof machineids / sizeof *machineids))
--- a/devel/elfkickers/files/patch-elftoc__outbase.h
+++ b/devel/elfkickers/files/patch-elftoc__outbase.h
@ -1,13 +0,0 @@
--- ./elftoc/outbase.h.orig	2011-05-22 20:46:29.000000000 +0200
-+++ ./elftoc/outbase.h	2011-06-08 12:16:37.000000000 +0200
-@@ -7,6 +7,10 @@
- #ifndef _outbase_h_
- #define _outbase_h_
- 
-+#ifdef __FreeBSD__
-+#define NT_AUXV     6
-+#endif
-+
- /* Set the current output file. Call this before calling any output
-  * functions. (The FILE* argument is given as a void* so as to not
-  * include stdio.h here.)
--- a/devel/elfkickers/files/patch-elftoc__pieces.c
+++ b/devel/elfkickers/files/patch-elftoc__pieces.c
@ -1,13 +0,0 @@
--- ./elftoc/pieces.c.orig	2011-05-26 03:25:14.000000000 +0200
-+++ ./elftoc/pieces.c	2011-06-08 12:16:37.000000000 +0200
-@@ -16,6 +16,10 @@
- #include "out.h"
- #include "pieces.h"
- 
-+#ifdef __FreeBSD__
-+typedef uint64_t Elf32_Xword;
-+#endif
-+
- /* Flags used to insert warnings in the generated source code.
-  */
- #define	PW_MISALIGNED	0x0001	/* piece misaligned for original type */
--- a/devel/elfkickers/files/patch-elftoc__readelf.h
+++ b/devel/elfkickers/files/patch-elftoc__readelf.h
@ -1,15 +0,0 @@
--- ./elftoc/readelf.h.orig	2011-05-22 20:46:29.000000000 +0200
-+++ ./elftoc/readelf.h	2011-06-08 12:16:37.000000000 +0200
-@@ -7,6 +7,12 @@
- #ifndef	_readelf_h_
- #define	_readelf_h_
- 
-+#ifdef __FreeBSD__
-+#define ELFCLASSNUM 3
-+#define ELFDATANUM  3
-+#define EV_NUM      2
-+#endif
-+
- /* Read all of the basic headers from the file image (namely the ELF
-  * header, the program segment header table, and the section header
-  * table). False is returned if the file could not be parsed as an ELF
--- a/devel/liblxqt/pkg-plist
+++ b/devel/liblxqt/pkg-plist
@ -31,9 +31,9 @@
 %%LXQT_INCLUDEDIR%%/LXQt/lxqtsettings.h
 %%LXQT_INCLUDEDIR%%/LXQt/lxqtsingleapplication.h
 %%LXQT_INCLUDEDIR%%/LXQt/lxqttranslator.h
-%%QT_LIBDIR%%/liblxqt.so
-%%QT_LIBDIR%%/liblxqt.so.0
-%%QT_LIBDIR%%/liblxqt.so.%%VERSION%%
+lib/liblxqt.so
+lib/liblxqt.so.0
+lib/liblxqt.so.%%VERSION%%
 libdata/pkgconfig/lxqt.pc
 share/cmake/lxqt/find-modules/FindXdgUserDirs.cmake
 share/cmake/lxqt/lxqt-config-version.cmake
--- a/devel/libqtxdg/pkg-plist
+++ b/devel/libqtxdg/pkg-plist
@ -19,12 +19,12 @@ include/qt5xdg/xdgmimetype.h
 include/qt5xdg/xmlhelper.h
 include/qt5xdgiconloader/%%VERSION%%/private/xdgiconloader/xdgiconloader_p.h
 include/qt5xdgiconloader/xdgiconloader_export.h
-%%QT_LIBDIR%%/libQt5Xdg.so
-%%QT_LIBDIR%%/libQt5Xdg.so.2
-%%QT_LIBDIR%%/libQt5Xdg.so.%%VERSION%%
-%%QT_LIBDIR%%/libQt5XdgIconLoader.so
-%%QT_LIBDIR%%/libQt5XdgIconLoader.so.2
-%%QT_LIBDIR%%/libQt5XdgIconLoader.so.%%VERSION%%
+lib/libQt5Xdg.so
+lib/libQt5Xdg.so.2
+lib/libQt5Xdg.so.%%VERSION%%
+lib/libQt5XdgIconLoader.so
+lib/libQt5XdgIconLoader.so.2
+lib/libQt5XdgIconLoader.so.%%VERSION%%
 libdata/pkgconfig/Qt5Xdg.pc
 libdata/pkgconfig/Qt5XdgIconLoader.pc
 share/cmake/qt5xdg/qt5xdg-config-version.cmake
--- a/devel/p5-AnyEvent-Filesys-Notify/Makefile
+++ b/devel/p5-AnyEvent-Filesys-Notify/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	AnyEvent-Filesys-Notify
-PORTVERSION=	1.19
+PORTVERSION=	1.21
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MGRIMES
--- a/devel/p5-AnyEvent-Filesys-Notify/distinfo
+++ b/devel/p5-AnyEvent-Filesys-Notify/distinfo
@ -1,2 +1,3 @@
-SHA256 (AnyEvent-Filesys-Notify-1.19.tar.gz) = ed39c8774f4963954e9db750ea25bf2dedac989d5deff6c26bb47e332ef3a8d0
-SIZE (AnyEvent-Filesys-Notify-1.19.tar.gz) = 25443
+TIMESTAMP = 1480400809
+SHA256 (AnyEvent-Filesys-Notify-1.21.tar.gz) = e8c73f003071b4240f719a7755ac78ebd72fb33b56499c97cc9b029d058e96b4
+SIZE (AnyEvent-Filesys-Notify-1.21.tar.gz) = 34271
--- a/devel/p5-App-FatPacker/Makefile
+++ b/devel/p5-App-FatPacker/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	App-FatPacker
-PORTVERSION=	0.010004
+PORTVERSION=	0.010005
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-App-FatPacker/distinfo
+++ b/devel/p5-App-FatPacker/distinfo
@ -1,2 +1,3 @@
-SHA256 (App-FatPacker-0.010004.tar.gz) = 542b4c7100f46cb179b88d93ee5b78140cbd7ba816311b99e7d676c34d732992
-SIZE (App-FatPacker-0.010004.tar.gz) = 11293
+TIMESTAMP = 1480402923
+SHA256 (App-FatPacker-0.010005.tar.gz) = 5661fe0f1cea0548ab7ad1040ffaf469699a622ff6780ff3240f6868b088bfd3
+SIZE (App-FatPacker-0.010005.tar.gz) = 11507
--- a/devel/p5-App-cpanminus/Makefile
+++ b/devel/p5-App-cpanminus/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	App-cpanminus
-PORTVERSION=	1.7039
+PORTVERSION=	1.7042
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
--- a/devel/p5-App-cpanminus/distinfo
+++ b/devel/p5-App-cpanminus/distinfo
@ -1,2 +1,3 @@
-SHA256 (App-cpanminus-1.7039.tar.gz) = 09bcd8303fcf9866d7bb9ff5c7df5f8d49d0cbe3d69c42446860ed1fc17064e4
-SIZE (App-cpanminus-1.7039.tar.gz) = 316814
+TIMESTAMP = 1480403345
+SHA256 (App-cpanminus-1.7042.tar.gz) = 9da50e155df72bce55cb69f51f1dbb4b62d23740fb99f6178bb27f22ebdf8a46
+SIZE (App-cpanminus-1.7042.tar.gz) = 317681
--- a/devel/qbs/files/patch-git_5c1183a
+++ b/devel/qbs/files/patch-git_5c1183a
@ -0,0 +1,36 @@
+This fixes a build failure with libc++ 3.9.0 (FreeBSD 12+):
+
+In file included from /wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/api/internaljobs.cpp:39:
+In file included from /wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/buildgraph/executor.h:45:
+/usr/include/c++/v1/queue:400:5: error: static_assert failed ""
+    static_assert((is_same<_Tp, value_type>::value), "" );
+    ^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+/wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/buildgraph/executor.h:156:12: note: in instantiation of template class 'std::__1::priority_queue<qbs::Internal::Artifact *, std::__1::vector<qbs::Internal::BuildGraphNode *, std::__1::allocator<qbs::Internal::BuildGraphNode *> >, qbs::Internal::Executor::ComparePriority>' requested here
+    Leaves m_leaves;
+
+commit 5c1183aa377ae8de487d5541360369ebd2ee0f6b
+Author: Christian Kandeler <christian.kandeler@qt.io>
+Date:   Mon Nov 28 14:54:43 2016 +0100
+
+    Executor: Fix undefined behavior
+
+    C++17 introduces new requirements on the template parameters of
+    std::priority_queue.
+
+    Task-number: QBS-1051
+    Change-Id: I9a22b8f2d3c1f0bd532b0a76f5d2a16bebc303f7
+    Reviewed-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+    Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
+
+--- src/lib/corelib/buildgraph/executor.h
+++ src/lib/corelib/buildgraph/executor.h
+@@ -107,7 +107,8 @@ private:
+         bool operator() (const BuildGraphNode *x, const BuildGraphNode *y) const;
+     };
+
+-    typedef std::priority_queue<Artifact *, std::vector<BuildGraphNode *>, ComparePriority> Leaves;
+    typedef std::priority_queue<BuildGraphNode *, std::vector<BuildGraphNode *>,
+                                ComparePriority> Leaves;
+
+     void doBuild();
+     void prepareAllNodes();
--- a/devel/qscintilla2-qt5/pkg-plist
+++ b/devel/qscintilla2-qt5/pkg-plist
@ -48,10 +48,10 @@
 %%QT_INCDIR%%/Qsci/qsciscintillabase.h
 %%QT_INCDIR%%/Qsci/qscistyle.h
 %%QT_INCDIR%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR%%/libqscintilla2-qt5.so
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0.1
+lib/libqscintilla2-qt5.so
+lib/libqscintilla2-qt5.so.12
+lib/libqscintilla2-qt5.so.12.0
+lib/libqscintilla2-qt5.so.12.0.1
 %%QT_MKSPECDIR%%/features/qscintilla2.prf
 %%QT_DATADIR%%/qsci/api/python/Python-2.4.api
 %%QT_DATADIR%%/qsci/api/python/Python-2.5.api
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@ -48,10 +48,10 @@
 %%QT_INCDIR%%/Qsci/qsciscintillabase.h
 %%QT_INCDIR%%/Qsci/qscistyle.h
 %%QT_INCDIR%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR%%/libqscintilla2.so
-%%QT_LIBDIR%%/libqscintilla2.so.12
-%%QT_LIBDIR%%/libqscintilla2.so.12.0
-%%QT_LIBDIR%%/libqscintilla2.so.12.0.1
+lib/qt4/libqscintilla2.so
+lib/qt4/libqscintilla2.so.12
+lib/qt4/libqscintilla2.so.12.0
+lib/qt4/libqscintilla2.so.12.0.1
 %%QT_MKSPECDIR%%/features/qscintilla2.prf
 share/qt4/qsci/api/python/Python-2.4.api
 share/qt4/qsci/api/python/Python-2.5.api
--- a/devel/qt4-libqtassistantclient/pkg-plist
+++ b/devel/qt4-libqtassistantclient/pkg-plist
@ -2,10 +2,10 @@
 %%QT_INCDIR%%/QtAssistant/QtAssistant
 %%QT_INCDIR%%/QtAssistant/qassistantclient.h
 %%QT_INCDIR%%/QtAssistant/qassistantclient_global.h
-%%QT_LIBDIR%%/libQtAssistantClient.prl
-%%QT_LIBDIR%%/libQtAssistantClient.so
-%%QT_LIBDIR%%/libQtAssistantClient.so.4
-%%QT_LIBDIR%%/libQtAssistantClient.so.4.6
-%%QT_LIBDIR%%/libQtAssistantClient.so.4.6.3
+lib/qt4/libQtAssistantClient.prl
+lib/qt4/libQtAssistantClient.so
+lib/qt4/libQtAssistantClient.so.4
+lib/qt4/libQtAssistantClient.so.4.6
+lib/qt4/libQtAssistantClient.so.4.6.3
 libdata/pkgconfig/QtAssistantClient.pc
 %%QT_MKSPECDIR%%/features/assistant.prf
--- a/dns/credns/Makefile
+++ b/dns/credns/Makefile
@ -59,4 +59,10 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@ -18,10 +18,10 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 LIB_DEPENDS=	libboost_context.so:devel/boost-libs

 BROKEN_sparc64=	Does not compile on sparc64
-BROKEN_FreeBSD_9=	linker error

-USES=		compiler:c++11-lib cpe gmake pkgconfig ssl tar:bzip2
+USES=		compiler:c++11-lib cpe gmake localbase pkgconfig ssl tar:bzip2
 GNU_CONFIGURE=	YES
+CXXFLAGS+=	-D_GLIBCXX_USE_C99

 CPE_VENDOR=	powerdns

@ -54,4 +54,15 @@ USERS=		pdns_recursor
 GROUPS=		pdns
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT} == base
+BROKEN_FreeBSD_9=	FreeBSD 9.x requires SSL from ports
+.endif
+
+.if ${OSVERSION} < 1000000 && ${ARCH} == i386
+#BUILD_DEPENDS=		${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
+LDFLAGS+=		-latomic
+.endif
+
+.include <bsd.port.post.mk>
--- a/dns/validns/Makefile
+++ b/dns/validns/Makefile
@ -37,4 +37,10 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/finance/prestashop/Makefile
+++ b/finance/prestashop/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	prestashop
-PORTVERSION=	1.7.0.1
+PORTVERSION=	1.7.0.2
 CATEGORIES=	finance www
 MASTER_SITES=	http://www.prestashop.com/download/old/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
--- a/finance/prestashop/distinfo
+++ b/finance/prestashop/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1479804376
-SHA256 (prestashop_1.7.0.1.zip) = d452a85b1a17567b66c8dcfba2c65c9457ed9df3cc8f05598db9eac1c6fc8382
-SIZE (prestashop_1.7.0.1.zip) = 55426387
+TIMESTAMP = 1480422870
+SHA256 (prestashop_1.7.0.2.zip) = 9f762be0282d913500853a300f3a442a8ab9312e016412fdae6dc9b82ff51d6f
+SIZE (prestashop_1.7.0.2.zip) = 55631336
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@ -64,4 +64,10 @@ post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@ -171,6 +171,10 @@ CONFIGURE_ARGS+=	--with-libraries=${LIBDIRS}

 .include <bsd.port.pre.mk>

+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 .if !defined(_BUILDING_PROFTPD_MODULE)

 .if empty(ICONV_PREFIX)
--- a/graphics/gle-graphics/pkg-plist
+++ b/graphics/gle-graphics/pkg-plist
@ -1,7 +1,7 @@
-%%QT_BINDIR%%/gle
-%%QT_BINDIR%%/glebtool
-%%QT_BINDIR%%/manip
-%%QT_BINDIR%%/qgle
+bin/gle
+bin/glebtool
+bin/manip
+bin/qgle
 lib/libgle-graphics-4.2.4c.so
 libdata/pkgconfig/gle-graphics.pc
 man/man1/gle.1.gz
--- a/irc/bip/Makefile
+++ b/irc/bip/Makefile
@ -45,4 +45,10 @@ post-install-EXAMPLES-on:
 	${INSTALL_DATA} ${WRKSRC}/samples/${i} ${STAGEDIR}${EXAMPLESDIR}
 .endfor

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@ -74,4 +74,10 @@ post-patch:
 	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@ -79,6 +79,10 @@ CPE_UPDATE=	p${RUBY_PATCHLEVEL}

 .include <bsd.port.pre.mk>

+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 # PORTEPOCH/PORTREVISION hack

 .if ${PORTEPOCH} != 0
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@ -77,6 +77,10 @@ USE_OPENSSL=		no

 .include <bsd.port.pre.mk>

+.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 THREADS_CONFIGURE_WITH=	pthread
 MOUSE_CONFIGURE_ENABLE=	mouse
 NLS_CONFIGURE_ENABLE=	nls
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@ -92,4 +92,10 @@ post-install-X11-off:
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@ -41,4 +41,10 @@ post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/mail/panda-cclient/Makefile
+++ b/mail/panda-cclient/Makefile
@ -35,6 +35,10 @@ PKGMESSAGE=	pkg-message-ssl

 .include <bsd.port.pre.mk>

+.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 USE_LDCONFIG=	yes
 ALL_TARGET=	bsf
 .if ! ${PORT_OPTIONS:MSSL}
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	procmail
 PORTVERSION=	3.22
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \
@ -30,7 +30,7 @@ PORTEXAMPLES=	1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
 		advanced dirname forward local_procmail_lmtp.m4 mailstat

 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config.h ${WRKSRC}/src/autoconf
 # Allow parallel builds (-jX) to work
 	@${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|'

--- a/mail/procmail/files/patch-config.h
+++ b/mail/procmail/files/patch-config.h
@ -26,12 +26,12 @@
 	system mailbox.	 This also must be an absolute path */
 
 -#define ETCRC	"/etc/procmailrc"	/* optional global procmailrc startup
-+#define ETCRC   "%%PREFIX%%/etc/procmailrc"       /* optional global procmailrc startup
+#define ETCRC   "/usr/local/etc/procmailrc"       /* optional global procmailrc startup
 					   file (will only be read if procmail
 	is started with no rcfile on the command line). */
 
 -#define ETCRCS	"/etc/procmailrcs/"	/* optional trusted path prefix for
-+#define ETCRCS  "%%PREFIX%%/etc/procmailrcs/"     /* optional trusted path prefix for
+#define ETCRCS  "/usr/local/etc/procmailrcs/"     /* optional trusted path prefix for
 					   rcfiles which will be executed with
 	the uid of the owner of the rcfile (this only happens if procmail is
 	called with the -m option, without variable assignments on the command
--- a/mail/procmail/files/patch-src-autoconf
+++ b/mail/procmail/files/patch-src-autoconf
@ -18,3 +18,15 @@
 if $MAKE _autotst >$DEVNULL 2>&1
  test -f _autotst
 then
+@@ -1491,6 +1493,11 @@
+   fi
+ done
+ 
+case ":$lpath:" in
+    *:/usr/local/bin:*) ;;
+    *) lpath="$lpath:/usr/local/bin" ;;
+esac
+
+ echo "#define defPATH \"PATH=\$HOME/bin:$lpath\"" >>$ACONF
+ echo "#define defSPATH \"PATH=$lpath\"" >>$ACONF
+ 
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@ -53,6 +53,10 @@ OPTIONS_DEFINE=	DOCS

 .include <bsd.port.pre.mk>

+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}

--- a/math/R/Makefile
+++ b/math/R/Makefile
@ -3,7 +3,7 @@

 PORTNAME=		R
 PORTVERSION=		3.3.2
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		math lang
 MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}

@ -65,7 +65,7 @@ ATLAS_VARS=		MANUAL_PACKAGE_BUILD=\
 CAIROPANGO_IMPLIES=	X11
 CAIROPANGO_CONFIGURE_WITH=cairo
 CAIROPANGO_USES=	gettext jpeg pkgconfig
-CAIROPANGO_USE=		gnome=pango,cairo
+CAIROPANGO_USE=		GNOME=pango,cairo
 GHOSTSCRIPT_IMPLIES=	X11
 GHOSTSCRIPT_USES=	ghostscript
 ICU_CONFIGURE_WITH=	ICU
@ -81,7 +81,11 @@ LDOUBLE_CONFIGURE_ENABLE=long-double
 LETTER_CONFIGURE_ENV=	R_PAPERSIZE=letter
 LIBR_CONFIGURE_ENABLE=	R-shlib
 LTO_CONFIGURE_ENABLE=	lto
-LTO_USE=		gcc=yes
+LTO_CONFIGURE_ENV=	AR="${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT:S/.//g}" \
+			RANLIB="${LOCALBASE}/bin/gcc-ranlib${GCC_DEFAULT:S/.//g}"
+LTO_USE=		GCC=yes
+LTO_VARS=		BINUTILS="ADDR2LINE AS CPPFILT GPROF LD NM OBJCOPY \
+			OBJDUMP READELF SIZE STRINGS"
 MEMPROF_CONFIGURE_ENABLE=memory-profiling
 NETLIB_USES=		blaslapack:netlib
 NETLIB_CONFIGURE_ON=	--disable-BLAS-shlib
@ -90,7 +94,7 @@ NLS_USES=		gettext
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_CONFIGURE_ON=	--disable-BLAS-shlib
 OPENMP_CONFIGURE_ENABLE=openmp
-OPENMP_USE=		compiler:openmp
+OPENMP_USES=		compiler:openmp
 PNG_IMPLIES=		X11
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	libpng
@ -115,33 +119,9 @@ TIFF_CONFIGURE_WITH=	libtiff
 X11_CONFIGURE_WITH=	x
 X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt

-R_SOVERSION=		1
-RBLAS_SOVERSION=	2
-RLAPACK_SOVERSION=	4
-
-PLIST_SUB=		R_SOVERSION="${R_SOVERSION}" \
-			RBLAS_SOVERSION="${RBLAS_SOVERSION}" \
-			RLAPACK_SOVERSION="${RLAPACK_SOVERSION}"
-
-.include <bsd.port.options.mk>
-.include "compiler.mk"
-
-.if ${PORT_OPTIONS:MLIBR} || ${PORT_OPTIONS:MRBLAS}
-USE_LDCONFIG=		${PREFIX}/lib/R/lib
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure

-## TODO: Add missing soname and soversion to shared libraries
-post-install:
-.for L in R Rblas Rlapack
-	if [ -d ${STAGEDIR}${PREFIX}/lib/R/lib ]; then \
-		cd ${STAGEDIR}${PREFIX}/lib/R/lib; \
-		if [ -f lib${L}.so ]; then \
-			${LN} -sf lib${L}.so lib${L}.so.${${L:tu}_SOVERSION}; \
-		fi; \
-	fi
-.endfor
-
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "compiler.mk"
+.include <bsd.port.post.mk>
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@ -101,11 +101,8 @@ lib/R/include/Rmath.h
 lib/R/include/Rversion.h
 lib/R/include/S.h
 %%RBLAS%%lib/R/lib/libRblas.so
-%%RBLAS%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
 %%RBLAS%%lib/R/lib/libRlapack.so
-%%RBLAS%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
 %%LIBR%%lib/R/lib/libR.so
-%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
 lib/R/library/KernSmooth/DESCRIPTION
 lib/R/library/KernSmooth/INDEX
 lib/R/library/KernSmooth/Meta/Rd.rds
--- a/math/octave-forge-interval/files/patch-mpfrtostring__d.cc
+++ b/math/octave-forge-interval/files/patch-mpfrtostring__d.cc
@ -9,3 +9,21 @@
                                         std::numeric_limits
                                           <double>::min_exponent - 1
                                         - exponent);
+@@ -219,7 +219,7 @@ DEFUN_DLD (mpfr_to_string_d, args, nargo
+               
+               // shift mantissa by 32 bits to format the first part
+               // sprintf (... "%x" ...) requires an unsigned 4-byte int 
+-              mantissa *= std::pow (2.0, sizeof (uint32_t) * 8);
+              mantissa *= uint64_t (1) << (sizeof (uint32_t) * 8);
+               uint32_t first_part = static_cast <uint32_t> (mantissa);
+               
+               // remove first mantissa part
+@@ -227,7 +227,7 @@ DEFUN_DLD (mpfr_to_string_d, args, nargo
+               
+               // shift mantissa by remaining 20 bits such that
+               // it is an integer
+-              mantissa *= std::pow (2.0,
+              mantissa *= uint64_t (1) << (
+                                     std::numeric_limits
+                                       <double>::digits - 1 - 32);
+               uint32_t second_part = static_cast <uint32_t> (mantissa);
--- a/math/vtk6/pkg-plist
+++ b/math/vtk6/pkg-plist
@ -825,7 +825,7 @@
 %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkGUISupportQtWebkit.cmake
 %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkRenderingQt.cmake
 %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkViewsQt.cmake
-%%SHARED%%%%DESIGNER%%%%QT_LIBDIR%%/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so
+%%SHARED%%%%DESIGNER%%lib/qt4/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so
 %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelGeometryJava.so
 %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelMPIJava.so
 %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkIOMPIImageJava.so
--- a/misc/seabios/Makefile
+++ b/misc/seabios/Makefile
@ -11,7 +11,8 @@ COMMENT=	Open source implementation of a 16bit X86 BIOS

 LICENSE=	LGPL3

-BROKEN_powerpc64=	Does not build
+ONLY_FOR_ARCHS=		amd64 i386
+ONLY_FOR_ARCHS_REASON=	specific to x86

 USES=	gmake python:build

--- a/multimedia/dvbcut/pkg-plist
+++ b/multimedia/dvbcut/pkg-plist
@ -1,4 +1,3 @@
-@comment %%QT_BINDIR%%/dvbcut
 bin/dvbcut
 share/applications/dvbcut.desktop
 share/mime/packages/dvbcut.xml
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@ -64,7 +64,7 @@ FFMPEG_CFLAGS_OFF+=-msse

 .if ${ARCH} == aarch64 || ${ARCH} == armv6
 CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
-CFLAGS=	-no-integrated-as
+CFLAGS+=	-no-integrated-as
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
--- a/multimedia/gstreamer-qt4/pkg-plist
+++ b/multimedia/gstreamer-qt4/pkg-plist
@ -123,8 +123,8 @@ lib/libQtGStreamerUi-%%GST_VERSION%%.so.%%VERSION%%
 lib/libQtGStreamerUtils-%%GST_VERSION%%.so
 lib/libQtGStreamerUtils-%%GST_VERSION%%.so.0
 lib/libQtGStreamerUtils-%%GST_VERSION%%.so.%%VERSION%%
-%%QT_LIBDIR%%/imports/QtGStreamer/libQtGStreamerQuick1.so
-%%QT_LIBDIR%%/imports/QtGStreamer/qmldir
+lib/qt4/imports/QtGStreamer/libQtGStreamerQuick1.so
+lib/qt4/imports/QtGStreamer/qmldir
 libdata/pkgconfig/QtGLib-2.0.pc
 libdata/pkgconfig/QtGStreamer-%%GST_VERSION%%.pc
 libdata/pkgconfig/QtGStreamerUi-%%GST_VERSION%%.pc
--- a/multimedia/librtmp/Makefile
+++ b/multimedia/librtmp/Makefile
@ -18,4 +18,10 @@ CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 WRKSRC=		${WRKDIR}/${DISTNAME}/librtmp

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@ -186,8 +186,8 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in
 %%QT_PREFIX%%/%%QT_INCDIR%%/Phonon
 %%QT_PREFIX%%/%%QT_INCDIR%%/phonon
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so.4
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so.4
+%%QT_PREFIX%%/lib/qt4/libphonon.so
+%%QT_PREFIX%%/lib/qt4/libphonon.so.4
+%%QT_PREFIX%%/lib/qt4/libphononexperimental.so
+%%QT_PREFIX%%/lib/qt4/libphononexperimental.so.4
 %%QT_PREFIX%%/%%QT_MKSPECDIR%%/modules/qt_phonon.pri
--- a/multimedia/qt4-mobility/pkg-plist
+++ b/multimedia/qt4-mobility/pkg-plist
@ -5,14 +5,14 @@
 %%BEARER%%%%QT_INCDIR%%/QtMobility/qlatin1constant.h
 %%BEARER%%%%QT_INCDIR%%/QtMobility/qmalgorithms.h
 %%BEARER%%%%QT_INCDIR%%/QtMobility/qmobilityglobal.h
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.prl
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1.2
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1.2.2
+%%BEARER%%lib/qt4/libQtBearer.prl
+%%BEARER%%lib/qt4/libQtBearer.so
+%%BEARER%%lib/qt4/libQtBearer.so.1
+%%BEARER%%lib/qt4/libQtBearer.so.1.2
+%%BEARER%%lib/qt4/libQtBearer.so.1.2.2
 %%BEARER%%%%QT_MKSPECDIR%%/features/mobility.prf
 %%BEARER%%%%QT_MKSPECDIR%%/features/mobilityconfig.prf
-%%CONNECTIVITY%%%%QT_BINDIR%%/ndefhandlergen
+%%CONNECTIVITY%%bin/ndefhandlergen
 %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothAddress
 %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothDeviceDiscoveryAgent
 %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothDeviceInfo
@ -75,11 +75,11 @@
 %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/qrfcommsocket.h
 %%CONNECTIVITY%%%%QT_IMPORTDIR%%/QtMobility/connectivity/libdeclarative_connectivity.so
 %%CONNECTIVITY%%%%QT_IMPORTDIR%%/QtMobility/connectivity/qmldir
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.prl
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1.2
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1.2.2
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.prl
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1.2
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1.2.2
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContact
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContactAbstractRequest
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContactAction
@ -218,11 +218,11 @@
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qcontacturl.h
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qtcontacts.h
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qtcontactsglobal.h
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.prl
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1.2
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1.2.2
+%%CONTACTS%%lib/qt4/libQtContacts.prl
+%%CONTACTS%%lib/qt4/libQtContacts.so
+%%CONTACTS%%lib/qt4/libQtContacts.so.1
+%%CONTACTS%%lib/qt4/libQtContacts.so.1.2
+%%CONTACTS%%lib/qt4/libQtContacts.so.1.2.2
 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackActuator
 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackEffect
 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackFileEffect
@ -236,11 +236,11 @@
 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/qfeedbackplugininterfaces.h
 %%FEEDBACK%%%%QT_IMPORTDIR%%/QtMobility/feedback/libdeclarative_feedback.so
 %%FEEDBACK%%%%QT_IMPORTDIR%%/QtMobility/feedback/qmldir
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.prl
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1.2
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1.2.2
+%%FEEDBACK%%lib/qt4/libQtFeedback.prl
+%%FEEDBACK%%lib/qt4/libQtFeedback.so
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1.2
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1.2.2
 %%GALLERY%%%%QT_INCDIR%%/QtGallery/QAbstractGallery
 %%GALLERY%%%%QT_INCDIR%%/QtGallery/QDocumentGallery
 %%GALLERY%%%%QT_INCDIR%%/QtGallery/QGalleryAbstractRequest
@ -270,11 +270,11 @@
 %%GALLERY%%%%QT_INCDIR%%/QtGallery/qgallerytyperequest.h
 %%GALLERY%%%%QT_IMPORTDIR%%/QtMobility/gallery/libdeclarative_gallery.so
 %%GALLERY%%%%QT_IMPORTDIR%%/QtMobility/gallery/qmldir
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.prl
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1.2
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1.2.2
+%%GALLERY%%lib/qt4/libQtGallery.prl
+%%GALLERY%%lib/qt4/libQtGallery.so
+%%GALLERY%%lib/qt4/libQtGallery.so.1
+%%GALLERY%%lib/qt4/libQtGallery.so.1.2
+%%GALLERY%%lib/qt4/libQtGallery.so.1.2.2
 %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoAddress
 %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoAreaMonitor
 %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoBoundingArea
@ -430,11 +430,11 @@
 %%LOCATION%%%%QT_INCDIR%%/QtLocation/qnmeapositioninfosource.h
 %%LOCATION%%%%QT_IMPORTDIR%%/QtMobility/location/libdeclarative_location.so
 %%LOCATION%%%%QT_IMPORTDIR%%/QtMobility/location/qmldir
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.prl
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1.2
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1.2.2
+%%LOCATION%%lib/qt4/libQtLocation.prl
+%%LOCATION%%lib/qt4/libQtLocation.so
+%%LOCATION%%lib/qt4/libQtLocation.so.1
+%%LOCATION%%lib/qt4/libQtLocation.so.1.2
+%%LOCATION%%lib/qt4/libQtLocation.so.1.2.2
 %%LOCATION%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_nokia.so
 %%LOCATION%%%%QT_PLUGINDIR%%/landmarks/libqtlandmarks_sqlite.so
 %%MULTIMEDIA%%%%QT_INCDIR%%/QtMultimediaKit/QAbstractAudioDeviceInfo
@ -582,11 +582,11 @@
 %%MULTIMEDIA%%%%QT_INCDIR%%/QtMultimediaKit/qvideowindowcontrol.h
 %%MULTIMEDIA%%%%QT_IMPORTDIR%%/QtMultimediaKit/libdeclarative_multimedia.so
 %%MULTIMEDIA%%%%QT_IMPORTDIR%%/QtMultimediaKit/qmldir
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.prl
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1.2
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1.2.2
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.prl
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1.2
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1.2.2
 %%MULTIMEDIA%%%%QT_PLUGINDIR%%/audio/libqtmedia_pulse.so
 %%MULTIMEDIA%%%%QT_PLUGINDIR%%/mediaservice/libqgstengine.so
 %%MULTIMEDIA%%%%QT_PLUGINDIR%%/mediaservice/libqtmedia_v4lengine.so
@ -730,13 +730,13 @@
 %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qorganizertodotime.h
 %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qtorganizer.h
 %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qtorganizerglobal.h
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.prl
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1.2
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1.2.2
-%%PUBLISHSUBSCRIBE%%%%QT_BINDIR%%/qcrmlgen
-%%PUBLISHSUBSCRIBE%%%%QT_BINDIR%%/vsexplorer
+%%ORGANIZER%%lib/qt4/libQtOrganizer.prl
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1.2
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1.2.2
+%%PUBLISHSUBSCRIBE%%bin/qcrmlgen
+%%PUBLISHSUBSCRIBE%%bin/vsexplorer
 %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpace
 %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpacePublisher
 %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpaceSubscriber
@ -745,11 +745,11 @@
 %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/qvaluespacesubscriber.h
 %%PUBLISHSUBSCRIBE%%%%QT_IMPORTDIR%%/QtMobility/publishsubscribe/libdeclarative_publishsubscribe.so
 %%PUBLISHSUBSCRIBE%%%%QT_IMPORTDIR%%/QtMobility/publishsubscribe/qmldir
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.prl
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1.2
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1.2.2
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.prl
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1.2
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1.2.2
 %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporter
 %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporterDetailHandler
 %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporterDetailHandlerV2
@ -774,11 +774,11 @@
 %%VERSIT%%%%QT_INCDIR%%/QtVersit/qversitwriter.h
 %%VERSIT%%%%QT_IMPORTDIR%%/QtMobility/contacts/libdeclarative_contacts.so
 %%VERSIT%%%%QT_IMPORTDIR%%/QtMobility/contacts/qmldir
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.prl
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1.2
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1.2.2
+%%VERSIT%%lib/qt4/libQtVersit.prl
+%%VERSIT%%lib/qt4/libQtVersit.so
+%%VERSIT%%lib/qt4/libQtVersit.so.1
+%%VERSIT%%lib/qt4/libQtVersit.so.1.2
+%%VERSIT%%lib/qt4/libQtVersit.so.1.2.2
 %%VERSIT%%%%QT_PLUGINDIR%%/versit/libqtversit_backuphandler.so
 %%VERSIT%%%%QT_PLUGINDIR%%/versit/libqtversit_vcardpreserver.so
 %%VERSITORGANIZER%%%%QT_INCDIR%%/QtVersitOrganizer/QVersitOrganizerExporter
@ -794,9 +794,9 @@
 %%VERSITORGANIZER%%%%QT_INCDIR%%/QtVersitOrganizer/qversittimezonehandler.h
 %%VERSITORGANIZER%%%%QT_IMPORTDIR%%/QtMobility/organizer/libdeclarative_organizer.so
 %%VERSITORGANIZER%%%%QT_IMPORTDIR%%/QtMobility/organizer/qmldir
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.prl
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1.2
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1.2.2
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.prl
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1.2
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1.2.2
 %%VERSITFEEDBACK%%%%QT_PLUGINDIR%%/feedback/libqtfeedback_mmk.so
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@ -31,7 +31,7 @@ BUILD_DEPENDS+=	protoc:devel/protobuf
 LIB_DEPENDS+=	libprotobuf.so:devel/protobuf

 TESTS_USE=		QT4=testlib
-TESTS_PLIST_FILES=	%%QT_BINDIR%%/test_bitcoin-qt \
+TESTS_PLIST_FILES=	bin/test_bitcoin-qt \
 			bin/test_bitcoin
 .endif

--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@ -35,6 +35,10 @@ KQUEUE_CONFIGURE_WITH=	kqueue

 .include <bsd.port.pre.mk>

+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 # Disable amd64 atomic ops on i386 when using gcc
 # undefined reference to __sync_add_and_fetch_8
 # undefined reference to __sync_fetch_and_and_8
--- a/net-p2p/litecoin/Makefile
+++ b/net-p2p/litecoin/Makefile
@ -37,7 +37,7 @@ LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 DBUS_USE=		QT4=dbus

 TESTS_USE=		QT4=testlib
-TESTS_PLIST_FILES=	%%QT_BINDIR%%/test_litecoin-qt
+TESTS_PLIST_FILES=	bin/test_litecoin-qt
 .endif

 OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET
--- a/net-p2p/sonarr/Makefile
+++ b/net-p2p/sonarr/Makefile
@ -1,8 +1,8 @@
 # $FreeBSD$

 PORTNAME=	sonarr
-PORTVERSION=	2.0.0.4389
-PORTREVISION=	1
+PORTVERSION=	2.0.0.4409
+PORTREVISION=	0
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://download.sonarr.tv/v2/master/mono/
 DISTNAME=	NzbDrone.master.${PORTVERSION}.mono
--- a/net-p2p/sonarr/distinfo
+++ b/net-p2p/sonarr/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1478960865
-SHA256 (NzbDrone.master.2.0.0.4389.mono.tar.gz) = be9a00c994e3281350533f5e83f0ae9e006fbb7a27a6babb4799876a1a757b9f
-SIZE (NzbDrone.master.2.0.0.4389.mono.tar.gz) = 6460948
+TIMESTAMP = 1480430611
+SHA256 (NzbDrone.master.2.0.0.4409.mono.tar.gz) = 825bd1afb1c2a95a2e6e367a931ac74aaac5dfd2ee44a467a4c82f17490d52cd
+SIZE (NzbDrone.master.2.0.0.4409.mono.tar.gz) = 6461904
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	chrony
-PORTVERSION=	2.4
+PORTVERSION=	2.4.1
 CATEGORIES=	net
 MASTER_SITES=	http://download.tuxfamily.org/chrony/

--- a/net/chrony/distinfo
+++ b/net/chrony/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1465554985
-SHA256 (chrony-2.4.tar.gz) = 8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f
-SIZE (chrony-2.4.tar.gz) = 390077
+TIMESTAMP = 1479833642
+SHA256 (chrony-2.4.1.tar.gz) = 0fd59e0ef625b4459e3a9c7f221c52f56596582bce31abfae5f7369702edb6e0
+SIZE (chrony-2.4.1.tar.gz) = 390641
--- a/net/libsrtp/Makefile
+++ b/net/libsrtp/Makefile
@ -44,4 +44,10 @@ post-build:
 check test runtest regression-test: build
 	${SETENV} LD_LIBRARY_PATH=${WRKSRC} ${MAKE_CMD} -C ${WRKSRC} runtest

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@ -49,4 +49,10 @@ VAAPI_CONFIGURE_WITH=	libva
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/net/libwebsockets/Makefile
+++ b/net/libwebsockets/Makefile
@ -2,9 +2,9 @@
 # $FreeBSD$

 PORTNAME=	libwebsockets
-PORTVERSION=	2.0.2
+PORTVERSION=	2.1.0
 DISTVERSIONPREFIX=	v
-CATEGORIES=	net
+CATEGORIES=	net devel
 MASTER_SITES=	GITHUB

 MAINTAINER=	iblis@hs.ntnu.edu.tw
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	warmcat

-PORTSCOUT=	limit:^v\d+\.
+PORTSCOUT=	limit:^v\d+\.*

 USES=		cmake pkgconfig ssl
 USE_LDCONFIG=	yes
@ -29,7 +29,7 @@ CMAKE_ARGS=	-DLWS_WITHOUT_TESTAPPS=ON \
 		-DLWS_WITHOUT_TEST_CLIENT=ON \
 		-DLWS_WITHOUT_TEST_FRAGGLE=ON

-OPTIONS_DEFINE=	HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER
+OPTIONS_DEFINE=	HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS
 OPTIONS_SUB=	yes

 HTTP_PROXY_DESC=	HTTP proxy support
@ -54,4 +54,9 @@ UNIX_SOCK_CMAKE_ON=	-DLWS_UNIX_SOCK=ON
 WEBSERVER_CMAKE_ON=	-DLWS_WITH_LWSWS=ON
 WEBSERVER_LIB_DEPENDS=	libuv.so:devel/libuv

+PLUGINS_CMAKE_ON=	-DLWS_WITH_PLUGINS=ON \
+			-DLWS_WITH_SERVER_STATUS=ON \
+			-DLWS_WITH_GENERIC_SESSIONS=ON
+PLUGINS_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+
 .include <bsd.port.mk>
--- a/net/libwebsockets/distinfo
+++ b/net/libwebsockets/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1468814124
-SHA256 (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 43865604debd06686ac4d8d0783976c4e10dd519ccd5c94e1b53878ec6178a59
-SIZE (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 2998706
+TIMESTAMP = 1479903723
+SHA256 (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66
+SIZE (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = 3721679
--- a/net/libwebsockets/files/patch-CMakeLists.txt
+++ b/net/libwebsockets/files/patch-CMakeLists.txt
@ -1,15 +1,15 @@
--- CMakeLists.txt.orig	2016-06-06 11:59:30 UTC
+--- CMakeLists.txt.orig	2016-10-06 19:19:50 UTC
 +++ CMakeLists.txt
-@@ -602,7 +602,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
+@@ -682,7 +682,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
                 set(VISIBILITY_FLAG -fvisibility=hidden)
     endif()
-     if (UNIX)
+     if (UNIX OR LWS_WITH_ESP8266)
 -               set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
 +               set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
-     else(UNIX)
+     else()
                set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
-     endif(UNIX)
-@@ -1316,7 +1316,7 @@ Cflags: -I\${includedir}"
+     endif()
+@@ -1416,7 +1416,7 @@ Cflags: -I\${includedir}"
 )
 
 	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
--- a/net/libwebsockets/files/patch-lib_server.c
+++ b/net/libwebsockets/files/patch-lib_server.c
@ -0,0 +1,11 @@
+--- lib/server.c.orig	2016-11-23 13:04:24 UTC
+++ lib/server.c
+@@ -110,7 +110,7 @@ lws_context_init_server(struct lws_conte
+ 	if (LWS_IPV6_ENABLED(vhost)) {
+ 		if (vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_MODIFY) {
+ 			int value = (vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_VALUE) ? 1 : 0;
+-			if (setsockopt(sockfd, SOL_IPV6, IPV6_V6ONLY,
+			if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ 					(const void*)&value, sizeof(value)) < 0) {
+ 				compatible_close(sockfd);
+ 				return 1;
--- a/net/libwebsockets/pkg-plist
+++ b/net/libwebsockets/pkg-plist
@ -1,5 +1,6 @@
@comment $FreeBSD$
 %%WEBSERVER%%bin/lwsws
+%%WEBSERVER%%include/lejp.h
 include/libwebsockets.h
 include/lws_config.h
 lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
@ -8,7 +9,24 @@ lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
 lib/libwebsockets.a
 lib/libwebsockets.so
-lib/libwebsockets.so.8
+lib/libwebsockets.so.9
 libdata/pkgconfig/libwebsockets.pc
-%%WEBSERVER%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
-%%WEBSERVER%%%%DATADIR%%-test-server/server-status/server-status.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.js
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-fail.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-ok.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-fail.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-ok.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-fail.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-ok.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/seats.jpg
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-fail.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-ok.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-table/index.html
+%%PLUGINS%%%%DATADIR%%-test-server/generic-table/lwsgt.js
+%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
+%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@ -29,6 +29,9 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>

 .if ${SSL_DEFAULT} != base
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	tramp
-PORTVERSION=	2.2.7
-PORTREVISION=	2
+PORTVERSION=	2.3.0
+#PORTREVISION=	0
 CATEGORIES=	net elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
--- a/net/tramp/distinfo
+++ b/net/tramp/distinfo
@ -1,2 +1,3 @@
-SHA256 (tramp-2.2.7.tar.gz) = ce9df3f898ccd56c5c0607d17456b4cfe14f8584c4c9ba25bbc009c44f0078d7
-SIZE (tramp-2.2.7.tar.gz) = 813729
+TIMESTAMP = 1480165959
+SHA256 (tramp-2.3.0.tar.gz) = f12dcc04aa2939d9b8e5501630db20499ad707e88b07630207c0794e89a83ceb
+SIZE (tramp-2.3.0.tar.gz) = 428407
--- a/net/tramp/files/patch-configure.ac
+++ b/net/tramp/files/patch-configure.ac
@ -1,21 +1,8 @@
--- configure.ac.orig	2010-11-20 19:59:36.000000000 +0900
-+++ configure.ac	2010-11-26 23:08:05.306093104 +0900
-@@ -55,11 +55,10 @@
- AC_EMACS_INFO
- 
- # Handle contrib files. "-" must be encoded as "_".
-TRAMP_CONTRIB_FILES=
-+TRAMP_CONTRIB_FILES=password.el
- 
- AC_CONTRIB_FILES([base64_encode_region],   [base64.el])
- AC_CONTRIB_FILES([format_spec],            [format_spec.el])
-AC_CONTRIB_FILES([password_cache_add],     [password.el],    [optional])
- if test "${EMACS_GW}" = yes; then
-    AC_CONTRIB_FILES([socks_open_network_stream], [socks.el], [optional])
- fi
-@@ -158,4 +157,4 @@
+--- configure.ac.orig	2016-06-26 19:35:17.000000000 +0900
+++ configure.ac	2016-11-26 22:49:34.137729000 +0900
+@@ -140,4 +140,4 @@
 # Regenerate autoloads.
 AC_MSG_NOTICE([regenerate autoloads])
 rm -f lisp/tramp-loaddefs.el
-make EMACS_INFO=${EMACS_INFO} -s -C lisp autoloads
+-make EMACS=${EMACS} -s -C lisp autoloads
 +gmake EMACS_INFO=${EMACS_INFO} -s -C lisp autoloads
--- a/net/tramp/files/patch-texi-Makefile.in
+++ b/net/tramp/files/patch-texi-Makefile.in
@ -1,8 +1,8 @@
--- texi/Makefile.in.orig	2011-02-13 20:38:54.000000000 +0900
-+++ texi/Makefile.in	2011-03-27 19:47:32.881845864 +0900
-@@ -48,8 +48,8 @@
+--- texi/Makefile.in.orig	2016-01-25 20:09:17.000000000 +0900
+++ texi/Makefile.in	2016-11-29 15:30:25.384280000 +0900
+@@ -45,8 +45,8 @@
 
- TEXI_FILES	= tramp.texi trampver.texi doclicense.texi \
+ TEXI_FILES	= tramp.texi trampver.texi doclicense.texi docstyle.texi \
 		  $(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi)
 -INFO_FILES	= $(localinfodir)/tramp
 -INSTALL_FILES	= $(DESTDIR)$(infodir)/tramp
@ -10,8 +10,8 @@
 +INSTALL_FILES	= $(DESTDIR)$(infodir)/tramp21.info
 CLEAN_FILES	= @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
 
- # To be used by maintainer only
-@@ -62,19 +62,22 @@
+ # To be used by maintainer only.
+@@ -59,7 +59,7 @@
 
 tramp: $(INFO_FILES) $(localinfodir)/dir
 
@ -20,21 +20,3 @@
 
 clean:
 	$(RM) $(CLEAN_FILES)
- 
- distclean: clean
- 
-$(localinfodir)/tramp: $(TEXI_FILES)
-+$(localinfodir)/%.info: $(TEXI_FILES)
- 	$(MKDIR) $(dir $@)
- 	$(MAKEINFO) --footnote-style=end -D $(EMACS_GVFS) -D $(EMACS_GW) \
-		-D $(EMACS_INFO) -D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi
-+		-D $(EMACS_INFO) -D $(INSTALL_CHAPTER) -o $@ $*.texi
- 
-$(DESTDIR)$(infodir)/tramp:
-+$(localinfodir)/tramp21.info: $(localinfodir)/tramp.info
-+	cp $(localinfodir)/tramp.info $@
-+
-+$(DESTDIR)$(infodir)/tramp21.info:
- 	$(MKDIR) $(dir $@)
- 	$(INSTALL) $(INFO_FILES) $(DESTDIR)$(infodir)
- 
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@ -8,8 +8,6 @@
 %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/run-at-time.elc
 %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.el
 %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.elc
-%%TRAMP_LISPDIR%%/password.el
-%%TRAMP_LISPDIR%%/password.elc
 %%TRAMP_LISPDIR%%/tramp-adb.el
 %%TRAMP_LISPDIR%%/tramp-adb.elc
 %%TRAMP_LISPDIR%%/tramp-cmds.el
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@ -54,4 +54,10 @@ post-install:
 	@cd ${STAGEDIR}${PREFIX}/man/man1/ && \
 	${LN} -s vtund.8 ../man1/vtun.1

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/ports-mgmt/pkg_replace/Makefile
+++ b/ports-mgmt/pkg_replace/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pkg_replace
-PORTVERSION=	20160411
+PORTVERSION=	20161113
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://member.tokoha-u.ac.jp/~kdeguchi/download/

--- a/ports-mgmt/pkg_replace/distinfo
+++ b/ports-mgmt/pkg_replace/distinfo
@ -1,2 +1,3 @@
-SHA256 (pkg_replace-20160411.tar.xz) = eef09c9f072ceb338d8a23e2a984ddac2282783a5ff72262a0af09e80bedface
-SIZE (pkg_replace-20160411.tar.xz) = 16320
+TIMESTAMP = 1478997789
+SHA256 (pkg_replace-20160411.tar.xz) = 437afb1370e3ca4c7f5c4621f532070338e966e261aabc54dc172c6834c5914b
+SIZE (pkg_replace-20160411.tar.xz) = 16372
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@ -11,6 +11,7 @@

 PORTNAME=	afni
 PORTVERSION=	2015.11.13
+PORTREVISION=	1
 CATEGORIES=	science biology graphics
 MASTER_SITES=	http://www.acadix.biz/Ports/distfiles/

@ -19,17 +20,19 @@ COMMENT=	Advanced Functional Neuro Imaging

 LICENSE=	GPLv2

-BUILD_DEPENDS=	gm4:devel/m4
-LIB_DEPENDS=	libXm.so:x11-toolkits/open-motif \
-		libR.so:math/R \
+BUILD_DEPENDS=	gm4:devel/m4 \
+		R:math/R
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libf2c.so:lang/f2c \
 		libgsl.so:math/gsl \
 		libnetcdff.so:science/netcdf-fortran \
 		libxml2.so:textproc/libxml2 \
-		libf2c.so:lang/f2c
-RUN_DEPENDS=	mpeg_encode:multimedia/mpeg_encode \
+		libXm.so:x11-toolkits/open-motif
+RUN_DEPENDS=	endian:sysutils/endian \
+		mpeg_encode:multimedia/mpeg_encode \
 		ppmtogif:graphics/netpbm \
-		endian:sysutils/endian \
-		qhull:math/qhull5
+		qhull:math/qhull5 \
+		R:math/R

 CONFLICTS=	im-[0-9]* \
 		nifticlib-[0-9]* \
@ -47,8 +50,8 @@ USE_GNOME=	glib20

 BROKEN_sparc64=	Does not compile: "undefined reference to '_mcount'"

-USE_GL=		glw glu
-USE_XORG=	xi
+USE_GL=		gl glu glw
+USE_XORG=	x11 xext xi xmu xp xt
 MAKE_ENV=	CC="${CC}" R_SHARE_DIR=${LOCALBASE}/lib/R/share
 MAKE_JOBS_UNSAFE=yes

--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@ -4,14 +4,7 @@
 PORTNAME=	chkrootkit
 PORTVERSION=	0.51
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.pangeia.com.br/pub/seg/pac/ \
-		ftp://gd.tuwien.ac.at/infosys/security/chkrootkit/ \
-		ftp://ftp.digitalvoodoo.org/pub/mirrors/chkrootkit/ \
-		http://www.spenneberg.org/chkrootkit-mirror/files/ \
-		http://www.mirrors.wiretapped.net/security/host-security/chkrootkit/ \
-		http://ftp.uni-stuttgart.de/pub/security/unix/forensics/chkrootkit/ \
-		http://ftp.bit.nl/mirror/chkrootkit/ \
-		http://chkrootkit.mirror.fr/
+MASTER_SITES=	ftp://ftp.pangeia.com.br/pub/seg/pac/

 MAINTAINER=	lacey.leanne@gmail.com
 COMMENT=	Tool to locally check for signs of a rootkit
--- a/security/john/Makefile
+++ b/security/john/Makefile
@ -71,6 +71,10 @@ post-patch:

 .include <bsd.port.pre.mk>

+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024
 CFLAGS+=	-flax-vector-conversions
 .endif
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@ -36,6 +36,10 @@ ZLIB_CONFIGURE_WITH=	libz

 .include <bsd.port.pre.mk>

+.if empty(PORT_OPTIONS:MGCRYPT) && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \
 		${WRKSRC}/libssh2.pc.in
--- a/security/luasec/Makefile
+++ b/security/luasec/Makefile
@ -30,4 +30,10 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -Ee '/^(INC|LIB)DIR/s/[^?]=/?=/' \
 		${WRKSRC}/Makefile

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/openca-tools-forked/Makefile
+++ b/security/openca-tools-forked/Makefile
@ -26,4 +26,10 @@ post-stage:
 	@${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/openca-${f}
 .endfor

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/p5-Crypt-OpenSSL-CA/Makefile
+++ b/security/p5-Crypt-OpenSSL-CA/Makefile
@ -30,4 +30,10 @@ USES=		perl5 ssl
 USE_PERL5=	modbuild
 CONFIGURE_ARGS=	--openssl-cflags=-L${OPENSSLINC} --openssl-ldflags="-I${OPENSSLLIB} ${OPENSSL_LDFLAGS}"

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/p5-Crypt-OpenSSL-ECDSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-ECDSA/Makefile
@ -23,4 +23,10 @@ CFLAGS+=	-I${OPENSSLINC}
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Crypt/OpenSSL/ECDSA/ECDSA.so

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@ -23,4 +23,10 @@ MAKE_ARGS=	PASTHRU_INC=-I${OPENSSLINC}
 regression-test: build
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/p5-Crypt-OpenSSL-X509/Makefile
+++ b/security/p5-Crypt-OpenSSL-X509/Makefile
@ -25,4 +25,10 @@ post-patch:
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Crypt/OpenSSL/X509/X509.so

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/p5-POE-Filter-SSL/Makefile
+++ b/security/p5-POE-Filter-SSL/Makefile
@ -29,4 +29,10 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/POE/Filter/SSL/SSL.so

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/pam_ssh_agent_auth/Makefile
+++ b/security/pam_ssh_agent_auth/Makefile
@ -22,4 +22,10 @@ PLIST_FILES=	lib/pam_ssh_agent_auth.so \
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pam_ssh_agent_auth.so

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/pkcs11-helper/Makefile
+++ b/security/pkcs11-helper/Makefile
@ -37,4 +37,10 @@ post-patch:
 	@${REINPLACE_CMD} 's|install-data-am: install-apidocDATA|install-data-am:|' \
 		${WRKSRC}/doc/api/Makefile.in

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/security/sslscan/Makefile
+++ b/security/sslscan/Makefile
@ -16,4 +16,10 @@ USE_OPENSSL=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	rbsec

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@ -134,6 +134,11 @@ PLIST_SUB+=		DBTYPE=${DBTYPE}
 .endif

 .include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 .if ${readline_ARGS} == "port"
 readline_CONFIGURE=	${LOCALBASE}
 .else
--- a/sysutils/bacula5-server/Makefile
+++ b/sysutils/bacula5-server/Makefile
@ -187,4 +187,10 @@ post-install:
 .else
 .include "${MASTERDIR}/Makefile.common"
 .endif # -client and -server are defined
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
+.include <bsd.port.post.mk>
--- a/Show more
+++ b/Show more