Sync with the latest from marcuscom

yurkis · Aug 18, 2014 · 7152a5b · 7152a5b
1 parent 08998a1
commit 7152a5b
Show file tree

Hide file tree

Showing 258 changed files with 700 additions and 1,164 deletions.
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
@@ -18,9 +18,8 @@ BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desk
 RUN_DEPENDS=	gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		at-spi2-core>=2.1.5:${PORTSDIR}/accessibility/at-spi2-core
 
-USES=		gettext gmake pkgconfig shebangfix tar:xz
+USES=		gettext gmake pkgconfig python:3 shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack py3gobject3
-USE_PYTHON=	3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
@@ -1,9 +1,10 @@
 # Created by: Maxim Sobolev <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/accessibility/at-spi2-atk/Makefile 19578 2014-04-25 21:50:30Z kwm $
+#   $MCom: ports/trunk/accessibility/at-spi2-atk/Makefile 19813 2014-08-15 19:44:33Z gusi $
 
 PORTNAME=	at-spi2-atk
 PORTVERSION=	2.12.1
+PORTREVISION=	1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -19,16 +20,13 @@ RUN_DEPENDS=	at-spi2-core>=2.8.0:${PORTSDIR}/accessibility/at-spi2-core
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	atk glib20 gnomehier intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-p2p
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libatk-bridge-2.0.so*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/modules/libatk-bridge.so
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/accessibility/at-spi2-atk/pkg-plist b/accessibility/at-spi2-atk/pkg-plist
@@ -1,10 +1,8 @@
 include/at-spi2-atk/2.0/atk-bridge.h
-lib/libatk-bridge-2.0.la
 lib/libatk-bridge-2.0.so
 lib/libatk-bridge-2.0.so.0
 lib/libatk-bridge-2.0.so.0.0.0
 lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
-lib/gtk-2.0/modules/libatk-bridge.la
 lib/gtk-2.0/modules/libatk-bridge.so
 libdata/pkgconfig/atk-bridge-2.0.pc
 @dirrmtry lib/gtk-2.0/modules

diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
@@ -1,9 +1,10 @@
 # Created by: Maxim Sobolev <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/accessibility/at-spi2-core/Makefile 19578 2014-04-25 21:50:30Z kwm $
+#   $MCom: ports/trunk/accessibility/at-spi2-core/Makefile 19813 2014-08-15 19:44:33Z gusi $
 
 PORTNAME=	at-spi2-core
 PORTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,16 +18,14 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomehier intlhack introspection:build
 USE_XORG=	x11 xi xtst xext
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-xevie
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libatspi.so.0
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist
@@ -33,7 +33,6 @@ include/at-spi-2.0/atspi/atspi-text.h
 include/at-spi-2.0/atspi/atspi-types.h
 include/at-spi-2.0/atspi/atspi-value.h
 lib/girepository-1.0/Atspi-2.0.typelib
-lib/libatspi.la
 lib/libatspi.so
 lib/libatspi.so.0
 lib/libatspi.so.0.0.1

diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
@@ -1,10 +1,10 @@
 # Created by: Maxim Sobolev <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/accessibility/atk/Makefile 19578 2014-04-25 21:50:30Z kwm $
+#   $MCom: ports/trunk/accessibility/atk/Makefile 19813 2014-08-15 19:44:33Z gusi $
 
 PORTNAME=	atk
 PORTVERSION=	2.12.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	accessibility devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,20 +18,18 @@ USES=		tar:xz
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES+=		gettext gmake libtool:keepla pathfix pkgconfig
+USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 gnomehier introspection:build referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
+INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests docs//" \
 		${WRKSRC}/Makefile.in
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libatk-1.0.so*
-
 .include <bsd.port.mk>
 
 .endif
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
@@ -33,7 +33,6 @@ include/atk-1.0/atk/atkvalue.h
 include/atk-1.0/atk/atkversion.h
 include/atk-1.0/atk/atkwindow.h
 lib/girepository-1.0/Atk-1.0.typelib
-lib/libatk-1.0.la
 lib/libatk-1.0.so
 lib/libatk-1.0.so.0
 lib/libatk-1.0.so.0.21209.1

diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <[email protected]>
 # $FreeBSD$
-#    $MCom: ports/trunk/accessibility/caribou/Makefile 19571 2014-04-25 18:12:46Z kwm $
+#    $MCom: ports/trunk/accessibility/caribou/Makefile 19804 2014-08-13 14:55:11Z kwm $
 
 PORTNAME=	caribou
 PORTVERSION=	0.4.13
@@ -20,22 +20,19 @@ LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
 		libxklavier.so:${PORTSDIR}/x11/libxklavier
 RUN_DEPENDS=	py2?-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi
 
-USES=		gettext gmake pathfix pkgconfig shebangfix tar:xz
+USES=		gettext gmake pathfix pkgconfig python:2 shebangfix tar:xz
 USE_GNOME=	gnomehier gtk30 intlhack introspection:build libxml2 \
 		libxslt:build pygobject3
 SHEBANG_FILES=	tools/fix_gir.py tools/make_schema.py
-USE_PYTHON=	2
 USE_XORG=	x11 xtst
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+
 CONFIGURE_ARGS=	--enable-gtk2-module=no
 GLIB_SCHEMAS=	org.gnome.caribou.gschema.xml \
 		org.gnome.antler.gschema.xml
 python_CMD=	${PYTHON_CMD}
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcaribou.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcaribou-gtk-module.so
-
 .include <bsd.port.mk>
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/accessibility/orca/Makefile 19652 2014-05-13 10:46:33Z gusi $
+#   $MCom: ports/trunk/accessibility/orca/Makefile 19804 2014-08-13 14:55:11Z kwm $
 
 PORTNAME=	orca
 PORTVERSION=	3.12.2
@@ -24,9 +24,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py3-dbus \
 # and py*-json-py shadows this.
 CONFLICTS=	py*-json-py-[0-9]*
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig python:3 tar:xz
 USE_GNOME=	gnomeprefix gtk30 py3gobject3
-USE_PYTHON=	3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/accessibility/py-atspi/Makefile 19571 2014-04-25 18:12:46Z kwm $
+#   $MCom: ports/trunk/accessibility/py-atspi/Makefile 19804 2014-08-13 14:55:11Z kwm $
 
 PORTNAME=	atspi
 PORTVERSION=	2.12.0
@@ -19,10 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at
 
 CONFLICTS=	at-spi-1.[0-9]*
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig python:2 tar:xz
 USE_GNOME=	gnomehier intlhack pygobject3
 GNU_CONFIGURE=	yes
-USE_PYTHON=	2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 

diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/accessibility/py3-atspi/Makefile 19571 2014-04-25 18:12:46Z kwm $
+#   $MCom: ports/trunk/accessibility/py3-atspi/Makefile 19804 2014-08-13 14:55:11Z kwm $
 
 PORTNAME=	atspi
 PORTVERSION=	2.12.0
@@ -19,10 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at
 
 CONFLICTS=	at-spi-1.[0-9]*
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig python:3 tar:xz
 USE_GNOME=	gnomehier intlhack py3gobject3
 GNU_CONFIGURE=	yes
-USE_PYTHON=	3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
@@ -1,6 +1,6 @@
 # Created by: Anders Nordby <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/archivers/file-roller/Makefile 19645 2014-05-13 06:55:22Z gusi $
+#   $MCom: ports/trunk/archivers/file-roller/Makefile 19814 2014-08-15 20:17:00Z gusi $
 
 PORTNAME=	file-roller
 PORTVERSION=	3.12.2
@@ -26,6 +26,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-packagekit
+INSTALL_TARGET=	install-strip
 
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GLIB_SCHEMAS=	org.gnome.FileRoller.gschema.xml
@@ -52,8 +53,4 @@ post-install:
 .endfor
 .endif
 
-.if ${PORT_OPTIONS:MNAUTILUS}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
-.endif	
-
 .include <bsd.port.mk>
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
@@ -1,10 +1,10 @@
 # Created by: Gustau Perez <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/audio/gnome-music/Makefile 19715 2014-05-31 16:16:53Z gusi $
+#   $MCom: ports/trunk/audio/gnome-music/Makefile 19808 2014-08-14 07:46:12Z gusi $
 
 PORTNAME=	gnome-music
 PORTVERSION=	3.12.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,12 +15,12 @@ COMMENT=	GNOME music playing application
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 LIB_DEPENDS=	libgrilo-0.2.so:${PORTSDIR}/net/grilo
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig \
+		python:3 tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack \
 		introspection:build
 GNU_CONFIGURE=	yes
-USE_PYTHON=	3
 USE_GSTREAMER1=	ogg mad
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

diff --git a/audio/gnome-music/pkg-plist b/audio/gnome-music/pkg-plist
@@ -1,5 +1,4 @@
 bin/gnome-music
-lib/gnome-music/libgd.la
 lib/gnome-music/libgd.so
 lib/gnome-music/girepository-1.0/Gd-1.0.typelib
 %%PYTHON_SITELIBDIR%%/gnomemusic/__init__.py

diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <[email protected]>
 # $FreeBSD$
-#   $MCom: ports-experimental/trunk/audio/libcanberra-gtk3/Makefile 19090 2014-03-11 16:57:43Z gusi $
+#   $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $
 
 CATEGORIES=	audio devel
 PKGNAMESUFFIX=	-gtk3
@@ -34,7 +34,4 @@ do-install:
 	${LN} -sf libcanberra-gtk3-module.so \
 		${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk-module.so
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk3-module.so
-
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/libcanberra-gtk3/pkg-plist b/audio/libcanberra-gtk3/pkg-plist
@@ -1,7 +1,5 @@
 lib/gtk-3.0/modules/libcanberra-gtk-module.so
-lib/gtk-3.0/modules/libcanberra-gtk3-module.la
 lib/gtk-3.0/modules/libcanberra-gtk3-module.so
-lib/libcanberra-gtk3.la
 lib/libcanberra-gtk3.so
 lib/libcanberra-gtk3.so.0
 lib/libcanberra-gtk3.so.0.1.9

diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
@@ -1,10 +1,10 @@
 # Created by: Joe Marcus Clarke <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/audio/libcanberra/Makefile 19578 2014-04-25 21:50:30Z kwm $
+#   $MCom: ports/trunk/audio/libcanberra/Makefile 19813 2014-08-15 19:44:33Z gusi $
 
 PORTNAME=	libcanberra
 PORTVERSION=	0.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/ \
 		http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LGPL
 
 LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomehier gnomeprefix gtk20 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist
@@ -2,25 +2,17 @@ bin/canberra-gtk-play
 include/canberra-gtk.h
 include/canberra.h
 lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
-lib/gtk-2.0/modules/libcanberra-gtk-module.la
 lib/gtk-2.0/modules/libcanberra-gtk-module.so
-lib/libcanberra-gtk.la
 lib/libcanberra-gtk.so
 lib/libcanberra-gtk.so.0
 lib/libcanberra-gtk.so.0.1.9
-lib/libcanberra.la
 lib/libcanberra.so
 lib/libcanberra.so.0
 lib/libcanberra.so.0.2.5
-%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.la
 %%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so
-lib/libcanberra-%%VERSION%%/libcanberra-multi.la
 lib/libcanberra-%%VERSION%%/libcanberra-multi.so
-lib/libcanberra-%%VERSION%%/libcanberra-null.la
 lib/libcanberra-%%VERSION%%/libcanberra-null.so
-lib/libcanberra-%%VERSION%%/libcanberra-oss.la
 lib/libcanberra-%%VERSION%%/libcanberra-oss.so
-%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.la
 %%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
 libdata/pkgconfig/libcanberra-gtk.pc
 libdata/pkgconfig/libcanberra.pc

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
@@ -1,12 +1,13 @@
 # Created by: Joe Marcus Clarke <[email protected]>
 # $FreeBSD$
-#   $MCom: ports/trunk/audio/pulseaudio/Makefile 19790 2014-08-05 09:23:18Z gusi $
+#   $MCom: ports/trunk/audio/pulseaudio/Makefile 19813 2014-08-15 19:44:33Z gusi $
 #
 # !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
 # PORTREVISION bumps of depending ports.
 
 PORTNAME=	pulseaudio
 PORTVERSION=	5.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
@@ -26,7 +27,7 @@ LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 USE_GNOME=	glib20 gnomehier intltool
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
-USES=		execinfo gettext gmake libtool:keepla pathfix \
+USES=		execinfo gettext gmake libtool pathfix \
 		pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libltdl