*/*: sync with upstream

Taken from: FreeBSD

astro/viking/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	viking
-PORTVERSION=	1.5.1
-PORTREVISION=	3
+PORTVERSION=	1.6
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/
 
@@ -12,22 +11,22 @@ COMMENT=	Program to manage GPS data (tracks, waypoints, etc.)
 
 LICENSE=	GPLv2
 
-BROKEN=		Fails to build
-
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
+		libmapnik.so:${PORTSDIR}/graphics/mapnik \
 		libpcre.so:${PORTSDIR}/devel/pcre \
-		libcurl.so:${PORTSDIR}/ftp/curl \
 		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
 RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 
 USES=		gmake iconv desktop-file-utils perl5 pkgconfig tar:bzip2
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
-USE_GNOME=	cairo gnomedocutils gtk20
+USE_GNOME=	cairo gnomedocutils gtk20 intlhack
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -39,7 +38,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=		DOCS GEOCACHES NLS GEOTAG GPSD
-OPTIONS_DEFAULT=	GEOTAG GPSD MERKAATOR
+OPTIONS_DEFAULT=	GEOTAG GPSD JOSM
 
 OPTIONS_MULTI=		OpenStreetMap-Editor
 OPTIONS_MULTI_OpenStreetMap-Editor=	JOSM MERKAATOR

astro/viking/distinfo

@@ -1,2 +1,2 @@
-SHA256 (viking-1.5.1.tar.bz2) = 6c560c8665112732e575110e9a316638cf278f03b5ecd92ff8845419cb3d53ec
-SIZE (viking-1.5.1.tar.bz2) = 1616172
+SHA256 (viking-1.6.tar.bz2) = 21f1bd372c571b8d021e4509a69ec6448efefec623355a9db26cd81898b5920a
+SIZE (viking-1.6.tar.bz2) = 3060389

astro/viking/pkg-plist

@@ -1,5 +1,7 @@
 bin/viking
 share/applications/viking.desktop
+share/gnome/help/viking/C/attribution.xml
+share/gnome/help/viking/C/commandline.xml
 share/gnome/help/viking/C/figures/DEM_file_info_dialog.png
 share/gnome/help/viking/C/figures/LayersTracksList.png
 share/gnome/help/viking/C/figures/LayersTracksStatistics.png
@@ -12,6 +14,7 @@ share/gnome/help/viking/C/figures/Viking-OSM-CycleMap-ManyTracks.jpg
 share/gnome/help/viking/C/figures/WaypointsList.png
 share/gnome/help/viking/C/figures/addtr_18.png
 share/gnome/help/viking/C/figures/addwp_18.png
+share/gnome/help/viking/C/figures/customize_toolbar_dialog.png
 share/gnome/help/viking/C/figures/demdl_18.png
 share/gnome/help/viking/C/figures/edtr_18.png
 share/gnome/help/viking/C/figures/edwp_18.png
@@ -30,7 +33,10 @@ share/gnome/help/viking/C/figures/trw_statusbar.png
 share/gnome/help/viking/C/figures/vik_new_route_18.png
 share/gnome/help/viking/C/figures/zoom_18.png
 share/gnome/help/viking/C/figures/zoom_status_popup.png
+share/gnome/help/viking/C/georef_layer.xml
 share/gnome/help/viking/C/legal.xml
+share/gnome/help/viking/C/mapnik_rendering_layer.xml
+share/gnome/help/viking/C/recommends.xml
 share/gnome/help/viking/C/viking.xml
 share/icons/hicolor/48x48/apps/viking.png
 %%NLS%%share/locale/ast/LC_MESSAGES/viking.mo
@@ -49,6 +55,7 @@ share/icons/hicolor/48x48/apps/viking.png
 %%NLS%%share/locale/it/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/jv/LC_MESSAGES/viking.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/viking.mo
@@ -67,3 +74,4 @@ share/pixmaps/viking.png
 %%DATADIR%%/external_tools.xml
 %%DATADIR%%/goto_tools.xml
 %%DATADIR%%/maps.xml
+%%DATADIR%%/latlontz.txt

audio/ncmpcpp/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ncmpcpp
-PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTVERSION=	0.6.7
 CATEGORIES=	audio
 MASTER_SITES=	http://ncmpcpp.rybczak.net/stable/
 

audio/ncmpcpp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ncmpcpp-0.6.5.tar.bz2) = 51128f6835c592c8d4367a66b08e06a9419a86c9d5c6e91d0f1dc73af56cd1fd
-SIZE (ncmpcpp-0.6.5.tar.bz2) = 429699
+SHA256 (ncmpcpp-0.6.7.tar.bz2) = 08807dc515b4e093154a6e91cdd17ba64ebedcfcd7aa34d0d6eb4d4cc28a217b
+SIZE (ncmpcpp-0.6.7.tar.bz2) = 429687

comms/hamlib/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	hamlib
 PORTVERSION=	1.2.15.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 
@@ -15,7 +15,8 @@ LICENSE=	LGPL20
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		perl5 libtool:keepla pkgconfig pathfix python tcl
+USES=		libtool:keepla pathfix perl5 pkgconfig python shebangfix tcl
+SHEBANG_FILES=	bindings/perltest.pl
 USE_PERL5=	build run
 USE_GNOME=	libxml2
 USE_AUTOTOOLS=	autoconf
@@ -43,11 +44,11 @@ post-build:
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \
-	${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \
-	${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \
-	${WRKSRC}/README.betatester ${WRKSRC}/README.win32 \
-	${WRKSRC}/THANKS
-	@${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
+		${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \
+		${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \
+		${WRKSRC}/README.betatester ${WRKSRC}/README.win32 \
+		${WRKSRC}/THANKS
+	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>

comms/xnec2c/Makefile

@@ -21,18 +21,12 @@ USE_GNOME=	gtk20 intltool
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	${CP} ${PATCHDIR}/clog.c ${WRKSRC}/src
-.if	${OSVERSION} < 900000
-	${CP} ${PATCHDIR}/cexp.[ch] ${WRKSRC}/src
-.else
 	${TOUCH} ${WRKSRC}/src/cexp.c
 	${TOUCH} ${WRKSRC}/src/cexp.h
-.endif
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/xnec2c.html ${STAGEDIR}${DOCSDIR}/xnec2c.html
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/images
@@ -44,4 +38,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/images/radiation.png ${STAGEDIR}${DOCSDIR}/images/radiation.png
 	${INSTALL_DATA} ${WRKSRC}/doc/images/wire.png ${STAGEDIR}${DOCSDIR}/images/wire.png
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

databases/libzdb/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzdb
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.tildeslash.com/libzdb/dist/
 

databases/libzdb/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libzdb-3.0.tar.gz) = e334bcb9ca1410e863634a164e3b1b5784018eb6e90b6c2b527780fc29a123c8
-SIZE (libzdb-3.0.tar.gz) = 700284
+SHA256 (libzdb-3.1.tar.gz) = 0f01abb1b01d1a1f4ab9b55ad3ba445d203fc3b4757abdf53e1d85e2b7b42695
+SIZE (libzdb-3.1.tar.gz) = 720162

deskutils/remind/Makefile

@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	remind
-PORTVERSION=	3.1.13
+PORTVERSION=	3.1.15
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.roaringpenguin.com/files/download/ \
 		http://freebsd.unixfreunde.de/sources/
-DISTNAME=	${PORTNAME}-03.01.13
+DISTNAME=	${PORTNAME}-03.01.15
 
 MAINTAINER=	[email protected]
 COMMENT=	Sophisticated calendar and alarm program

deskutils/remind/distinfo

@@ -1,2 +1,2 @@
-SHA256 (remind-03.01.13.tar.gz) = cf2663d5eb41863fc98da7c8db31ae0a86fbe7137aada81d0649523b4a0bfc4f
-SIZE (remind-03.01.13.tar.gz) = 361650
+SHA256 (remind-03.01.15.tar.gz) = 8adab4c0b30a556c34223094c5c74779164d5f3b8be66b8039f44b577e678ec1
+SIZE (remind-03.01.15.tar.gz) = 363101

devel/Makefile

@@ -4207,6 +4207,7 @@
     SUBDIR += py-raven
     SUBDIR += py-repl
     SUBDIR += py-repoze.lru
+    SUBDIR += py-repoze.sphinx.autointerface
     SUBDIR += py-repoze.tm2
     SUBDIR += py-repoze.what
     SUBDIR += py-repoze.what-pylons

devel/android-tools-adb-devel/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-DISTVERSION=	m-preview-1112
-DISTVERSIONSUFFIX=	-ge4c1bb5
+DISTVERSION=	m-preview-1212
+DISTVERSIONSUFFIX=	-g94c617ccbba4
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
@@ -17,6 +17,21 @@ USES=		compiler:c++11-lib
 BUILD_WRKSRC=	${WRKSRC}/adb
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_ENV=	FILESDIR="${FILESDIR}"
-CFLAGS+=	-DADB_REVISION='\"${DISTVERSIONFULL}\"'
+CFLAGS+=	-DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
+ALL_TARGET=	all
+
+OPTIONS_DEFINE=	TEST
+
+TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_USES=	python:2.7,build
+TEST_ALL_TARGET=adb_test
+
+pre-install-TEST-on:
+	${BUILD_WRKSRC}/adb_test
+	PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \
+		${PYTHON_CMD} ${BUILD_WRKSRC}/test_adb.py
+	PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \
+		${PYTHON_CMD} ${BUILD_WRKSRC}/test_device.py
 
 .include "${MASTERDIR}/Makefile"

devel/android-tools-adb-devel/distinfo

@@ -1,4 +1,4 @@
-SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 3fafd204d1ccf075fc5772937ef6e82f14d359f6ae4a9dbf9541e70314283fee
-SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 1342470
+SHA256 (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1ecf8e1ff6eaf133767f80fcf7271a50762a21812166d57abaa4117c6d4ad69c
+SIZE (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1361686
 SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7
 SIZE (bash_completion.d/adb?id=2b8cfec) = 5198

devel/android-tools-adb-devel/files/Makefile

@@ -22,6 +22,13 @@ SRCS+= transport.cpp
 SRCS+= transport_local.cpp
 SRCS+= transport_usb.cpp
 
+TEST_SRCS+= adb_io_test.cpp
+TEST_SRCS+= adb_utils_test.cpp
+TEST_SRCS+= fdevent_test.cpp
+TEST_SRCS+= shell_service_protocol_test.cpp
+TEST_SRCS+= socket_test.cpp
+TEST_SRCS+= transport_test.cpp
+
 .PATH: ${.CURDIR}/client
 SRCS+= main.cpp
 
@@ -34,6 +41,12 @@ SRCS+= file.cpp
 SRCS+= logging.cpp
 SRCS+= strings.cpp
 SRCS+= stringprintf.cpp
+TEST_SRCS+= file_test.cpp
+TEST_SRCS+= logging_test.cpp
+TEST_SRCS+= stringprintf_test.cpp
+TEST_SRCS+= strings_test.cpp
+TEST_SRCS+= test_main.cpp
+TEST_SRCS+= test_utils.cpp
 
 .PATH: ${.CURDIR}/../libcutils
 SRCS+= socket_inaddr_any_server.c
@@ -49,22 +62,34 @@ SRCS+= threads.c
 .PATH: ${.CURDIR}/../liblog
 SRCS+= fake_log_device.c
 SRCS+= logd_write.c
+CFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
 
 CFLAGS+= -DADB_HOST=1
 CFLAGS+= -DHAVE_FORKEXEC=1
 CFLAGS+= -DHAVE_SYMLINKS
 CFLAGS+= -DHAVE_TERMIO_H
 CFLAGS+= -DHAVE_SYS_SOCKET_H
 CFLAGS+= -D_FILE_OFFSET_BITS=64
-CFLAGS+= -DFAKE_LOG_DEVICE=1
 CFLAGS+= -I${.CURDIR}
 CFLAGS+= -I${.CURDIR}/../include
 CFLAGS+= -I${.CURDIR}/../base/include
+CFLAGS+=${CFLAGS.${.IMPSRC:T}}
 
 CXXFLAGS+= -std=gnu++11
 CXXFLAGS+= ${CFLAGS:N-std*}
 
+TEST_CFLAGS+= $$(${GTEST_CONFIG} --cppflags)
+.for f in ${TEST_SRCS}
+CFLAGS.${f}+= ${TEST_CFLAGS}
+.endfor
+
 LDADD+= -lcrypto -lpthread -lusb -lz
 DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
+TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
+
+GTEST_CONFIG?= gtest-config
+
+adb_test: ${SRCS:R:S/$/.o/:Nmain.o:Ncommandline.o} ${TEST_SRCS:R:S/$/.o/}
+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
 
 .include <bsd.prog.mk>

devel/android-tools-adb-devel/files/patch-adb_adb__io__test.cpp

@@ -0,0 +1,10 @@
+--- adb/adb_io_test.cpp.orig	2015-09-05 00:01:27 UTC
++++ adb/adb_io_test.cpp
+@@ -18,6 +18,7 @@
+
+ #include <gtest/gtest.h>
+
++#include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>