diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2013-05-25 14:37:02 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2013-05-25 14:37:02 +0000 |
| commit | 92ea0d614b10bd99ce43a611721c7c4003cd79a5 (patch) | |
| tree | cf13f962932aab3646f0af684b2923c4e0f0825b /x11-toolkits | |
| parent | - Unbreak build when devel/libsysinfo is installed (diff) | |
The FreeBSD x11 team proudly presents
an zeising, kwm, miwi, bapt, eadler production:
Xorg 7.7
Starring:
xserver 1.12.4 (new xorg only)
Mesa 8.0.4, including libGL, libGLU and dri (new xorg only)
libX11 1.5.0
libxcb 1.9
libdrm 2.4.42 (new xorg only)
freeglut 2.8.1
Also starring:
Updates to drivers and other libraries and utilities
Additional notes:
Change pkgconf to be a build dependency.
Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use
this.
Trim makefile headers.
Take maintanership of x11/xcb-proto, ok'd by ashish.
If you are running WITH_NEW_XORG=, you need to rebuild all installed
drivers, see UPDATING for more information.
Various fixes to make ports compile.
PR: ports/177942
Exp-run by: miwi
Approved by: portmgr (miwi)
Thanks to all who helped testing!
Notes
Notes:
svn path=/head/; revision=319055
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtkglext/Makefile | 5 | ||||
| -rw-r--r-- | x11-toolkits/libXaw/Makefile | 18 | ||||
| -rw-r--r-- | x11-toolkits/libXaw/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/libXaw/pkg-plist | 47 | ||||
| -rw-r--r-- | x11-toolkits/libXmu/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/libXmu/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/libXt/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/libXt/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/termit/Makefile | 7 |
9 files changed, 66 insertions, 40 deletions
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index 5ca4d06a5f3a..6ce5935a0d45 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - xcb:${PORTSDIR}/x11/libxcb \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig OPTIONS_DEFINE= DOCS @@ -28,8 +27,8 @@ OPTIONS_DEFINE= DOCS USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ - xfixes xi xinerama xmu xrandr xrender xt xxf86vm +USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \ + xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm USE_GL= glu USES= pathfix pkgconfig gettext iconv USE_GNOME= gdkpixbuf2 gtk20 diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index 901d3822344f..11183bc5dc8c 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXaw -# Date Created: 25 Jan, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXaw -PORTVERSION= 1.0.9 +PORTVERSION= 1.0.11 PORTEPOCH= 2 CATEGORIES= x11-toolkits @@ -16,15 +12,7 @@ COMMENT= X Athena Widgets library XORG_CAT= lib USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt USE_GMAKE= yes -CONFIGURE_ARGS= --without-xmlto - -PORTDOCS= * - -.if defined(NOPORTDOCS) -CONFIGURE_ARGS+=--disable-specs -post-configure: - @${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile -.endif +CONFIGURE_ARGS+=--without-xmlto MAN3= Xaw.3 diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo index 3e67ebd8e5ea..e2007b6f2fd5 100644 --- a/x11-toolkits/libXaw/distinfo +++ b/x11-toolkits/libXaw/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633 diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist index 9d2af3b87a80..d8c4c79a0285 100644 --- a/x11-toolkits/libXaw/pkg-plist +++ b/x11-toolkits/libXaw/pkg-plist @@ -82,4 +82,51 @@ lib/libXaw7.so lib/libXaw7.so.7 libdata/pkgconfig/xaw6.pc libdata/pkgconfig/xaw7.pc +%%DOCSDIR%%/AsciiSink.xml +%%DOCSDIR%%/AsciiSource.xml +%%DOCSDIR%%/AsciiText.xml +%%DOCSDIR%%/Box.xml +%%DOCSDIR%%/CH1.xml +%%DOCSDIR%%/CH2.xml +%%DOCSDIR%%/CH3.xml +%%DOCSDIR%%/CH4.xml +%%DOCSDIR%%/CH5.xml +%%DOCSDIR%%/CH6.xml +%%DOCSDIR%%/CH7.xml +%%DOCSDIR%%/Command.xml +%%DOCSDIR%%/Dialog.xml +%%DOCSDIR%%/Form.xml +%%DOCSDIR%%/Grip.xml +%%DOCSDIR%%/Label.xml +%%DOCSDIR%%/List.xml +%%DOCSDIR%%/MenuButton.xml +%%DOCSDIR%%/Paned.xml +%%DOCSDIR%%/Panner.xml +%%DOCSDIR%%/Porthole.xml +%%DOCSDIR%%/Repeater.xml +%%DOCSDIR%%/Scrollbar.xml +%%DOCSDIR%%/Simple.xml +%%DOCSDIR%%/SimpleMenu.xml +%%DOCSDIR%%/Sme.xml +%%DOCSDIR%%/SmeBSB.xml +%%DOCSDIR%%/SmeLine.xml +%%DOCSDIR%%/StripChart.xml +%%DOCSDIR%%/TPage_Credits.xml +%%DOCSDIR%%/Template.xml +%%DOCSDIR%%/Template_private_header_file.xml +%%DOCSDIR%%/Template_public_header_file.xml +%%DOCSDIR%%/Template_widget_source_file.xml +%%DOCSDIR%%/Text.xml +%%DOCSDIR%%/TextActions.xml +%%DOCSDIR%%/TextActions_default_translation_bindings.xml +%%DOCSDIR%%/TextActions_text_widget_actions.xml +%%DOCSDIR%%/TextCustom.xml +%%DOCSDIR%%/TextFuncs.xml +%%DOCSDIR%%/TextSink.xml +%%DOCSDIR%%/TextSource.xml +%%DOCSDIR%%/Toggle.xml +%%DOCSDIR%%/Tree.xml +%%DOCSDIR%%/Viewport.xml +%%DOCSDIR%%/libXaw.xml +@dirrmtry %%DOCSDIR%% @dirrmtry include/X11/Xaw diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index 7d4ed1ccdaaf..34b4a8cfa3ec 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXmu -# Date Created: 25 Jan, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXmu -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 PORTEPOCH= 1 CATEGORIES= x11-toolkits diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo index 45c279a93888..d6b1abb646c0 100644 --- a/x11-toolkits/libXmu/distinfo +++ b/x11-toolkits/libXmu/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473 diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index 129c4d172d38..36742bbf4c96 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXt -# Date Created: 25 Jan, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXt -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= x11-toolkits @@ -15,6 +11,7 @@ COMMENT= X Toolkit library XORG_CAT= lib USE_XORG= x11 sm xproto:both kbproto +CONFIGURE_ARGS= --disable-specs MAN3= MenuPopdown.3 \ MenuPopup.3 \ diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo index 57b1aa78e720..a3c4f12153e0 100644 --- a/x11-toolkits/libXt/distinfo +++ b/x11-toolkits/libXt/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679 diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile index 838dc28bf8d1..5564cc60e384 100644 --- a/x11-toolkits/termit/Makefile +++ b/x11-toolkits/termit/Makefile @@ -18,14 +18,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig USE_BZIP2= yes USES= cmake pkgconfig iconv USE_LUA= yes -USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ - xi xinerama xrandr xrender +USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ + xfixes xi xinerama xrandr xrender USE_GNOME= gdkpixbuf2 vte MAKE_JOBS_SAFE= yes |