*/*: sync with upstream

Taken from: FreeBSD

archivers/dpkg/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dpkg
-PORTVERSION=	1.18.9
+PORTVERSION=	1.18.10
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	dpkg_${PORTVERSION}

archivers/dpkg/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1468141798
-SHA256 (dpkg_1.18.9.tar.xz) = 86ac4af917e9e75eb9b6c947a0a11439d1de32f72237413f7ddab17f77082093
-SIZE (dpkg_1.18.9.tar.xz) = 4632900
+TIMESTAMP = 1470065650
+SHA256 (dpkg_1.18.10.tar.xz) = 025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5
+SIZE (dpkg_1.18.10.tar.xz) = 4645448

archivers/dpkg/pkg-plist

@@ -161,6 +161,7 @@ libexec/libdpkg.a
 libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/de/man1/dpkg-architecture.1.gz
 %%NLS%%man/de/man1/dpkg-buildflags.1.gz
+%%NLS%%man/de/man1/dpkg-buildpackage.1.gz
 %%NLS%%man/de/man1/dpkg-checkbuilddeps.1.gz
 %%NLS%%man/de/man1/dpkg-deb.1.gz
 %%NLS%%man/de/man1/dpkg-distaddfile.1.gz
@@ -186,6 +187,7 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/de/man1/update-alternatives.1.gz
 %%NLS%%man/de/man5/deb-changelog.5.gz
 %%NLS%%man/de/man5/deb-changes.5.gz
+%%NLS%%man/de/man5/deb-conffiles.5.gz
 %%NLS%%man/de/man5/deb-control.5.gz
 %%NLS%%man/de/man5/deb-extra-override.5.gz
 %%NLS%%man/de/man5/deb-old.5.gz
@@ -378,6 +380,7 @@ man/man3/Dpkg::Vendor::Ubuntu.3.gz
 man/man3/Dpkg::Version.3.gz
 man/man5/deb-changelog.5.gz
 man/man5/deb-changes.5.gz
+man/man5/deb-conffiles.5.gz
 man/man5/deb-control.5.gz
 man/man5/deb-extra-override.5.gz
 man/man5/deb-old.5.gz

archivers/zstd/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zstd
-PORTVERSION=	0.7.4
+PORTVERSION=	0.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers
 
@@ -16,6 +16,7 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cyan4973
 
+PLIST_SUB=	LIBVER=${PORTVERSION}
 ALL_TARGET=	default
 MAKE_ARGS=	MANDIR="${PREFIX}/man/man1" \
 		LIBDIR="${PREFIX}/lib" \

archivers/zstd/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1469858423
-SHA256 (Cyan4973-zstd-v0.7.4_GH0.tar.gz) = 35ab3a5084d0194e9ff08e702edb6f507eab1bfb8c09c913639241cec852e2b7
-SIZE (Cyan4973-zstd-v0.7.4_GH0.tar.gz) = 567830
+TIMESTAMP = 1470041319
+SHA256 (Cyan4973-zstd-v0.8.0_GH0.tar.gz) = 297ef978fd956a503de6a303f7d58714de3300f602c7cf5e4b382a82f1483051
+SIZE (Cyan4973-zstd-v0.8.0_GH0.tar.gz) = 596389

archivers/zstd/files/patch-Makefile

@@ -1,11 +0,0 @@
---- Makefile.orig	2016-07-16 18:17:53 UTC
-+++ Makefile
-@@ -73,7 +73,7 @@ clean:
- #------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
- #------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly))
- HOST_OS = POSIX
- install:
- 	$(MAKE) -C $(ZSTDDIR) $@

archivers/zstd/files/patch-lib_Makefile

@@ -1,15 +1,6 @@
---- lib/Makefile.orig	2016-07-16 18:17:53 UTC
+--- lib/Makefile.orig	2016-08-01 07:51:18 UTC
 +++ lib/Makefile
-@@ -99,7 +99,7 @@ clean:
- 
- #------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly))
- 
- libzstd.pc:
- libzstd.pc: libzstd.pc.in
-@@ -111,15 +111,15 @@ libzstd.pc: libzstd.pc.in
+@@ -113,15 +113,15 @@ libzstd.pc: libzstd.pc.in
               $< >$@
  
  install: libzstd libzstd.pc
@@ -19,7 +10,7 @@
 -	@cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
 -	@cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
 -	@install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
--	@install -m 644 common/zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
+-	@install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
 -	@install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
 -	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
 +	@install -d -m 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
@@ -28,7 +19,7 @@
 +	@ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
 +	@$(BSD_INSTALL_DATA) libzstd.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
 +	@$(BSD_INSTALL_LIB) libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-+	@$(BSD_INSTALL_DATA) common/zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
++	@$(BSD_INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
 +	@$(BSD_INSTALL_DATA) common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
 +	@$(BSD_INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
  	@echo zstd static and shared library installed

archivers/zstd/files/patch-programs_Makefile

@@ -1,12 +1,6 @@
---- programs/Makefile.orig	2016-07-16 18:17:53 UTC
+--- programs/Makefile.orig	2016-08-01 07:51:18 UTC
 +++ programs/Makefile
-@@ -157,16 +157,16 @@ clean:
- #---------------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD, Hurd and OpenBSD targets
- #---------------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly))
- HOST_OS = POSIX
+@@ -181,11 +181,11 @@ HOST_OS = POSIX
  install: zstd
  	@echo Installing binaries
  	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/

archivers/zstd/pkg-plist

@@ -7,7 +7,7 @@ include/zstd.h
 lib/libzstd.a
 lib/libzstd.so
 lib/libzstd.so.0
-lib/libzstd.so.0.7.4
+lib/libzstd.so.%%LIBVER%%
 libdata/pkgconfig/libzstd.pc
 man/man1/unzstd.1.gz
 man/man1/zstd.1.gz

comms/usrp/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	usrp
 PORTVERSION=	3.4.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/adrian
 DISTNAME=	Ettus-USRP-3.4.3

comms/usrp/pkg-plist

@@ -239,6 +239,7 @@ libdata/pkgconfig/uhd.pc
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/folderopen.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_a.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_b.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_c.html
@@ -248,6 +249,7 @@ libdata/pkgconfig/uhd.pc
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_f.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_a.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_b.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_c.html
@@ -270,7 +272,6 @@ libdata/pkgconfig/uhd.pc
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_v.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_w.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_x.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_~.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_g.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_h.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_i.html
@@ -289,7 +290,6 @@ libdata/pkgconfig/uhd.pc
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_w.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_x.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_~.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/gain__group_8hpp.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/gain__group_8hpp_source.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals.html

comms/yaps/files/patch-cfg.c

@@ -0,0 +1,20 @@
+--- cfg.c.orig	1997-06-11 12:05:34 UTC
++++ cfg.c
+@@ -203,7 +203,7 @@ cfg_read (char *fname, void *bp, char *s
+ 			fcur -> fp = fp;
+ 			fcur -> up = NULL;
+ 			while (fcur) {
+-				while (gline = getline (fcur -> fp, True)) {
++				while (gline = get_line (fcur -> fp, True)) {
+ 					for (line = gline; isspace (*line); ++line)
+ 						;
+ 					if ((! *line) || (*line == '#')) {
+@@ -279,7 +279,7 @@ cfg_read (char *fname, void *bp, char *s
+ 								done = False;
+ 								siz = 0;
+ 								len = 0;
+-								while (ptr = getline (fcur -> fp, False)) {
++								while (ptr = get_line (fcur -> fp, False)) {
+ 									if ((*ptr != '}') || *(ptr + 1)) {
+ 										plen = strlen (ptr);
+ 										if (len + plen + 2 >= siz) {

comms/yaps/files/patch-cv.c

@@ -0,0 +1,11 @@
+--- cv.c.orig	1997-06-03 18:43:52 UTC
++++ cv.c
+@@ -151,7 +151,7 @@ cv_read_table (void *cv, char *fname)
+ 	MCHK (c);
+ 	if ((! c) || (! (fp = fopen (fname, "r"))))
+ 		return -1;
+-	while (line = getline (fp, True)) {
++	while (line = get_line (fp, True)) {
+ 		for (sp = line; isspace (*sp); ++sp)
+ 			;
+ 		if (*sp && (*sp != '#')) {

comms/yaps/files/patch-pager.h

@@ -0,0 +1,11 @@
+--- pager.h.orig	1997-06-12 11:59:28 UTC
++++ pager.h
+@@ -67,7 +67,7 @@ typedef struct {
+ /*{{{	utility */
+ extern char	*skip (char *str);
+ extern char	*skipch (char *str, char ch);
+-extern char	*getline (FILE *fp, Bool cont);
++extern char	*get_line (FILE *fp, Bool cont);
+ extern int	verbose_out (char *, ...);
+ /*}}}*/
+ /*{{{	string handling */

comms/yaps/files/patch-util.c

@@ -0,0 +1,11 @@
+--- util.c.orig	1997-05-31 17:20:40 UTC
++++ util.c
+@@ -36,7 +36,7 @@ skipch (char *str, char ch)
+ }
+ 
+ char *
+-getline (FILE *fp, Bool cont)
++get_line (FILE *fp, Bool cont)
+ {
+ 	char	*buf;
+ 	int	size;

comms/yaps/files/patch-yaps.c

@@ -0,0 +1,11 @@
+--- yaps.c.orig	1997-06-14 10:25:56 UTC
++++ yaps.c
+@@ -1177,7 +1177,7 @@ create_messages (void *cfg, char *servic
+ 			fprintf (stderr, "Unable to open message file %s for reading\n", mfile);
+ 			return NULL;
+ 		}
+-		while (ptr = getline (fp, False)) {
++		while (ptr = get_line (fp, False)) {
+ 			sav = skip (ptr);
+ 			if (*ptr && *sav) {
+ 				if (rcnt + 2 >= rsiz) {

databases/Makefile

@@ -427,6 +427,7 @@
     SUBDIR += p5-GraphViz-DBI
     SUBDIR += p5-HTML-FormHandler-Model-DBIC
     SUBDIR += p5-Ima-DBI
+    SUBDIR += p5-Interchange6-Schema
     SUBDIR += p5-Iterator-DBI
     SUBDIR += p5-Jifty-DBI
     SUBDIR += p5-KyotoCabinet

databases/p5-Interchange6-Schema/Makefile

@@ -0,0 +1,36 @@
+# Created by: <hvo.pm@xs4all.nl>
+# $FreeBSD$
+
+PORTNAME=	Interchange6-Schema
+PORTVERSION=	0.120
+CATEGORIES=	databases perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:HORNBURG
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	hvo.pm@xs4all.nl
+COMMENT=	Database Schema for Interchange 6
+
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class\
+		p5-DBIx-Class-Schema-Config>=0:databases/p5-DBIx-Class-Schema-Config\
+		p5-DBIx-Class-PassphraseColumn>=0:databases/p5-DBIx-Class-PassphraseColumn\
+		p5-DBIx-Class-InflateColumn-Authen-Passphrase>=0:databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase\
+		p5-DBIx-Class-Tree>=0:databases/p5-DBIx-Class-Tree\
+		p5-Data-UUID>=0:devel/p5-Data-UUID\
+		p5-Time-Duration-Parse>=0:devel/p5-Time-Duration-Parse\
+		p5-Locale-SubCountry>=0:misc/p5-Locale-SubCountry\
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-DBIx-Class-TimeStamp>=0:databases/p5-DBIx-Class-TimeStamp\
+		p5-DBIx-Class-Helpers>=0:databases/p5-DBIx-Class-Helpers\
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings\
+		p5-DBICx-TestDatabase>=0:databases/p5-DBICx-TestDatabase
+
+NO_ARCH=	yes
+USES=		perl5
+USE_PERL5=	configure
+
+.include <bsd.port.mk>

databases/p5-Interchange6-Schema/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1469362983
+SHA256 (Interchange6-Schema-0.120.tar.gz) = 513a602f8adbe2169a7a738f29de77b367fc77df03575d0dc18e21a14e263a58
+SIZE (Interchange6-Schema-0.120.tar.gz) = 115497

databases/p5-Interchange6-Schema/pkg-descr

@@ -0,0 +1,4 @@
+Database schema classes for Interchange6
+Open Source eCommerce software.
+
+WWW: http://search.cpan.org/dist/Interchange6-Schema/

databases/p5-Interchange6-Schema/pkg-plist

@@ -0,0 +1,161 @@
+bin/interchange6-create-database
+bin/interchange6-create-schema-png
+%%SITE_PERL%%/Interchange6/Schema.pm
+%%SITE_PERL%%/Interchange6/Schema/Base/Attribute.pm
+%%SITE_PERL%%/Interchange6/Schema/Candy.pm
+%%SITE_PERL%%/Interchange6/Schema/Component/Validation.pm
+%%SITE_PERL%%/Interchange6/Schema/Manual.pod
+%%SITE_PERL%%/Interchange6/Schema/Manual/Classes.pod
+%%SITE_PERL%%/Interchange6/Schema/Manual/Cookbook.pod
+%%SITE_PERL%%/Interchange6/Schema/Manual/DatabaseSupport.pod
+%%SITE_PERL%%/Interchange6/Schema/Populate.pm
+%%SITE_PERL%%/Interchange6/Schema/Populate/CountryLocale.pm
+%%SITE_PERL%%/Interchange6/Schema/Populate/MessageType.pm
+%%SITE_PERL%%/Interchange6/Schema/Populate/Role.pm
+%%SITE_PERL%%/Interchange6/Schema/Populate/StateLocale.pm
+%%SITE_PERL%%/Interchange6/Schema/Populate/Zone.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Address.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Attribute.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/AttributeValue.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Cart.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/CartProduct.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Country.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Inventory.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Media.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/MediaDisplay.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/MediaNavigation.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/MediaProduct.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/MediaType.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/MerchandisingAttribute.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/MerchandisingProduct.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Message.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/MessageType.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Navigation.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/NavigationAttribute.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/NavigationAttributeValue.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/NavigationMessage.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/NavigationProduct.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Order.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/OrderComment.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/OrderStatus.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Orderline.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/OrderlinesShipping.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/PaymentOrder.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Permission.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/PriceModifier.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Product.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ProductAttribute.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ProductAttributeValue.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ProductMessage.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Role.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Session.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Setting.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Shipment.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ShipmentCarrier.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ShipmentDestination.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ShipmentMethod.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ShipmentRate.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/State.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Tax.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/UriRedirect.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/User.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/UserAttribute.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/UserAttributeValue.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/UserRole.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/Zone.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ZoneCountry.pm
+%%SITE_PERL%%/Interchange6/Schema/Result/ZoneState.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet/Message.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet/Navigation.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet/Order.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet/Product.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet/Session.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet/Tax.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet/UriRedirect.pm
+%%SITE_PERL%%/Interchange6/Schema/ResultSet/User.pm
+%%SITE_PERL%%/Interchange6/Test/Role/Database.pm
+%%SITE_PERL%%/Interchange6/Test/Role/Fixtures.pm
+%%SITE_PERL%%/Interchange6/Test/Role/MySQL.pm
+%%SITE_PERL%%/Interchange6/Test/Role/PostgreSQL.pm
+%%SITE_PERL%%/Interchange6/Test/Role/SQLite.pm
+%%PERL5_MAN1%%/interchange6-create-schema-png.1.gz
+%%PERL5_MAN3%%/Interchange6::Schema.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Base::Attribute.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Candy.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Component::Validation.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Manual.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Manual::Classes.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Manual::Cookbook.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Manual::DatabaseSupport.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Populate.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Populate::CountryLocale.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Populate::MessageType.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Populate::Role.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Populate::StateLocale.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Populate::Zone.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Address.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Attribute.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::AttributeValue.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Cart.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::CartProduct.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Country.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Inventory.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Media.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::MediaDisplay.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::MediaNavigation.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::MediaProduct.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::MediaType.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::MerchandisingAttribute.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::MerchandisingProduct.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Message.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::MessageType.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Navigation.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::NavigationAttribute.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::NavigationAttributeValue.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::NavigationMessage.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::NavigationProduct.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Order.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::OrderComment.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::OrderStatus.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Orderline.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::OrderlinesShipping.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::PaymentOrder.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Permission.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::PriceModifier.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Product.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ProductAttribute.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ProductAttributeValue.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ProductMessage.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Role.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Session.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Setting.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Shipment.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ShipmentCarrier.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ShipmentDestination.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ShipmentMethod.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ShipmentRate.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::State.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Tax.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::UriRedirect.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::User.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::UserAttribute.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::UserAttributeValue.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::UserRole.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::Zone.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ZoneCountry.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::Result::ZoneState.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet::Message.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet::Navigation.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet::Order.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet::Product.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet::Session.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet::Tax.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet::UriRedirect.3.gz
+%%PERL5_MAN3%%/Interchange6::Schema::ResultSet::User.3.gz
+%%PERL5_MAN3%%/Interchange6::Test::Role::Database.3.gz
+%%PERL5_MAN3%%/Interchange6::Test::Role::Fixtures.3.gz
+%%PERL5_MAN3%%/Interchange6::Test::Role::MySQL.3.gz
+%%PERL5_MAN3%%/Interchange6::Test::Role::PostgreSQL.3.gz
+%%PERL5_MAN3%%/Interchange6::Test::Role::SQLite.3.gz

devel/Makefile

@@ -2726,6 +2726,7 @@
     SUBDIR += p5-MooseX-Clone
     SUBDIR += p5-MooseX-CompileTime-Traits
     SUBDIR += p5-MooseX-ConfigFromFile
+    SUBDIR += p5-MooseX-CoverableModifiers
     SUBDIR += p5-MooseX-Daemonize
     SUBDIR += p5-MooseX-Declare
     SUBDIR += p5-MooseX-Emulate-Class-Accessor-Fast
@@ -3816,6 +3817,7 @@
     SUBDIR += php56-sysvsem
     SUBDIR += php56-sysvshm
     SUBDIR += php56-tokenizer
+    SUBDIR += php70-APCu
     SUBDIR += php70-gettext
     SUBDIR += php70-intl
     SUBDIR += php70-json

devel/cppunit/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	cppunit
 PORTVERSION=	1.13.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://dev-www.libreoffice.org/src/
 

devel/cppunit/pkg-plist

@@ -1338,9 +1338,6 @@ share/aclocal/cppunit.m4
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_ba2a4a3a284960cb5e490c57e3886afc_dep.md5
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_ba2a4a3a284960cb5e490c57e3886afc_dep.png
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_c4b14d76b0344c563c835d95a27c8cd0.html
-%%DOXYGEN%%%%DOCSDIR%%/html/dir_c4b14d76b0344c563c835d95a27c8cd0_dep.map
-%%DOXYGEN%%%%DOCSDIR%%/html/dir_c4b14d76b0344c563c835d95a27c8cd0_dep.md5
-%%DOXYGEN%%%%DOCSDIR%%/html/dir_c4b14d76b0344c563c835d95a27c8cd0_dep.png
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_c5eaf16858184a764c0b183940730f6f.html
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_c5eaf16858184a764c0b183940730f6f_dep.map
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_c5eaf16858184a764c0b183940730f6f_dep.md5
@@ -1369,6 +1366,7 @@ share/aclocal/cppunit.m4
 %%DOXYGEN%%%%DOCSDIR%%/html/folderclosed.png
 %%DOXYGEN%%%%DOCSDIR%%/html/folderopen.png
 %%DOXYGEN%%%%DOCSDIR%%/html/functions.html
+%%DOXYGEN%%%%DOCSDIR%%/html/functions_0x7e.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_a.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_b.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_c.html
@@ -1378,6 +1376,7 @@ share/aclocal/cppunit.m4
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_eval.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_f.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_func.html
+%%DOXYGEN%%%%DOCSDIR%%/html/functions_func_0x7e.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_func_b.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_func_c.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_func_d.html
@@ -1398,7 +1397,6 @@ share/aclocal/cppunit.m4
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_func_u.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_func_w.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_func_x.html
-%%DOXYGEN%%%%DOCSDIR%%/html/functions_func_~.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_g.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_h.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_i.html
@@ -1416,7 +1414,6 @@ share/aclocal/cppunit.m4
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_vars.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_w.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_x.html
-%%DOXYGEN%%%%DOCSDIR%%/html/functions_~.html
 %%DOXYGEN%%%%DOCSDIR%%/html/globals.html
 %%DOXYGEN%%%%DOCSDIR%%/html/globals_defs.html
 %%DOXYGEN%%%%DOCSDIR%%/html/globals_func.html

devel/doxygen/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	doxygen
-PORTVERSION=	1.8.10
-PORTREVISION=	3
+PORTVERSION=	1.8.11
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
@@ -20,6 +19,8 @@ USES=		bison cmake:outsource iconv python:2 shebangfix
 ALL_TARGET=	all
 CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
 REINPLACE_ARGS=	-i ''
+# I need to look into why it doesn't work with parallel jobs
+MAKE_JOBS_UNSAFE=	yes
 
 EXTRACT_AFTER_ARGS=	--exclude '*/libmd5' \
 			--exclude '*/libpng' \

devel/doxygen/distinfo

@@ -1,2 +1,3 @@
-SHA256 (doxygen-1.8.10.src.tar.gz) = cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93
-SIZE (doxygen-1.8.10.src.tar.gz) = 4818276
+TIMESTAMP = 1467043745
+SHA256 (doxygen-1.8.11.src.tar.gz) = 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049
+SIZE (doxygen-1.8.11.src.tar.gz) = 4834291

devel/doxygen/files/patch-cmake_run__translator.cmake

@@ -1,10 +0,0 @@
---- cmake/run_translator.cmake.orig	2015-05-31 21:24:49 UTC
-+++ cmake/run_translator.cmake
-@@ -1,5 +1,5 @@
- include(${SOURCE}/cmake/version.cmake)
--find_program(PYTHON NAMES python)
-+find_package(PythonInterp)
- execute_process(
--    COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/translator.py
-+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/translator.py
- )

devel/doxygen/files/patch-doc_CMakeLists.txt

@@ -0,0 +1,11 @@
+--- doc/CMakeLists.txt.orig	2015-09-01 12:42:06 UTC
++++ doc/CMakeLists.txt
+@@ -169,7 +169,7 @@ install(FILES
+         "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+         "${PROJECT_BINARY_DIR}/man/doxysearch.1"
+         "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
+-        DESTINATION share/man/man1
++        DESTINATION man/man1
+ )
+ 
+ install(FILES

devel/doxygen/files/patch-md5-dot

@@ -1,4 +1,4 @@
---- src/dot.cpp.orig	2015-03-15 12:15:52 UTC
+--- src/dot.cpp.orig	2015-12-28 19:46:20 UTC
 +++ src/dot.cpp
 @@ -39,6 +39,7 @@
  #include "dirdef.h"
@@ -8,7 +8,7 @@
  #include "md5.h"
  #include "memberlist.h"
  #include "groupdef.h"
-@@ -2311,10 +2312,8 @@ void DotGfxHierarchyTable::createGraph(D
+@@ -2305,10 +2306,8 @@ void DotGfxHierarchyTable::createGraph(D
    }
    writeGraphFooter(md5stream);
    resetReNumbering();
@@ -20,7 +20,7 @@
    bool regenerate=FALSE;
    if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
        !checkDeliverables(absImgName,absMapName))
-@@ -3073,10 +3072,8 @@ QCString computeMd5Signature(DotNode *ro
+@@ -3072,10 +3071,8 @@ QCString computeMd5Signature(DotNode *ro
      }
    }
    writeGraphFooter(md5stream);
@@ -32,10 +32,10 @@
    if (reNumber)
    {
      resetReNumbering();
-@@ -4007,10 +4004,8 @@ QCString DotDirDeps::writeGraph(FTextStr
-   QGString theGraph;
+@@ -4009,10 +4006,8 @@ QCString DotDirDeps::writeGraph(FTextStr
    FTextStream md5stream(&theGraph);
-   m_dir->writeDepGraph(md5stream);
+   //m_dir->writeDepGraph(md5stream);
+   writeDotDirDepGraph(md5stream,m_dir,linkRelations);
 -  uchar md5_sig[16];
    QCString sigStr(33);
 -  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
@@ -44,7 +44,7 @@
    bool regenerate=FALSE;
    if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
        !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
-@@ -4152,10 +4147,8 @@ void generateGraphLegend(const char *pat
+@@ -4154,10 +4149,8 @@ void generateGraphLegend(const char *pat
    md5stream << "  Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
    md5stream << "  Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
    writeGraphFooter(md5stream);
@@ -56,7 +56,7 @@
    QCString absBaseName = (QCString)path+"/graph_legend";
    QCString absDotName  = absBaseName+".dot";
    QCString imgExt = getDotImageExtension();
-@@ -4555,10 +4548,8 @@ QCString DotGroupCollaboration::writeGra
+@@ -4557,10 +4550,8 @@ QCString DotGroupCollaboration::writeGra
  
    writeGraphFooter(md5stream);
    resetReNumbering();

devel/doxygen/files/patch-src_code.l

@@ -1,11 +0,0 @@
---- src/code.l.orig	2015-05-31 19:01:12 UTC
-+++ src/code.l
-@@ -3695,7 +3695,7 @@ void codeFreeScanner()
- extern "C" { // some bogus code to keep the compiler happy
-   void codeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
- 

devel/doxygen/files/patch-src_commentscan.l

@@ -1,20 +0,0 @@
---- src/commentscan.l.orig	2015-05-31 19:01:12 UTC
-+++ src/commentscan.l
-@@ -1103,7 +1103,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
- 					      // but we need to know the position in the input buffer where this 
- 					      // rule matched.
- 					      // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+#if YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33 || YY_FLEX_MINOR_VERSION>=6
- 					      inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
- #else
- 					      inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
-@@ -1165,7 +1165,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
-                                           g_memberGroupHeader.resize(0);
- 					  parseMore=TRUE;
-                                           needNewEntry = TRUE;
--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+#if YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33 || YY_FLEX_MINOR_VERSION>=6
- 				          inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
- #else
- 				          inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);

devel/doxygen/files/patch-src_fortrancode.l

@@ -1,11 +0,0 @@
---- src/fortrancode.l.orig	2015-11-19 06:39:17 UTC
-+++ src/fortrancode.l
-@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterfac
- extern "C" { // some bogus code to keep the compiler happy
-   void fortrancodeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #else
- extern "C" { // some bogus code to keep the compiler happy

devel/doxygen/files/patch-src_pycode.l

@@ -1,11 +0,0 @@
---- src/pycode.l.orig	2015-11-19 06:41:15 UTC
-+++ src/pycode.l
-@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface
- extern "C" { // some bogus code to keep the compiler happy
-   void pycodeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
- 

devel/doxygen/files/patch-src_vhdlcode.l

@@ -1,11 +0,0 @@
---- src/vhdlcode.l.orig	2015-11-19 06:41:43 UTC
-+++ src/vhdlcode.l
-@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
- extern "C" { // some bogus code to keep the compiler happy
-   void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
- 

devel/doxygen/files/patch-src_xmlcode.l

@@ -1,11 +0,0 @@
---- src/xmlcode.l.orig	2015-05-31 19:01:12 UTC
-+++ src/xmlcode.l
-@@ -407,7 +407,7 @@ void resetXmlCodeParserState() 
- extern "C" { // some bogus code to keep the compiler happy
-   void xmlcodeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
- 

devel/kBuild/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	kBuild
 DISTVERSION=	${KBUILD_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/ \
 		http://tmp.chruetertee.ch/ \
@@ -17,8 +17,8 @@ BROKEN_powerpc64=	Does not build
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
+USE_GCC=	any
 USES=		autoreconf:build gmake makeinfo
-CFLAGS+=	-D_WITH_GETLINE=1 -D_WITH_DPRINTF=1
 
 CONFLICTS_INSTALL=	kBuild-devel-[0-9]*
 
@@ -26,11 +26,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 KBUILD_VERSION=	0.1.9998
 KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/:S/x86_64/amd64/:S/powerpc/ppc32/}
-KBUILD_ENV=	${MAKE_ENV}
-KBUILD_ENV+=	ACLOCAL=${ACLOCAL} \
+KBUILD_ENV=	ACLOCAL=${ACLOCAL} \
 		AUTOMAKE=${AUTOMAKE} \
 		AUTORECONF=${AUTORECONF} \
-		AUTOPOINT=true
+		AUTOPOINT=true \
+		CFLAGS="-D_WITH_GETLINE -D_WITH_DPRINTF"
 KBUILD_TARGET=	${OPSYS:tl}
 
 KBUILD_BINS=	kDepIDB kDepPre kObjCache kmk kmk_append kmk_ash kmk_cat \

devel/mercurial/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercurial
-PORTVERSION=	3.8.4
+PORTVERSION=	3.9
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial-scm.org/release/
 
@@ -16,11 +16,12 @@ USES=	cpe python:2
 USE_PYTHON=	distutils
 
 OPTIONS_DEFINE=	CA_BUNDLE DATA DOCS NLS FREEBSD
-OPTIONS_DEFAULT=DATA
+OPTIONS_DEFAULT=CA_BUNDLE DATA
 OPTIONS_SUB=	yes
 
 CA_BUNDLE_DESC=		Install CA Certificates
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+DATA_SUB_FILES=	pkg-message
 FREEBSD_DESC=		Patches used internally by the FreeBSD Project
 FREEBSD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-authormapsuffix
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
@@ -38,7 +39,6 @@ CONTRIB_FILES=	bash_completion \
 		hgsh/hgsh.c \
 		mercurial.el \
 		mq.el \
-		perf.py \
 		pylintrc \
 		python-hook-examples.py \
 		simplemerge \
@@ -54,34 +54,26 @@ CONTRIB_FILES=	bash_completion \
 		vim/patchreview.vim
 DOCS=		CONTRIBUTORS README
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDATA}
-SUB_FILES=	pkg-message
-.endif
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/*.so
 	${STRIP_CMD} \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/hgext/fsmonitor/pywatchman/*.so
-.if ${PORT_OPTIONS:MDATA}
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${DATADIR}/contrib
-	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/hgsh
-	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/vim
-	for f in ${CONTRIB_FILES}; do \
-		${CP} -p ${WRKSRC}/contrib/$${f} ${STAGEDIR}${DATADIR}/contrib/$${f}; \
-	done
+
+post-install-DATA-on:
+.for d in hgsh vim
+	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/${d}
+.endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/www
-	${INSTALL_DATA} ${WRKSRC}/*.cgi ${STAGEDIR}${DATADIR}/www
-	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.fcgi ${STAGEDIR}${DATADIR}/www
-	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.wsgi ${STAGEDIR}${DATADIR}/www
-.endif
+.for f in ${CONTRIB_FILES}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${f} \
+		${STAGEDIR}${DATADIR}/contrib/${f}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.* ${STAGEDIR}${DATADIR}/www
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

devel/mercurial/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1467440792
-SHA256 (mercurial-3.8.4.tar.gz) = 4b2e3ef19d34fa1d781cb7425506a05d4b6b1172bab69d6ea78874175fdf3da6
-SIZE (mercurial-3.8.4.tar.gz) = 4775341
+TIMESTAMP = 1470079520
+SHA256 (mercurial-3.9.tar.gz) = 834f25dcff44994198fb8a7ba161a6e24204dbd63c8e6270577e06e6cedbdabc
+SIZE (mercurial-3.9.tar.gz) = 4796280

devel/mercurial/files/pkg-message.in

@@ -1,7 +1,7 @@
 ====
 Note that we now install a few more files in %%PREFIX%%/share/mercurial:
 - shell completion scripts (bash, tcsh and zsh)
-- CGI / WSGI scripts for web access to repositories
+- FastCGI / WSGI scripts for web access to repositories
   see http://www.mercurial-scm.org/wiki/PublishingRepositories
 - various documentation files
 ====

devel/mercurial/pkg-plist

@@ -114,9 +114,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/graphlog.py
 %%PYTHON_SITELIBDIR%%/hgext/graphlog.pyc
 %%PYTHON_SITELIBDIR%%/hgext/graphlog.pyo
-%%PYTHON_SITELIBDIR%%/hgext/hgcia.py
-%%PYTHON_SITELIBDIR%%/hgext/hgcia.pyc
-%%PYTHON_SITELIBDIR%%/hgext/hgcia.pyo
 %%PYTHON_SITELIBDIR%%/hgext/hgk.py
 %%PYTHON_SITELIBDIR%%/hgext/hgk.pyc
 %%PYTHON_SITELIBDIR%%/hgext/hgk.pyo
@@ -129,6 +126,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/histedit.py
 %%PYTHON_SITELIBDIR%%/hgext/histedit.pyc
 %%PYTHON_SITELIBDIR%%/hgext/histedit.pyo
+%%PYTHON_SITELIBDIR%%/hgext/journal.py
+%%PYTHON_SITELIBDIR%%/hgext/journal.pyc
+%%PYTHON_SITELIBDIR%%/hgext/journal.pyo
 %%PYTHON_SITELIBDIR%%/hgext/keyword.py
 %%PYTHON_SITELIBDIR%%/hgext/keyword.pyc
 %%PYTHON_SITELIBDIR%%/hgext/keyword.pyo
@@ -159,6 +159,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.py
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.pyc
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/storefactory.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/storefactory.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/storefactory.pyo
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.py
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.pyc
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.pyo
@@ -411,9 +414,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.py
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.py
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyo
@@ -495,6 +495,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/phases.py
 %%PYTHON_SITELIBDIR%%/mercurial/phases.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/phases.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/policy.py
+%%PYTHON_SITELIBDIR%%/mercurial/policy.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/policy.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/posix.py
 %%PYTHON_SITELIBDIR%%/mercurial/posix.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/posix.pyo
@@ -812,7 +815,6 @@ man/man5/hgrc.5.gz
 %%DATA%%%%DATADIR%%/contrib/hgsh/hgsh.c
 %%DATA%%%%DATADIR%%/contrib/mercurial.el
 %%DATA%%%%DATADIR%%/contrib/mq.el
-%%DATA%%%%DATADIR%%/contrib/perf.py
 %%DATA%%%%DATADIR%%/contrib/pylintrc
 %%DATA%%%%DATADIR%%/contrib/python-hook-examples.py
 %%DATA%%%%DATADIR%%/contrib/simplemerge
@@ -826,6 +828,5 @@ man/man5/hgrc.5.gz
 %%DATA%%%%DATADIR%%/contrib/vim/patchreview.txt
 %%DATA%%%%DATADIR%%/contrib/vim/patchreview.vim
 %%DATA%%%%DATADIR%%/contrib/zsh_completion
-%%DATA%%%%DATADIR%%/www/hgweb.cgi
 %%DATA%%%%DATADIR%%/www/hgweb.fcgi
 %%DATA%%%%DATADIR%%/www/hgweb.wsgi