svn commit: r476013 - in head: . Mk audio/rhythmbox cad/brlcad chinese/librime devel/directfb devel/imake devel/lndir devel/makedepend devel/sdl12 editors/vim emulators/open-vm-tools emulators/ston...
Niclas Zeising
zeising at FreeBSD.org
Tue Jul 31 18:41:40 UTC 2018
Author: zeising
Date: Tue Jul 31 18:41:30 2018
New Revision: 476013
URL: https://svnweb.freebsd.org/changeset/ports/476013
Log:
Switch to xorgproto instead of individual packages
Upstream used to distribute protocol headers as separate packages, but has
decided to merge those to a common package, named xorgproto. This update
tracks that change.
* Add a new port, x11/xorgproto, with are protocol headers for xorg.
* Hook the new protocol port to the build and to infrastructure in
bsd.xorg.mk.
* Update all ports with a dependency on any of the old *proto packages to
instead depend on xorgproto. Bump portrevision.
* Delete the old *proto packages, update MOVED.
PR: 230023
Submitted by: zeising
Approved by: portmgr (antoine)
exp-run by: antoine
Added:
head/x11/xorgproto/
head/x11/xorgproto/Makefile (contents, props changed)
head/x11/xorgproto/distinfo (contents, props changed)
head/x11/xorgproto/files/
head/x11/xorgproto/files/patch-man_Xprint.man (contents, props changed)
head/x11/xorgproto/pkg-descr (contents, props changed)
head/x11/xorgproto/pkg-plist (contents, props changed)
Deleted:
head/x11-fonts/fontcacheproto/
head/x11-fonts/fontsproto/
head/x11-fonts/xf86bigfontproto/
head/x11/bigreqsproto/
head/x11/compositeproto/
head/x11/damageproto/
head/x11/dmxproto/
head/x11/dri2proto/
head/x11/dri3proto/
head/x11/fixesproto/
head/x11/glproto/
head/x11/inputproto/
head/x11/kbproto/
head/x11/presentproto/
head/x11/printproto/
head/x11/randrproto/
head/x11/recordproto/
head/x11/renderproto/
head/x11/resourceproto/
head/x11/scrnsaverproto/
head/x11/trapproto/
head/x11/videoproto/
head/x11/xcmiscproto/
head/x11/xextproto/
head/x11/xf86dgaproto/
head/x11/xf86driproto/
head/x11/xf86miscproto/
head/x11/xf86rushproto/
head/x11/xf86vidmodeproto/
head/x11/xineramaproto/
head/x11/xproto/
head/x11/xproxymanagementprotocol/
Modified:
head/MOVED
head/Mk/bsd.port.mk
head/Mk/bsd.xorg.mk
head/UPDATING
head/audio/rhythmbox/Makefile
head/cad/brlcad/Makefile
head/chinese/librime/Makefile
head/devel/directfb/Makefile
head/devel/imake/Makefile
head/devel/lndir/Makefile
head/devel/makedepend/Makefile
head/devel/sdl12/Makefile
head/editors/vim/Makefile
head/emulators/open-vm-tools/Makefile
head/emulators/stonx/Makefile
head/emulators/virtualbox-ose-additions/Makefile
head/emulators/virtualbox-ose/Makefile
head/games/doom/Makefile
head/games/fkiss/Makefile
head/games/xjig/Makefile
head/games/xpilot-ng-client/Makefile
head/games/xtrojka/Makefile
head/graphics/cairo/Makefile
head/graphics/jogl/Makefile
head/graphics/libosmesa/Makefile
head/graphics/mesa-demos/Makefile
head/graphics/mesa-dri/Makefile
head/graphics/mesa-libs/Makefile
head/graphics/pgplot/Makefile
head/java/classpath/Makefile
head/math/reduce/Makefile
head/math/xppaut/Makefile
head/misc/wmtunlo/Makefile
head/multimedia/gstreamer-plugins/Makefile
head/multimedia/gstreamer1-vaapi/Makefile
head/multimedia/libcec/Makefile
head/multimedia/libva/Makefile
head/multimedia/libvdpau/Makefile
head/multimedia/mplayer/Makefile
head/multimedia/mplayer/Makefile.optvars
head/multimedia/mpv/Makefile
head/multimedia/recordmydesktop/Makefile
head/multimedia/totem/Makefile
head/multimedia/vlc/Makefile
head/net/freerdp/Makefile
head/net/freerdp1/Makefile
head/net/mediastreamer/Makefile
head/net/tigervnc-devel/Makefile
head/net/tigervnc/Makefile
head/net/x11vnc/Makefile
head/science/paraview/Makefile
head/security/keepassx-devel/Makefile
head/security/keepassx/Makefile
head/security/keepassx2/Makefile
head/sysutils/gnome-control-center/Makefile
head/sysutils/mate-power-manager/Makefile
head/sysutils/xfce4-settings/Makefile
head/textproc/scim-kmfl-imengine/Makefile
head/www/chromium/Makefile
head/www/gtkhtml4/Makefile
head/www/iridium/Makefile
head/www/links-hacked/Makefile
head/www/links/Makefile
head/www/qt5-webengine/Makefile
head/x11-drivers/xf86-input-acecad/Makefile
head/x11-drivers/xf86-input-egalax/Makefile
head/x11-drivers/xf86-input-elographics/Makefile
head/x11-drivers/xf86-input-evdev/Makefile
head/x11-drivers/xf86-input-fpit/Makefile
head/x11-drivers/xf86-input-hyperpen/Makefile
head/x11-drivers/xf86-input-joystick/Makefile
head/x11-drivers/xf86-input-keyboard/Makefile
head/x11-drivers/xf86-input-libinput/Makefile
head/x11-drivers/xf86-input-mouse/Makefile
head/x11-drivers/xf86-input-mutouch/Makefile
head/x11-drivers/xf86-input-penmount/Makefile
head/x11-drivers/xf86-input-synaptics/Makefile
head/x11-drivers/xf86-input-vmmouse/Makefile
head/x11-drivers/xf86-input-void/Makefile
head/x11-drivers/xf86-input-wacom/Makefile
head/x11-drivers/xf86-video-amdgpu/Makefile
head/x11-drivers/xf86-video-apm/Makefile
head/x11-drivers/xf86-video-ark/Makefile
head/x11-drivers/xf86-video-ast/Makefile
head/x11-drivers/xf86-video-ati/Makefile
head/x11-drivers/xf86-video-chips/Makefile
head/x11-drivers/xf86-video-cirrus/Makefile
head/x11-drivers/xf86-video-dummy/Makefile
head/x11-drivers/xf86-video-geode/Makefile
head/x11-drivers/xf86-video-glint/Makefile
head/x11-drivers/xf86-video-i128/Makefile
head/x11-drivers/xf86-video-i740/Makefile
head/x11-drivers/xf86-video-intel/Makefile
head/x11-drivers/xf86-video-mach64/Makefile
head/x11-drivers/xf86-video-mga/Makefile
head/x11-drivers/xf86-video-neomagic/Makefile
head/x11-drivers/xf86-video-nv/Makefile
head/x11-drivers/xf86-video-openchrome/Makefile
head/x11-drivers/xf86-video-qxl/Makefile
head/x11-drivers/xf86-video-r128/Makefile
head/x11-drivers/xf86-video-rendition/Makefile
head/x11-drivers/xf86-video-s3/Makefile
head/x11-drivers/xf86-video-s3virge/Makefile
head/x11-drivers/xf86-video-savage/Makefile
head/x11-drivers/xf86-video-scfb/Makefile
head/x11-drivers/xf86-video-siliconmotion/Makefile
head/x11-drivers/xf86-video-sis/Makefile
head/x11-drivers/xf86-video-sunffb/Makefile
head/x11-drivers/xf86-video-tdfx/Makefile
head/x11-drivers/xf86-video-trident/Makefile
head/x11-drivers/xf86-video-tseng/Makefile
head/x11-drivers/xf86-video-vesa/Makefile
head/x11-drivers/xf86-video-vmware/Makefile
head/x11-drivers/xf86-video-voodoo/Makefile
head/x11-drivers/xorgxrdp/Makefile
head/x11-fm/rox-filer/Makefile
head/x11-fonts/Makefile
head/x11-fonts/bdftopcf/Makefile
head/x11-fonts/fonttosfnt/Makefile
head/x11-fonts/libFS/Makefile
head/x11-fonts/libXfont/Makefile
head/x11-fonts/libXfont2/Makefile
head/x11-fonts/libXfontcache/Makefile
head/x11-fonts/libXft/Makefile
head/x11-fonts/libfontenc/Makefile
head/x11-fonts/mkfontscale/Makefile
head/x11-servers/Xfstt/Makefile
head/x11-servers/xorg-dmx/Makefile
head/x11-servers/xorg-server/Makefile
head/x11-themes/xcursor-themes/Makefile
head/x11-toolkits/gtk12/Makefile
head/x11-toolkits/lesstif/Makefile
head/x11-toolkits/libXaw/Makefile
head/x11-toolkits/libXmu/Makefile
head/x11-toolkits/libXt/Makefile
head/x11-toolkits/qt4-gui/Makefile
head/x11-wm/awesome/Makefile
head/x11-wm/compiz-plugins-extra/Makefile
head/x11-wm/compiz-plugins-main/Makefile
head/x11-wm/compiz-plugins-unsupported/Makefile
head/x11-wm/compiz/Makefile
head/x11-wm/e16/Makefile
head/x11-wm/fluxbox/Makefile
head/x11-wm/fluxter/Makefile
head/x11-wm/transset/Makefile
head/x11-wm/wmii/Makefile
head/x11-wm/wmname/Makefile
head/x11/Makefile
head/x11/bitmap/Makefile
head/x11/gdm/Makefile
head/x11/i3lock/Makefile
head/x11/iceauth/Makefile
head/x11/kde-workspace-kde4/Makefile
head/x11/libICE/Makefile
head/x11/libSM/Makefile
head/x11/libX11/Makefile
head/x11/libXScrnSaver/Makefile
head/x11/libXTrap/Makefile
head/x11/libXau/Makefile
head/x11/libXcomposite/Makefile
head/x11/libXcursor/Makefile
head/x11/libXdamage/Makefile
head/x11/libXdmcp/Makefile
head/x11/libXevie/Makefile
head/x11/libXext/Makefile
head/x11/libXfixes/Makefile
head/x11/libXi/Makefile
head/x11/libXinerama/Makefile
head/x11/libXp/Makefile
head/x11/libXpm/Makefile
head/x11/libXprintAppUtil/Makefile
head/x11/libXprintUtil/Makefile
head/x11/libXrandr/Makefile
head/x11/libXrender/Makefile
head/x11/libXres/Makefile
head/x11/libXtst/Makefile
head/x11/libXv/Makefile
head/x11/libXvMC/Makefile
head/x11/libXxf86dga/Makefile
head/x11/libXxf86misc/Makefile
head/x11/libXxf86vm/Makefile
head/x11/libdmx/Makefile
head/x11/libxkbfile/Makefile
head/x11/libxkbui/Makefile
head/x11/libxshmfence/Makefile
head/x11/listres/Makefile
head/x11/lsw/Makefile
head/x11/metalock/Makefile
head/x11/nxcomp/Makefile
head/x11/p5-X11-XCB/Makefile
head/x11/p5-X11-Xlib/Makefile
head/x11/rgb/Makefile
head/x11/slock/Makefile
head/x11/thinglaunch/Makefile
head/x11/thingylaunch/Makefile
head/x11/workrave/Makefile
head/x11/xbelld/Makefile
head/x11/xbelld/files/patch-xbell.c
head/x11/xbelld/files/patch-xbelld.c
head/x11/xcursorgen/Makefile
head/x11/xdpyinfo/Makefile
head/x11/xdriinfo/Makefile
head/x11/xfce4-clipman-plugin/Makefile
head/x11/xfindproxy/Makefile
head/x11/xfwp/Makefile
head/x11/xinput/Makefile
head/x11/xkbutils/Makefile
head/x11/xrestop/Makefile
head/x11/xrx/Makefile
head/x11/xscope/Makefile
head/x11/xsel/Makefile
head/x11/xset/Makefile
head/x11/xterm/Makefile
head/x11/xwininfo/Makefile
head/x11/xwinwrap/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Tue Jul 31 18:38:39 2018 (r476012)
+++ head/MOVED Tue Jul 31 18:41:30 2018 (r476013)
@@ -10363,3 +10363,35 @@ audio/glame||2018-07-28|Has expired: Does not build
net/isc-dhcp43-relay|net/isc-dhcp44-relay|2018-07-31|Has expired: Please upgrade to isc-dhcp44
net/isc-dhcp43-server|net/isc-dhcp44-server|2018-07-31|Has expired: Please upgrade to isc-dhcp44
net/isc-dhcp43-client|net/isc-dhcp44-client|2018-07-31|Has expired: Please upgrade to isc-dhcp44
+x11/bigreqsproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/compositeproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/damageproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/dmxproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/dri2proto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/dri3proto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/fixesproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/glproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/inputproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/kbproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/presentproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/printproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/randrproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/recordproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/renderproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/resourceproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/scrnsaverproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/trapproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/videoproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xcmiscproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xextproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xf86dgaproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xf86driproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xf86miscproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xf86rushproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xf86vidmodeproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xineramaproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11/xproxymanagementprotocol|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11-fonts/fontcacheproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11-fonts/fontsproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
+x11-fonts/xf86bigfontproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Tue Jul 31 18:38:39 2018 (r476012)
+++ head/Mk/bsd.port.mk Tue Jul 31 18:41:30 2018 (r476013)
@@ -1895,10 +1895,10 @@ _GL_egl_BUILD_DEPENDS= ${LOCALBASE}/lib/libEGL.so:gra
_GL_egl_RUN_DEPENDS= ${LOCALBASE}/lib/libEGL.so:graphics/mesa-libs
_GL_gl_BUILD_DEPENDS= ${LOCALBASE}/lib/libGL.so:graphics/mesa-libs
_GL_gl_RUN_DEPENDS= ${LOCALBASE}/lib/libGL.so:graphics/mesa-libs
-_GL_gl_USE_XORG= glproto dri2proto dri3proto
+_GL_gl_USE_XORG= xorgproto
_GL_glew_LIB_DEPENDS= libGLEW.so:graphics/glew
_GL_glu_LIB_DEPENDS= libGLU.so:graphics/libGLU
-_GL_glu_USE_XORG= glproto dri2proto dri3proto
+_GL_glu_USE_XORG= xorgproto
_GL_glw_LIB_DEPENDS= libGLw.so:graphics/libGLw
_GL_glut_LIB_DEPENDS= libglut.so:graphics/freeglut
.if defined(USE_GL)
Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk Tue Jul 31 18:38:39 2018 (r476012)
+++ head/Mk/bsd.xorg.mk Tue Jul 31 18:41:30 2018 (r476013)
@@ -20,8 +20,7 @@ Xorg_Pre_Include= bsd.xorg.mk
# app - Installs applications, no shared libraries.
# data - Installs only data.
# doc - no particular notes
-# driver - input depends on inputproto/randrproto at least
-# video depends on randrproto/renderproto at least
+# driver - depends on xorgproto at least
# font - don't install .pc file
# lib - various dependencies, install .pc file, needs pathfix
# proto - install .pc file, needs pathfix, most only needed at build time.
@@ -58,10 +57,7 @@ USE_XORG+= xorg-macros
. endif
. if ${XORG_CAT} == "driver"
-USE_XORG+= xorg-server xproto randrproto xi renderproto xextproto \
- inputproto kbproto fontsproto videoproto dri2proto dri3proto \
- xf86driproto presentproto glproto xineramaproto resourceproto \
- scrnsaverproto
+USE_XORG+= xorg-server xorgproto xi
CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
USES+= libtool
INSTALL_TARGET= install-strip
@@ -112,37 +108,15 @@ Xorg_Post_Include= bsd.xorg.mk
# Register all xorg .pc files here.
# foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
-XORG_MODULES= bigreqsproto \
- compositeproto \
- damageproto \
- dmx \
- dmxproto \
- dri2proto \
- dri3proto \
- evieproto \
- fixesproto \
- fontcacheproto \
+XORG_MODULES= dmx \
fontenc \
- fontsproto \
fontutil \
- glproto \
ice \
- inputproto \
- kbproto \
libfs \
oldx \
pciaccess \
pixman \
- presentproto \
- printproto \
- randrproto \
- recordproto \
- renderproto \
- resourceproto \
- scrnsaverproto \
sm \
- trapproto \
- videoproto \
x11 \
xau \
xaw \
@@ -150,20 +124,12 @@ XORG_MODULES= bigreqsproto \
xaw7 \
xbitmaps \
xcb \
- xcmiscproto \
xcomposite \
xcursor \
xdamage \
xdmcp \
xevie \
xext \
- xextproto \
- xf86bigfontproto \
- xf86dgaproto \
- xf86driproto \
- xf86miscproto \
- xf86rushproto \
- xf86vidmodeproto \
xfixes \
xfont \
xfont2 \
@@ -171,19 +137,17 @@ XORG_MODULES= bigreqsproto \
xft \
xi \
xinerama \
- xineramaproto \
xkbfile \
xkbui \
xmu \
xmuu \
xorg-macros \
xorg-server \
+ xorgproto \
xp \
xpm \
xprintapputil \
xprintutil \
- xproto \
- xproxymngproto \
xrandr \
xrender \
xres \
@@ -199,37 +163,15 @@ XORG_MODULES= bigreqsproto \
xxf86misc \
xxf86vm
-bigreqsproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:x11/bigreqsproto
-compositeproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:x11/compositeproto
-damageproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/damageproto.pc:x11/damageproto
dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx
-dmxproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:x11/dmxproto
-dri2proto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:x11/dri2proto
-dri3proto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri3proto.pc:x11/dri3proto
-evieproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/evieproto.pc:x11/evieext
-fixesproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:x11/fixesproto
-fontcacheproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:x11-fonts/fontcacheproto
fontenc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc
-fontsproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontsproto.pc:x11-fonts/fontsproto
fontutil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util
-glproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/glproto.pc:x11/glproto
ice_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE
-inputproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/inputproto.pc:x11/inputproto
-kbproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/kbproto.pc:x11/kbproto
libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS
oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX
pciaccess_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:devel/libpciaccess
pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:x11/pixman
-presentproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/presentproto.pc:x11/presentproto
-printproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/printproto.pc:x11/printproto
-randrproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/randrproto.pc:x11/randrproto
-recordproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/recordproto.pc:x11/recordproto
-renderproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/renderproto.pc:x11/renderproto
-resourceproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/resourceproto.pc:x11/resourceproto
-scrnsaverproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/scrnsaverproto.pc:x11/scrnsaverproto
sm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/sm.pc:x11/libSM
-trapproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/trapproto.pc:x11/trapproto
-videoproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/videoproto.pc:x11/videoproto
x11_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11
xau_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xau.pc:x11/libXau
xaw_LIB_PC_DEPENDS= ${xaw7_LIB_PC_DEPENDS}
@@ -237,20 +179,12 @@ xaw6_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x
xaw7_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:x11-toolkits/libXaw
xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps
xcb_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:x11/libxcb
-xcmiscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:x11/xcmiscproto
xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:x11/libXcomposite
xcursor_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor
xdamage_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:x11/libXdamage
xdmcp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:x11/libXdmcp
xevie_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xevie.pc:x11/libXevie
xext_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext
-xextproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xextproto.pc:x11/xextproto
-xf86bigfontproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86bigfontproto.pc:x11-fonts/xf86bigfontproto
-xf86dgaproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86dgaproto.pc:x11/xf86dgaproto
-xf86driproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86driproto.pc:x11/xf86driproto
-xf86miscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86miscproto.pc:x11/xf86miscproto
-xf86rushproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86rushproto.pc:x11/xf86rushproto
-xf86vidmodeproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86vidmodeproto.pc:x11/xf86vidmodeproto
xfixes_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:x11/libXfixes
xfont_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfont.pc:x11-fonts/libXfont
xfont2_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfont2.pc:x11-fonts/libXfont2
@@ -258,19 +192,17 @@ xfontcache_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgcon
xft_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xft.pc:x11-fonts/libXft
xi_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xi.pc:x11/libXi
xinerama_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:x11/libXinerama
-xineramaproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xineramaproto.pc:x11/xineramaproto
xkbfile_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:x11/libxkbfile
xkbui_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:x11/libxkbui
xmu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu
xmuu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmuu.pc:x11-toolkits/libXmu
xorg-macros_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros
xorg-server_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-servers/xorg-server
+xorgproto_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xproto.pc:x11/xorgproto
xp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp
xpm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm
xprintapputil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:x11/libXprintAppUtil
xprintutil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:x11/libXprintUtil
-xproto_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xproto.pc:x11/xproto
-xproxymngproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xproxymngproto.pc:x11/xproxymanagementprotocol
xrandr_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:x11/libXrandr
xrender_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender
xres_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xres.pc:x11/libXres
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Tue Jul 31 18:38:39 2018 (r476012)
+++ head/UPDATING Tue Jul 31 18:41:30 2018 (r476013)
@@ -5,6 +5,15 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20180731:
+ AFFECTS: users of x11/xorg and all ports with USE_XORG=*proto
+ AUTHOR: zeising at daemonic.se
+
+ The xorg *proto packages have all been merged into one package,
+ x11/xorgproto. This might cause issues with upgrading. If you
+ get conflicts between xorgproto and old *proto packages, please
+ remove the old package and install xorgproto again.
+
20180728:
AFFECTS: users who upgrade from security/kc to security/kc24
AUTHOR: pi at FreeBSD.org
Modified: head/audio/rhythmbox/Makefile
==============================================================================
--- head/audio/rhythmbox/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/audio/rhythmbox/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,6 +3,7 @@
PORTNAME= rhythmbox
PORTVERSION= 3.4.2
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -34,7 +35,7 @@ USES= desktop-file-utils gmake gnome libtool localbas
pathfix pkgconfig tar:xz
USE_GNOME= cairo intlhack glib20 gnomeprefix gtk30 introspection \
pygobject3 libxml2
-USE_XORG= ice x11 xproto
+USE_XORG= ice x11 xorgproto
GNU_CONFIGURE= yes
USE_GSTREAMER1= flac lame jpeg cdparanoia vorbis
CONFIGURE_ARGS= --enable-vala \
Modified: head/cad/brlcad/Makefile
==============================================================================
--- head/cad/brlcad/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/cad/brlcad/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= brlcad
PORTVERSION= 7.24.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
@@ -30,8 +30,8 @@ CONFLICTS_INSTALL= py[23][0-9]-epsilon
USES= bison cmake:outsource pathfix pkgconfig python:env shebangfix \
tar:bzip2 tk:85
USE_GL= gl glu
-USE_XORG= ice inputproto sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \
- xproto xrender xscrnsaver xt xxf86vm
+USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \
+ xorgproto xrender xscrnsaver xt xxf86vm
USE_LDCONFIG= yes
SHEBANG_FILES= src/conv/intaval-g.py
Modified: head/chinese/librime/Makefile
==============================================================================
--- head/chinese/librime/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/chinese/librime/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -4,7 +4,7 @@
PORTNAME= librime
PORTVERSION= 1.2.9
DISTVERSIONPREFIX= rime-
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= chinese textproc
MAINTAINER= lichray at gmail.com
@@ -23,7 +23,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
USES= cmake compiler:c++11-lib pathfix pkgconfig gettext perl5
USE_PERL5= build patch
USE_LDCONFIG= yes
-USE_XORG= xproto
+USE_XORG= xorgproto
LDFLAGS+= -lintl
USE_GITHUB= yes
GH_ACCOUNT= rime
Modified: head/devel/directfb/Makefile
==============================================================================
--- head/devel/directfb/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/devel/directfb/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,6 +3,7 @@
PORTNAME= directfb
PORTVERSION= 1.4.17
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://sources.buildroot.net/
DISTNAME= DirectFB-${PORTVERSION}
@@ -54,7 +55,7 @@ CONFIGURE_ARGS= --disable-osx --disable-extra-warnings
DOCS_BUILD_DEPENDS= man2html:textproc/man2html
FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
FREETYPE_CONFIGURE_ENABLE= freetype
-X11_USE= XORG=x11,xext,xproto
+X11_USE= XORG=x11,xext,xorgproto
X11_CONFIGURE_ENABLE= x11
SDL_USE= sdl=sdl
SDL_CONFIGURE_ENABLE= sdl
Modified: head/devel/imake/Makefile
==============================================================================
--- head/devel/imake/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/devel/imake/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,6 +3,7 @@
PORTNAME= imake
PORTVERSION= 1.0.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
@@ -20,7 +21,7 @@ USE_PERL5= run
SHEBANG_FILES= mkhtmlindex.pl
XORG_CAT= util
-USE_XORG= xproto
+USE_XORG= xorgproto
CONFIGURE_ENV= ac_cv_path_RAWCPP=tradcpp
Modified: head/devel/lndir/Makefile
==============================================================================
--- head/devel/lndir/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/devel/lndir/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,13 +3,14 @@
PORTNAME= lndir
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= unixmania at gmail.com
COMMENT= Create a shadow directory of symbolic links to another directory tree
XORG_CAT= util
-USE_XORG= xproto
+USE_XORG= xorgproto
PLIST_FILES= bin/lndir \
man/man1/lndir.1.gz
Modified: head/devel/makedepend/Makefile
==============================================================================
--- head/devel/makedepend/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/devel/makedepend/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,6 +3,7 @@
PORTNAME= makedepend
PORTVERSION= 1.0.5
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
@@ -12,7 +13,7 @@ COMMENT= Dependency generator for makefiles
LICENSE= MIT
XORG_CAT= util
-USE_XORG= xproto
+USE_XORG= xorgproto
PLIST_FILES= bin/makedepend man/man1/makedepend.1.gz
Modified: head/devel/sdl12/Makefile
==============================================================================
--- head/devel/sdl12/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/devel/sdl12/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= sdl
PORTVERSION= 1.2.15
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
@@ -58,7 +58,7 @@ SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib
VGL_CONFIGURE_ENABLE= video-vgl
VGL_VARS= PKGMESSAGE=pkg-message.vgl
X11_CONFIGURE_ENABLE= video-x11
-X11_USE= XORG=x11,xrender,xrandr,xextproto
+X11_USE= XORG=x11,xrender,xrandr,xorgproto
post-patch:
@${REINPLACE_CMD} -e '/EXTRA_LDFLAGS/s/-liconv/${ICONV_LIB}/' \
Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/editors/vim/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,6 +3,7 @@
PORTNAME= vim
PORTVERSION= 8.1.0139
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= editors
@@ -94,7 +95,7 @@ CONSOLE_VARS= GUI=no
GNOME_PLIST_SUB= GUI="" DESKTOP=""
GNOME_IMPLIES= NLS
-GNOME_USE= GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,glproto,x11,xpm,xt
+GNOME_USE= GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,xorgproto,x11,xpm,xt
GNOME_USES= desktop-file-utils
GNOME_VARS= GUI=gnome2 INSTALLS_ICONS=yes
Modified: head/emulators/open-vm-tools/Makefile
==============================================================================
--- head/emulators/open-vm-tools/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/emulators/open-vm-tools/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -4,7 +4,7 @@
PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER}
DISTVERSIONPREFIX= stable-
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= emulators
@@ -30,7 +30,7 @@ DNET_DESC= libdnet support
LIBNOTIFY_DESC= Desktop notification support
X11_CONFIGURE_WITH= x gtk2 gtkmm
-X11_USE= xorg=ice,sm,x11,xext,xi,xinerama,xineramaproto,xrandr,xrender,xtst \
+X11_USE= xorg=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst \
gnome=gdkpixbuf2,gtk20,gtkmm24
X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
Modified: head/emulators/stonx/Makefile
==============================================================================
--- head/emulators/stonx/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/emulators/stonx/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,6 +3,7 @@
PORTNAME= stonx
PORTVERSION= 0.6.7e.6
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF/stonx/stonx/0.6.7.6
DISTNAME= STonX-0.6.7.6
@@ -23,7 +24,7 @@ RESTRICTED= Contains ROM (C) by Atari
TOSIMG?= tos.img
USES= fonts
FONTNAME= misc
-USE_XORG= x11 sm ice xext xextproto
+USE_XORG= x11 sm ice xext xorgproto
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --x-includes=${LOCALBASE}/include \
--x-libraries=${LOCALBASE}/lib
Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/emulators/virtualbox-ose-additions/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= virtualbox-ose
PORTVERSION= 5.2.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?= -additions
@@ -102,7 +102,7 @@ VBOX_LIBS= VBoxEGL.so \
.if ${PORT_OPTIONS:MX11}
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-servers/xorg-server
RUN_DEPENDS+= xrandr:x11/xrandr
-USE_XORG+= inputproto x11 xcursor xext xmu xorg-server xrandr xt
+USE_XORG+= xorgproto x11 xcursor xext xmu xorg-server xrandr xt
USES+= pkgconfig
VBOX_WITH_X11= 1
XORG_DRV_ABI= pkgconf --modversion xorg-server | \
Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/emulators/virtualbox-ose/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= virtualbox-ose
PORTVERSION= 5.2.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
@@ -180,7 +180,7 @@ VBOX_UTILS+= vboxwebsrv webtest
.if ${PORT_OPTIONS:MX11}
USE_SDL= sdl
-USE_XORG+= inputproto x11 xcursor xext xinerama xmu xt
+USE_XORG+= xorgproto x11 xcursor xext xinerama xmu xt
VBOX_PROGS+= VBoxSDL
.endif
Modified: head/games/doom/Makefile
==============================================================================
--- head/games/doom/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/games/doom/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= doom
PORTVERSION= 1.10
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= IDSOFTWARE/source
DISTNAME= doomsrc
@@ -21,7 +21,7 @@ NO_CDROM= Redistribution is limited, see license; Requ
ONLY_FOR_ARCHS= i386
USES= gmake zip
-USE_XORG= x11 sm xextproto xext
+USE_XORG= x11 sm xorgproto xext
NO_WRKSUBDIR= yes
DATADIR= ${DMDIR}
Modified: head/games/fkiss/Makefile
==============================================================================
--- head/games/fkiss/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/games/fkiss/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= fkiss
PORTVERSION= 0.33a
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www2s.biglobe.ne.jp/~yav/soft/fkiss/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/a//}
@@ -25,7 +25,7 @@ BROKEN_armv7= fails to compile: passing char * to par
EXTRA_PATCHES= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.diff
USES= gmake
-USE_XORG= x11 xproto
+USE_XORG= x11 xorgproto
GNU_CONFIGURE= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
AUTOMAKE="${TRUE}"
Modified: head/games/xjig/Makefile
==============================================================================
--- head/games/xjig/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/games/xjig/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= xjig
PORTVERSION= 2.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= XCONTRIB/games
@@ -11,7 +11,7 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Jigsaw puzzle game for X11
USES= compiler tar:tgz
-USE_XORG= x11 xproto xext
+USE_XORG= x11 xorgproto xext
MAKEFILE= Makefile.Linux
PLIST_FILES= bin/xjig man/man1/xjig.1.gz
Modified: head/games/xpilot-ng-client/Makefile
==============================================================================
--- head/games/xpilot-ng-client/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/games/xpilot-ng-client/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -1,11 +1,14 @@
# Created by: Jean-Yves Lefort <jylefort at brutele.be>
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
PKGNAMESUFFIX= -client
COMMENT= Enhanced version of XPilot (client program)
MASTERDIR= ${.CURDIR}/../xpilot-ng-server
+
+USE_XORG= x11 xext xxf86misc
+USE_GL= gl
.include "${MASTERDIR}/Makefile"
Modified: head/games/xtrojka/Makefile
==============================================================================
--- head/games/xtrojka/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/games/xtrojka/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -2,7 +2,7 @@
PORTNAME= xtrojka
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SUNSITE/games/arcade/tetris
DISTNAME= ${PORTNAME}${PORTVERSION:C/\.//g}
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:C/\.//g}
MAINTAINER= ports at edwinm.ik.nu
COMMENT= Game of skill similar to T*tris
-USE_XORG= x11 xt xproto xaw xmu xext
+USE_XORG= x11 xt xorgproto xaw xmu xext
MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX}
Modified: head/graphics/cairo/Makefile
==============================================================================
--- head/graphics/cairo/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/graphics/cairo/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= cairo
PORTVERSION= 1.14.8
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -52,7 +52,7 @@ GLIB_DESC= Enable GObject Functions Feature
OPTIONS_SUB= yes
X11_USE= xorg=x11,xext,xrender
X11_CONFIGURE_ENABLE=xlib
-OPENGL_USE= gl=gl,egl xorg=glproto:both,dri2proto:both
+OPENGL_USE= gl=gl,egl xorg=xorgproto:both
OPENGL_CONFIGURE_ENABLE=gl egl
OPENGL_IMPLIES= X11
GLIB_USES= gettext-runtime
Modified: head/graphics/jogl/Makefile
==============================================================================
--- head/graphics/jogl/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/graphics/jogl/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= jogl
PORTVERSION= 1.1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics devel java
MASTER_SITES= http://download.java.net/media/jogl/builds/archive/jsr-231-1.1.1/
EXTRACT_SUFX= -src.zip
@@ -29,8 +29,7 @@ ALL_TARGET= all
ONLY_FOR_ARCHS= i386 amd64
USES= zip
-USE_XORG= x11 xau xdamage xdmcp xext xf86vidmodeproto xfixes xproto xt \
- xxf86vm
+USE_XORG= x11 xau xdamage xdmcp xext xfixes xorgproto xt xxf86vm
USE_GL= gl
USE_ANT= yes
USE_LDCONFIG= yes
Modified: head/graphics/libosmesa/Makefile
==============================================================================
--- head/graphics/libosmesa/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/graphics/libosmesa/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,11 +3,12 @@
PORTNAME= libosmesa
PORTVERSION= ${MESAVERSION}
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Off-Screen Mesa implementation of the OpenGL API
-USE_XORG= glproto
+USE_XORG= xorgproto
.include <bsd.port.options.mk>
.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
Modified: head/graphics/mesa-demos/Makefile
==============================================================================
--- head/graphics/mesa-demos/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/graphics/mesa-demos/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,6 +3,7 @@
PORTNAME= mesa-demos
PORTVERSION= 8.4.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/
@@ -16,7 +17,7 @@ LIB_DEPENDS= libdrm.so:graphics/libdrm
GNU_CONFIGURE= yes
USES= gmake localbase pkgconfig tar:bzip2
USE_GL= egl gbm gl glesv2 glew glu glut
-USE_XORG= dri2proto glproto x11 xdamage xext xfixes xi xxf86vm
+USE_XORG= xorgproto x11 xdamage xext xfixes xi xxf86vm
CONFIGURE_ARGS+=--disable-osmesa --disable-vg --disable-wayland \
--with-system-data-files
Modified: head/graphics/mesa-dri/Makefile
==============================================================================
--- head/graphics/mesa-dri/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/graphics/mesa-dri/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,13 +3,12 @@
PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for DRI2+
-USE_XORG= dri2proto dri3proto glproto presentproto x11 xdamage xext \
- xfixes xshmfence xv xvmc
+USE_XORG= xorgproto x11 xdamage xext xfixes xshmfence xv xvmc
OPTIONS_DEFINE= TEXTURE VAAPI VDPAU
OPTIONS_DEFAULT=TEXTURE
Modified: head/graphics/mesa-libs/Makefile
==============================================================================
--- head/graphics/mesa-libs/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/graphics/mesa-libs/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,11 +3,12 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
-USE_XORG= dri2proto dri3proto glproto presentproto x11 xcb xdamage xext \
+USE_XORG= xorgproto x11 xcb xdamage xext \
xfixes xshmfence xxf86vm
OPTIONS_DEFINE= WAYLAND
Modified: head/graphics/pgplot/Makefile
==============================================================================
--- head/graphics/pgplot/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/graphics/pgplot/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= pgplot
PORTVERSION= 5.2.2
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/
DISTNAME= ${PORTNAME}${PORTVERSION:R}
@@ -17,7 +17,7 @@ MAKE_JOBS_UNSAFE= yes
USES= fortran shebangfix
USE_LDCONFIG= yes
-USE_XORG= x11 xproto xt
+USE_XORG= x11 xorgproto xt
MAKE_ENV= SSP_CFLAGS=
SHEBANG_FILES= makehtml maketex
Modified: head/java/classpath/Makefile
==============================================================================
--- head/java/classpath/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/java/classpath/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= classpath
PORTVERSION= 0.99
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= java devel
MASTER_SITES= GNU \
SAVANNAH
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USES= gmake iconv libtool perl5 pkgconfig
USE_LDCONFIG= yes
USE_PERL5= build
-USE_XORG= x11 ice xtst xaw xproto xext
+USE_XORG= x11 ice xtst xaw xorgproto xext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Modified: head/math/reduce/Makefile
==============================================================================
--- head/math/reduce/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/math/reduce/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,6 +3,7 @@
PORTNAME= reduce
PORTVERSION= 20180117
+PORTREVISION= 1
CATEGORIES= math lang
MASTER_SITES= SF/${PORTNAME}-algebra/${SFSUBDIR}/
DISTNAME= Reduce-svn4372-src
@@ -35,7 +36,7 @@ CPPFLAGS+= -I${NCURSESINC}
HAS_CONFIGURE= yes
ALL_TARGET=
-USE_XORG= x11 xext xproto xft
+USE_XORG= x11 xext xorgproto xft
USES+= jpeg
CONFIGURE_ARGS= --with-csl
CPPFLAGS+= `freetype-config --cflags`
Modified: head/math/xppaut/Makefile
==============================================================================
--- head/math/xppaut/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/math/xppaut/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= xppaut
PORTVERSION= 7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math graphics
MASTER_SITES= http://www.math.pitt.edu/~bard/bardware/
DISTNAME= ${PORTNAME}${PORTVERSION}
@@ -14,7 +14,7 @@ COMMENT= Graphical tool for solving differential equat
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_XORG= x11 xbitmaps xproto
+USE_XORG= x11 xbitmaps xorgproto
CFLAGS+= -w -Wno-return-type
WRKSRC= ${WRKDIR}
ALL_TARGET= xppaut
Modified: head/misc/wmtunlo/Makefile
==============================================================================
--- head/misc/wmtunlo/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/misc/wmtunlo/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= wmtunlo
PORTVERSION= 0.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc windowmaker
MASTER_SITES= http://www.gnu-darwin.org/distfiles/ \
http://cvsup.theplanet.com/distfiles/
@@ -13,7 +13,7 @@ COMMENT= Falling-down-a-tunnel dockapp
LICENSE= GPLv2
-USE_XORG= x11 xpm xextproto
+USE_XORG= x11 xpm xorgproto
ALL_TARGET= wmtunlo
OPTIONS_DEFINE= EXAMPLES
Modified: head/multimedia/gstreamer-plugins/Makefile
==============================================================================
--- head/multimedia/gstreamer-plugins/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/gstreamer-plugins/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -6,7 +6,7 @@ PORTNAME= gstreamer
PORTVERSION?= ${BASE_PORTVERSION}
# When chasing a shared library for a plug-in bump the PORTREVISION in the
# plug-in port instead, like ${category}/gstreamer-plugin-${PLUGIN}.
-PORTREVISION?= 8
+PORTREVISION?= 9
PORTEPOCH= 3
CATEGORIES?= multimedia audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
@@ -72,7 +72,7 @@ PLIST_SUB+= I386="@comment "
gst_base_DIST= base
NO_GSTREAMER_COMMON= yes
USE_LDCONFIG= yes
-USE_XORG= x11 xv xext videoproto xextproto
+USE_XORG= x11 xv xext xorgproto
PLIST_SUB+= VERSION="${VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}"
SHEBANG_FILES= tools/gst-visualise-m.m
Modified: head/multimedia/gstreamer1-vaapi/Makefile
==============================================================================
--- head/multimedia/gstreamer1-vaapi/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/gstreamer1-vaapi/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= gstreamer1-vaapi
PORTVERSION= 1.12.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= https://gstreamer.freedesktop.org/src/gstreamer-vaapi/
DISTNAME= gstreamer-vaapi-${PORTVERSION}
@@ -24,7 +24,7 @@ USE_LDCONFIG= yes
USE_GNOME= glib20
USE_GSTREAMER1= bad gl
USE_GL= gl
-USE_XORG= x11 xrandr xrender xproto:build
+USE_XORG= x11 xrandr xrender xorgproto:build
# drm backend needs libudev so disable it for now.
CONFIGURE_ARGS+=--disable-drm
Modified: head/multimedia/libcec/Makefile
==============================================================================
--- head/multimedia/libcec/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/libcec/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= libcec
PORTVERSION= 4.0.2
-PORTREVISION= 3
+PORTREVISION= 4
DISTVERSIONPREFIX= ${PORTNAME}-
CATEGORIES= multimedia
@@ -51,7 +51,7 @@ CMAKE_ARGS+= -DSKIP_PYTHON_WRAPPER:BOOL=true
.endif
.if ${PORT_OPTIONS:MX11}
-USE_XORG= x11 xproto xrandr
+USE_XORG= x11 xorgproto xrandr
.endif
post-patch:
Modified: head/multimedia/libva/Makefile
==============================================================================
--- head/multimedia/libva/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/libva/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -2,6 +2,7 @@
PORTNAME= libva
PORTVERSION= 2.2.0
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= madpilot at FreeBSD.org
@@ -15,7 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:mu
LIB_DEPENDS= libdrm.so:graphics/libdrm
USES= autoreconf gmake libtool localbase pkgconfig tar:bzip2
-USE_XORG= glproto pciaccess x11 xext xfixes
+USE_XORG= xorgproto pciaccess x11 xext xfixes
USE_GL= gl
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=va
Modified: head/multimedia/libvdpau/Makefile
==============================================================================
--- head/multimedia/libvdpau/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/libvdpau/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -2,6 +2,7 @@
PORTNAME= libvdpau
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/
@@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf libtool pkgconfig tar:xz
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-documentation
-USE_XORG= dri2proto xext
+USE_XORG= xorgproto xext
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/mplayer/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia audio
MAINTAINER= riggs at FreeBSD.org
Modified: head/multimedia/mplayer/Makefile.optvars
==============================================================================
--- head/multimedia/mplayer/Makefile.optvars Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/mplayer/Makefile.optvars Tue Jul 31 18:41:30 2018 (r476013)
@@ -140,7 +140,7 @@ VDPAU_CONFIGURE_OFF= --disable-vdpau
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
VPX_CONFIGURE_OFF= --disable-libvpx-lavc
-X11_USE= XORG=x11,xext,xproto,xscrnsaver
+X11_USE= XORG=x11,xext,xorgproto,xscrnsaver
X11_CONFIGURE_OFF= --disable-x11
X11DGA_USE= XORG=xxf86dga
@@ -154,7 +154,7 @@ X11VM_IMPLIES= X11
X264_LIB_DEPENDS= libx264.so:multimedia/libx264
X264_CONFIGURE_OFF= --disable-x264
-XINERAMA_USE= XORG=xinerama,xineramaproto
+XINERAMA_USE= XORG=xinerama,xorgproto
XINERAMA_CONFIGURE_OFF= --disable-xinerama
XINERAMA_IMPLIES= X11
Modified: head/multimedia/mpv/Makefile
==============================================================================
--- head/multimedia/mpv/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/mpv/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= mpv
PORTVERSION= 0.29.0
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= multimedia audio
@@ -141,7 +141,7 @@ WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wa
libxkbcommon.so:x11/libxkbcommon
WAYLAND_CONFIGURE_OFF= --disable-wayland
-X11_USE= XORG=x11,xext,xinerama,xineramaproto,xrandr,xscrnsaver,xv,xxf86vm
+X11_USE= XORG=x11,xext,xinerama,xorgproto,xrandr,xscrnsaver,xv,xxf86vm
X11_VARS= INSTALLS_ICONS=yes
X11_CONFIGURE_OFF= --disable-x11
Modified: head/multimedia/recordmydesktop/Makefile
==============================================================================
--- head/multimedia/recordmydesktop/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/recordmydesktop/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -2,7 +2,7 @@
PORTNAME= recordmydesktop
DISTVERSION= 0.3.8.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-oss=yes \
--enable-jack=yes
-USE_XORG= ice sm x11 xext xextproto xfixes xdamage
+USE_XORG= ice sm x11 xext xorgproto xfixes xdamage
PLIST_FILES= bin/recordmydesktop man/man1/recordmydesktop.1.gz
.include <bsd.port.mk>
Modified: head/multimedia/totem/Makefile
==============================================================================
--- head/multimedia/totem/Makefile Tue Jul 31 18:38:39 2018 (r476012)
+++ head/multimedia/totem/Makefile Tue Jul 31 18:41:30 2018 (r476013)
@@ -3,7 +3,7 @@
PORTNAME= totem
PORTVERSION= 3.18.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -36,7 +36,7 @@ USES= desktop-file-utils gettext gmake gnome libtool
pathfix pkgconfig python:2.7 tar:xz
USE_GNOME= gtk30 intlhack introspection:build libxml2 nautilus3 \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list