*/*: sync with upstream

Taken from: FreeBSD

archivers/Makefile

@@ -11,7 +11,6 @@
     SUBDIR += ark
     SUBDIR += atool
     SUBDIR += bicom
-    SUBDIR += brotli
     SUBDIR += bzip
     SUBDIR += bzip2
     SUBDIR += cabextract
@@ -162,6 +161,7 @@
     SUBDIR += pxz
     SUBDIR += py-attic
     SUBDIR += py-borgbackup
+    SUBDIR += py-brotli
     SUBDIR += py-bz2file
     SUBDIR += py-libarchive-c
     SUBDIR += py-librtfcomp

archivers/dpkg/Makefile

@@ -10,7 +10,7 @@ DISTNAME=	dpkg_${PORTVERSION}
 MAINTAINER=	[email protected]
 COMMENT=	Debian package maintenance system
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	po4a:textproc/po4a
@@ -23,12 +23,14 @@ CPE_VENDOR=	debian
 WRKSRC=		${WRKDIR}/dpkg-${PORTVERSION}
 
 DPKGDIR?=	/var/db/dpkg
-PLIST_SUB+=	DPKGDIR=${DPKGDIR}
+PLIST_SUB=	DPKGDIR=${DPKGDIR}
 
-CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \
+CONFIGURE_ARGS=	--with-admindir=${DPKGDIR} \
+		--libdir=${PREFIX}/libexec \
 		--with-libintl-prefix=${LOCALBASE} \
-		--with-logdir=/var/log --with-libmd
-CONFIGURE_ENV+=	PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}"
+		--with-logdir=/var/log \
+		--with-libmd
+CONFIGURE_ENV=	PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}"
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes

archivers/innoextract/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	innoextract
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://constexpr.org/innoextract/files/
 

archivers/par2cmdline-tbb/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	par2cmdline-tbb
 PORTVERSION=	20100203
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	archivers
 MASTER_SITES=	http://chuchusoft.com/par2_tbb/
 DISTNAME=	par2cmdline-0.4-tbb-${PORTVERSION}

archivers/brotli/Makefile → archivers/py-brotli/Makefile

@@ -3,8 +3,11 @@
 
 PORTNAME=	brotli
 PORTVERSION=	0.5.2
-DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	archivers
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	Brotli-${PORTVERSION}
 
 MAINTAINER=	[email protected]
 COMMENT=	Generic-purpose lossless compression algorithm
@@ -13,13 +16,10 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_PYTHON=	autoplist distutils
-USES=		compiler:c++0x python
+USES=		compiler:c++0x python zip
 
 PLIST_FILES=	bin/brotli
 
-GH_ACCOUNT=	google
-USE_GITHUB=	yes
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/python/bro.py ${STAGEDIR}${PREFIX}/bin/brotli
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/brotli.so

archivers/py-brotli/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1479973203
+SHA256 (Brotli-0.5.2.zip) = 3411b9acd2a2056e55084acf7a6ab3e4a8540c2ef37a4435bca62644e8aaf50e
+SIZE (Brotli-0.5.2.zip) = 504952

archivers/tardy/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	tardy
 PORTVERSION=	1.28
 DISTVERSIONSUFFIX=	.D001.orig
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	SF/tardy/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}

astro/Makefile

@@ -34,6 +34,7 @@
     SUBDIR += libgal
     SUBDIR += libkgeomap
     SUBDIR += libnova
+    SUBDIR += libosmium
     SUBDIR += libosmpbf
     SUBDIR += luna
     SUBDIR += marble
@@ -45,7 +46,6 @@
     SUBDIR += nightfall
     SUBDIR += opencpn
     SUBDIR += openuniverse
-    SUBDIR += osmium
     SUBDIR += osmosis
     SUBDIR += p5-Astro
     SUBDIR += p5-Astro-ADS

astro/josm/Makefile

@@ -8,7 +8,6 @@ MASTER_SITES=	http://josm.openstreetmap.de/download/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}.jar
 EXTRACT_SUFX=	# empty
-EXTRACT_ONLY=	# empty
 
 MAINTAINER=	[email protected]
 COMMENT=	Comprehensive editor for OpenStreetMap.org database
@@ -19,8 +18,9 @@ PORTSCOUT=	ignore:1
 
 NO_WRKSUBDIR=	yes
 
+USES=		zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
+JAVA_VERSION=	1.8+
 
 JOSM_MEMORY_LIMIT?=1024
 
@@ -30,15 +30,25 @@ NO_ARCH=	yes
 SUB_FILES=	josm.sh
 SUB_LIST=	JARNAME=${DISTNAME} JOSM_MEMORY_LIMIT=${JOSM_MEMORY_LIMIT}
 
-PLIST_FILES=	bin/josm ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
+PLIST_FILES=	bin/josm \
+		${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME} \
+		share/pixmaps/josm.png
+
+DESKTOP_ENTRIES="JOSM" \
+		"" \
+		"${PORTNAME}" \
+		"${PORTNAME}" \
+		"Education;Geoscience;Maps;" \
+		true
 
 pre-everything::
 	@${ECHO_CMD} "You can change limit of memory available to josm by defining"
 	@${ECHO_CMD} "JOSM_MEMORY_LIMIT variable in /etc/make.conf. Default is 1024 (MB)."
 
 do-install:
-	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
+	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/josm.sh ${STAGEDIR}${PREFIX}/bin/josm
+	${INSTALL_DATA} ${WRKSRC}/images/logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/josm.png
 
 .include <bsd.port.mk>

astro/libkgeomap/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	libkgeomap
 PORTVERSION=	${KDE4_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

astro/libosmium/Makefile

@@ -0,0 +1,41 @@
+# Created by: Dmitry Marakasov <[email protected]>
+# $FreeBSD$
+
+PORTNAME=	libosmium
+PORTVERSION=	2.10.3
+DISTVERSIONPREFIX=	v
+CATEGORIES=	astro geography devel
+
+MAINTAINER=	[email protected]
+COMMENT=	Fast and flexible C++ library for working with OpenStreetMap data
+
+LICENSE=	BSL
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libboost_regex.so:devel/boost-libs \
+		libgeos.so:graphics/geos \
+		libexpat.so:textproc/expat2
+BUILD_DEPENDS=	sparsehash>=0:devel/sparsehash
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	osmcode
+
+USES=		cmake compiler:c++11-lib
+CMAKE_ARGS=	-DBUILD_EXAMPLES:BOOL=OFF
+
+# though it build tests, the library itself it header-only
+NO_ARCH=	yes
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	TEST DOCS
+OPTIONS_DEFAULT=	TEST
+TEST_TEST_TARGET=	test
+TEST_CMAKE_BOOL=	BUILD_TESTING
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>

astro/libosmium/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1479910332
+SHA256 (osmcode-libosmium-v2.10.3_GH0.tar.gz) = 9254a276d5e2c1b172c3bdd11d284f3ef5ffcfc296e685c57e59233d641fd229
+SIZE (osmcode-libosmium-v2.10.3_GH0.tar.gz) = 428643

astro/libosmium/files/patch-include_osmium_util_endian.hpp

@@ -0,0 +1,13 @@
+--- include/osmium/util/endian.hpp.orig	2016-11-20 16:25:23 UTC
++++ include/osmium/util/endian.hpp
+@@ -35,7 +35,9 @@ DEALINGS IN THE SOFTWARE.
+
+ // Windows is only available for little endian architectures
+ // http://stackoverflow.com/questions/6449468/can-i-safely-assume-that-windows-installations-will-always-be-little-endian
+-#if !defined(_WIN32) && !defined(__APPLE__)
++#if defined(__FreeBSD__)
++# include <sys/endian.h>
++#elif !defined(_WIN32) && !defined(__APPLE__)
+ # include <endian.h>
+ #else
+ # define __LITTLE_ENDIAN 1234

astro/libosmium/pkg-descr

@@ -0,0 +1,11 @@
+The Osmium Library has extensive support for all types of OSM
+entities: nodes, ways, relations, and changesets. It allows reading
+from and writing to OSM files in XML and PBF formats, including
+change files and full history files. Osmium can store OSM data in
+memory and on disk in various formats and using various indexes.
+Its easy to use handler interface allows you to quickly write data
+filtering and conversion functions. Osmium can create WKT, WKB,
+OGR, GEOS and GeoJSON geometries for easy conversion into many GIS
+formats and it can assemble multipolygons from ways and relations.
+
+WWW: http://osmcode.org/libosmium/