[Midnightbsd-cvs] mports [18495] trunk/x11: update several x related ports

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 29 19:26:09 EDT 2015 

Revision: 18495
          http://svnweb.midnightbsd.org/mports/?rev=18495
Author:   laffer1
Date:     2015-03-29 19:26:09 -0400 (Sun, 29 Mar 2015)
Log Message:
-----------
update several x related ports

Modified Paths:
--------------
    trunk/x11/Makefile
    trunk/x11/libXTrap/Makefile
    trunk/x11/libXTrap/pkg-plist
    trunk/x11/libXrender/Makefile
    trunk/x11/libXrender/distinfo
    trunk/x11/libXrender/pkg-plist
    trunk/x11/libXres/Makefile
    trunk/x11/libXtst/Makefile
    trunk/x11/libXtst/pkg-plist
    trunk/x11/libXv/Makefile
    trunk/x11/libXv/distinfo
    trunk/x11/libXv/pkg-plist
    trunk/x11/libXvMC/Makefile
    trunk/x11/libXvMC/distinfo
    trunk/x11/libXvMC/pkg-plist
    trunk/x11/libXxf86dga/Makefile
    trunk/x11/libXxf86dga/pkg-plist
    trunk/x11/libXxf86misc/Makefile
    trunk/x11/libXxf86misc/pkg-plist
    trunk/x11/libXxf86vm/Makefile
    trunk/x11/libXxf86vm/pkg-plist
    trunk/x11/libexo/Makefile
    trunk/x11/libexo/distinfo
    trunk/x11/libexo/pkg-plist
    trunk/x11/libgnome/Makefile
    trunk/x11/libgnome/pkg-plist
    trunk/x11/libgnomekbd/Makefile
    trunk/x11/libgnomekbd/distinfo
    trunk/x11/libgnomekbd/pkg-plist
    trunk/x11/libxkbfile/Makefile
    trunk/x11/libxkbfile/pkg-plist
    trunk/x11/libxkbui/Makefile
    trunk/x11/libxkbui/pkg-plist
    trunk/x11/libxklavier/Makefile
    trunk/x11/libxklavier/distinfo
    trunk/x11/libxklavier/pkg-plist

Added Paths:
-----------
    trunk/x11/libgnome/files/patch-libgnome__Makefile.in
    trunk/x11/libxkbfile/files/
    trunk/x11/libxkbfile/files/patch-src_cout.c

Removed Paths:
-------------
    trunk/x11/libXrender/files/
    trunk/x11/libXvMC/files/
    trunk/x11/libgnome/files/patch-libgnome::Makefile.in
    trunk/x11/libgnomemm/

Modified: trunk/x11/Makefile
===================================================================
--- trunk/x11/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -77,7 +77,6 @@
 SUBDIR += libexo
 SUBDIR += libgnome
 SUBDIR += libgnomekbd
-SUBDIR += libgnomemm
 SUBDIR += liboldX
 SUBDIR += libxcb
 SUBDIR += libxdg-basedir

Modified: trunk/x11/libXTrap/Makefile
===================================================================
--- trunk/x11/libXTrap/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXTrap/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXTrap
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org

Modified: trunk/x11/libXTrap/pkg-plist
===================================================================
--- trunk/x11/libXTrap/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXTrap/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,5 +1,6 @@
+lib/libXTrap.a
+lib/libXTrap.la
+lib/libXTrap.so
 lib/libXTrap.so.6
-lib/libXTrap.so
-lib/libXTrap.la
-lib/libXTrap.a
+lib/libXTrap.so.6.4.0
 libdata/pkgconfig/xtrap.pc

Modified: trunk/x11/libXrender/Makefile
===================================================================
--- trunk/x11/libXrender/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXrender/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	libXrender
-PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTVERSION=	0.9.8
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org

Modified: trunk/x11/libXrender/distinfo
===================================================================
--- trunk/x11/libXrender/distinfo	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXrender/distinfo	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
-SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
+SHA256 (xorg/lib/libXrender-0.9.8.tar.bz2) = 1d14b02f0060aec5d90dfdcf16a996f17002e515292906ed26e3dcbba0f4fc62
+SIZE (xorg/lib/libXrender-0.9.8.tar.bz2) = 306121

Modified: trunk/x11/libXrender/pkg-plist
===================================================================
--- trunk/x11/libXrender/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXrender/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -6,5 +6,3 @@
 lib/libXrender.so.1.3.0
 libdata/pkgconfig/xrender.pc
 %%DOCSDIR%%/libXrender.txt
- at dirrm %%DOCSDIR%%
- at dirrmtry include/X11/extensions

Modified: trunk/x11/libXres/Makefile
===================================================================
--- trunk/x11/libXres/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXres/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXres
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org

Modified: trunk/x11/libXtst/Makefile
===================================================================
--- trunk/x11/libXtst/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXtst/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,11 +2,12 @@
 
 PORTNAME=	libXtst
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	X Test extension
+
 LICENSE=	mit
 
 XORG_CAT=	lib

Modified: trunk/x11/libXtst/pkg-plist
===================================================================
--- trunk/x11/libXtst/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXtst/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -4,6 +4,7 @@
 lib/libXtst.la
 lib/libXtst.so
 lib/libXtst.so.6
+lib/libXtst.so.6.1.0
 libdata/pkgconfig/xtst.pc
 man/man3/XTestCompareCurrentCursorWithWindow.3.gz
 man/man3/XTestCompareCursorWithWindow.3.gz
@@ -16,4 +17,3 @@
 man/man3/XTestQueryExtension.3.gz
 man/man3/XTestSetGContextOfGC.3.gz
 man/man3/XTestSetVisualIDOfVisual.3.gz
- at dirrmtry include/X11/extensions

Modified: trunk/x11/libXv/Makefile
===================================================================
--- trunk/x11/libXv/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXv/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,7 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	libXv
-PORTVERSION=	1.0.8
+PORTVERSION=	1.0.10
+PORTREVISION=	2
+PORTEPOCH=	1
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -11,31 +13,4 @@
 XORG_CAT=	lib
 USE_XORG=	x11 xext xextproto videoproto:both xproto:both
 
-MAN3=	Xv.3 \
-	XvFreeAdaptorInfo.3 \
-	XvFreeEncodingInfo.3 \
-	XvCreateImage.3 \
-	XvGetPortAttribute.3 \
-	XvGetStill.3 \
-	XvGetVideo.3 \
-	XvGrabPort.3 \
-	XvListImageFormats.3 \
-	XvPutImage.3 \
-	XvPortNotify.3 \
-	XvPutStill.3 \
-	XvPutVideo.3 \
-	XvQueryAdaptors.3 \
-	XvQueryBestSize.3 \
-	XvQueryEncodings.3 \
-	XvQueryExtension.3 \
-	XvQueryPortAttributes.3 \
-	XvSelectPortNotify.3 \
-	XvSelectVideoNotify.3 \
-	XvSetPortAttribute.3 \
-	XvShmCreateImage.3 \
-	XvShmPutImage.3 \
-	XvStopVideo.3 \
-	XvUngrabPort.3 \
-	XvVideoNotify.3
-
 .include <bsd.port.mk>

Modified: trunk/x11/libXv/distinfo
===================================================================
--- trunk/x11/libXv/distinfo	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXv/distinfo	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXv-1.0.8.tar.bz2) = 4f00eb5347390909cea4e53a69425839d2a6a44e0e0613321d59e7e4aeaf73d7
-SIZE (xorg/lib/libXv-1.0.8.tar.bz2) = 308065
+SHA256 (xorg/lib/libXv-1.0.10.tar.bz2) = 55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525
+SIZE (xorg/lib/libXv-1.0.10.tar.bz2) = 300633

Modified: trunk/x11/libXv/pkg-plist
===================================================================
--- trunk/x11/libXv/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXv/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -3,4 +3,31 @@
 lib/libXv.la
 lib/libXv.so
 lib/libXv.so.1
+lib/libXv.so.1.0.0
 libdata/pkgconfig/xv.pc
+man/man3/Xv.3.gz
+man/man3/XvFreeAdaptorInfo.3.gz
+man/man3/XvFreeEncodingInfo.3.gz
+man/man3/XvCreateImage.3.gz
+man/man3/XvGetPortAttribute.3.gz
+man/man3/XvGetStill.3.gz
+man/man3/XvGetVideo.3.gz
+man/man3/XvGrabPort.3.gz
+man/man3/XvListImageFormats.3.gz
+man/man3/XvPutImage.3.gz
+man/man3/XvPortNotify.3.gz
+man/man3/XvPutStill.3.gz
+man/man3/XvPutVideo.3.gz
+man/man3/XvQueryAdaptors.3.gz
+man/man3/XvQueryBestSize.3.gz
+man/man3/XvQueryEncodings.3.gz
+man/man3/XvQueryExtension.3.gz
+man/man3/XvQueryPortAttributes.3.gz
+man/man3/XvSelectPortNotify.3.gz
+man/man3/XvSelectVideoNotify.3.gz
+man/man3/XvSetPortAttribute.3.gz
+man/man3/XvShmCreateImage.3.gz
+man/man3/XvShmPutImage.3.gz
+man/man3/XvStopVideo.3.gz
+man/man3/XvUngrabPort.3.gz
+man/man3/XvVideoNotify.3.gz

Modified: trunk/x11/libXvMC/Makefile
===================================================================
--- trunk/x11/libXvMC/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXvMC/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,11 +1,12 @@
 # $MidnightBSD$
 
 PORTNAME=	libXvMC
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	X Video Extension Motion Compensation library
+
 LICENSE=	mit
 
 XORG_CAT=	lib

Modified: trunk/x11/libXvMC/distinfo
===================================================================
--- trunk/x11/libXvMC/distinfo	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXvMC/distinfo	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
-SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
+SHA256 (xorg/lib/libXvMC-1.0.8.tar.bz2) = 5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204
+SIZE (xorg/lib/libXvMC-1.0.8.tar.bz2) = 305234

Modified: trunk/x11/libXvMC/pkg-plist
===================================================================
--- trunk/x11/libXvMC/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXvMC/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -3,11 +3,11 @@
 lib/libXvMC.la
 lib/libXvMC.so
 lib/libXvMC.so.1
+lib/libXvMC.so.1.0.0
 lib/libXvMCW.a
 lib/libXvMCW.la
 lib/libXvMCW.so
 lib/libXvMCW.so.1
+lib/libXvMCW.so.1.0.0
 libdata/pkgconfig/xvmc.pc
 %%DOCSDIR%%/XvMC_API.txt
- at dirrm %%DOCSDIR%%
- at dirrmtry include/X11/extensions

Modified: trunk/x11/libXxf86dga/Makefile
===================================================================
--- trunk/x11/libXxf86dga/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXxf86dga/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,35 +2,15 @@
 
 PORTNAME=	libXxf86dga
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	X DGA Extension
+
 LICENSE=	mit
 
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xextproto xext xf86dgaproto:both
 
-MAN3=		XDGA.3 \
-		XDGAOpenFramebuffer.3 \
-		XDGAChangePixmapMode.3 \
-		XDGAQueryExtension.3 \
-		XDGACloseFramebuffer.3 \
-		XDGAQueryModes.3 \
-		XDGACopyArea.3 \
-		XDGAQueryVersion.3 \
-		XDGACopyTransparentArea.3 \
-		XDGASelectInput.3 \
-		XDGACreateColormap.3 \
-		XDGASetClientVersion.3 \
-		XDGAFillRectangle.3 \
-		XDGASetMode.3 \
-		XDGAGetViewportStatus.3 \
-		XDGASetViewport.3 \
-		XDGAInstallColormap.3 \
-		XDGASync.3 \
-		XDGAKeyEventToXKeyEvent.3 \
-		XF86DGA.3 \
-		XFree86-DGA.3
-
 .include <bsd.port.mk>

Modified: trunk/x11/libXxf86dga/pkg-plist
===================================================================
--- trunk/x11/libXxf86dga/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXxf86dga/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -4,5 +4,26 @@
 lib/libXxf86dga.la
 lib/libXxf86dga.so
 lib/libXxf86dga.so.1
+lib/libXxf86dga.so.1.0.0
 libdata/pkgconfig/xxf86dga.pc
- at dirrmtry include/X11/extensions
+man/man3/XDGA.3.gz
+man/man3/XDGAOpenFramebuffer.3.gz
+man/man3/XDGAChangePixmapMode.3.gz
+man/man3/XDGAQueryExtension.3.gz
+man/man3/XDGACloseFramebuffer.3.gz
+man/man3/XDGAQueryModes.3.gz
+man/man3/XDGACopyArea.3.gz
+man/man3/XDGAQueryVersion.3.gz
+man/man3/XDGACopyTransparentArea.3.gz
+man/man3/XDGASelectInput.3.gz
+man/man3/XDGACreateColormap.3.gz
+man/man3/XDGASetClientVersion.3.gz
+man/man3/XDGAFillRectangle.3.gz
+man/man3/XDGASetMode.3.gz
+man/man3/XDGAGetViewportStatus.3.gz
+man/man3/XDGASetViewport.3.gz
+man/man3/XDGAInstallColormap.3.gz
+man/man3/XDGASync.3.gz
+man/man3/XDGAKeyEventToXKeyEvent.3.gz
+man/man3/XF86DGA.3.gz
+man/man3/XFree86-DGA.3.gz

Modified: trunk/x11/libXxf86misc/Makefile
===================================================================
--- trunk/x11/libXxf86misc/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXxf86misc/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,23 +2,15 @@
 
 PORTNAME=	libXxf86misc
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	X XF86-Misc Extension
+
 LICENSE=	mit
 
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xextproto xext xf86miscproto:both
 
-MAN3=		XF86Misc.3 \
-		XF86MiscGetKbdSettings.3 \
-		XF86MiscGetMouseSettings.3 \
-		XF86MiscGetSaver.3 \
-		XF86MiscQueryExtension.3 \
-		XF86MiscQueryVersion.3 \
-		XF86MiscSetKbdSettings.3 \
-		XF86MiscSetMouseSettings.3 \
-		XF86MiscSetSaver.3
-
 .include <bsd.port.mk>

Modified: trunk/x11/libXxf86misc/pkg-plist
===================================================================
--- trunk/x11/libXxf86misc/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXxf86misc/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,5 +2,14 @@
 lib/libXxf86misc.la
 lib/libXxf86misc.so
 lib/libXxf86misc.so.1
+lib/libXxf86misc.so.1.1.0
 libdata/pkgconfig/xxf86misc.pc
- at dirrmtry include/X11/extensions
+man/man3/XF86Misc.3.gz
+man/man3/XF86MiscGetKbdSettings.3.gz
+man/man3/XF86MiscGetMouseSettings.3.gz
+man/man3/XF86MiscGetSaver.3.gz
+man/man3/XF86MiscQueryExtension.3.gz
+man/man3/XF86MiscQueryVersion.3.gz
+man/man3/XF86MiscSetKbdSettings.3.gz
+man/man3/XF86MiscSetMouseSettings.3.gz
+man/man3/XF86MiscSetSaver.3.gz

Modified: trunk/x11/libXxf86vm/Makefile
===================================================================
--- trunk/x11/libXxf86vm/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXxf86vm/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,36 +2,15 @@
 
 PORTNAME=	libXxf86vm
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	X Vidmode Extension
+
 LICENSE=	mit
 
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xextproto xext xf86vidmodeproto:both
 
-MAN3=		XF86VM.3 \
-		XF86VidModeLockModeSwitch.3 \
-		XF86VidModeDeleteModeLine.3 \
-		XF86VidModeModModeLine.3 \
-		XF86VidModeGetAllModeLines.3 \
-		XF86VidModeQueryExtension.3 \
-		XF86VidModeGetDotClocks.3 \
-		XF86VidModeQueryVersion.3 \
-		XF86VidModeGetGamma.3 \
-		XF86VidModeSetClientVersion.3 \
-		XF86VidModeGetGammaRamp.3 \
-		XF86VidModeSetGamma.3 \
-		XF86VidModeGetGammaRampSize.3 \
-		XF86VidModeSetGammaRamp.3 \
-		XF86VidModeGetModeLine.3 \
-		XF86VidModeSetViewPort.3 \
-		XF86VidModeGetMonitor.3 \
-		XF86VidModeSwitchMode.3 \
-		XF86VidModeGetPermissions.3 \
-		XF86VidModeSwitchToMode.3 \
-		XF86VidModeGetViewPort.3 \
-		XF86VidModeValidateModeLine.3
-
 .include <bsd.port.mk>

Modified: trunk/x11/libXxf86vm/pkg-plist
===================================================================
--- trunk/x11/libXxf86vm/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libXxf86vm/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -3,5 +3,27 @@
 lib/libXxf86vm.la
 lib/libXxf86vm.so
 lib/libXxf86vm.so.1
+lib/libXxf86vm.so.1.0.0
 libdata/pkgconfig/xxf86vm.pc
- at dirrmtry include/X11/extensions
+man/man3/XF86VM.3.gz
+man/man3/XF86VidModeLockModeSwitch.3.gz
+man/man3/XF86VidModeDeleteModeLine.3.gz
+man/man3/XF86VidModeModModeLine.3.gz
+man/man3/XF86VidModeGetAllModeLines.3.gz
+man/man3/XF86VidModeQueryExtension.3.gz
+man/man3/XF86VidModeGetDotClocks.3.gz
+man/man3/XF86VidModeQueryVersion.3.gz
+man/man3/XF86VidModeGetGamma.3.gz
+man/man3/XF86VidModeSetClientVersion.3.gz
+man/man3/XF86VidModeGetGammaRamp.3.gz
+man/man3/XF86VidModeSetGamma.3.gz
+man/man3/XF86VidModeGetGammaRampSize.3.gz
+man/man3/XF86VidModeSetGammaRamp.3.gz
+man/man3/XF86VidModeGetModeLine.3.gz
+man/man3/XF86VidModeSetViewPort.3.gz
+man/man3/XF86VidModeGetMonitor.3.gz
+man/man3/XF86VidModeSwitchMode.3.gz
+man/man3/XF86VidModeGetPermissions.3.gz
+man/man3/XF86VidModeSwitchToMode.3.gz
+man/man3/XF86VidModeGetViewPort.3.gz
+man/man3/XF86VidModeValidateModeLine.3.gz

Modified: trunk/x11/libexo/Makefile
===================================================================
--- trunk/x11/libexo/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libexo/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,11 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	libexo
-PORTVERSION=	0.10.2
-PORTREVISION=	1
+PORTVERSION=	0.10.3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/exo/${PORTVERSION:R}
 DISTNAME=	exo-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -12,44 +10,35 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Application library for the Xfce desktop environment
 
-LICENSE=	gpl2
+LICENSE=	gpl2 lgpl2.1
+LICENSE_COMB=	multi
+LICENSE_DISTFILES=	${WRKSRC}/COPYING \
+	${WRKSRC}/COPYING.LIB
 
 BUILD_DEPENDS=	p5-URI>=1.60:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS=	p5-URI>=1.60:${PORTSDIR}/net/p5-URI
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/lib//}
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
-USES=		desktop-file-utils gmake libtool:oldver pathfix perl5 \
-		pkgconfig tar:bzip2
+USES=		desktop-file-utils gmake libtool pathfix perl5 \
+		pkgconfig gettext-tools xfce tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_LDCONFIG=	yes
-USE_PERL5=	yes
-USE_XFCE=	configenv libmenu libutil
+USE_XFCE=	libmenu
 USE_XORG=	x11
 
-OPTIONS_DEFINE=	DOCS NLS
+CONFIGURE_ARGS=--without-html-dir
 
-.include <bsd.mport.options.mk>
+OPTIONS_DEFINE=	NLS
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
+post-patch:
+	${REINPLACE_CMD} -e 's|internet-mail|mail-send|' \
+		${WRKSRC}/exo-open/exo-mail-reader.desktop.in
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 .include <bsd.port.mk>

Modified: trunk/x11/libexo/distinfo
===================================================================
--- trunk/x11/libexo/distinfo	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libexo/distinfo	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,2 +1,2 @@
-SHA256 (xfce4/exo-0.10.2.tar.bz2) = b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce
-SIZE (xfce4/exo-0.10.2.tar.bz2) = 1209633
+SHA256 (xfce4/exo-0.10.3.tar.bz2) = 95704b14ef9065268c3aa9a7c0bacbe0ddb490a183a4f5ab13bba4a1722826bd
+SIZE (xfce4/exo-0.10.3.tar.bz2) = 1222247

Modified: trunk/x11/libexo/pkg-plist
===================================================================
--- trunk/x11/libexo/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libexo/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -27,9 +27,9 @@
 include/exo-1/exo/exo-wrap-table.h
 include/exo-1/exo/exo-xsession-client.h
 include/exo-1/exo/exo.h
-lib/libexo-1.la
 lib/libexo-1.so
-lib/libexo-1.so.1
+lib/libexo-1.so.0
+lib/libexo-1.so.0.1.0
 lib/xfce4/exo-1/exo-compose-mail-1
 lib/xfce4/exo-1/exo-helper-1
 libdata/pkgconfig/exo-1.pc
@@ -40,57 +40,10 @@
 share/applications/exo-preferred-applications.desktop
 share/applications/exo-terminal-emulator.desktop
 share/applications/exo-web-browser.desktop
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererEllipsizedText.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererIcon.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconBar.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconChooserDialog.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconView.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoJob.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoSimpleJob.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsEditor.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsEditorDialog.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsModel.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsView.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoTreeView.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoWrapTable.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoXsessionClient.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ch01.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-1.devhelp2
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Binding-Properties-Functions.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Executing-Applications.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-GObject.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-Gtk.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-gdk-pixbuf.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Miscellaneous-Utility-Functions.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-String-Utility-Functions.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Version-Information.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-cell-renderers.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-csource.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-extensions.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-gtk-file-chooser-add-thumbnail-preview.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-icon-chooser-dialog.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-jobs.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-miscelleanous.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-overview.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-editor-dialog.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-editor.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-view.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-tools.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-widgets.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-wrap-table.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/home.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/index.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/index.sgml
-%%APIDOCS%%share/gtk-doc/html/exo-1/ix01.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/left.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/right.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/style.css
-%%APIDOCS%%share/gtk-doc/html/exo-1/up.png
 share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
-share/icons/hicolor/48x48/apps/applications-internet.png
-share/icons/hicolor/48x48/apps/applications-other.png
 share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
+share/icons/hicolor/48x48/categories/applications-internet.png
+share/icons/hicolor/48x48/categories/applications-other.png
 %%NLS%%share/locale/ar/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/be/LC_MESSAGES/exo-1.mo
@@ -101,6 +54,7 @@
 %%NLS%%share/locale/da/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/de/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/el/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/es/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/et/LC_MESSAGES/exo-1.mo
@@ -119,9 +73,11 @@
 %%NLS%%share/locale/ko/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/exo-1.mo
@@ -130,15 +86,20 @@
 %%NLS%%share/locale/ru/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/si/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/te/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/th/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/exo-1.mo
 share/pixmaps/exo-1/exo-thumbnail-frame.png
 share/xfce4/helpers/Thunar.desktop
@@ -174,38 +135,19 @@
 share/xfce4/helpers/opera-browser.desktop
 share/xfce4/helpers/opera-mailer.desktop
 share/xfce4/helpers/pcmanfm.desktop
+share/xfce4/helpers/qterminal.desktop
+share/xfce4/helpers/qtfm.desktop
+share/xfce4/helpers/qupzilla.desktop
 share/xfce4/helpers/rodent.desktop
 share/xfce4/helpers/rox-filer.desktop
 share/xfce4/helpers/sakura.desktop
+share/xfce4/helpers/surf.desktop
 share/xfce4/helpers/sylpheed-claws.desktop
 share/xfce4/helpers/sylpheed.desktop
 share/xfce4/helpers/thunderbird.desktop
 share/xfce4/helpers/urxvt.desktop
+share/xfce4/helpers/vimprobable2.desktop
 share/xfce4/helpers/w3m.desktop
 share/xfce4/helpers/xfce4-terminal.desktop
 share/xfce4/helpers/xfe.desktop
 share/xfce4/helpers/xterm.desktop
- at dirrm share/xfce4/helpers
- at dirrmtry share/xfce4
- at dirrm share/pixmaps/exo-1
-%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur_PK
-%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/si
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-%%APIDOCS%%@dirrm share/gtk-doc/html/exo-1
-%%APIDOCS%%@dirrmtry share/gtk-doc/html
-%%APIDOCS%%@dirrmtry share/gtk-doc
- at dirrm lib/xfce4/exo-1
- at dirrmtry lib/xfce4
- at dirrm include/exo-1/exo
- at dirrm include/exo-1
- at dirrmtry etc/xdg/xfce4
- at dirrmtry etc/xdg

Modified: trunk/x11/libgnome/Makefile
===================================================================
--- trunk/x11/libgnome/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libgnome/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgnome
 PORTVERSION=	2.32.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,25 +17,21 @@
 .if !defined(REFERENCE_PORT)
 
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
+INSTALL_TARGET=	install-strip
 USE_GNOME=	gnomeprefix intlhack esound libbonobo \
-		gnomevfs2 ltverhack referencehack
-USE_BISON=	build
-USE_PATHFIX=	yes
+		gnomevfs2 referencehack
+USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig
 USE_XORG=	xpm
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-deinstall
 
-MAN7=		gnome-options.7
-
 GCONF_SCHEMAS=	desktop_gnome_accessibility_keyboard.schemas \
 		desktop_gnome_accessibility_startup.schemas \
 		desktop_gnome_applications_at_mobility.schemas \

Deleted: trunk/x11/libgnome/files/patch-libgnome::Makefile.in
===================================================================
--- trunk/x11/libgnome/files/patch-libgnome::Makefile.in	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libgnome/files/patch-libgnome::Makefile.in	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,11 +0,0 @@
---- libgnome/Makefile.in.orig	Tue May 29 22:16:13 2007
-+++ libgnome/Makefile.in	Tue May 29 22:16:58 2007
-@@ -280,6 +280,8 @@
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
- INCLUDES = \
-+	-DPREFIX=\""$(PREFIX)"\"				\
-+	-DLOCALBASE=\""$(LOCALBASE)"\"				\
- 	-I..							\
- 	-I$(srcdir)/..						\
- 	$(WARN_CFLAGS)						\

Copied: trunk/x11/libgnome/files/patch-libgnome__Makefile.in (from rev 18484, trunk/x11/libgnome/files/patch-libgnome::Makefile.in)
===================================================================
--- trunk/x11/libgnome/files/patch-libgnome__Makefile.in	                        (rev 0)
+++ trunk/x11/libgnome/files/patch-libgnome__Makefile.in	2015-03-29 23:26:09 UTC (rev 18495)
@@ -0,0 +1,11 @@
+--- libgnome/Makefile.in.orig	Tue May 29 22:16:13 2007
++++ libgnome/Makefile.in	Tue May 29 22:16:58 2007
+@@ -280,6 +280,8 @@
+ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
+ INCLUDES = \
++	-DPREFIX=\""$(PREFIX)"\"				\
++	-DLOCALBASE=\""$(LOCALBASE)"\"				\
+ 	-I..							\
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\

Modified: trunk/x11/libgnome/pkg-plist
===================================================================
--- trunk/x11/libgnome/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libgnome/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -23,8 +23,10 @@
 lib/libgnome-2.la
 lib/libgnome-2.so
 lib/libgnome-2.so.0
+lib/libgnome-2.so.0.3200.0
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
+man/man7/gnome-options.7.gz
 share/gnome-background-properties/gnome-default.xml
 share/locale/am/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
@@ -118,56 +120,3 @@
 share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 share/pixmaps/backgrounds/gnome/background-default.jpg
- at dirrmtry share/pixmaps/backgrounds/gnome
- at dirrmtry share/pixmaps/backgrounds
- at dirrmtry share/gnome-background-properties
- at dirrm include/libgnome-2.0/libgnome
- at dirrm include/libgnome-2.0
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/yi/LC_MESSAGES
- at dirrmtry share/locale/yi
- at dirrmtry share/locale/xh/LC_MESSAGES
- at dirrmtry share/locale/xh
- at dirrmtry share/locale/tt/LC_MESSAGES
- at dirrmtry share/locale/tt
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/sr at ije/LC_MESSAGES
- at dirrmtry share/locale/sr at ije
- at dirrmtry share/locale/si/LC_MESSAGES
- at dirrmtry share/locale/si
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/locale/oc/LC_MESSAGES
- at dirrmtry share/locale/oc
- at dirrmtry share/locale/nds/LC_MESSAGES
- at dirrmtry share/locale/nds
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/mg/LC_MESSAGES
- at dirrmtry share/locale/mg
- at dirrmtry share/locale/mai/LC_MESSAGES
- at dirrmtry share/locale/mai
- at dirrmtry share/locale/ku/LC_MESSAGES
- at dirrmtry share/locale/ku
- at dirrmtry share/locale/kk/LC_MESSAGES
- at dirrmtry share/locale/kk
- at dirrmtry share/locale/fur/LC_MESSAGES
- at dirrmtry share/locale/fur
- at dirrmtry share/locale/en at shaw/LC_MESSAGES
- at dirrmtry share/locale/en at shaw
- at dirrmtry share/locale/dz/LC_MESSAGES
- at dirrmtry share/locale/dz
- at dirrmtry share/locale/crh/LC_MESSAGES
- at dirrmtry share/locale/crh
- at dirrmtry share/locale/ca at valencia/LC_MESSAGES
- at dirrmtry share/locale/ca at valencia
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
- at dirrmtry share/locale/as/LC_MESSAGES
- at dirrmtry share/locale/as

Modified: trunk/x11/libgnomekbd/Makefile
===================================================================
--- trunk/x11/libgnomekbd/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libgnomekbd/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,29 +2,32 @@
 # $FreeBSD: ports/x11/libgnomekbd/Makefile,v 1.7 2007/05/28 23:22:29 mezz Exp $
 
 PORTNAME=	libgnomekbd
-PORTVERSION=	2.32.0
+PORTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	GNOME keyboard shared library
 LICENSE=	lgpl
 
-LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
+BUILD_DEPENDS=	libxklavier>=5.2:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/x11/libxklavier
 
-USES=		gmake gettext tar:bzip2
-USE_GNOME=	gnomeprefix gnomehack ltverhack gconf2
-USE_AUTOTOOLS=	libtool
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gnomeprefix gtk30 intltool introspection:build \
+		libxml2
+GNU_CONFIGURE=	yes
+USE_XORG=	ice
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
-GCONF_SCHEMAS=	desktop_gnome_peripherals_keyboard_xkb.schemas
+GLIB_SCHEMAS=	org.gnome.libgnomekbd.desktop.gschema.xml \
+		org.gnome.libgnomekbd.gschema.xml \
+		org.gnome.libgnomekbd.keyboard.gschema.xml
 
-#post-patch:
-#	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-#	    	's|-Werror||g'
-
 .include <bsd.port.mk>

Modified: trunk/x11/libgnomekbd/distinfo
===================================================================
--- trunk/x11/libgnomekbd/distinfo	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libgnomekbd/distinfo	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgnomekbd-2.32.0.tar.bz2) = ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
-SIZE (gnome2/libgnomekbd-2.32.0.tar.bz2) = 410928
+SHA256 (gnome3/libgnomekbd-3.6.0.tar.xz) = c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09
+SIZE (gnome3/libgnomekbd-3.6.0.tar.xz) = 373588

Modified: trunk/x11/libgnomekbd/pkg-plist
===================================================================
--- trunk/x11/libgnomekbd/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libgnomekbd/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,29 +1,34 @@
-bin/gkbd-indicator-plugins-capplet
+bin/gkbd-keyboard-display
+include/libgnomekbd/gkbd-configuration.h
 include/libgnomekbd/gkbd-desktop-config.h
 include/libgnomekbd/gkbd-indicator-config.h
-include/libgnomekbd/gkbd-indicator-plugin.h
 include/libgnomekbd/gkbd-indicator.h
 include/libgnomekbd/gkbd-keyboard-config.h
 include/libgnomekbd/gkbd-keyboard-drawing.h
 include/libgnomekbd/gkbd-status.h
 include/libgnomekbd/gkbd-util.h
+lib/girepository-1.0/Gkbd-3.0.typelib
 lib/libgnomekbd.a
-lib/libgnomekbd.la
 lib/libgnomekbd.so
-lib/libgnomekbd.so.4
+lib/libgnomekbd.so.8
+lib/libgnomekbd.so.8.0.0
 lib/libgnomekbdui.a
-lib/libgnomekbdui.la
 lib/libgnomekbdui.so
-lib/libgnomekbdui.so.4
+lib/libgnomekbdui.so.8
+lib/libgnomekbdui.so.8.0.0
 libdata/pkgconfig/libgnomekbd.pc
 libdata/pkgconfig/libgnomekbdui.pc
-share/applications/gkbd-indicator-plugins-capplet.desktop
-%%DATADIR%%/ui/gkbd-indicator-plugins.ui
-%%DATADIR%%/ui/gkbd-indicator-plugins_add.ui
+share/GConf/gsettings/libgnomekbd.convert
+share/applications/gkbd-keyboard-display.desktop
+share/gir-1.0/Gkbd-3.0.gir
+%%DATADIR%%/icons/kbdled-caps-lock.svg
+%%DATADIR%%/icons/kbdled-num-lock.svg
+%%DATADIR%%/icons/kbdled-scroll-lock.svg
 %%DATADIR%%/ui/show-layout.ui
 share/locale/ar/LC_MESSAGES/libgnomekbd.mo
 share/locale/as/LC_MESSAGES/libgnomekbd.mo
 share/locale/ast/LC_MESSAGES/libgnomekbd.mo
+share/locale/be/LC_MESSAGES/libgnomekbd.mo
 share/locale/be at latin/LC_MESSAGES/libgnomekbd.mo
 share/locale/bg/LC_MESSAGES/libgnomekbd.mo
 share/locale/bn/LC_MESSAGES/libgnomekbd.mo
@@ -35,12 +40,13 @@
 share/locale/de/LC_MESSAGES/libgnomekbd.mo
 share/locale/dz/LC_MESSAGES/libgnomekbd.mo
 share/locale/el/LC_MESSAGES/libgnomekbd.mo
+share/locale/en at shaw/LC_MESSAGES/libgnomekbd.mo
 share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
-share/locale/en at shaw/LC_MESSAGES/libgnomekbd.mo
 share/locale/eo/LC_MESSAGES/libgnomekbd.mo
 share/locale/es/LC_MESSAGES/libgnomekbd.mo
 share/locale/et/LC_MESSAGES/libgnomekbd.mo
 share/locale/eu/LC_MESSAGES/libgnomekbd.mo
+share/locale/fa/LC_MESSAGES/libgnomekbd.mo
 share/locale/fi/LC_MESSAGES/libgnomekbd.mo
 share/locale/fr/LC_MESSAGES/libgnomekbd.mo
 share/locale/ga/LC_MESSAGES/libgnomekbd.mo
@@ -84,40 +90,9 @@
 share/locale/te/LC_MESSAGES/libgnomekbd.mo
 share/locale/th/LC_MESSAGES/libgnomekbd.mo
 share/locale/tr/LC_MESSAGES/libgnomekbd.mo
+share/locale/ug/LC_MESSAGES/libgnomekbd.mo
 share/locale/uk/LC_MESSAGES/libgnomekbd.mo
 share/locale/vi/LC_MESSAGES/libgnomekbd.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
- at dirrm %%DATADIR%%/ui
- at dirrm %%DATADIR%%
- at dirrmtry share/applications
- at dirrm include/libgnomekbd
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/si/LC_MESSAGES
- at dirrmtry share/locale/si
- at dirrmtry share/locale/oc/LC_MESSAGES
- at dirrmtry share/locale/oc
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/mai/LC_MESSAGES
- at dirrmtry share/locale/mai
- at dirrmtry share/locale/en at shaw/LC_MESSAGES
- at dirrmtry share/locale/en at shaw
- at dirrmtry share/locale/dz/LC_MESSAGES
- at dirrmtry share/locale/dz
- at dirrmtry share/locale/ca at valencia/LC_MESSAGES
- at dirrmtry share/locale/ca at valencia
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/be at latin/LC_MESSAGES
- at dirrmtry share/locale/be at latin
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
- at dirrmtry share/locale/as/LC_MESSAGES
- at dirrmtry share/locale/as

Modified: trunk/x11/libxkbfile/Makefile
===================================================================
--- trunk/x11/libxkbfile/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libxkbfile/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,10 +2,12 @@
 
 PORTNAME=	libxkbfile
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	XKB file library
+
 LICENSE=	mit
 
 XORG_CAT=	lib

Added: trunk/x11/libxkbfile/files/patch-src_cout.c
===================================================================
--- trunk/x11/libxkbfile/files/patch-src_cout.c	                        (rev 0)
+++ trunk/x11/libxkbfile/files/patch-src_cout.c	2015-03-29 23:26:09 UTC (rev 18495)
@@ -0,0 +1,21 @@
+From 9fa04388dcbb5bf205319569f540a62c03754688 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Sonnenberger?= <joerg at NetBSD.org>
+Date: Wed, 26 Nov 2014 14:33:38 +0100
+Subject: Remove unnecessary check.
+
+The vmods member of XkbNamesPtr is an array and thus never NULL.
+
+Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+
+--- src/cout.c.orig	2012-03-08 05:37:23.000000000 +0100
++++ src/cout.c	2015-02-03 19:45:53.373211000 +0100
+@@ -45,7 +45,7 @@ WriteCHdrVMods(FILE *file,Display *dpy,X
+ {
+ register int i,nOut;
+ 
+-    if ((!xkb)||(!xkb->names)||(!xkb->names->vmods))
++    if ((!xkb)||(!xkb->names))
+ 	return False;
+     for (i=nOut=0;i<XkbNumVirtualMods;i++) {
+ 	if (xkb->names->vmods[i]!=None) {


Property changes on: trunk/x11/libxkbfile/files/patch-src_cout.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/libxkbfile/pkg-plist
===================================================================
--- trunk/x11/libxkbfile/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libxkbfile/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -8,5 +8,5 @@
 lib/libxkbfile.la
 lib/libxkbfile.so
 lib/libxkbfile.so.1
+lib/libxkbfile.so.1.0.2
 libdata/pkgconfig/xkbfile.pc
- at dirrmtry include/X11/extensions

Modified: trunk/x11/libxkbui/Makefile
===================================================================
--- trunk/x11/libxkbui/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libxkbui/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,11 +2,12 @@
 
 PORTNAME=	libxkbui
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The xkbui library
+
 LICENSE=	mit
 
 XORG_CAT=	lib

Modified: trunk/x11/libxkbui/pkg-plist
===================================================================
--- trunk/x11/libxkbui/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libxkbui/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -3,5 +3,5 @@
 lib/libxkbui.la
 lib/libxkbui.so
 lib/libxkbui.so.1
+lib/libxkbui.so.1.0.0
 libdata/pkgconfig/xkbui.pc
- at dirrmtry include/X11/extensions

Modified: trunk/x11/libxklavier/Makefile
===================================================================
--- trunk/x11/libxklavier/Makefile	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libxklavier/Makefile	2015-03-29 23:26:09 UTC (rev 18495)
@@ -2,8 +2,7 @@
 # $FreeBSD: ports/x11/libxklavier/Makefile,v 1.35 2007/05/19 20:27:03 flz Exp $
 
 PORTNAME=	libxklavier
-PORTVERSION=	5.0
-PORTREVISION=	4
+PORTVERSION=	5.3
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
@@ -13,29 +12,25 @@
 
 LICENSE=	lgpl
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes
 RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
-    		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+    		iso-codes>=0:${PORTSDIR}/misc/iso-codes
 
-USES=		libtool:keepla pathfix gmake pkgconfig tar:bzip2
-USE_XORG=	x11 xi xkbfile
-USE_GNOME=	libxml2 glib20
+USE_XORG=	x11 xkbfile
+USES=		gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	libxml2 glib20 introspection:build
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
+GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-doxygen \
-		--with-xkb-base=${LOCALBASE}/share/X11/xkb \
+CONFIGURE_ARGS=	--with-xkb-base=${LOCALBASE}/share/X11/xkb \
 		--with-xkb-bin-base=${LOCALBASE}/bin \
 		--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
 		--disable-gtk-doc \
 		--with-html-dir=${GNOME_HTML_DIR}
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|== "yes|= "yes|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: trunk/x11/libxklavier/distinfo
===================================================================
--- trunk/x11/libxklavier/distinfo	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libxklavier/distinfo	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,2 +1,2 @@
-SHA256 (libxklavier-5.0.tar.bz2) = dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0
-SIZE (libxklavier-5.0.tar.bz2) = 357862
+SHA256 (libxklavier-5.3.tar.xz) = ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404
+SIZE (libxklavier-5.3.tar.xz) = 315684

Modified: trunk/x11/libxklavier/pkg-plist
===================================================================
--- trunk/x11/libxklavier/pkg-plist	2015-03-29 23:26:00 UTC (rev 18494)
+++ trunk/x11/libxklavier/pkg-plist	2015-03-29 23:26:09 UTC (rev 18495)
@@ -1,19 +1,19 @@
+include/libxklavier/xkl-enum-types.h
 include/libxklavier/xkl_config_item.h
 include/libxklavier/xkl_config_rec.h
 include/libxklavier/xkl_config_registry.h
 include/libxklavier/xkl_engine.h
 include/libxklavier/xkl_engine_marshal.h
-include/libxklavier/xkl-enum-types.h
 include/libxklavier/xklavier.h
+lib/girepository-1.0/Xkl-1.0.typelib
 lib/libxklavier.a
-lib/libxklavier.la
 lib/libxklavier.so
 lib/libxklavier.so.16
+lib/libxklavier.so.16.3.0
 libdata/pkgconfig/libxklavier.pc
 %%DOCSDIR%%/XklConfigItem.html
 %%DOCSDIR%%/XklConfigRec.html
 %%DOCSDIR%%/XklConfigRegistry.html
-%%DOCSDIR%%/XklEngine.html
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/home.png
@@ -20,11 +20,10 @@
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
 %%DOCSDIR%%/left.png
+%%DOCSDIR%%/libxklavier-xkl-engine.html
 %%DOCSDIR%%/libxklavier-xklavier.html
-%%DOCSDIR%%/libxklavier.devhelp
 %%DOCSDIR%%/libxklavier.devhelp2
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
- at dirrm %%DOCSDIR%%
- at dirrm include/libxklavier
+share/gir-1.0/Xkl-1.0.gir

More information about the Midnightbsd-cvs mailing list