*/*: sync with upstream

Taken from: FreeBSD
opnsense2 · Oct 12, 2016 · 444dfc7 · 444dfc7
1 parent d72d311
commit 444dfc7
Show file tree

Hide file tree

Showing 359 changed files with 2,754 additions and 1,727 deletions.
diff --git a/accessibility/py3-speech-dispatcher/Makefile b/accessibility/py3-speech-dispatcher/Makefile
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
-PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Common interface to speech synthesis python bindings
 
 SPEECH_SLAVE=	yes
 
-MASTERDIR=	${.CURDIR}/../../accessibility/speech-dispatcher
+MASTERDIR=	${.CURDIR}/../speech-dispatcher
 
 BUILD_WRKSRC=	${WRKSRC}/src/api/python
 INSTALL_WRKSRC=	${WRKSRC}/src/api/python
 
-PLIST=	${.CURDIR}/pkg-plist
+PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/accessibility/py3-speech-dispatcher/pkg-plist b/accessibility/py3-speech-dispatcher/pkg-plist
@@ -1,23 +1,23 @@
 bin/spd-conf
 %%PYTHON_SITELIBDIR%%/speechd/__init__.py
 %%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/speechd/_test.py
 %%PYTHON_SITELIBDIR%%/speechd/client.py
 %%PYTHON_SITELIBDIR%%/speechd/paths.py
 %%PYTHON_SITELIBDIR%%/speechd_config/__init__.py
 %%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/speechd_config/config.py
 %%PYTHON_SITELIBDIR%%/speechd_config/paths.py
 share/sounds/speech-dispatcher/test.wav

diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
@@ -68,6 +68,7 @@ NAS_CONFIGURE_WITH=	nas
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=pulse
 
+.include <bsd.port.pre.mk>
 post-patch:
 	@${REINPLACE_CMD} -e '/SUBDIRS/ s/tests//' \
 		${WRKSRC}/src/Makefile.in
@@ -84,13 +85,22 @@ post-install:
 
 .else
 
-USES+=		python:3
+NO_ARCH=	yes
+USES+=		python:3.3+
 LIB_DEPENDS+=	libspeechd.so:accessibility/speech-dispatcher
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg
 
-USE_PYTHON=	py3kplist
-PLIST_SUB=	PYVER=${PYTHON_VER:S|.||}
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3500
+PYOEXTENSION=	pyo
+.else
+PYOEXTENSION=	opt-1.pyc
+.endif
+
+PLIST_SUB+=	PYOEXTENSION=${PYOEXTENSION} \
+		PYVER=${PYTHON_VER:S/.//}
 
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
@@ -17,9 +17,6 @@ BUILD_DEPENDS=	po4a:textproc/po4a
 RUN_DEPENDS=	gtar:archivers/gtar \
 		gpatch:devel/patch
 
-NOT_FOR_ARCHS=		sparc64
-NOT_FOR_ARCHS_REASON=	Debian does is not available for ${ARCH}
-
 GNU_CONFIGURE=	yes
 USES=		cpe gmake iconv libtool ncurses perl5 pkgconfig tar:xz
 CPE_VENDOR=	debian

diff --git a/audio/deadbeef-mpris2-plugin/Makefile b/audio/deadbeef-mpris2-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	deadbeef-mpris2-plugin
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.9
+DISTVERSION=	1.10
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]

diff --git a/audio/deadbeef-mpris2-plugin/distinfo b/audio/deadbeef-mpris2-plugin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Serranya-deadbeef-mpris2-plugin-v1.9_GH0.tar.gz) = 787319629fcd89b138402140f29998a382dbdb414323010773cc2667a8956a40
-SIZE (Serranya-deadbeef-mpris2-plugin-v1.9_GH0.tar.gz) = 9634
+TIMESTAMP = 1475314642
+SHA256 (Serranya-deadbeef-mpris2-plugin-v1.10_GH0.tar.gz) = 050d6fd3d77558f66b3f527b85e336bfe99e62ed49b05832881f4020e02269ab
+SIZE (Serranya-deadbeef-mpris2-plugin-v1.10_GH0.tar.gz) = 9638
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moc
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.1
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.daper.net/pub/soft/moc/stable/
 

diff --git a/audio/moc/distinfo b/audio/moc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (moc-2.5.0.tar.bz2) = d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091
-SIZE (moc-2.5.0.tar.bz2) = 594532
+TIMESTAMP = 1472028956
+SHA256 (moc-2.5.1.tar.bz2) = 1b419c75a92a85ff4ee7670c65d660c86fef32032c65e89e868b988f80fac4f2
+SIZE (moc-2.5.1.tar.bz2) = 580329
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -25,34 +25,30 @@ LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
 		libsecret-1.so:security/libsecret \
 		libtdb.so:databases/tdb
 
-USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
-		pkgconfig tar:xz
+USES=		desktop-file-utils gettext gmake gnome libtool localbase \
+		pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack gnomeprefix gtk30 introspection:build \
 		py3gobject3
 USE_XORG=	ice xproto
 GNU_CONFIGURE=	yes
 USE_GSTREAMER1=	flac lame jpeg cdparanoia vorbis
 CONFIGURE_ARGS=	--enable-vala \
-		--disable-gudev \
+		--without-gudev \
 		--without-webkit \
 		--enable-visualizer=no \
 		--disable-browser-plugin \
 		--with-libsecret=yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-PLIST_SUB+=	PYTVER=${PYTHON_VER:S/.//}
-
 GLIB_SCHEMAS=	org.gnome.rhythmbox.gschema.xml
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BRASERO DAAP GRILO IPOD NOTIFY PYTHON LIRC MTP
 OPTIONS_DEFAULT=BRASERO NOTIFY PYTHON
 BRASERO_DESC=	Brasero disc burning support
-BRASERO_CONFIGURE_ENABLE=brasero
+BRASERO_CONFIGURE_WITH=brasero
 BRASERO_LIB_DEPENDS=	libbrasero-media3.so:sysutils/brasero
 DAAP_DESC=	DAAP support
 DAAP_CONFIGURE_ENABLE=	daap
@@ -66,14 +62,14 @@ GRILO_BUILD_DEPENDS=	grilo-plugins>=0:net/grilo-plugins
 GRILO_RUN_DEPENDS=	grilo-plugins>=0:net/grilo-plugins
 LIRC_CONFIGURE_ENABLE=	lirc
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
-NOTIFY_CONFIGURE_ENABLE=	notify
+NOTIFY_CONFIGURE_ENABLE=	libnotify
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 MTP_CONFIGURE_WITH=	mtp
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp \
 			libhal.so:sysutils/hal
 PYTHON_CONFIGURE_ENABLE=	python
-PYTHON_USES=		python:3
-PYTHON_USE=		PYTVER=${PYTHON_VER:S/.//}
+PYTHON_USES=		python:3.3+
+PYTHON_PLIST_SUB+=	PYTVER=${PYTHON_SUFFIX} PYOEXTENSION=${PYOEXTENSION}
 PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
 # context plugin
 # webkit is for the context plugin, which is broken because
@@ -82,6 +78,14 @@ PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
 #WEBKIT_CONFIGURE_WITH=	webkit
 #WEBKIT_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3500
+PYOEXTENSION=	pyo
+.else
+PYOEXTENSION=	opt-1.pyc
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|{MOZILLA_PLUGINDIR|{MOZILLA_PLUGINDIR}|g' \
 		${WRKSRC}/configure
@@ -90,4 +94,4 @@ post-patch:
 post-install:
 	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/rhythmbox/plugins/rbzeitgeist
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>