diff options
348 files changed, 1088 insertions, 1343 deletions
@@ -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 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 05228d60dcb8..5730557f93db 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1895,10 +1895,10 @@ _GL_egl_BUILD_DEPENDS= ${LOCALBASE}/lib/libEGL.so:graphics/mesa-libs _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) diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index bf84b9cf3e11..5c2754d9b1d8 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -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/xaw6.pc:x11-toolkits/libXaw 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/pkgconfig/xfontcache.pc:x11-font 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 @@ -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@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@FreeBSD.org diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 68081776e8e2..c054a435b881 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -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 localbase \ 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 \ diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile index 9e8cccb69c2c..9003b520deef 100644 --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -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 diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile index 274d2c2f1399..4b30fe469ced 100644 --- a/chinese/librime/Makefile +++ b/chinese/librime/Makefile @@ -4,7 +4,7 @@ PORTNAME= librime PORTVERSION= 1.2.9 DISTVERSIONPREFIX= rime- -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= chinese textproc MAINTAINER= lichray@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 diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index 405a1ff046e2..c52d735d0353 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -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 --disable-profiling \ 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 diff --git a/devel/imake/Makefile b/devel/imake/Makefile index fb80a142dd14..bb65d91a51d1 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -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 diff --git a/devel/lndir/Makefile b/devel/lndir/Makefile index 935c4f5f52ce..110254ddc7ce 100644 --- a/devel/lndir/Makefile +++ b/devel/lndir/Makefile @@ -3,13 +3,14 @@ PORTNAME= lndir PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= unixmania@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 diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile index b45462c85c86..d96209e0ad18 100644 --- a/devel/makedepend/Makefile +++ b/devel/makedepend/Makefile @@ -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 diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 9a39389a7a9b..a9c2b52f1fcb 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -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}/' \ diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 7181b305420b..256b24a0adf0 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -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 diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 106debcc5f44..227b88eeba71 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -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 diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile index 05ff0085b3b0..207d1cc60186 100644 --- a/emulators/stonx/Makefile +++ b/emulators/stonx/Makefile @@ -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 diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 2789168e0867..a3992afa901f 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -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 | \ diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 7b9838501afc..6475a5883cbf 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -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 diff --git a/games/doom/Makefile b/games/doom/Makefile index 6dccf7eec358..2f13f52c7c92 100644 --- a/games/doom/Makefile +++ b/games/doom/Makefile @@ -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; Requested by id Software ONLY_FOR_ARCHS= i386 USES= gmake zip -USE_XORG= x11 sm xextproto xext +USE_XORG= x11 sm xorgproto xext NO_WRKSUBDIR= yes DATADIR= ${DMDIR} diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile index c4ca7c46030b..a9c6217ee622 100644 --- a/games/fkiss/Makefile +++ b/games/fkiss/Makefile @@ -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 parameter of incompatible typ 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}" diff --git a/games/xjig/Makefile b/games/xjig/Makefile index 1376f56aa327..2631a863728e 100644 --- a/games/xjig/Makefile +++ b/games/xjig/Makefile @@ -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@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 diff --git a/games/xpilot-ng-client/Makefile b/games/xpilot-ng-client/Makefile index 0ae633f52b4e..135277676343 100644 --- a/games/xpilot-ng-client/Makefile +++ b/games/xpilot-ng-client/Makefile @@ -1,11 +1,14 @@ # Created by: Jean-Yves Lefort <jylefort@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" diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile index c3535fdc4254..5058e2c91310 100644 --- a/games/xtrojka/Makefile +++ b/games/xtrojka/Makefile @@ -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@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} diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 3262e452010b..0d752fe0d8a7 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -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 diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile index bb37ebf5de3d..20972f7f2728 100644 --- a/graphics/jogl/Makefile +++ b/graphics/jogl/Makefile @@ -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 diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile index de324b088a60..c09d71bb3df7 100644 --- a/graphics/libosmesa/Makefile +++ b/graphics/libosmesa/Makefile @@ -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" diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index 526755171bf3..de9fd281ca14 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -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 diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index f04c17080da1..af80f12ea820 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -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 diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile index 7c3dcc1ffc3f..090565b0105a 100644 --- a/graphics/mesa-libs/Makefile +++ b/graphics/mesa-libs/Makefile @@ -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 diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile index c9fd5a82d6f4..900229c29ba8 100644 --- a/graphics/pgplot/Makefile +++ b/graphics/pgplot/Makefile @@ -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 diff --git a/java/classpath/Makefile b/java/classpath/Makefile index 26bd475ce0c9..42dbc094dffa 100644 --- a/java/classpath/Makefile +++ b/java/classpath/Makefile @@ -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 diff --git a/math/reduce/Makefile b/math/reduce/Makefile index 6aa5b1c62e9b..957d1328243b 100644 --- a/math/reduce/Makefile +++ b/math/reduce/Makefile @@ -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` diff --git a/math/xppaut/Makefile b/math/xppaut/Makefile index 6564f1ba3044..486170df6841 100644 --- a/math/xppaut/Makefile +++ b/math/xppaut/Makefile @@ -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 equations, etc 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 diff --git a/misc/wmtunlo/Makefile b/misc/wmtunlo/Makefile index ca2d21fe1f2f..d40aa7544b50 100644 --- a/misc/wmtunlo/Makefile +++ b/misc/wmtunlo/Makefile @@ -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 diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 1dc06ee55fef..a7fa33cd1f40 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -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 diff --git a/multimedia/gstreamer1-vaapi/Makefile b/multimedia/gstreamer1-vaapi/Makefile index a4b864e94d71..d1d97bf91996 100644 --- a/multimedia/gstreamer1-vaapi/Makefile +++ b/multimedia/gstreamer1-vaapi/Makefile @@ -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 diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile index 4997f8ef3271..ec7707e6b6ca 100644 --- a/multimedia/libcec/Makefile +++ b/multimedia/libcec/Makefile @@ -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: diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 14dc5da47f1f..4daff2fa2de6 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -2,6 +2,7 @@ PORTNAME= libva PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org @@ -15,7 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat 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 diff --git a/multimedia/libvdpau/Makefile b/multimedia/libvdpau/Makefile index aa4149ddf9f4..c7aa0e854d7c 100644 --- a/multimedia/libvdpau/Makefile +++ b/multimedia/libvdpau/Makefile @@ -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 diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 6e34f1d4fff6..62ced8b8ff83 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index 68a69bb82dfb..f0d622b708a8 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -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 diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index ec7fa30005fa..666c472479cf 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -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/wayland \ 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 diff --git a/multimedia/recordmydesktop/Makefile b/multimedia/recordmydesktop/Makefile index 6681b067b681..3c064fd56ff5 100644 --- a/multimedia/recordmydesktop/Makefile +++ b/multimedia/recordmydesktop/Makefile @@ -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> diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 4f270f7c8e66..a0883cdc76c0 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -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 \ pygobject3 -USE_XORG= x11 xproto xtst ice sm +USE_XORG= x11 xorgproto xtst ice sm USE_GSTREAMER1= core good bad soup ugly INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 72a9c727a59c..e718a4cdfb71 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.2.8 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -307,7 +307,7 @@ VDPAU_CONFIGURE_ENABLE= vdpau VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE=vorbis -X11_USE= GL=gl XORG=xcb,xproto +X11_USE= GL=gl XORG=xcb,xorgproto X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms X11_CONFIGURE_ENABLE= xcb xvideo X11_CONFIGURE_WITH= x diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index e7ab377922a7..234ddaaf570f 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -3,7 +3,7 @@ PORTNAME= freerdp DISTVERSION= 2.0.0-rc1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net comms ipv6 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -50,7 +50,7 @@ FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ FFMPEG_CMAKE_BOOL= WITH_FFMPEG GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 -GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xext,xextproto,xrandr +GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xext,xorgproto,xrandr GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 ICU_LIB_DEPENDS= libicuuc.so:devel/icu @@ -84,7 +84,7 @@ WAYLAND_CMAKE_BOOL= WITH_WAYLAND X11_DESC= Build FreeRDP X11 client X11_CMAKE_BOOL= WITH_X11 X11_CMAKE_OFF= -DWITH_XKBFILE=OFF -X11_USE= xorg=x11,xcursor,xext,xextproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv +X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv .include <bsd.port.pre.mk> diff --git a/net/freerdp1/Makefile b/net/freerdp1/Makefile index 9438fd132089..1ff5f8ad7f0f 100644 --- a/net/freerdp1/Makefile +++ b/net/freerdp1/Makefile @@ -3,7 +3,7 @@ PORTNAME= freerdp PORTVERSION= 1.2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net comms ipv6 PKGNAMESUFFIX= 1 @@ -48,7 +48,7 @@ FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ FFMPEG_CMAKE_BOOL= WITH_FFMPEG GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 -GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr +GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xorgproto,xext,xrandr GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 NEON_DESC= Enable Media Processing Engine instructions @@ -66,7 +66,7 @@ X11_DESC= Build FreeRDP X11 client X11_BUILD_DEPENDS= xmlto:textproc/xmlto X11_CMAKE_BOOL= WITH_X11 X11_CMAKE_OFF= -DWITH_XKBFILE=OFF -X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xrandr,xi,xfixes,xrender +X11_USE= xorg=x11,xkbfile,xcursor,xorgproto,xv,xinerama,xext,xrandr,xi,xfixes,xrender .include <bsd.port.pre.mk> diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile index a53224846de1..d074376075bb 100644 --- a/net/mediastreamer/Makefile +++ b/net/mediastreamer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mediastreamer PORTVERSION= 2.14.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= SAVANNAH/linphone/mediastreamer @@ -82,7 +82,7 @@ VPX_CONFIGURE_ENABLE= vp8 VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx XVIDEO_CONFIGURE_ENABLE=x11 xv -XVIDEO_USE= XORG=videoproto,x11,xv +XVIDEO_USE= XORG=xorgproto,x11,xv .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug diff --git a/net/tigervnc-devel/Makefile b/net/tigervnc-devel/Makefile index c644b8126a89..235c89410757 100644 --- a/net/tigervnc-devel/Makefile +++ b/net/tigervnc-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= tigervnc PORTVERSION= 1.9.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net x11-servers PKGNAMESUFFIX= -devel @@ -36,11 +37,8 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= TigerVNC -USE_XORG+= bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \ - ice inputproto kbproto pixman presentproto randrproto renderproto \ - resourceproto scrnsaverproto sm videoproto x11 xau xcmiscproto xdamage \ - xdmcp xext xextproto xfixes xfont xkbfile xorg-macros xproto xrandr \ - xrender xtrans xtst +USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont xkbfile \ + xorg-macros xorgproto xrandr xrender xtrans xtst CFLAGS+= -fPIC diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index b7a62ab1652a..506291661088 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -2,6 +2,7 @@ PORTNAME= tigervnc PORTVERSION= 1.9.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net x11-servers @@ -33,11 +34,8 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= TigerVNC -USE_XORG+= bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \ - ice inputproto kbproto pixman presentproto randrproto renderproto \ - resourceproto scrnsaverproto sm videoproto x11 xau xcmiscproto xdamage \ - xdmcp xext xextproto xfixes xfont xkbfile xorg-macros xproto xrandr \ - xrender xtrans xtst +USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont xkbfile \ + xorg-macros xorgproto xrandr xrender xtrans xtst CFLAGS+= -fPIC diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index 8da677e4b1a7..98609443cbf8 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -3,7 +3,7 @@ PORTNAME= x11vnc PORTVERSION= 0.9.13 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MASTER_SITES= SF/libvncserver/${PORTNAME}/${PORTVERSION} @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread- LIB_DEPENDS= libdbus-1.so:devel/dbus USE_XORG= x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \ - xdmcp recordproto + xdmcp xorgproto # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS LDFLAGS+= -L${LOCALBASE}/lib USES= iconv pkgconfig jpeg ssl diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 2b415671574a..72e574cd6c6a 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -3,7 +3,7 @@ PORTNAME= paraview DISTVERSION= 5.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/ DISTNAME= ParaView-v${PORTVERSION} @@ -35,7 +35,7 @@ RUN_DEPENDS= bash:shells/bash \ USES= alias cmake:outsource jpeg localbase python:2.7 qt:5 shebangfix USE_QT= core gui help network sql widgets x11extras xmlpatterns buildtools_build qmake_build USE_GL= gl glu -USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm dri3proto +USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm xorgproto USE_LDCONFIG= yes USE_GSTREAMER= yes diff --git a/security/keepassx-devel/Makefile b/security/keepassx-devel/Makefile index 958a9fd0e015..571b34a00af3 100644 --- a/security/keepassx-devel/Makefile +++ b/security/keepassx-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= keepassx PORTVERSION= 2.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security PKGNAMESUFFIX= -devel @@ -28,7 +28,7 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_QT= buildtools_build concurrent core gui linguisttools qmake_build \ testlib widgets x11extras -USE_XORG= ice inputproto sm x11 xcursor xext xfixes xi xrandr xrender \ +USE_XORG= ice xorgproto sm x11 xcursor xext xfixes xi xrandr xrender \ xt xtst USE_GITHUB= yes diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile index 5a2d4e015890..9ca3064f6ded 100644 --- a/security/keepassx/Makefile +++ b/security/keepassx/Makefile @@ -3,6 +3,7 @@ PORTNAME= KeePassX PORTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.keepassx.org/releases/${PORTVERSION}/ \ http://www.keepassx.org/releases/${PORTVERSION}/ @@ -22,7 +23,7 @@ PORTSCOUT= ignore USES= desktop-file-utils qmake qt:4 shared-mime-info USE_QT= moc_build uic_build qt3support_build rcc_build \ corelib gui xml -USE_XORG= xt inputproto xtst xrender xrandr xfixes xcursor\ +USE_XORG= xt xorgproto xtst xrender xrandr xfixes xcursor\ xext x11 sm ice xi QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include LIBS+=-L${LOCALBASE}/lib diff --git a/security/keepassx2/Makefile b/security/keepassx2/Makefile index 6ac08e07f7c6..719f835c409c 100644 --- a/security/keepassx2/Makefile +++ b/security/keepassx2/Makefile @@ -3,6 +3,7 @@ PORTNAME= keepassx PORTVERSION= 2.0.3 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= security MASTER_SITES= https://www.keepassx.org/releases/${PORTVERSION}/ @@ -29,7 +30,7 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_QT= corelib gui xml qtestlib uic_build moc_build \ qmake_build rcc_build linguisttools -USE_XORG= ice inputproto sm x11 xcursor xext xfixes xi xrandr xrender \ +USE_XORG= ice xorgproto sm x11 xcursor xext xfixes xi xrandr xrender \ xt xtst .include <bsd.port.pre.mk> diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 2431748c4801..849078e31c54 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnome-control-center PORTVERSION= 3.18.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -44,7 +44,7 @@ PORTSCOUT= limitw:1,even USES= compiler:c++11-lib gettext gmake gnome localbase:ldflags pathfix pkgconfig tar:xz USE_GNOME= gnomedesktop3 intltool libxml2 -USE_XORG= xscrnsaver x11 xxf86misc kbproto xi +USE_XORG= xscrnsaver x11 xxf86misc xorgproto xi GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes diff --git a/sysutils/mate-power-manager/Makefile b/sysutils/mate-power-manager/Makefile index 2c929c934327..263e167afb5e 100644 --- a/sysutils/mate-power-manager/Makefile +++ b/sysutils/mate-power-manager/Makefile @@ -3,6 +3,7 @@ PORTNAME= mate-power-manager PORTVERSION= 1.20.1 +PORTREVISION= 1 CATEGORIES= sysutils mate MASTER_SITES= MATE DIST_SUBDIR= mate @@ -30,7 +31,7 @@ PORTSCOUT= limitw:1,even USES= gettext gmake libtool localbase \ pathfix pkgconfig tar:xz USE_MATE= panel -USE_XORG= x11 xext xproto xrandr xrender +USE_XORG= x11 xext xorgproto xrandr xrender USE_GNOME= cairo glib20 gtk30 intlhack GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index 951984377093..62cec1f00263 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.12.4 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -25,7 +26,7 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= glib20 gtk20 cairo intltool intlhack USE_XFCE= garcon libexo -USE_XORG= inputproto x11 xcursor xi xrandr +USE_XORG= xorgproto x11 xcursor xi xrandr CONFIGURE_ARGS= --enable-debug=yes \ --disable-xorg-libinput diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile index c5c3895baa69..65945ceac8de 100644 --- a/textproc/scim-kmfl-imengine/Makefile +++ b/textproc/scim-kmfl-imengine/Makefile @@ -3,7 +3,7 @@ PORTNAME= scim-kmfl-imengine PORTVERSION= 0.9.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MASTER_SITES= SF/kmfl/kmfl/${PORTVERSION} \ http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ @@ -21,7 +21,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ RUN_DEPENDS= kmflcomp:textproc/kmflcomp \ scim:textproc/scim -USE_XORG= x11 xkbfile xproto +USE_XORG= x11 xkbfile xorgproto USE_GNOME= glib20 gtk20 intlhack USES= gettext iconv pkgconfig libtool GNU_CONFIGURE= yes diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 298a1f444abb..55308b5c1d56 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 67.0.3396.87 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -81,8 +82,8 @@ CPE_PRODUCT= chrome USE_GL= gl USE_LDCONFIG= ${DATADIR} USE_PERL5= build -USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ - xproto xrandr xrender xscrnsaver xtst +USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ + xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile index 82be732d010d..69d31f2ad1c2 100644 --- a/www/gtkhtml4/Makefile +++ b/www/gtkhtml4/Makefile @@ -3,6 +3,7 @@ PORTNAME= gtkhtml PORTVERSION= 4.10.0 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 4 @@ -17,7 +18,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz -USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage xproto +USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage xorgproto USE_GNOME= gnomeprefix intlhack gtk30 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 8fe5109c608c..fa69f209867f 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -3,7 +3,7 @@ PORTNAME= iridium PORTVERSION= 58.0 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -62,8 +62,8 @@ USES= bison desktop-file-utils jpeg ninja perl5 \ pkgconfig python:2.7,build shebangfix tar:xz USE_PERL5= build -USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ - xproto xrandr xrender xscrnsaver xtst +USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ + xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk20 gtk30 libxml2 libxslt MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome diff --git a/www/links-hacked/Makefile b/www/links-hacked/Makefile index 5155a1dfffc2..52e6f25d1b31 100644 --- a/www/links-hacked/Makefile +++ b/www/links-hacked/Makefile @@ -3,7 +3,7 @@ PORTNAME= links-hacked DISTVERSION= 101110 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= www MASTER_SITES= http://xray.sai.msu.ru/~karpov/links-hacked/downloads/ @@ -42,7 +42,7 @@ JS_DESC= Javascript interpreter support (very basic) JS_CONFIGURE_ENABLE= javascript SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib SVGALIB_CONFIGURE_WITH= svgalib -X11_USE= xorg=x11,xproto +X11_USE= xorg=x11,xorgproto X11_CONFIGURE_WITH= x .include <bsd.port.options.mk> diff --git a/www/links/Makefile b/www/links/Makefile index 73dc1b01eefc..376bcbcf354d 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -3,7 +3,7 @@ PORTNAME= links DISTVERSION= 2.14 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://links.twibright.com/download/ @@ -55,7 +55,7 @@ TRANS_EXTRA_PATCHES= ${FILESDIR}/extra-terminal.c.diff UTF8_CONFIGURE_ENABLE= utf8 -X11_USE= xorg=x11,xproto +X11_USE= xorg=x11,xorgproto X11_LIB_DEPENDS= libevent.so:devel/libevent \ libfontconfig.so:x11-fonts/fontconfig X11_CONFIGURE_WITH= x diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index 53c37a8bbd18..388e8d8cb3c5 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -20,7 +20,7 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -75,7 +75,7 @@ USES= gperf jpeg python:2.7,build pkgconfig \ USE_GNOME= glib20 libxml2 libxslt USE_QT= core designer gui location network qml quick webchannel \ widgets buildtools_build qmake_build printsupport -USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xi xproto \ +USE_XORG= x11 xcb xcomposite xcursor xext xi xorgproto \ xrandr xrender xscrnsaver xtst USE_LDCONFIG= ${QT_LIBDIR} diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index a3861ae89e0d..422df9ab7c1b 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-acecad PORTVERSION= 1.5.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile index 9cea686f8c8c..20f83550cf72 100644 --- a/x11-drivers/xf86-input-egalax/Makefile +++ b/x11-drivers/xf86-input-egalax/Makefile @@ -3,7 +3,7 @@ PORTNAME= xf86-input-egalax PORTVERSION= 0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= glebius@FreeBSD.org diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile index 19be4171b933..3dc772823d9d 100644 --- a/x11-drivers/xf86-input-elographics/Makefile +++ b/x11-drivers/xf86-input-elographics/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-elographics PORTVERSION= 1.4.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-evdev/Makefile b/x11-drivers/xf86-input-evdev/Makefile index b4c90e125877..3ab51a039b37 100644 --- a/x11-drivers/xf86-input-evdev/Makefile +++ b/x11-drivers/xf86-input-evdev/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-input-evdev PORTVERSION= 2.10.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile index b8186b3143a7..8484e3d39efb 100644 --- a/x11-drivers/xf86-input-fpit/Makefile +++ b/x11-drivers/xf86-input-fpit/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-fpit PORTVERSION= 1.4.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index e1fd7d27bd56..0b95c45ba30b 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-hyperpen PORTVERSION= 1.4.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index 7cc2f7de4c45..33b96898450b 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-input-joystick PORTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index fa56954a73f0..a039caed990e 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-keyboard PORTVERSION= 1.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -12,6 +12,5 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= driver -USE_XORG= kbproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-libinput/Makefile b/x11-drivers/xf86-input-libinput/Makefile index 3573e6c7fe06..cfe6d2edbd81 100644 --- a/x11-drivers/xf86-input-libinput/Makefile +++ b/x11-drivers/xf86-input-libinput/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-input-libinput PORTVERSION= 0.25.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index 9899e5f598b4..f386a802b0a3 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-input-mouse PORTVERSION= 1.9.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index 1d85b9fca919..a97df3d962d6 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-mutouch PORTVERSION= 1.3.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index 2e923c45f496..7a42f8fbe372 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-penmount PORTVERSION= 1.5.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile index 9c74c40c7769..a343ddf1c85d 100644 --- a/x11-drivers/xf86-input-synaptics/Makefile +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-input-synaptics PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index 3301d8c16333..df96fa5f997d 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -3,7 +3,7 @@ PORTNAME= xf86-input-vmmouse PORTVERSION= 13.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile index c77ee8c5de50..7ae0a97a4d41 100644 --- a/x11-drivers/xf86-input-void/Makefile +++ b/x11-drivers/xf86-input-void/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-void PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile index bf8a0378fc6b..b998c60c76a6 100644 --- a/x11-drivers/xf86-input-wacom/Makefile +++ b/x11-drivers/xf86-input-wacom/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-input-wacom PORTVERSION= 0.36.1 +PORTREVISION= 1 CATEGORIES= x11-drivers MASTER_SITES= https://github.com/linuxwacom/${PORTNAME}/releases/download/${DISTNAME}/ diff --git a/x11-drivers/xf86-video-amdgpu/Makefile b/x11-drivers/xf86-video-amdgpu/Makefile index afd521ad276b..ce39245a523f 100644 --- a/x11-drivers/xf86-video-amdgpu/Makefile +++ b/x11-drivers/xf86-video-amdgpu/Makefile @@ -4,7 +4,7 @@ PORTNAME= xf86-video-amdgpu PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile index 24ecbd833f41..1e15dd0cd3f6 100644 --- a/x11-drivers/xf86-video-apm/Makefile +++ b/x11-drivers/xf86-video-apm/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-apm PORTVERSION= 1.2.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile index a0f17dc8b85f..574ea0850173 100644 --- a/x11-drivers/xf86-video-ark/Makefile +++ b/x11-drivers/xf86-video-ark/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ark PORTVERSION= 0.7.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ast/Makefile b/x11-drivers/xf86-video-ast/Makefile index 7b36d4e5ef37..c484e2e843e0 100644 --- a/x11-drivers/xf86-video-ast/Makefile +++ b/x11-drivers/xf86-video-ast/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-ast PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -11,7 +12,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= driver -USE_XORG= xf86driproto glproto INSTALL_TARGET= install-strip PLIST_FILES= lib/xorg/modules/drivers/ast_drv.so diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 659aff65f1de..503168d7b648 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-ati PORTVERSION= 7.9.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-drivers diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index aaf2fbf24115..3ea23923031e 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-chips PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile index ac49d6159f0d..506394dedfe8 100644 --- a/x11-drivers/xf86-video-cirrus/Makefile +++ b/x11-drivers/xf86-video-cirrus/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-cirrus PORTVERSION= 1.5.3 -PORREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index d9abbd51522b..fbe3b451a2e5 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-dummy PORTVERSION= 0.3.8 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -11,6 +12,5 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= driver -USE_XORG= xf86dgaproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-geode/Makefile b/x11-drivers/xf86-video-geode/Makefile index 77396a140e72..8865d20c12d6 100644 --- a/x11-drivers/xf86-video-geode/Makefile +++ b/x11-drivers/xf86-video-geode/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-geode PORTVERSION= 2.11.19 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile index 9b6ff455727a..a28ddefc214a 100644 --- a/x11-drivers/xf86-video-glint/Makefile +++ b/x11-drivers/xf86-video-glint/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-glint PORTVERSION= 1.2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -11,6 +11,5 @@ COMMENT= X.Org glint display driver USE_GL= gl XORG_CAT= driver -USE_XORG= xf86dgaproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index 48943d79b717..e55aeb001870 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-i128 PORTVERSION= 1.3.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile index 5545746ef4b6..2d59ea9f2787 100644 --- a/x11-drivers/xf86-video-i740/Makefile +++ b/x11-drivers/xf86-video-i740/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-i740 PORTVERSION= 1.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index 609032b5b4df..bf325ecc81c4 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -3,6 +3,7 @@ PORTNAME= xf86-video-intel PORTVERSION= 2.99.917.20180512 +PORTREVISION= 1 CATEGORIES= x11-drivers MASTER_SITES= http://cgit.freedesktop.org/xorg/${XORG_CAT}/${PORTNAME}/snapshot/ DISTNAME= ${PORTNAME}-${COMMIT_ID} diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile index a881c6e566b4..72185c5ee0e3 100644 --- a/x11-drivers/xf86-video-mach64/Makefile +++ b/x11-drivers/xf86-video-mach64/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-mach64 PORTVERSION= 6.9.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index b0196b1625c6..46ae2a5aa98d 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-mga PORTVERSION= 1.6.5 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 3 CATEGORIES= x11-drivers diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile index 0371bb7f9dbc..07b15acde5eb 100644 --- a/x11-drivers/xf86-video-neomagic/Makefile +++ b/x11-drivers/xf86-video-neomagic/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-neomagic PORTVERSION= 1.2.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org neomagic display driver XORG_CAT= driver -USE_XORG= xf86dgaproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile index ff10576926c9..680d48fc1416 100644 --- a/x11-drivers/xf86-video-nv/Makefile +++ b/x11-drivers/xf86-video-nv/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-nv PORTVERSION= 2.1.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile index bec73f7e0f0d..bd58dae598bd 100644 --- a/x11-drivers/xf86-video-openchrome/Makefile +++ b/x11-drivers/xf86-video-openchrome/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-openchrome PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-qxl/Makefile b/x11-drivers/xf86-video-qxl/Makefile index fe47fed2ab61..a74ee0d6296a 100644 --- a/x11-drivers/xf86-video-qxl/Makefile +++ b/x11-drivers/xf86-video-qxl/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-qxl DISTVERSION= 0.1.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= ports@FreeBSD.org @@ -15,7 +16,7 @@ LIB_DEPENDS= libspice-server.so:devel/libspice-server USES= localbase:ldflags pkgconfig python:2.7 shebangfix -USE_XORG= xf86dgaproto xfont +USE_XORG= xfont XORG_CAT= driver CONFIGURE_ARGS+=--enable-xspice diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile index 021da17f9c9a..f16995c2ac8c 100644 --- a/x11-drivers/xf86-video-r128/Makefile +++ b/x11-drivers/xf86-video-r128/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-r128 PORTVERSION= 6.11.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -12,6 +13,5 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_GL= gl XORG_CAT= driver -USE_XORG= xf86miscproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile index da13caa3763d..164051eaee15 100644 --- a/x11-drivers/xf86-video-rendition/Makefile +++ b/x11-drivers/xf86-video-rendition/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-rendition PORTVERSION= 4.2.7 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile index 9c02e5bb494b..f761a3823299 100644 --- a/x11-drivers/xf86-video-s3/Makefile +++ b/x11-drivers/xf86-video-s3/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-s3 PORTVERSION= 0.6.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index 3680790dab13..341c4d07fa97 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-s3virge PORTVERSION= 1.10.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index f11fa13b17a4..628bbf89e0f0 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-savage PORTVERSION= 2.3.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-scfb/Makefile b/x11-drivers/xf86-video-scfb/Makefile index a13bc21dea8a..4db32ab5010a 100644 --- a/x11-drivers/xf86-video-scfb/Makefile +++ b/x11-drivers/xf86-video-scfb/Makefile @@ -3,7 +3,7 @@ PORTNAME= xf86-video-scfb PORTVERSION= 0.0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index ae7a93108ad6..472c35670e5f 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-siliconmotion PORTVERSION= 1.7.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index dbdc6327e16d..1317fadf8dd3 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-sis PORTVERSION= 0.10.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -11,6 +11,5 @@ COMMENT= X.Org sis display driver USE_GL= gl XORG_CAT= driver -USE_XORG= xf86dgaproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile index 29f4f2b8681d..09981c16447f 100644 --- a/x11-drivers/xf86-video-sunffb/Makefile +++ b/x11-drivers/xf86-video-sunffb/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-sunffb PORTVERSION= 1.2.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile index e39615d8f289..17989dc5dd42 100644 --- a/x11-drivers/xf86-video-tdfx/Makefile +++ b/x11-drivers/xf86-video-tdfx/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tdfx PORTVERSION= 1.4.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile index bb76bd1d20a4..ed8c29491e17 100644 --- a/x11-drivers/xf86-video-trident/Makefile +++ b/x11-drivers/xf86-video-trident/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-trident PORTVERSION= 1.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org trident display driver XORG_CAT= driver -USE_XORG= xf86dgaproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile index 0aa3b20aacf7..f7c43934528b 100644 --- a/x11-drivers/xf86-video-tseng/Makefile +++ b/x11-drivers/xf86-video-tseng/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tseng PORTVERSION= 1.2.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index 5bd8fd5f7e3c..6213501dd39a 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-vesa PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index 50817cfc3fa9..57a31ad1f7ab 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-vmware PORTVERSION= 13.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile index fea4fce68041..1f42b336d564 100644 --- a/x11-drivers/xf86-video-voodoo/Makefile +++ b/x11-drivers/xf86-video-voodoo/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-voodoo PORTVERSION= 1.2.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org voodoo display driver XORG_CAT= driver -USE_XORG= xf86dgaproto .include <bsd.port.mk> diff --git a/x11-drivers/xorgxrdp/Makefile b/x11-drivers/xorgxrdp/Makefile index 386a714b9921..44d0adb14654 100644 --- a/x11-drivers/xorgxrdp/Makefile +++ b/x11-drivers/xorgxrdp/Makefile @@ -2,6 +2,7 @@ PORTNAME= xorgxrdp PORTVERSION= 0.2.6 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= x11-drivers DIST_SUBDIR= xrdp @@ -15,9 +16,7 @@ RUN_DEPENDS= xauth:x11/xauth BUILD_DEPENDS= nasm:devel/nasm USES= autoreconf libtool:build pkgconfig -USE_XORG= dri2proto dri3proto glproto inputproto presentproto randrproto \ - renderproto resourceproto scrnsaverproto xf86driproto xineramaproto \ - xorg-server +USE_XORG= xorgproto xorg-server USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= neutrinolabs diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile index 9e8c70f2b36a..18d6e1438a2c 100644 --- a/x11-fm/rox-filer/Makefile +++ b/x11-fm/rox-filer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rox-filer PORTVERSION= 2.11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-fm gnome MASTER_SITES= SF/rox/rox/${PORTVERSION} DISTNAME= rox-filer-${PORTVERSION} @@ -12,7 +12,7 @@ COMMENT= Simple and easy to use graphical file manager PLIST_SUB+= LOCALBASE=${LOCALBASE} -USE_XORG= x11 sm xaw xproto +USE_XORG= x11 sm xaw xorgproto USE_GNOME= atk glib20 gtk20 libxml2 pango USES= gmake pkgconfig shared-mime-info tar:bzip2 diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile index 7768c8a030e8..033085228ac0 100644 --- a/x11-fonts/Makefile +++ b/x11-fonts/Makefile @@ -93,12 +93,10 @@ SUBDIR += font-util SUBDIR += font-winitzki-cyrillic SUBDIR += font-xfree86-type1 - SUBDIR += fontcacheproto SUBDIR += fontconfig SUBDIR += fontconfig-reference SUBDIR += fontmatrix SUBDIR += fonts-indic - SUBDIR += fontsproto SUBDIR += fonttosfnt SUBDIR += freefont-ttf SUBDIR += freefonts @@ -196,7 +194,6 @@ SUBDIR += vollkorn-ttf SUBDIR += webfonts SUBDIR += wqy - SUBDIR += xf86bigfontproto SUBDIR += xfontsel SUBDIR += xfs SUBDIR += xfsinfo diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile index 2f1dd60c57af..923590d9e23d 100644 --- a/x11-fonts/bdftopcf/Makefile +++ b/x11-fonts/bdftopcf/Makefile @@ -3,6 +3,7 @@ PORTNAME= bdftopcf PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= localbase XORG_CAT= app -USE_XORG= fontsproto xproto +USE_XORG= xorgproto PLIST_FILES= bin/bdftopcf man/man1/bdftopcf.1.gz diff --git a/x11-fonts/fontcacheproto/Makefile b/x11-fonts/fontcacheproto/Makefile deleted file mode 100644 index b6e2f99f0aef..000000000000 --- a/x11-fonts/fontcacheproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= fontcacheproto -PORTVERSION= 0.1.3 -CATEGORIES= x11-fonts - -MAINTAINER= x11@FreeBSD.org -COMMENT= Fontcache extension headers - -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11-fonts/fontcacheproto/distinfo b/x11-fonts/fontcacheproto/distinfo deleted file mode 100644 index a1f09183ed05..000000000000 --- a/x11-fonts/fontcacheproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/fontcacheproto-0.1.3.tar.bz2) = 1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb -SIZE (xorg/proto/fontcacheproto-0.1.3.tar.bz2) = 84470 diff --git a/x11-fonts/fontcacheproto/pkg-descr b/x11-fonts/fontcacheproto/pkg-descr deleted file mode 100644 index e168bb607399..000000000000 --- a/x11-fonts/fontcacheproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org Fontcache extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11-fonts/fontcacheproto/pkg-plist b/x11-fonts/fontcacheproto/pkg-plist deleted file mode 100644 index 595a1b11e676..000000000000 --- a/x11-fonts/fontcacheproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/fontcache.h -include/X11/extensions/fontcacheP.h -include/X11/extensions/fontcachstr.h -libdata/pkgconfig/fontcacheproto.pc diff --git a/x11-fonts/fontsproto/Makefile b/x11-fonts/fontsproto/Makefile deleted file mode 100644 index 12abbda2354e..000000000000 --- a/x11-fonts/fontsproto/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= fontsproto -PORTVERSION= 2.1.3 -PORTEPOCH= 1 -CATEGORIES= x11-fonts - -MAINTAINER= x11@FreeBSD.org -COMMENT= Fonts extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11-fonts/fontsproto/distinfo b/x11-fonts/fontsproto/distinfo deleted file mode 100644 index ac15338391a4..000000000000 --- a/x11-fonts/fontsproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/fontsproto-2.1.3.tar.bz2) = 259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8 -SIZE (xorg/proto/fontsproto-2.1.3.tar.bz2) = 154087 diff --git a/x11-fonts/fontsproto/pkg-descr b/x11-fonts/fontsproto/pkg-descr deleted file mode 100644 index 495c40d30c3b..000000000000 --- a/x11-fonts/fontsproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org fontsproto protocol headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11-fonts/fontsproto/pkg-plist b/x11-fonts/fontsproto/pkg-plist deleted file mode 100644 index 05119c782e00..000000000000 --- a/x11-fonts/fontsproto/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -%%DOCSDIR%%/fsproto.xml -include/X11/fonts/FS.h -include/X11/fonts/FSproto.h -include/X11/fonts/font.h -include/X11/fonts/fontproto.h -include/X11/fonts/fontstruct.h -include/X11/fonts/fsmasks.h -libdata/pkgconfig/fontsproto.pc diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile index 0a0cff1418ff..1a8afd431fd4 100644 --- a/x11-fonts/fonttosfnt/Makefile +++ b/x11-fonts/fonttosfnt/Makefile @@ -2,7 +2,7 @@ PORTNAME= fonttosfnt PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Wrap a bitmap font in a sftn wrapper LIB_DEPENDS= libfreetype.so:print/freetype2 XORG_CAT= app -USE_XORG= xproto fontenc +USE_XORG= xorgproto fontenc PLIST_FILES= bin/fonttosfnt man/man1/fonttosfnt.1.gz diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile index 635804150eda..89381af2fae5 100644 --- a/x11-fonts/libFS/Makefile +++ b/x11-fonts/libFS/Makefile @@ -2,13 +2,14 @@ PORTNAME= libFS PORTVERSION= 1.0.7 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= The FS library XORG_CAT= lib -USE_XORG= fontsproto:both xproto:both xtrans +USE_XORG= xorgproto xtrans USES+= cpe CPE_PRODUCT= libfs CPE_VENDOR= x diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index 57343d8a778e..d0767cab7b4f 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXfont PORTVERSION= 1.5.4 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= x11-fonts @@ -17,7 +18,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 USES= cpe XORG_CAT= lib -USE_XORG= xproto:both xtrans fontsproto:both fontenc +USE_XORG= xorgproto xtrans fontenc INSTALL_TARGET= install-strip CPE_PRODUCT= libxfont CPE_VENDOR= x diff --git a/x11-fonts/libXfont2/Makefile b/x11-fonts/libXfont2/Makefile index 8f5b175b6ee0..3229efe69fb6 100644 --- a/x11-fonts/libXfont2/Makefile +++ b/x11-fonts/libXfont2/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXfont2 PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= X font library LIB_DEPENDS= libfreetype.so:print/freetype2 XORG_CAT= lib -USE_XORG= xproto:both xtrans fontsproto:both fontenc +USE_XORG= xorgproto xtrans fontenc INSTALL_TARGET= install-strip #USES+= cpe #CPE_PRODUCT= libxfont diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile index 380014203645..0dc720a5103b 100644 --- a/x11-fonts/libXfontcache/Makefile +++ b/x11-fonts/libXfontcache/Makefile @@ -2,13 +2,13 @@ PORTNAME= libXfontcache PORTVERSION= 1.0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= The Xfontcache library XORG_CAT= lib -USE_XORG= fontcacheproto:both x11 xext xextproto +USE_XORG= x11 xext xorgproto .include <bsd.port.mk> diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index 031aea621fda..190aec433edc 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -2,7 +2,7 @@ PORTNAME= libXft PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= gnome@FreeBSD.org @@ -15,7 +15,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig XORG_CAT= lib -USE_XORG= xproto:both xrender +USE_XORG= xorgproto xrender INSTALL_TARGET= install-strip post-extract: diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile index e33de45519a4..0f976959397b 100644 --- a/x11-fonts/libfontenc/Makefile +++ b/x11-fonts/libfontenc/Makefile @@ -3,7 +3,7 @@ PORTNAME= libfontenc PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= xproto +USE_XORG= xorgproto CONFIGURE_ARGS= --with-encodingsdir=${LOCALBASE}/share/fonts/encodings diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile index 5e4a0b261fd9..2f221df277fc 100644 --- a/x11-fonts/mkfontscale/Makefile +++ b/x11-fonts/mkfontscale/Makefile @@ -3,6 +3,7 @@ PORTNAME= mkfontscale PORTVERSION= 1.1.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 XORG_CAT= app -USE_XORG= xproto fontenc +USE_XORG= xorgproto fontenc CONFIGURE_ARGS+=--disable-maintainer-mode diff --git a/x11-fonts/xf86bigfontproto/Makefile b/x11-fonts/xf86bigfontproto/Makefile deleted file mode 100644 index 440353870991..000000000000 --- a/x11-fonts/xf86bigfontproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xf86bigfontproto -PORTVERSION= 1.2.0 -CATEGORIES= x11-fonts - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-Bigfont extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11-fonts/xf86bigfontproto/distinfo b/x11-fonts/xf86bigfontproto/distinfo deleted file mode 100644 index 69d1319be5c3..000000000000 --- a/x11-fonts/xf86bigfontproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xf86bigfontproto-1.2.0.tar.bz2) = ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648 -SIZE (xorg/proto/xf86bigfontproto-1.2.0.tar.bz2) = 49191 diff --git a/x11-fonts/xf86bigfontproto/pkg-descr b/x11-fonts/xf86bigfontproto/pkg-descr deleted file mode 100644 index c2d38744b1bb..000000000000 --- a/x11-fonts/xf86bigfontproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org XFree86-Bigfont extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11-fonts/xf86bigfontproto/pkg-plist b/x11-fonts/xf86bigfontproto/pkg-plist deleted file mode 100644 index a0e8e8ec76b2..000000000000 --- a/x11-fonts/xf86bigfontproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/xf86bigfont.h -include/X11/extensions/xf86bigfproto.h -include/X11/extensions/xf86bigfstr.h -libdata/pkgconfig/xf86bigfontproto.pc diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile index b4990285ef75..2788a4b6874d 100644 --- a/x11-servers/Xfstt/Makefile +++ b/x11-servers/Xfstt/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfstt PORTVERSION= 1.9.2 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= http://archive.hadrons.org/software/xfstt/ @@ -13,7 +14,7 @@ LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB USES= pkgconfig tar:xz -USE_XORG= fontsproto xproto +USE_XORG= xorgproto USE_RC_SUBR= xfstt GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-nls diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index ff7c3a1096b6..5e13159778cf 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -13,7 +13,7 @@ DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes OPTIONS_EXCLUDE=DEVD HAL SUID -USE_XORG= dmx dmxproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst +USE_XORG= dmx xorgproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --disable-xwayland diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 1763b0b525a7..fbe4f78f5263 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 8 +PORTREVISION?= 9 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -36,12 +36,7 @@ OPTIONS_EXCLUDE_sparc64= HAL USES= gmake libtool perl5 ssl tar:bzip2 USE_PERL5= build USE_GL+= gl -USE_XORG+= bigreqsproto compositeproto damageproto dri2proto dri3proto \ - fixesproto fontsproto glproto inputproto kbproto pixman \ - presentproto randrproto recordproto renderproto \ - resourceproto scrnsaverproto videoproto xau \ - xcmiscproto xdmcp xextproto xf86driproto xfont \ - xineramaproto xkbfile xproto xshmfence xtrans +USE_XORG+= pixman xau xdmcp xfont xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --localstatedir=/var --with-shared-memory-dir=/tmp \ --disable-config-udev --disable-config-udev-kms \ @@ -57,7 +52,7 @@ BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure .if ${SLAVE_PORT} == "no" USE_GL+= gbm -USE_XORG+= pciaccess xf86dgaproto xf86vidmodeproto +USE_XORG+= pciaccess CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --disable-xwayland --enable-xcsecurity SUB_FILES= pkg-install pkg-deinstall diff --git a/x11-themes/xcursor-themes/Makefile b/x11-themes/xcursor-themes/Makefile index 000bfa4953c1..0b83710d71f9 100644 --- a/x11-themes/xcursor-themes/Makefile +++ b/x11-themes/xcursor-themes/Makefile @@ -2,6 +2,7 @@ PORTNAME= xcursor-themes PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= x11-themes MAINTAINER= x11@FreeBSD.org @@ -12,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xcursorgen:x11/xcursorgen -USE_XORG= xextproto +USE_XORG= xorgproto XORG_CAT= data diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index cb76d0a83c54..b908d790f18d 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -4,7 +4,7 @@ PORTNAME= gtk PORTVERSION= 1.2.10 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/1.2 PKGNAMESUFFIX= 12 @@ -15,7 +15,7 @@ COMMENT= Gimp Toolkit for X11 GUI (previous stable version) USES= libtool pathfix perl5 USE_PERL5= build -USE_XORG= x11 ice xext sm inputproto xi +USE_XORG= x11 ice xext sm xorgproto xi USE_GNOME= glib12 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile index 02ea7dfeb70c..f4f3209c554f 100644 --- a/x11-toolkits/lesstif/Makefile +++ b/x11-toolkits/lesstif/Makefile @@ -3,7 +3,7 @@ PORTNAME= lesstif PORTVERSION= 0.95.2 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= x11-toolkits MASTER_SITES= SF @@ -19,7 +19,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ CONFLICTS?= open-motif-* USES= tar:bzip2 libtool -USE_XORG= sm ice xt xp xext x11 xextproto xrender xft +USE_XORG= sm ice xt xp xext x11 xorgproto xrender xft USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static --enable-shared --enable-production \ diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index dd8ecb0d3fb8..f23cac869283 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXaw PORTVERSION= 1.0.13 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= x11-toolkits @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake XORG_CAT= lib -USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt +USE_XORG= x11 xau xext xmu xp xpm xorgproto xt CONFIGURE_ARGS= --without-xmlto .include <bsd.port.mk> diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index 9a3738498636..a79df0aa3a1d 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -3,7 +3,7 @@ PORTNAME= libXmu PORTVERSION= 1.1.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11-toolkits @@ -14,6 +14,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= xproto:both x11 xt xext +USE_XORG= xorgproto x11 xt xext .include <bsd.port.mk> diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index 0f6a36fc0f54..c5353298f89a 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXt PORTVERSION= 1.1.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits @@ -13,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= x11 sm ice xproto:both kbproto +USE_XORG= x11 sm ice xorgproto CONFIGURE_ARGS= --disable-specs USES= cpe CPE_PRODUCT= libxt diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 385c092543a2..3831ca9f9a4f 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -3,7 +3,7 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- @@ -19,7 +19,7 @@ USES= pkgconfig qmake:no_env qt-dist:4 HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -USE_XORG= xrender xrandr xinerama inputproto xfixes \ +USE_XORG= xrender xrandr xinerama xorgproto xfixes \ sm xcursor xext x11 ice xi xt ALL_TARGET= first diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 137722731c2a..0a771129e0d4 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -3,6 +3,7 @@ PORTNAME= awesome PORTVERSION= 4.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= x11-wm @@ -14,7 +15,6 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= convert:graphics/ImageMagick \ - xproto>=7.0.15:x11/xproto \ ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \ bash:shells/bash @@ -41,7 +41,7 @@ CMAKE_ARGS= -DSYSCONFDIR=${PREFIX}/etc \ -DGENERATE_DOC=OFF USE_GNOME= glib20 pango gdkpixbuf2 USE_XORG= pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \ - xproto + xorgproto OPTIONS_DEFINE= DBUS DOCS MANPAGES OPTIONS_DEFAULT=DBUS MANPAGES diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile index 34c628eb6f10..055d9614777d 100644 --- a/x11-wm/compiz-plugins-extra/Makefile +++ b/x11-wm/compiz-plugins-extra/Makefile @@ -3,7 +3,7 @@ PORTNAME= compiz-plugins-extra PORTVERSION= 0.8.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ @@ -22,7 +22,7 @@ USE_GL= yes USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2 USE_CSTD= gnu89 USE_GNOME= gconf2 intltool -USE_XORG= glproto +USE_XORG= xorgproto USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile index ac02db9acb38..f1763c383d9d 100644 --- a/x11-wm/compiz-plugins-main/Makefile +++ b/x11-wm/compiz-plugins-main/Makefile @@ -3,7 +3,7 @@ PORTNAME= compiz-plugins-main PORTVERSION= 0.8.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ @@ -22,7 +22,7 @@ USE_GL= yes USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2 USE_CSTD= gnu89 USE_GNOME= gconf2 intltool -USE_XORG= glproto +USE_XORG= xorgproto USE_LDCONFIG= yes GCONF_SCHEMAS= compiz-animation.schemas \ diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile index 01efa31f1a43..3e1791c81c58 100644 --- a/x11-wm/compiz-plugins-unsupported/Makefile +++ b/x11-wm/compiz-plugins-unsupported/Makefile @@ -3,7 +3,7 @@ PORTNAME= compiz-plugins-unsupported PORTVERSION= 0.8.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ @@ -22,7 +22,7 @@ INSTALL_TARGET= install-strip USE_GL= yes USES= pathfix gettext gmake libtool:keepla pkgconfig tar:bzip2 USE_GNOME= gconf2 intltool -USE_XORG= glproto +USE_XORG= xorgproto USE_LDCONFIG= yes GCONF_SCHEMAS= compiz-atlantis.schemas \ diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index d3c142628d05..d587898f6bcf 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -2,7 +2,7 @@ PORTNAME= compiz PORTVERSION= 0.8.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ @@ -21,7 +21,7 @@ INSTALL_TARGET= install-strip USES= gettext gmake libtool pathfix tar:bzip2 USE_GL= glu USE_GNOME= gconf2 libxslt intltool -USE_XORG= glproto ice sm x11 xcomposite xdamage xext xfixes xinerama \ +USE_XORG= xorgproto ice sm x11 xcomposite xdamage xext xfixes xinerama \ xrandr xrender USE_LDCONFIG= yes diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index 51f2a941a5ab..65fa2268b8fe 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -3,6 +3,7 @@ PORTNAME= e16 PORTVERSION= 1.0.18 +PORTREVISION= 1 CATEGORIES= x11-wm enlightenment MASTER_SITES= SF/enlightenment/${PORTNAME}/${PORTVERSION}/ @@ -29,7 +30,7 @@ NLS_CONFIGURE_OFF= --disable-nls DOCS_CONFIGURE_ON= --enable-docs=yes DOCS_CONFIGURE_OFF= --enable-docs=no -USE_XORG= compositeproto damageproto ice sm xextproto x11 xbitmaps \ +USE_XORG= ice sm xorgproto x11 xbitmaps \ xcomposite xdamage xext xfixes xft xinerama xrandr xrender \ xxf86vm USES= gettext gmake iconv libtool perl5 pkgconfig shebangfix diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index 5cc8936e55d9..b86f0e3cb8e4 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -3,7 +3,7 @@ PORTNAME= fluxbox PORTVERSION= 1.3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -20,7 +20,7 @@ LIB_DEPENDS= libfribidi.so:converters/fribidi \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -USE_XORG= x11 xext xextproto xft xpm xrandr +USE_XORG= x11 xext xorgproto xft xpm xrandr USES= gmake pkgconfig GNU_CONFIGURE= yes diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile index ed30fb67e528..28b78dd0e175 100644 --- a/x11-wm/fluxter/Makefile +++ b/x11-wm/fluxter/Makefile @@ -3,6 +3,7 @@ PORTNAME= fluxter PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://www.hydrus.org.uk/downloads/ @@ -11,7 +12,7 @@ COMMENT= Desktop pager for the Fluxbox Slit LICENSE= GPLv2 -USE_XORG= x11 ice xproto xt xaw xext +USE_XORG= x11 ice xorgproto xt xaw xext GNU_CONFIGURE= yes USES= gmake diff --git a/x11-wm/transset/Makefile b/x11-wm/transset/Makefile index 26c577ec7444..c40f946658a4 100644 --- a/x11-wm/transset/Makefile +++ b/x11-wm/transset/Makefile @@ -3,6 +3,7 @@ PORTNAME= transset PORTVERSION= 1.0.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-wm @@ -10,7 +11,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Make your windows transparent XORG_CAT= app -USE_XORG= x11 xproto +USE_XORG= x11 xorgproto PLIST_FILES= bin/transset man/man1/transset.1.gz diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile index 84e07167c671..54ea89254734 100644 --- a/x11-wm/wmii/Makefile +++ b/x11-wm/wmii/Makefile @@ -3,7 +3,7 @@ PORTNAME= wmii DISTVERSION= 3.6 # this is stable version; for 3.9.x, use -devel port -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= http://dl.suckless.org/wmii/ @@ -18,7 +18,7 @@ RUN_DEPENDS= dmenu:x11/dmenu CONFLICTS= wmii-devel-[0-9]* -USE_XORG= x11 xextproto xt xext +USE_XORG= x11 xorgproto xt xext MAKE_ARGS= PREFIX="${PREFIX}" MAN="${MANPREFIX}/man" \ INCLUDE="${LOCALBASE}/include" \ diff --git a/x11-wm/wmname/Makefile b/x11-wm/wmname/Makefile index 7ff798367819..b19cde378d3f 100644 --- a/x11-wm/wmname/Makefile +++ b/x11-wm/wmname/Makefile @@ -3,13 +3,14 @@ PORTNAME= wmname PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://dl.suckless.org/tools/ MAINTAINER= nuncupatio@gmail.com COMMENT= Prints/sets the window manager name property of the root window -USE_XORG= x11 xproto +USE_XORG= x11 xorgproto PLIST_FILES= bin/wmname diff --git a/x11/Makefile b/x11/Makefile index b7796ddb5290..bfb1c0f1ad04 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -23,7 +23,6 @@ SUBDIR += beforelight SUBDIR += bgrot SUBDIR += bgs - SUBDIR += bigreqsproto SUBDIR += bitmap SUBDIR += blast SUBDIR += bmpanel2 @@ -37,10 +36,8 @@ SUBDIR += cinnamon-session SUBDIR += cl-clx SUBDIR += cl-clx-sbcl - SUBDIR += compositeproto SUBDIR += controllermap SUBDIR += cool-retro-term - SUBDIR += damageproto SUBDIR += decurs SUBDIR += deforaos-desktop SUBDIR += deforaos-keyboard @@ -52,10 +49,7 @@ SUBDIR += dgs SUBDIR += dmenu SUBDIR += dmenu2 - SUBDIR += dmxproto SUBDIR += docker-tray - SUBDIR += dri2proto - SUBDIR += dri3proto SUBDIR += dsbautostart SUBDIR += dxpc SUBDIR += dynamag @@ -70,7 +64,6 @@ SUBDIR += fbdesk SUBDIR += fbpanel SUBDIR += fireflies - SUBDIR += fixesproto SUBDIR += florence SUBDIR += flruler SUBDIR += fluxbg @@ -79,7 +72,6 @@ SUBDIR += gcb SUBDIR += gdkxft SUBDIR += gdm - SUBDIR += glproto SUBDIR += gmrun SUBDIR += gnome-clipboard-daemon SUBDIR += gnome-desktop @@ -119,12 +111,10 @@ SUBDIR += idesk SUBDIR += imwheel SUBDIR += innerspace - SUBDIR += inputproto SUBDIR += ipager SUBDIR += kactivities SUBDIR += kactivitymanagerd SUBDIR += kb2mb2 - SUBDIR += kbproto SUBDIR += kde-baseapps SUBDIR += kde-baseapps-kde4 SUBDIR += kde-runtime-kde4 @@ -283,8 +273,6 @@ SUBDIR += plasma5-plasma-integration SUBDIR += plasma5-plasma-workspace SUBDIR += polybar - SUBDIR += presentproto - SUBDIR += printproto SUBDIR += printscreen SUBDIR += props SUBDIR += py-pyvirtualdisplay @@ -301,11 +289,7 @@ SUBDIR += qterminal-l10n SUBDIR += qxkb SUBDIR += radare-cutter - SUBDIR += randrproto - SUBDIR += recordproto SUBDIR += rendercheck - SUBDIR += renderproto - SUBDIR += resourceproto SUBDIR += rgb SUBDIR += rofi SUBDIR += rox-wallpaper @@ -320,7 +304,6 @@ SUBDIR += sbxkb SUBDIR += screen-message SUBDIR += scripts - SUBDIR += scrnsaverproto SUBDIR += sddm SUBDIR += sessreg SUBDIR += setlayout @@ -350,13 +333,11 @@ SUBDIR += tilda SUBDIR += tint SUBDIR += tint-devel - SUBDIR += trapproto SUBDIR += trayer SUBDIR += tycoon SUBDIR += urxvt-font-size SUBDIR += urxvt-perls SUBDIR += vdesk - SUBDIR += videoproto SUBDIR += viewres SUBDIR += virtualgl SUBDIR += wbar @@ -408,7 +389,6 @@ SUBDIR += xclipboard SUBDIR += xcm SUBDIR += xcmd - SUBDIR += xcmiscproto SUBDIR += xcmsdb SUBDIR += xcoloredit SUBDIR += xcolors @@ -427,14 +407,8 @@ SUBDIR += xdtm SUBDIR += xedit SUBDIR += xev - SUBDIR += xextproto SUBDIR += xeyes SUBDIR += xf86dga - SUBDIR += xf86dgaproto - SUBDIR += xf86driproto - SUBDIR += xf86miscproto - SUBDIR += xf86rushproto - SUBDIR += xf86vidmodeproto SUBDIR += xfce4-clipman-plugin SUBDIR += xfce4-conf SUBDIR += xfce4-dashboard @@ -458,7 +432,6 @@ SUBDIR += xgrab SUBDIR += xhost SUBDIR += xidle - SUBDIR += xineramaproto SUBDIR += xinit SUBDIR += xinput SUBDIR += xkb-switch @@ -500,6 +473,7 @@ SUBDIR += xorg-docs SUBDIR += xorg-libraries SUBDIR += xorg-minimal + SUBDIR += xorgproto SUBDIR += xplsprinters SUBDIR += xpr SUBDIR += xpra @@ -507,8 +481,6 @@ SUBDIR += xprintidle SUBDIR += xprompt SUBDIR += xprop - SUBDIR += xproto - SUBDIR += xproxymanagementprotocol SUBDIR += xpyb SUBDIR += xrandr SUBDIR += xrdb diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile deleted file mode 100644 index 9cbcc65bc342..000000000000 --- a/x11/bigreqsproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= bigreqsproto -PORTVERSION= 1.1.2 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= BigReqs extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo deleted file mode 100644 index 80d243bc21bd..000000000000 --- a/x11/bigreqsproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e -SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218 diff --git a/x11/bigreqsproto/pkg-descr b/x11/bigreqsproto/pkg-descr deleted file mode 100644 index 5698f674e24a..000000000000 --- a/x11/bigreqsproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org BigReqs extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/bigreqsproto/pkg-plist b/x11/bigreqsproto/pkg-plist deleted file mode 100644 index a620ac710000..000000000000 --- a/x11/bigreqsproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/bigreqsproto.h -include/X11/extensions/bigreqstr.h -libdata/pkgconfig/bigreqsproto.pc -%%DOCSDIR%%/bigreq.xml diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile index 6c7aa99af40f..899cc8c94c28 100644 --- a/x11/bitmap/Makefile +++ b/x11/bitmap/Makefile @@ -2,12 +2,13 @@ PORTNAME= bitmap PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Bitmap editor and converter utilities for X XORG_CAT= app -USE_XORG= x11 xaw xbitmaps xmu xproto +USE_XORG= x11 xaw xbitmaps xmu xorgproto .include <bsd.port.mk> diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile deleted file mode 100644 index 850643fe1ef6..000000000000 --- a/x11/compositeproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= compositeproto -PORTVERSION= 0.4.2 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Composite extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo deleted file mode 100644 index dc5679054c8d..000000000000 --- a/x11/compositeproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/compositeproto-0.4.2.tar.bz2) = 049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc -SIZE (xorg/proto/compositeproto-0.4.2.tar.bz2) = 101208 diff --git a/x11/compositeproto/pkg-descr b/x11/compositeproto/pkg-descr deleted file mode 100644 index 4d18278485bd..000000000000 --- a/x11/compositeproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org Composite extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/compositeproto/pkg-plist b/x11/compositeproto/pkg-plist deleted file mode 100644 index c5ccc91329e7..000000000000 --- a/x11/compositeproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/composite.h -include/X11/extensions/compositeproto.h -libdata/pkgconfig/compositeproto.pc -share/doc/compositeproto/compositeproto.txt diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile deleted file mode 100644 index 8a59b12b5846..000000000000 --- a/x11/damageproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= damageproto -PORTVERSION= 1.2.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Damage extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo deleted file mode 100644 index 0cd77b87edb0..000000000000 --- a/x11/damageproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/damageproto-1.2.1.tar.bz2) = 5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b -SIZE (xorg/proto/damageproto-1.2.1.tar.bz2) = 98392 diff --git a/x11/damageproto/pkg-descr b/x11/damageproto/pkg-descr deleted file mode 100644 index 298ce272b741..000000000000 --- a/x11/damageproto/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains X.Org Damage extension protocol specification -and header files. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/damageproto/pkg-plist b/x11/damageproto/pkg-plist deleted file mode 100644 index 2e0893e4a3b4..000000000000 --- a/x11/damageproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/damageproto.h -include/X11/extensions/damagewire.h -libdata/pkgconfig/damageproto.pc -share/doc/damageproto/damageproto.txt diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile deleted file mode 100644 index 364bd4d5a337..000000000000 --- a/x11/dmxproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= dmxproto -PORTVERSION= 2.3.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= DMX extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/dmxproto/distinfo b/x11/dmxproto/distinfo deleted file mode 100644 index 9ab13c66218c..000000000000 --- a/x11/dmxproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/dmxproto-2.3.1.tar.bz2) = e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509 -SIZE (xorg/proto/dmxproto-2.3.1.tar.bz2) = 96467 diff --git a/x11/dmxproto/pkg-descr b/x11/dmxproto/pkg-descr deleted file mode 100644 index 53859e7c26ab..000000000000 --- a/x11/dmxproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org DMXProto protocol headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/dmxproto/pkg-plist b/x11/dmxproto/pkg-plist deleted file mode 100644 index 3fa0eaed01a4..000000000000 --- a/x11/dmxproto/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -include/X11/extensions/dmx.h -include/X11/extensions/dmxproto.h -libdata/pkgconfig/dmxproto.pc diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile deleted file mode 100644 index f1926c196809..000000000000 --- a/x11/dri2proto/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ - -PORTNAME= dri2proto -PORTVERSION= 2.8 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= DRI2 prototype headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo deleted file mode 100644 index bdb207e719c7..000000000000 --- a/x11/dri2proto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04 -SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746 diff --git a/x11/dri2proto/pkg-descr b/x11/dri2proto/pkg-descr deleted file mode 100644 index 45df0d86fd59..000000000000 --- a/x11/dri2proto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org DRI2 prototype headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/dri2proto/pkg-plist b/x11/dri2proto/pkg-plist deleted file mode 100644 index 506a82df6c7d..000000000000 --- a/x11/dri2proto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/dri2proto.h -include/X11/extensions/dri2tokens.h -libdata/pkgconfig/dri2proto.pc -share/doc/dri2proto/dri2proto.txt diff --git a/x11/dri3proto/Makefile b/x11/dri3proto/Makefile deleted file mode 100644 index 414b9306f5c7..000000000000 --- a/x11/dri3proto/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ - -PORTNAME= dri3proto -PORTVERSION= 1.0 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= DRI3 prototype headers - -LICENSE= MIT - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/dri3proto/distinfo b/x11/dri3proto/distinfo deleted file mode 100644 index 948341bd6c11..000000000000 --- a/x11/dri3proto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/dri3proto-1.0.tar.bz2) = 01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074 -SIZE (xorg/proto/dri3proto-1.0.tar.bz2) = 105366 diff --git a/x11/dri3proto/pkg-descr b/x11/dri3proto/pkg-descr deleted file mode 100644 index 0ce5f634a246..000000000000 --- a/x11/dri3proto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org DRI3 prototype headers. - -WWW: http://www.freedesktop.org/wiki/Software/xlibs diff --git a/x11/dri3proto/pkg-plist b/x11/dri3proto/pkg-plist deleted file mode 100644 index 43222aed307f..000000000000 --- a/x11/dri3proto/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -include/X11/extensions/dri3proto.h -libdata/pkgconfig/dri3proto.pc -share/doc/dri3proto/dri3proto.txt diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile deleted file mode 100644 index c89d45211ab4..000000000000 --- a/x11/fixesproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= fixesproto -PORTVERSION= 5.0 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Fixes extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/fixesproto/distinfo b/x11/fixesproto/distinfo deleted file mode 100644 index a28d9b6eaafb..000000000000 --- a/x11/fixesproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/fixesproto-5.0.tar.bz2) = ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce -SIZE (xorg/proto/fixesproto-5.0.tar.bz2) = 100886 diff --git a/x11/fixesproto/pkg-descr b/x11/fixesproto/pkg-descr deleted file mode 100644 index c87cbd2e8178..000000000000 --- a/x11/fixesproto/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains X.Org Fixes extension protocol specification -and header files. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/fixesproto/pkg-plist b/x11/fixesproto/pkg-plist deleted file mode 100644 index 2c5201ac4d40..000000000000 --- a/x11/fixesproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/xfixesproto.h -include/X11/extensions/xfixeswire.h -libdata/pkgconfig/fixesproto.pc -%%DOCSDIR%%/fixesproto.txt diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index eb599ba91eb0..6db926392e37 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdm PORTVERSION= 3.16.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -46,7 +46,7 @@ CPE_VENDOR= gnome CPE_VENDOR= gnome_display_manager USE_GNOME= dconf intlhack introspection librsvg2 USE_LDCONFIG= yes -USE_XORG= dmx dmxproto +USE_XORG= dmx xorgproto INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile deleted file mode 100644 index 73aa818e6695..000000000000 --- a/x11/glproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= glproto -PORTVERSION= 1.4.17 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= GLX extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo deleted file mode 100644 index b88e829ec59c..000000000000 --- a/x11/glproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/glproto-1.4.17.tar.bz2) = adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40 -SIZE (xorg/proto/glproto-1.4.17.tar.bz2) = 126969 diff --git a/x11/glproto/pkg-descr b/x11/glproto/pkg-descr deleted file mode 100644 index e9a6153cb354..000000000000 --- a/x11/glproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org GLX extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/glproto/pkg-plist b/x11/glproto/pkg-plist deleted file mode 100644 index 560c7eb3cf9a..000000000000 --- a/x11/glproto/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -include/GL/glxint.h -include/GL/glxmd.h -include/GL/glxproto.h -include/GL/glxtokens.h -include/GL/internal/glcore.h -libdata/pkgconfig/glproto.pc diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile index 0e58a1d987c5..fb27ea475a31 100644 --- a/x11/i3lock/Makefile +++ b/x11/i3lock/Makefile @@ -3,6 +3,7 @@ PORTNAME= i3lock PORTVERSION= 2.10 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://i3wm.org/${PORTNAME}/ @@ -28,7 +29,7 @@ PLIST_FILES= "@(,,4755) bin/i3lock" \ man/man1/i3lock.1.gz LDFLAGS+= ${ICONV_LIB} -USE_XORG= x11 xcb xt xproto xext +USE_XORG= x11 xcb xt xorgproto xext USES= gmake iconv pkgconfig tar:bzip2 PORTDOCS= CHANGELOG README.md diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile index 9e09c00d261b..7aec116239f4 100644 --- a/x11/iceauth/Makefile +++ b/x11/iceauth/Makefile @@ -2,6 +2,7 @@ PORTNAME= iceauth PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= app -USE_XORG= xproto ice +USE_XORG= xorgproto ice PLIST_FILES= bin/iceauth man/man1/iceauth.1.gz diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile deleted file mode 100644 index 38f730414e28..000000000000 --- a/x11/inputproto/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= inputproto -PORTVERSION= 2.3.2 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Input extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -CONFIGURE_ARGS= --without-asciidoc - -.include <bsd.port.mk> diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo deleted file mode 100644 index 7f09539f4cc1..000000000000 --- a/x11/inputproto/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1478370505 -SHA256 (xorg/proto/inputproto-2.3.2.tar.bz2) = 893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d -SIZE (xorg/proto/inputproto-2.3.2.tar.bz2) = 200857 diff --git a/x11/inputproto/pkg-descr b/x11/inputproto/pkg-descr deleted file mode 100644 index d851f442f923..000000000000 --- a/x11/inputproto/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains X.Org Input extension headers. diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist deleted file mode 100644 index 8c89c02cb48e..000000000000 --- a/x11/inputproto/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -include/X11/extensions/XI.h -include/X11/extensions/XI2.h -include/X11/extensions/XI2proto.h -include/X11/extensions/XIproto.h -libdata/pkgconfig/inputproto.pc diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile deleted file mode 100644 index 9d140499b055..000000000000 --- a/x11/kbproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= kbproto -PORTVERSION= 1.0.7 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= KB extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo deleted file mode 100644 index 672dc5459b26..000000000000 --- a/x11/kbproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/kbproto-1.0.7.tar.bz2) = f882210b76376e3fa006b11dbd890e56ec0942bc56e65d1249ff4af86f90b857 -SIZE (xorg/proto/kbproto-1.0.7.tar.bz2) = 250178 diff --git a/x11/kbproto/pkg-descr b/x11/kbproto/pkg-descr deleted file mode 100644 index 3ed4b5277feb..000000000000 --- a/x11/kbproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org KB extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/kbproto/pkg-plist b/x11/kbproto/pkg-plist deleted file mode 100644 index 5cfd454cee9b..000000000000 --- a/x11/kbproto/pkg-plist +++ /dev/null @@ -1,39 +0,0 @@ -include/X11/extensions/XKB.h -include/X11/extensions/XKBgeom.h -include/X11/extensions/XKBproto.h -include/X11/extensions/XKBsrv.h -include/X11/extensions/XKBstr.h -libdata/pkgconfig/kbproto.pc -%%DOCSDIR%%/XKBproto-1.svg -%%DOCSDIR%%/XKBproto-10.svg -%%DOCSDIR%%/XKBproto-11.svg -%%DOCSDIR%%/XKBproto-2.svg -%%DOCSDIR%%/XKBproto-3.svg -%%DOCSDIR%%/XKBproto-4.svg -%%DOCSDIR%%/XKBproto-5.svg -%%DOCSDIR%%/XKBproto-6.svg -%%DOCSDIR%%/XKBproto-7.svg -%%DOCSDIR%%/XKBproto-8.svg -%%DOCSDIR%%/XKBproto-9.svg -%%DOCSDIR%%/acknowledgements.xml -%%DOCSDIR%%/appA.xml -%%DOCSDIR%%/appB.xml -%%DOCSDIR%%/appC.xml -%%DOCSDIR%%/appD.xml -%%DOCSDIR%%/ch01.xml -%%DOCSDIR%%/ch02.xml -%%DOCSDIR%%/ch03.xml -%%DOCSDIR%%/ch04.xml -%%DOCSDIR%%/ch05.xml -%%DOCSDIR%%/ch06.xml -%%DOCSDIR%%/ch07.xml -%%DOCSDIR%%/ch08.xml -%%DOCSDIR%%/ch09.xml -%%DOCSDIR%%/ch10.xml -%%DOCSDIR%%/ch11.xml -%%DOCSDIR%%/ch12.xml -%%DOCSDIR%%/ch13.xml -%%DOCSDIR%%/ch14.xml -%%DOCSDIR%%/ch15.xml -%%DOCSDIR%%/ch16.xml -%%DOCSDIR%%/xkbproto.xml diff --git a/x11/kde-workspace-kde4/Makefile b/x11/kde-workspace-kde4/Makefile index 6dda9a712772..b4e7f1ea4604 100644 --- a/x11/kde-workspace-kde4/Makefile +++ b/x11/kde-workspace-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= x11 kde kde-applications PKGNAMESUFFIX= -kde4 @@ -50,7 +50,7 @@ USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons5 \ USE_QT= corelib dbus declarative designer_build gui network \ opengl phonon qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build -USE_XORG= ice sm kbproto x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ +USE_XORG= ice sm xorgproto x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ xft xi xinerama xkbfile xpm xrandr xrender xres xscrnsaver xtst xxf86vm SHEBANG_FILES= kwin/clients/oxygen/data/update_oxygen.pl USE_LDCONFIG= yes diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile index bed36ef6e089..53446928479a 100644 --- a/x11/libICE/Makefile +++ b/x11/libICE/Makefile @@ -3,7 +3,7 @@ PORTNAME= libICE PORTVERSION= 1.0.9 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11 @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= xproto:both xtrans +USE_XORG= xorgproto xtrans INSTALL_TARGET= install-strip .include <bsd.port.mk> diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index 1ddb60c8eae3..d86d3959dad7 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -3,7 +3,7 @@ PORTNAME= libSM PORTVERSION= 1.2.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11 @@ -14,7 +14,7 @@ LICENSE= MIT USES= pathfix XORG_CAT= lib -USE_XORG= ice xproto:both xtrans +USE_XORG= ice xorgproto xtrans CONFIGURE_ARGS+=--disable-docs --without-xmlto diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index c6021eceb4d1..61bf8d4bef95 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -3,6 +3,7 @@ PORTNAME= libX11 PORTVERSION= 1.6.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 @@ -13,9 +14,7 @@ LICENSE= MIT USES= cpe perl5 XORG_CAT= lib -USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ - kbproto:both inputproto xf86bigfontproto xproto:both \ - xcb +USE_XORG= xau xdmcp xtrans xorgproto xcb USE_PERL5= build CPE_VENDOR= x diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile index 355ec6fc260f..74dcc47fd22e 100644 --- a/x11/libXScrnSaver/Makefile +++ b/x11/libXScrnSaver/Makefile @@ -2,6 +2,7 @@ PORTNAME= libXScrnSaver PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,6 +12,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= x11 xext xextproto scrnsaverproto:both +USE_XORG= x11 xext xorgproto .include <bsd.port.mk> diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile index b8719a8a09d8..e9daaf453d3a 100644 --- a/x11/libXTrap/Makefile +++ b/x11/libXTrap/Makefile @@ -2,13 +2,13 @@ PORTNAME= libXTrap PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= The XTrap library XORG_CAT= lib -USE_XORG= trapproto:both x11 xext xextproto xt +USE_XORG= x11 xext xorgproto xt .include <bsd.port.mk> diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile index ad43b03683d8..84e2afd56ec0 100644 --- a/x11/libXau/Makefile +++ b/x11/libXau/Makefile @@ -3,7 +3,7 @@ PORTNAME= libXau PORTVERSION= 1.0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -13,6 +13,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= xproto:both +USE_XORG= xorgproto .include <bsd.port.mk> diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile index 81535e42aeb8..3dee5c8d0cb7 100644 --- a/x11/libXcomposite/Makefile +++ b/x11/libXcomposite/Makefile @@ -3,7 +3,7 @@ PORTNAME= libXcomposite PORTVERSION= 0.4.4 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11 @@ -14,6 +14,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= compositeproto:both x11 xfixes xext fixesproto xproto:both +USE_XORG= x11 xfixes xext xorgproto .include <bsd.port.mk> diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile index a2899f9b3fd2..e541a0f42935 100644 --- a/x11/libXcursor/Makefile +++ b/x11/libXcursor/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXcursor PORTVERSION= 1.1.15 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,8 +12,7 @@ COMMENT= X client-side cursor loading library LICENSE= MIT XORG_CAT= lib -USE_XORG= xrender x11 xfixes fixesproto xproto:both \ - xextproto +USE_XORG= xrender x11 xfixes xorgproto USES+= cpe CPE_PRODUCT= libxcursor diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile index 3469dcb5e560..7e071944f6b1 100644 --- a/x11/libXdamage/Makefile +++ b/x11/libXdamage/Makefile @@ -3,7 +3,7 @@ PORTNAME= libXdamage PORTVERSION= 1.1.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -13,6 +13,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= x11 damageproto:both xfixes fixesproto xextproto xproto:both +USE_XORG= x11 xfixes xorgproto .include <bsd.port.mk> diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile index 25ef59bf41fe..c02ad4d05bbc 100644 --- a/x11/libXdmcp/Makefile +++ b/x11/libXdmcp/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXdmcp PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= X Display Manager Control Protocol library LICENSE= MIT XORG_CAT= lib -USE_XORG= xproto:both +USE_XORG= xorgproto:both CONFIGURE_ARGS+=--disable-docs --without-xmlto diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile index 63e6b101174f..8790fdefb1f5 100644 --- a/x11/libXevie/Makefile +++ b/x11/libXevie/Makefile @@ -2,7 +2,7 @@ PORTNAME= libXevie PORTVERSION= 1.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,6 +11,6 @@ COMMENT= The Xevie library LICENSE= MIT XORG_CAT= lib -USE_XORG= evieproto x11 xext xextproto xproto:both +USE_XORG= x11 xext xorgproto .include <bsd.port.mk> diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index 6e4481d3e8bc..f546e172deaf 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -3,7 +3,7 @@ PORTNAME= libXext PORTVERSION= 1.3.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11 @@ -13,7 +13,7 @@ COMMENT= X11 Extension library LICENSE= MIT XORG_CAT= lib -USE_XORG= xproto x11 xextproto:both xau +USE_XORG= x11 xau xorgproto CONFIGURE_ARGS+=--disable-specs --without-xmlto INSTALL_TARGET= install-strip USES+= cpe diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile index d3a02d6080ec..2ec433c4d2bf 100644 --- a/x11/libXfixes/Makefile +++ b/x11/libXfixes/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXfixes PORTVERSION= 5.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= X Fixes extension library LICENSE= MIT XORG_CAT= lib -USE_XORG= x11 fixesproto:both xproto:both xextproto +USE_XORG= x11 xorgproto USES+= cpe CPE_PRODUCT= libxfixes CPE_VENDOR= x diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index f7f7b7a9d545..d8a2027fa2df 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXi PORTVERSION= 1.7.9 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 @@ -12,7 +13,7 @@ COMMENT= X Input extension library LICENSE= MIT XORG_CAT= lib -USE_XORG= xproto x11 xext xextproto xfixes inputproto:both +USE_XORG= x11 xext xfixes xorgproto INSTALL_TARGET= install-strip USES+= cpe CPE_PRODUCT= libxi diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index ce166445ce42..7614dd1253f7 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXinerama PORTVERSION= 1.1.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 @@ -12,7 +13,7 @@ COMMENT= X11 Xinerama library LICENSE= MIT XORG_CAT= lib -USE_XORG= x11 xext xextproto xineramaproto:both +USE_XORG= x11 xext xorgproto USES+= cpe CPE_PRODUCT= libxinerama CPE_VENDOR= x diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile index 5296745c586e..40786f113398 100644 --- a/x11/libXp/Makefile +++ b/x11/libXp/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXp PORTVERSION= 1.0.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 @@ -12,7 +13,7 @@ COMMENT= X print library LICENSE= MIT XORG_CAT= lib -USE_XORG= x11 xext xextproto xau printproto:both +USE_XORG= x11 xext xau xorgproto USES+= cpe CPE_PRODUCT= libxp CPE_VENDOR= x diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile index b2d3d45ca1a4..642cb486b6dc 100644 --- a/x11/libXpm/Makefile +++ b/x11/libXpm/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXpm PORTVERSION= 3.5.12 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= X Pixmap library LICENSE= MIT XORG_CAT= lib -USE_XORG= xproto x11 xext xextproto xt +USE_XORG= xorgproto x11 xext xt LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile index c3261174c5bc..4b6e246a468e 100644 --- a/x11/libXprintAppUtil/Makefile +++ b/x11/libXprintAppUtil/Makefile @@ -2,13 +2,13 @@ PORTNAME= libXprintAppUtil PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= The XprintAppUtil library XORG_CAT= lib -USE_XORG= printproto x11 xau xp xprintutil xproto:both +USE_XORG= x11 xau xp xprintutil xorgproto .include <bsd.port.mk> diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile index 17032585fa6b..45742fcd3ab3 100644 --- a/x11/libXprintUtil/Makefile +++ b/x11/libXprintUtil/Makefile @@ -2,13 +2,13 @@ PORTNAME= libXprintUtil PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= The XprintUtil library XORG_CAT= lib -USE_XORG= printproto:both x11 xau xp xt +USE_XORG= xorgproto:both x11 xau xp xt .include <bsd.port.mk> diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index d1fc7692ab1d..a1003beec4a3 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXrandr PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= X Resize and Rotate extension library LICENSE= MIT XORG_CAT= lib -USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both +USE_XORG= x11 xext xrender xorgproto USES+= cpe CPE_PRODUCT= libxrandr CPE_VENDOR= x diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index a77edc688a6e..d5153bfb7198 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXrender PORTVERSION= 0.9.10 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,6 +12,6 @@ COMMENT= X Render extension library LICENSE= MIT XORG_CAT= lib -USE_XORG= x11 renderproto:both xproto:both +USE_XORG= x11 xorgproto .include <bsd.port.mk> diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index a14a0f9bef2c..eb03b9b0307b 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXres PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= X Resource usage library LICENSE= MIT XORG_CAT= lib -USE_XORG= x11 xext xextproto resourceproto xproto:both +USE_XORG= x11 xext xorgproto INSTALL_TARGET= install-strip USES+= cpe CPE_PRODUCT= libxres diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile index c06f9ca5cf3d..c7441ab79b60 100644 --- a/x11/libXtst/Makefile +++ b/x11/libXtst/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXtst PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,8 +12,7 @@ COMMENT= X Test extension LICENSE= MIT XORG_CAT= lib -USE_XORG= x11 xext recordproto:both xextproto inputproto:both \ - xi +USE_XORG= x11 xext xi xorgproto USES+= cpe CPE_PRODUCT= libxtst CPE_VENDOR= x diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index 32836122afb9..797d8ac0850b 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXv PORTVERSION= 1.0.11 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 @@ -12,7 +13,7 @@ COMMENT= X Video Extension library LICENSE= MIT XORG_CAT= lib -USE_XORG= x11 xext xextproto videoproto:both xproto:both +USE_XORG= x11 xext xorgproto USES+= cpe CPE_PRODUCT= libxv CPE_VENDOR= x diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile index 089b09a1642e..86e1a96bf4fa 100644 --- a/x11/libXvMC/Makefile +++ b/x11/libXvMC/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXvMC PORTVERSION= 1.0.10 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe XORG_CAT= lib -USE_XORG= x11 xext xv xextproto videoproto:both xproto:both +USE_XORG= x11 xext xv xorgproto CPE_PRODUCT= libxvmc CPE_VENDOR= x diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile index 038aa6a62f4f..92a260a8c3e7 100644 --- a/x11/libXxf86dga/Makefile +++ b/x11/libXxf86dga/Makefile @@ -3,7 +3,7 @@ PORTNAME= libXxf86dga PORTVERSION= 1.1.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -12,7 +12,7 @@ COMMENT= X DGA Extension LICENSE= MIT XORG_CAT= lib -USE_XORG= xproto x11 xextproto xext xf86dgaproto:both +USE_XORG= x11 xext xorgproto USES+= cpe CPE_PRODUCT= libxxf86dga CPE_VENDOR= x diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile index 027ab30f2a90..6040a28c454e 100644 --- a/x11/libXxf86misc/Makefile +++ b/x11/libXxf86misc/Makefile @@ -3,6 +3,7 @@ PORTNAME= libXxf86misc PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -11,6 +12,6 @@ COMMENT= X XF86-Misc Extension LICENSE= MIT XORG_CAT= lib -USE_XORG= xproto x11 xextproto xext xf86miscproto:both +USE_XORG= x11 xext xorgproto .include <bsd.port.mk> diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index 41133f756d4b..e123a8fa00ff 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -3,7 +3,7 @@ PORTNAME= libXxf86vm PORTVERSION= 1.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -12,7 +12,7 @@ COMMENT= X Vidmode Extension LICENSE= MIT XORG_CAT= lib -USE_XORG= xproto x11 xextproto xext xf86vidmodeproto:both +USE_XORG= xorgproto x11 xext USES+= cpe CPE_PRODUCT= libxxf86vm CPE_VENDOR= x diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile index 237fad570c79..50d97037c877 100644 --- a/x11/libdmx/Makefile +++ b/x11/libdmx/Makefile @@ -3,13 +3,14 @@ PORTNAME= libdmx PORTVERSION= 1.1.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= DMX extension library XORG_CAT= lib -USE_XORG= x11 xext xextproto dmxproto:both +USE_XORG= x11 xext xorgproto USES+= cpe CPE_VENDOR= x diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile index 472129edc9bd..943c3cd91620 100644 --- a/x11/libxkbfile/Makefile +++ b/x11/libxkbfile/Makefile @@ -3,6 +3,7 @@ PORTNAME= libxkbfile PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -12,6 +13,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= lib -USE_XORG= x11 kbproto:both +USE_XORG= x11 xorgproto .include <bsd.port.mk> diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile index 60c2c0dc769e..3887c1a6eefd 100644 --- a/x11/libxkbui/Makefile +++ b/x11/libxkbui/Makefile @@ -3,12 +3,12 @@ PORTNAME= libxkbui PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= The xkbui library XORG_CAT= lib -USE_XORG= x11 xt xkbfile kbproto:both +USE_XORG= x11 xt xkbfile xorgproto .include <bsd.port.mk> diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile index d325e00c7ad2..a43341db1cfb 100644 --- a/x11/libxshmfence/Makefile +++ b/x11/libxshmfence/Makefile @@ -2,7 +2,7 @@ PORTNAME= libxshmfence PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Shared memory 'SyncFence' synchronization primitive LICENSE= MIT -USE_XORG= xproto +USE_XORG= xorgproto XORG_CAT= lib CONFIGURE_ARGS= --with-shared-memory-dir=/tmp diff --git a/x11/listres/Makefile b/x11/listres/Makefile index 2bc321014a75..e63b38fc230f 100644 --- a/x11/listres/Makefile +++ b/x11/listres/Makefile @@ -2,13 +2,14 @@ PORTNAME= listres PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= List resources in widgets XORG_CAT= app -USE_XORG= x11 xaw xmu xproto xt +USE_XORG= x11 xaw xmu xorgproto xt PLIST_FILES= bin/listres man/man1/listres.1.gz diff --git a/x11/lsw/Makefile b/x11/lsw/Makefile index 3b78038e60e8..290f3f6d931b 100644 --- a/x11/lsw/Makefile +++ b/x11/lsw/Makefile @@ -3,6 +3,7 @@ PORTNAME= lsw PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://dl.suckless.org/tools/ @@ -16,7 +17,7 @@ PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USE_XORG= x11 xt xproto xext +USE_XORG= x11 xt xorgproto xext post-patch: @${REINPLACE_CMD} -e 's|-I/usr/include||;s|-L/usr/lib||;s|= -Os|+=|'\ diff --git a/x11/metalock/Makefile b/x11/metalock/Makefile index 2e35a850c317..00f641217dca 100644 --- a/x11/metalock/Makefile +++ b/x11/metalock/Makefile @@ -3,7 +3,7 @@ PORTNAME= metalock PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= BERLIOS DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -16,7 +16,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE USES= tar:bzip2 -USE_XORG= x11 xt xproto xext xpm +USE_XORG= x11 xt xorgproto xext xpm OPTIONS_DEFINE= IMLIB2 XFT ULTRAGETOPT OPTIONS_DEFAULT= IMLIB2 XFT ULTRAGETOPT diff --git a/x11/nxcomp/Makefile b/x11/nxcomp/Makefile index 90af87224cb5..472feae38df0 100644 --- a/x11/nxcomp/Makefile +++ b/x11/nxcomp/Makefile @@ -2,6 +2,7 @@ PORTNAME= nxcomp PORTVERSION= 3.5.0.32 +PORTREVISION= 1 MASTER_SITES= http://code.x2go.org/releases/source/nx-libs/ CATEGORIES= x11 devel DISTNAME= nx-libs-${PORTVERSION}-lite @@ -12,7 +13,7 @@ COMMENT= NX X11 protocol compression libraries WRKSRC= ${WRKDIR}/nx-libs-${PORTVERSION}/${PORTNAME} USES= autoreconf gmake jpeg -USE_XORG= xproto +USE_XORG= xorgproto GNU_CONFIGURE= yes LIB_DEPENDS= libpng.so:graphics/png diff --git a/x11/p5-X11-XCB/Makefile b/x11/p5-X11-XCB/Makefile index 2263bcdb9ce9..32ce54f5cc9c 100644 --- a/x11/p5-X11-XCB/Makefile +++ b/x11/p5-X11-XCB/Makefile @@ -2,6 +2,7 @@ PORTNAME= X11-XCB PORTVERSION= 0.16 +PORTREVISION= 1 CATEGORIES= x11 perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -32,7 +33,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= localbase perl5 USE_PERL5= configure -USE_XORG= x11 xcb xproto xinerama +USE_XORG= x11 xcb xorgproto xinerama MAKE_JOBS_UNSAFE= yes post-install: diff --git a/x11/p5-X11-Xlib/Makefile b/x11/p5-X11-Xlib/Makefile index 5d9aea5eec75..f377bfd11d43 100644 --- a/x11/p5-X11-Xlib/Makefile +++ b/x11/p5-X11-Xlib/Makefile @@ -2,6 +2,7 @@ PORTNAME= X11-Xlib PORTVERSION= 0.18 +PORTREVISION= 1 CATEGORIES= x11 perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -19,7 +20,7 @@ BUILD_DEPENDS= p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib \ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 -USE_XORG= x11 xcomposite xext xfixes xinerama xproto xrender xtst +USE_XORG= x11 xcomposite xext xfixes xinerama xorgproto xrender xtst pre-configure: cd ${WRKSRC} && ${PERL} Makefile.PL diff --git a/x11/presentproto/Makefile b/x11/presentproto/Makefile deleted file mode 100644 index f083e5cb5cf5..000000000000 --- a/x11/presentproto/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ - -PORTNAME= presentproto -PORTVERSION= 1.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Present protocol specification - -LICENSE= MIT - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/presentproto/distinfo b/x11/presentproto/distinfo deleted file mode 100644 index 0335f76a9723..000000000000 --- a/x11/presentproto/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1485631172 -SHA256 (xorg/proto/presentproto-1.1.tar.bz2) = f69b23a8869f78a5898aaf53938b829c8165e597cda34f06024d43ee1e6d26b9 -SIZE (xorg/proto/presentproto-1.1.tar.bz2) = 116156 diff --git a/x11/presentproto/pkg-descr b/x11/presentproto/pkg-descr deleted file mode 100644 index d047c1d74b59..000000000000 --- a/x11/presentproto/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains X.Org Present protocol specification. diff --git a/x11/presentproto/pkg-plist b/x11/presentproto/pkg-plist deleted file mode 100644 index 22e55d9e32af..000000000000 --- a/x11/presentproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/presentproto.h -include/X11/extensions/presenttokens.h -libdata/pkgconfig/presentproto.pc -share/doc/presentproto/presentproto.txt diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile deleted file mode 100644 index e24da17e1d58..000000000000 --- a/x11/printproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= printproto -PORTVERSION= 1.0.5 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Print extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/printproto/distinfo b/x11/printproto/distinfo deleted file mode 100644 index 17cadc6e9955..000000000000 --- a/x11/printproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/printproto-1.0.5.tar.bz2) = 1298316cf43b987365ab7764d61b022a3d7f180b67b423eed3456862d155911a -SIZE (xorg/proto/printproto-1.0.5.tar.bz2) = 222559 diff --git a/x11/printproto/pkg-descr b/x11/printproto/pkg-descr deleted file mode 100644 index a270e6771412..000000000000 --- a/x11/printproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org Print extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/printproto/pkg-plist b/x11/printproto/pkg-plist deleted file mode 100644 index 089c1cd40c5b..000000000000 --- a/x11/printproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/Print.h -include/X11/extensions/Printstr.h -libdata/pkgconfig/printproto.pc -man/man7/Xprint.7.gz diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile deleted file mode 100644 index 854fa9d7f1b1..000000000000 --- a/x11/randrproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= randrproto -PORTVERSION= 1.5.0 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Randr extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo deleted file mode 100644 index f850b72ca573..000000000000 --- a/x11/randrproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/randrproto-1.5.0.tar.bz2) = 4c675533e79cd730997d232c8894b6692174dce58d3e207021b8f860be498468 -SIZE (xorg/proto/randrproto-1.5.0.tar.bz2) = 142168 diff --git a/x11/randrproto/pkg-descr b/x11/randrproto/pkg-descr deleted file mode 100644 index b96d862b97ec..000000000000 --- a/x11/randrproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org Randr extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/randrproto/pkg-plist b/x11/randrproto/pkg-plist deleted file mode 100644 index 12266c837609..000000000000 --- a/x11/randrproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/randr.h -include/X11/extensions/randrproto.h -libdata/pkgconfig/randrproto.pc -%%DOCSDIR%%/randrproto.txt diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile deleted file mode 100644 index f812e338a3a9..000000000000 --- a/x11/recordproto/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= recordproto -PORTVERSION= 1.14.2 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= RECORD extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -CONFIGURE_ARGS+=--disable-specs --without-xmlto - -post-patch: - @${REINPLACE_CMD} '/^SUBDIRS/,/&$$/ \ - s/specs//' ${WRKSRC}/Makefile.in - -.include <bsd.port.mk> diff --git a/x11/recordproto/distinfo b/x11/recordproto/distinfo deleted file mode 100644 index 6c42289b4d3c..000000000000 --- a/x11/recordproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370 -SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033 diff --git a/x11/recordproto/pkg-descr b/x11/recordproto/pkg-descr deleted file mode 100644 index eb120a140755..000000000000 --- a/x11/recordproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org RECORD extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/recordproto/pkg-plist b/x11/recordproto/pkg-plist deleted file mode 100644 index 24c4b88f24dd..000000000000 --- a/x11/recordproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/recordconst.h -include/X11/extensions/recordproto.h -include/X11/extensions/recordstr.h -libdata/pkgconfig/recordproto.pc diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile deleted file mode 100644 index 285e87cf29a0..000000000000 --- a/x11/renderproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= renderproto -PORTVERSION= 0.11.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= RenderProto protocol headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/renderproto/distinfo b/x11/renderproto/distinfo deleted file mode 100644 index 6f6e9afdd92a..000000000000 --- a/x11/renderproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/renderproto-0.11.1.tar.bz2) = 06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537 -SIZE (xorg/proto/renderproto-0.11.1.tar.bz2) = 105741 diff --git a/x11/renderproto/pkg-descr b/x11/renderproto/pkg-descr deleted file mode 100644 index ec3addda7f7d..000000000000 --- a/x11/renderproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org RenderProto protocol headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/renderproto/pkg-plist b/x11/renderproto/pkg-plist deleted file mode 100644 index ae302a750b74..000000000000 --- a/x11/renderproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/render.h -include/X11/extensions/renderproto.h -libdata/pkgconfig/renderproto.pc -share/doc/renderproto/renderproto.txt diff --git a/x11/resourceproto/Makefile b/x11/resourceproto/Makefile deleted file mode 100644 index 9a1074c1dd07..000000000000 --- a/x11/resourceproto/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= resourceproto -PORTVERSION= 1.2.0 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Resource extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -post-patch: - @${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \ - s/install-dist_docDATA//' ${WRKSRC}/Makefile.in - -.include <bsd.port.mk> diff --git a/x11/resourceproto/distinfo b/x11/resourceproto/distinfo deleted file mode 100644 index 4d7000eddf68..000000000000 --- a/x11/resourceproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/resourceproto-1.2.0.tar.bz2) = 3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818 -SIZE (xorg/proto/resourceproto-1.2.0.tar.bz2) = 102992 diff --git a/x11/resourceproto/pkg-descr b/x11/resourceproto/pkg-descr deleted file mode 100644 index e62713f93e37..000000000000 --- a/x11/resourceproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org Resource extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/resourceproto/pkg-plist b/x11/resourceproto/pkg-plist deleted file mode 100644 index da955a74ec5f..000000000000 --- a/x11/resourceproto/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -include/X11/extensions/XResproto.h -libdata/pkgconfig/resourceproto.pc diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile index 8f7cd80ae0e0..ffe7b8638ee8 100644 --- a/x11/rgb/Makefile +++ b/x11/rgb/Makefile @@ -2,6 +2,7 @@ PORTNAME= rgb PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= Uncompile an rgb color-name database CONFIGURE_ARGS= --with-rgb-db-dir=${PREFIX}/lib/X11/rgb XORG_CAT= app -USE_XORG= x11 xproto +USE_XORG= x11 xorgproto PLIST_FILES= bin/showrgb lib/X11/rgb.txt man/man1/showrgb.1.gz diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile deleted file mode 100644 index 369f2cdef4a1..000000000000 --- a/x11/scrnsaverproto/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -PORTNAME= scrnsaverproto -PORTVERSION= 1.2.2 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= ScrnSaver extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -CONFIGURE_ARGS+=--disable-specs --without-xmlto - -post-patch: - @${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ \ - s/specs//' ${WRKSRC}/Makefile.in - -.include <bsd.port.mk> diff --git a/x11/scrnsaverproto/distinfo b/x11/scrnsaverproto/distinfo deleted file mode 100644 index 3d1e15ef8557..000000000000 --- a/x11/scrnsaverproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65 -SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820 diff --git a/x11/scrnsaverproto/pkg-descr b/x11/scrnsaverproto/pkg-descr deleted file mode 100644 index 42d48f98c179..000000000000 --- a/x11/scrnsaverproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org ScrnSaver extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/scrnsaverproto/pkg-plist b/x11/scrnsaverproto/pkg-plist deleted file mode 100644 index 613c15f0a1fc..000000000000 --- a/x11/scrnsaverproto/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -include/X11/extensions/saver.h -include/X11/extensions/saverproto.h -libdata/pkgconfig/scrnsaverproto.pc diff --git a/x11/slock/Makefile b/x11/slock/Makefile index 70683de36530..962a393f4139 100644 --- a/x11/slock/Makefile +++ b/x11/slock/Makefile @@ -3,6 +3,7 @@ PORTNAME= slock PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://dl.suckless.org/tools/ @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe CPE_VENDOR= suckless -USE_XORG= x11 xext xproto xrandr xt +USE_XORG= x11 xext xorgproto xrandr xt MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \ X11INC="${LOCALBASE}/include" CC="${CC}" \ MANPREFIX="${MANPREFIX}/man" diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile index aafbca04476d..0d2d28d7c415 100644 --- a/x11/thinglaunch/Makefile +++ b/x11/thinglaunch/Makefile @@ -3,13 +3,14 @@ PORTNAME= thinglaunch PORTVERSION= 1.8 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Very fast launcher program for X -USE_XORG= x11 xproto +USE_XORG= x11 xorgproto CPPFLAGS+= -I${LOCALBASE}/include -lX11 LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11/thingylaunch/Makefile b/x11/thingylaunch/Makefile index a26c388a3266..1debbdb73492 100644 --- a/x11/thingylaunch/Makefile +++ b/x11/thingylaunch/Makefile @@ -3,7 +3,7 @@ PORTNAME= thingylaunch PORTVERSION= 2.0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://gahr.ch/thingylaunch/ @@ -19,7 +19,7 @@ LIBX11_DESC= Build against libX11 LIBXCB_DESC= Build against libXCB OPTIONS_DEFAULT= LIBX11 -USE_XORG= xproto +USE_XORG= xorgproto USE_CXXSTD= c++11 USES= cmake:outsource compiler:c++11-lib diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile deleted file mode 100644 index dd42adb42869..000000000000 --- a/x11/trapproto/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= trapproto -PORTVERSION= 3.4.3 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= DEC-XTRAP extension headers - -XORG_CAT= proto - -USE_XORG= xt:both - -.include <bsd.port.mk> diff --git a/x11/trapproto/distinfo b/x11/trapproto/distinfo deleted file mode 100644 index 365ee59540c7..000000000000 --- a/x11/trapproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/trapproto-3.4.3.tar.bz2) = ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1 -SIZE (xorg/proto/trapproto-3.4.3.tar.bz2) = 48785 diff --git a/x11/trapproto/pkg-descr b/x11/trapproto/pkg-descr deleted file mode 100644 index 65097c35b4eb..000000000000 --- a/x11/trapproto/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains X.Org DEC-XTRAP extension headers. diff --git a/x11/trapproto/pkg-plist b/x11/trapproto/pkg-plist deleted file mode 100644 index 68de50399da7..000000000000 --- a/x11/trapproto/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -include/X11/extensions/xtrapbits.h -include/X11/extensions/xtrapddmi.h -include/X11/extensions/xtrapdi.h -include/X11/extensions/xtrapemacros.h -include/X11/extensions/xtraplib.h -include/X11/extensions/xtraplibp.h -include/X11/extensions/xtrapproto.h -libdata/pkgconfig/trapproto.pc diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile deleted file mode 100644 index e627eeead6e2..000000000000 --- a/x11/videoproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= videoproto -PORTVERSION= 2.3.3 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Video extension headers - -LICENSE= MIT - -XORG_CAT= proto - -post-patch: - @${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \ - s/install-dist_docDATA//' ${WRKSRC}/Makefile.in - -.include <bsd.port.mk> diff --git a/x11/videoproto/distinfo b/x11/videoproto/distinfo deleted file mode 100644 index 01f12b674964..000000000000 --- a/x11/videoproto/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1478373084 -SHA256 (xorg/proto/videoproto-2.3.3.tar.bz2) = c7803889fd08e6fcaf7b68cc394fb038b2325d1f315e571a6954577e07cca702 -SIZE (xorg/proto/videoproto-2.3.3.tar.bz2) = 121016 diff --git a/x11/videoproto/pkg-descr b/x11/videoproto/pkg-descr deleted file mode 100644 index 0e4175a2ef6a..000000000000 --- a/x11/videoproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org Video extension headers. - -WWW: http://www.freedesktop.org/wiki/Software/xlibs diff --git a/x11/videoproto/pkg-plist b/x11/videoproto/pkg-plist deleted file mode 100644 index 14156a7e026b..000000000000 --- a/x11/videoproto/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -include/X11/extensions/Xv.h -include/X11/extensions/XvMC.h -include/X11/extensions/XvMCproto.h -include/X11/extensions/Xvproto.h -include/X11/extensions/vldXvMC.h -libdata/pkgconfig/videoproto.pc diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index e9f1d15b6d41..3b8643ea8a9f 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -4,7 +4,7 @@ PORTNAME= workrave DISTVERSIONPREFIX= v DISTVERSION= 1_10_16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= tobik@FreeBSD.org @@ -17,7 +17,7 @@ LIB_DEPENDS= libgdome.so:textproc/gdome2 USES= compiler:c++11-lang autoreconf:build gettext gmake libtool \ localbase pathfix pkgconfig USE_CXXSTD= c++11 -USE_XORG= ice recordproto sm x11 xext xmu xscrnsaver xtst +USE_XORG= ice xorgproto sm x11 xext xmu xscrnsaver xtst USE_GNOME= intltool intlhack introspection gtkmm30 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gsettings \ diff --git a/x11/xbelld/Makefile b/x11/xbelld/Makefile index 39ec391a2a30..8eb875c9dad8 100644 --- a/x11/xbelld/Makefile +++ b/x11/xbelld/Makefile @@ -14,7 +14,7 @@ COMMENT= XBellD is a small daemon for replacing the standard X terminal bell LIB_DEPENDS= libaudiofile.so:audio/libaudiofile USES= imake tar:tgz -USE_XORG= ice sm xtrap xmu xt +USE_XORG= ice sm x11 xtrap xmu xt USE_GNOME= esound # xbelld calls sqrt which requires -lm on some architectures diff --git a/x11/xbelld/files/patch-xbell.c b/x11/xbelld/files/patch-xbell.c index 98318a63a10f..4aeb9121383c 100644 --- a/x11/xbelld/files/patch-xbell.c +++ b/x11/xbelld/files/patch-xbell.c @@ -1,5 +1,5 @@ ---- xbell.c.orig 2002-10-26 20:26:48.000000000 -0400 -+++ xbell.c 2014-08-16 14:05:35.000000000 -0400 +--- xbell.c.orig 2002-10-27 00:26:48 UTC ++++ xbell.c @@ -38,8 +38,7 @@ #include <sysexits.h> diff --git a/x11/xbelld/files/patch-xbelld.c b/x11/xbelld/files/patch-xbelld.c index f8c701fc1a08..8538173ebd68 100644 --- a/x11/xbelld/files/patch-xbelld.c +++ b/x11/xbelld/files/patch-xbelld.c @@ -1,5 +1,5 @@ ---- xbelld.c.orig 2002-10-26 20:28:36.000000000 -0400 -+++ xbelld.c 2014-08-16 14:07:14.000000000 -0400 +--- xbelld.c.orig 2002-10-27 00:28:36 UTC ++++ xbelld.c @@ -60,8 +60,7 @@ #include <dirent.h> @@ -10,7 +10,7 @@ #endif /* !lint */ #define XskRFilename "XskRFilename" -@@ -268,7 +267,7 @@ +@@ -268,7 +267,7 @@ _hash_nfind(struct hash *hp, u_int i; if (!hp->h_size) @@ -19,7 +19,16 @@ i = hp->h_hash(data) % hp->h_size; if (!TAILQ_EMPTY(&(hp->h_buckets[i]))) { -@@ -914,7 +913,7 @@ +@@ -805,7 +804,7 @@ _play(struct sound_desc *sdp, float per) + } + + static void +-_cb_bell(XETC *tc, XETrapDatum *data, XPointer *unused) ++_cb_bell(XETC *tc, XETrapDatum *data, unsigned char *unused) + { + xBellReq *breq = (xBellReq *)&(data->u.req); + struct client_desc cd, *cdp; +@@ -914,7 +913,7 @@ _rescan(void) close(dfd); for (nent = 0, dep = (struct dirent *)dbuf; (char *)dep - dbuf < nb; @@ -28,7 +37,7 @@ ; _hash_resize(&(_bd.bd_sndhash), nent * 2); if (_bd.bd_defsnd) -@@ -924,7 +923,7 @@ +@@ -924,7 +923,7 @@ _rescan(void) } for (dep = (struct dirent *)dbuf; (char *)dep - dbuf < nb; diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile deleted file mode 100644 index d4f24698d9df..000000000000 --- a/x11/xcmiscproto/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xcmiscproto -PORTVERSION= 1.2.2 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= XCMisc extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -CONFIGURE_ARGS+=--disable-specs --without-xmlto - -post-patch: - @${REINPLACE_CMD} '/^SUBDIRS =/,/^$$/ s/specs//' \ - ${WRKSRC}/Makefile.in - -#SUBDIRS= specs - -.include <bsd.port.mk> diff --git a/x11/xcmiscproto/distinfo b/x11/xcmiscproto/distinfo deleted file mode 100644 index b38fec5dac10..000000000000 --- a/x11/xcmiscproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df -SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486 diff --git a/x11/xcmiscproto/pkg-descr b/x11/xcmiscproto/pkg-descr deleted file mode 100644 index 4fe39d0034d8..000000000000 --- a/x11/xcmiscproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org XCMisc extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/xcmiscproto/pkg-plist b/x11/xcmiscproto/pkg-plist deleted file mode 100644 index 5a98082f74cf..000000000000 --- a/x11/xcmiscproto/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -include/X11/extensions/xcmiscproto.h -include/X11/extensions/xcmiscstr.h -libdata/pkgconfig/xcmiscproto.pc diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile index 1d4929cccdf0..29c5fd519d17 100644 --- a/x11/xcursorgen/Makefile +++ b/x11/xcursorgen/Makefile @@ -2,7 +2,7 @@ PORTNAME= xcursorgen PORTVERSION= 1.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -13,7 +13,7 @@ LICENSE= MIT LIB_DEPENDS= libpng.so:graphics/png XORG_CAT= app -USE_XORG= x11 xcursor xextproto +USE_XORG= x11 xcursor xorgproto INSTALL_TARGET= install-strip PLIST_FILES= bin/xcursorgen man/man1/xcursorgen.1.gz diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile index 425277a5f7c9..0abd31da3d44 100644 --- a/x11/xdpyinfo/Makefile +++ b/x11/xdpyinfo/Makefile @@ -2,6 +2,7 @@ PORTNAME= xdpyinfo PORTVERSION= 1.3.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= Display information utility for X LICENSE= MIT XORG_CAT= app -USE_XORG= dmx x11 xcb xcomposite xext xinerama xproto xrender \ +USE_XORG= dmx x11 xcb xcomposite xext xinerama xorgproto xrender \ xtst xxf86dga xxf86misc xxf86vm PLIST_FILES= bin/xdpyinfo man/man1/xdpyinfo.1.gz diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile index b534846568e5..04d6c138dab8 100644 --- a/x11/xdriinfo/Makefile +++ b/x11/xdriinfo/Makefile @@ -2,6 +2,7 @@ PORTNAME= xdriinfo PORTVERSION= 1.0.6 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= Query configuration information of DRI drivers USE_GL= gl XORG_CAT= app -USE_XORG= x11 glproto +USE_XORG= x11 xorgproto PLIST_FILES= bin/xdriinfo man/man1/xdriinfo.1.gz .include <bsd.port.mk> diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile deleted file mode 100644 index 6097dd6d5cf8..000000000000 --- a/x11/xextproto/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Created by: Dejan Lesjak <lesi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xextproto -PORTVERSION= 7.3.0 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= XExt extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -CONFIGURE_ARGS+=--disable-specs - -post-patch: - @${REINPLACE_CMD} '/^SUBDIR/s/specs//' ${WRKSRC}/Makefile.in - -.include <bsd.port.mk> diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo deleted file mode 100644 index ec6b5fe8358e..000000000000 --- a/x11/xextproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xextproto-7.3.0.tar.bz2) = f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 -SIZE (xorg/proto/xextproto-7.3.0.tar.bz2) = 229310 diff --git a/x11/xextproto/pkg-descr b/x11/xextproto/pkg-descr deleted file mode 100644 index 47f0e64eb2b2..000000000000 --- a/x11/xextproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org XExt extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/xextproto/pkg-plist b/x11/xextproto/pkg-plist deleted file mode 100644 index 4b54f972d844..000000000000 --- a/x11/xextproto/pkg-plist +++ /dev/null @@ -1,34 +0,0 @@ -include/X11/extensions/EVI.h -include/X11/extensions/EVIproto.h -include/X11/extensions/ag.h -include/X11/extensions/agproto.h -include/X11/extensions/cup.h -include/X11/extensions/cupproto.h -include/X11/extensions/dbe.h -include/X11/extensions/dbeproto.h -include/X11/extensions/dpmsconst.h -include/X11/extensions/dpmsproto.h -include/X11/extensions/ge.h -include/X11/extensions/geproto.h -include/X11/extensions/lbx.h -include/X11/extensions/lbxproto.h -include/X11/extensions/mitmiscconst.h -include/X11/extensions/mitmiscproto.h -include/X11/extensions/multibufconst.h -include/X11/extensions/multibufproto.h -include/X11/extensions/secur.h -include/X11/extensions/securproto.h -include/X11/extensions/shapeconst.h -include/X11/extensions/shapeproto.h -include/X11/extensions/shapestr.h -include/X11/extensions/shm.h -include/X11/extensions/shmproto.h -include/X11/extensions/shmstr.h -include/X11/extensions/syncconst.h -include/X11/extensions/syncproto.h -include/X11/extensions/syncstr.h -include/X11/extensions/xtestconst.h -include/X11/extensions/xtestext1const.h -include/X11/extensions/xtestext1proto.h -include/X11/extensions/xtestproto.h -libdata/pkgconfig/xextproto.pc diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile deleted file mode 100644 index 33e9e949f672..000000000000 --- a/x11/xf86dgaproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xf86dgaproto -PORTVERSION= 2.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-DGA extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/xf86dgaproto/distinfo b/x11/xf86dgaproto/distinfo deleted file mode 100644 index d79263f83c93..000000000000 --- a/x11/xf86dgaproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xf86dgaproto-2.1.tar.bz2) = ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050 -SIZE (xorg/proto/xf86dgaproto-2.1.tar.bz2) = 85934 diff --git a/x11/xf86dgaproto/pkg-descr b/x11/xf86dgaproto/pkg-descr deleted file mode 100644 index e49d129facda..000000000000 --- a/x11/xf86dgaproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org XFree86-DGA extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/xf86dgaproto/pkg-plist b/x11/xf86dgaproto/pkg-plist deleted file mode 100644 index 67317772e3ed..000000000000 --- a/x11/xf86dgaproto/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -include/X11/extensions/xf86dga.h -include/X11/extensions/xf86dga1const.h -include/X11/extensions/xf86dga1proto.h -include/X11/extensions/xf86dga1str.h -include/X11/extensions/xf86dgaconst.h -include/X11/extensions/xf86dgaproto.h -include/X11/extensions/xf86dgastr.h -libdata/pkgconfig/xf86dgaproto.pc diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile deleted file mode 100644 index faf570d7fb1d..000000000000 --- a/x11/xf86driproto/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xf86driproto -PORTVERSION= 2.1.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-DRI extension headers - -LICENSE= MIT - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo deleted file mode 100644 index 0ff0cb5d2a62..000000000000 --- a/x11/xf86driproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xf86driproto-2.1.1.tar.bz2) = 9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f -SIZE (xorg/proto/xf86driproto-2.1.1.tar.bz2) = 96528 diff --git a/x11/xf86driproto/pkg-descr b/x11/xf86driproto/pkg-descr deleted file mode 100644 index d8418631cb7c..000000000000 --- a/x11/xf86driproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org XFree86-DRI extension headers. - -WWW: http://www.freedesktop.org/wiki/Software/xlibs diff --git a/x11/xf86driproto/pkg-plist b/x11/xf86driproto/pkg-plist deleted file mode 100644 index e132a0afcab7..000000000000 --- a/x11/xf86driproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/dri/xf86dri.h -include/X11/dri/xf86driproto.h -include/X11/dri/xf86dristr.h -libdata/pkgconfig/xf86driproto.pc diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile deleted file mode 100644 index 25b7bd3ea33a..000000000000 --- a/x11/xf86miscproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xf86miscproto -PORTVERSION= 0.9.3 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-Misc extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/xf86miscproto/distinfo b/x11/xf86miscproto/distinfo deleted file mode 100644 index 517f245d0053..000000000000 --- a/x11/xf86miscproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xf86miscproto-0.9.3.tar.bz2) = 45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095 -SIZE (xorg/proto/xf86miscproto-0.9.3.tar.bz2) = 84950 diff --git a/x11/xf86miscproto/pkg-descr b/x11/xf86miscproto/pkg-descr deleted file mode 100644 index 17e74ee63bdd..000000000000 --- a/x11/xf86miscproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org XFree86-Misc extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/xf86miscproto/pkg-plist b/x11/xf86miscproto/pkg-plist deleted file mode 100644 index 4dbb50750e86..000000000000 --- a/x11/xf86miscproto/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -include/X11/extensions/xf86misc.h -include/X11/extensions/xf86mscstr.h -libdata/pkgconfig/xf86miscproto.pc diff --git a/x11/xf86rushproto/Makefile b/x11/xf86rushproto/Makefile deleted file mode 100644 index b380b1c18eb3..000000000000 --- a/x11/xf86rushproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xf86rushproto -PORTVERSION= 1.1.2 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-Rush extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/xf86rushproto/distinfo b/x11/xf86rushproto/distinfo deleted file mode 100644 index 3aff1f0f6648..000000000000 --- a/x11/xf86rushproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xf86rushproto-1.1.2.tar.bz2) = 07d9b237541f2d6313b5b28f5335d987a766b36c87b133f77cc48f31d969a3ae -SIZE (xorg/proto/xf86rushproto-1.1.2.tar.bz2) = 37695 diff --git a/x11/xf86rushproto/pkg-descr b/x11/xf86rushproto/pkg-descr deleted file mode 100644 index b5f1b23c0ef8..000000000000 --- a/x11/xf86rushproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org XFree86-Rush extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/xf86rushproto/pkg-plist b/x11/xf86rushproto/pkg-plist deleted file mode 100644 index 7cacadf91e03..000000000000 --- a/x11/xf86rushproto/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -include/X11/extensions/xf86rush.h -include/X11/extensions/xf86rushstr.h -libdata/pkgconfig/xf86rushproto.pc diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile deleted file mode 100644 index e35286479bda..000000000000 --- a/x11/xf86vidmodeproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xf86vidmodeproto -PORTVERSION= 2.3.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-VidModeExtension extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/xf86vidmodeproto/distinfo b/x11/xf86vidmodeproto/distinfo deleted file mode 100644 index b34ce498b9ce..000000000000 --- a/x11/xf86vidmodeproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xf86vidmodeproto-2.3.1.tar.bz2) = 45d9499aa7b73203fd6b3505b0259624afed5c16b941bd04fcf123e5de698770 -SIZE (xorg/proto/xf86vidmodeproto-2.3.1.tar.bz2) = 96822 diff --git a/x11/xf86vidmodeproto/pkg-descr b/x11/xf86vidmodeproto/pkg-descr deleted file mode 100644 index 7f862c15d18c..000000000000 --- a/x11/xf86vidmodeproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org XFree86-VidModeExtension extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/xf86vidmodeproto/pkg-plist b/x11/xf86vidmodeproto/pkg-plist deleted file mode 100644 index fe46d0049709..000000000000 --- a/x11/xf86vidmodeproto/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/extensions/xf86vm.h -include/X11/extensions/xf86vmproto.h -include/X11/extensions/xf86vmstr.h -libdata/pkgconfig/xf86vidmodeproto.pc diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index ef870d82d74f..08fc47008392 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-clipman-plugin PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -21,7 +22,7 @@ USES= gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3 GNU_CONFIGURE= yes USE_GNOME= gtk30 intltool glib20 cairo USE_XFCE= panel -USE_XORG= ice sm x11 xtst xproto +USE_XORG= ice sm x11 xtst xorgproto INSTALLS_ICONS= yes INSTALL_TARGET= install-strip diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile index 2a664b25a03a..8c4a15d0d83c 100644 --- a/x11/xfindproxy/Makefile +++ b/x11/xfindproxy/Makefile @@ -2,6 +2,7 @@ PORTNAME= xfindproxy PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= Locate available proxy services LICENSE= MIT XORG_CAT= app -USE_XORG= x11 ice xt xproxymngproto +USE_XORG= x11 ice xt xorgproto PLIST_FILES= bin/xfindproxy man/man1/xfindproxy.1.gz diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile index d2c8e1ed7e60..4b03198fb64f 100644 --- a/x11/xfwp/Makefile +++ b/x11/xfwp/Makefile @@ -2,6 +2,7 @@ PORTNAME= xfwp PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= X firewall proxy LICENSE= MIT XORG_CAT= app -USE_XORG= x11 ice xproxymngproto +USE_XORG= x11 ice xorgproto PLIST_FILES= bin/xfwp man/man1/xfwp.1.gz diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile deleted file mode 100644 index acd5cb8798ac..000000000000 --- a/x11/xineramaproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xineramaproto -PORTVERSION= 1.2.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Xinerama extension headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/xineramaproto/distinfo b/x11/xineramaproto/distinfo deleted file mode 100644 index 7cc01366759b..000000000000 --- a/x11/xineramaproto/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xineramaproto-1.2.1.tar.bz2) = 977574bb3dc192ecd9c55f59f991ec1dff340be3e31392c95deff423da52485b -SIZE (xorg/proto/xineramaproto-1.2.1.tar.bz2) = 96239 diff --git a/x11/xineramaproto/pkg-descr b/x11/xineramaproto/pkg-descr deleted file mode 100644 index 652cfc958463..000000000000 --- a/x11/xineramaproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org Xinerama extension headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/xineramaproto/pkg-plist b/x11/xineramaproto/pkg-plist deleted file mode 100644 index dc9fb95e6a88..000000000000 --- a/x11/xineramaproto/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -include/X11/extensions/panoramiXproto.h -libdata/pkgconfig/xineramaproto.pc diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile index 3a21c90d3cb3..821bc149b239 100644 --- a/x11/xinput/Makefile +++ b/x11/xinput/Makefile @@ -3,13 +3,14 @@ PORTNAME= xinput PORTVERSION= 1.6.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Very useful utility for configuring and testing XInput devices XORG_CAT= app -USE_XORG= inputproto x11 xi xext xrandr xinerama +USE_XORG= xorgproto x11 xi xext xrandr xinerama PLIST_FILES= bin/xinput man/man1/xinput.1.gz diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile index ed4a3361ded7..56b7d6d64f10 100644 --- a/x11/xkbutils/Makefile +++ b/x11/xkbutils/Makefile @@ -2,6 +2,7 @@ PORTNAME= xkbutils PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -10,6 +11,6 @@ COMMENT= XKB utility demos LICENSE= MIT XORG_CAT= app -USE_XORG= xkbfile x11 xaw inputproto +USE_XORG= xkbfile x11 xaw xorgproto .include <bsd.port.mk> diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile new file mode 100644 index 000000000000..b973889c7e18 --- /dev/null +++ b/x11/xorgproto/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PORTNAME= xorgproto +PORTVERSION= 2018.4 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= xorg protocol headers + +XORG_CAT= proto + +CONFIGURE_ARGS= --without-fop \ + --without-xmlto \ + --without-xsltproc \ + --enable-legacy + +.include <bsd.port.mk> diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo new file mode 100644 index 000000000000..ac1c94d1a918 --- /dev/null +++ b/x11/xorgproto/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1532366892 +SHA256 (xorg/proto/xorgproto-2018.4.tar.bz2) = fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0 +SIZE (xorg/proto/xorgproto-2018.4.tar.bz2) = 390293 diff --git a/x11/xorgproto/files/patch-man_Xprint.man b/x11/xorgproto/files/patch-man_Xprint.man new file mode 100644 index 000000000000..735c1d58a228 --- /dev/null +++ b/x11/xorgproto/files/patch-man_Xprint.man @@ -0,0 +1,424 @@ +--- man/Xprint.man.orig 2018-07-24 10:46:56 UTC ++++ man/Xprint.man +@@ -0,0 +1,421 @@ ++.\" -*- coding: us-ascii -*- ++.TH Xprint __miscmansuffix__ "8 October 2004" ++.SH NAME ++Xprint \- The "X print service" - a portable, network-transparent printing system based on the X11 protocol ++.SH SYNOPSIS ++Xprint is a very flexible, extensible, scaleable, client/server ++print system based on ISO 10175 (and some other specs) and the X11 ++rendering protocol. ++Using Xprint an application can search, query and use devices like ++printers, FAX machines or create documents in formats like PDF. ++In particular, an application can seek a printer, query supported ++attributes (like paper size, trays, fonts etc.), configure the printer ++device to match it\(cqs needs and print on it like on any other X device ++reusing parts of the code which is used for the video card Xserver. ++.SH OVERVIEW ++The "X Print Service" technology allows X rendering to devices such as ++printers and fax. Most of the service is available in the X11 ++technology stack as Xp, with the remainder in single toolkit stacks (e.g. DtPrint for CDE). ++Modifications have also been made to the LessTif/Motif/Qt technology ++stacks to support Xprint. ++.PP ++The Xp portion consists of: ++.TP 0.2i ++\(bu ++Xp Extension for the X-Server (included in the X-Server Xprt) ++.TP 0.2i ++\(bu ++Xp Extension API for the client side (libXp/libXprintUtils) ++.TP 0.2i ++\(bu ++PCL ddx driver that converts core X to native PCL ++.TP 0.2i ++\(bu ++PDF ddx driver that converts core X to native PDF ++.TP 0.2i ++\(bu ++PostScript ddx driver that converts core X to native PostScript ++.TP 0.2i ++\(bu ++Raster ddx driver that generates xwd rasters which can be converted to PCL, PDF or PostScript rasters ++.PP ++.PP ++From an X clients perspective, it can attach to one of two nearly ++identical X-Servers, a "Video" X-Server, and a "Print" X-Server ++which has the additional Xp capability but otherwise looks and ++behaves the same. ++.SH "HOW THE X PRINT SERVICE WORKS" ++The X Print Service expands on the traditional X-Server and Xlib world ++in four ways. ++.TP 0.4i ++1. ++Most obvious is the use of "print ddx drivers" instead of ++"video ddx drivers". While a video ddx driver modifies pixels ++in a video frame buffer, a print ddx driver generates "page ++description language (PDL)" output (such as PCL, PDF or PostScript) ++or sends the print rendering instructions to a platform-specific ++print API (like Win32/GDI). ++ ++Once a print ddx driver generates PDL output, it can be sent to ++a spooler such as \fBlp\fR(1) ++or retrieved by the client (to implement functionality like "print-to-file"). ++ ++Though not currently done, a single X-Server can support both ++print and video ddx drivers. ++.TP 0.4i ++2. ++Since printers support "paged" output, unlike video, a portion ++of the Xp Extension supports APIs to delineate printed output. ++For example, XpStartPage and XpEndPage tell the X-Server where ++a physical page starts and ends in an otherwise continuous ++stream of X rendering primitives. Likewise, XpStartJob and ++XpEndJob determine when a collection of pages starts and ends. ++XpEndJob typically causes the generated PDL to be submitted to ++a spooler, such as \fBlp\fR(1). ++.TP 0.4i ++3. ++Since printers have extensive capabilities, another portion of ++the Xp Extension supports APIs to manipulate "print contexts". ++ ++Once a printer is selected using the Xp Extension API, a print ++context to represent it can be created. A print context ++embodies the printer selected - it contains the printer's ++default capabilities, selectable range of capabilities, ++printer state, and generated output. Some "attributes" within ++the print context can be modified by the user, and the ++X-Server and print ddx driver will react accordingly. For ++example, the attribute "content-orientation" can be set to ++"landscape" or "portrait" (if the printer supports these ++values - which can be queried using the Xprint API as well). ++.TP 0.4i ++4. ++Since printers can have "built in" fonts, the Xp Extension in ++the X-Server works with the print ddx drivers to make ++available (for printing only) additional fonts on a per print ++context basis. ++ ++When a print context is created and set for a given printer, ++the X font calls may be able to access additional printer ++fonts. To do this (typically), the X-Server must have access ++to "printer metric files" (.pmf) that describe at minimum the ++metrics of the built in fonts. ++.PP ++.SH USAGE ++There are three tasks to start the X Print Service: ++.TP 0.4i ++1. ++configuring the X Print Server, ++.TP 0.4i ++2. ++starting the X Print Service ++.TP 0.4i ++3. ++configuring the user session so that clients can find the running X Print Service ++.PP ++.PP ++The tasks are described in detail below. ++.SH "SERVER CONFIGURATION" ++The X Print Server (Xprt) can read a number of configuration files which ++control its behavior and support for printers. Each vendor platform has ++a default location for this information. Xprt can also read the ++environment variable \fBXPCONFIGDIR\fR to locate alternate configuration ++directories. Common settings include: ++ ++export XPCONFIGDIR=/X11/lib/X11/XpConfig/ ++.PP ++export XPCONFIGDIR=/proj/x11/xc/programs/Xserver/XpConfig/ ++ ++.PP ++Xprt has many built-in defaults, and lacking any configuration files, ++will immediately try to support all printers visible via \fBlpstat\fR(1). ++.PP ++In order of importance for configuration by a system administrator, the ++configuration files for a "C" locale are as follows (see \fBXprt\fR(__appmansuffix__) for more ++details (including support for non-"C" locales)): ++.TP ++\fB${XPCONFIGDIR}/C/print/Xprinters\fR ++\&'Xprinters' is the top most configuration file. It tells ++Xprt which specific printer names (e.g. mylaser) should ++be supported, and whether \fBlpstat\fR(1) or other commands ++should be used to automatically supplement the list of ++printers. ++.TP ++\fB${XPCONFIGDIR}/C/print/attributes/printer\fR ++The 'printer' file maps printer names to model ++configurations (see 'model-config' below). For example, ++"mylaser" could be mapped to a "HPDJ1600C", and all other ++arbitrary printers could be mapped to a default, such as ++"HPLJ4SI". When depending on \fBlpstat\fR(1) in the Xprinters ++file, setting up defaults in 'printer' becomes all the ++more important. ++.TP ++\fB${XPCONFIGDIR}/C/print/attributes/document\fR ++The 'document' file specifies the initial document values ++for any print jobs. For example, which paper tray to ++use, what default resolution, etc. ++.TP ++\fB${XPCONFIGDIR}/C/print/attributes/job\fR ++The 'job' file specifies the initial job values for any ++print jobs. For example, "notification-profile" can be ++set so that when a print job is successfully sent to a ++printer, e-mail is sent to the user. ++.TP ++\fB${XPCONFIGDIR}/C/print/models/PSdefault/model\-config\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/fonts.dir\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00051.pmf\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00093.pmf\fR ++The 'model-config' file has attributes that describe the ++printer model\(cqs capabilities and default settings. ++Printer model fonts may also be present. The model-config ++file also identifies the print ddx driver to be used. ++For each printer model supported, a complete hierarchy of ++files should exist. In most cases, these files do not ++need to be modified. ++.TP ++\fB${XPCONFIGDIR}/C/print/ddx\-config/raster/pcl\fR, \fB${XPCONFIGDIR}/C/print/ddx\-config/raster/pdf\fR, \fB${XPCONFIGDIR}/C/print/ddx\-config/raster/postscript\fR ++The print ddx drivers can have highly specific ++configuration files to control their behavior. In most ++cases, these files do not need to be modified. ++.PP ++More information in how to configure and customize the X print server can be found in the ++\fBXprt\fR(__appmansuffix__) ++manual page. ++.SH "STARTING UP" ++The summary checklist for starting the X Print Service is as follows: ++.TP 0.4i ++1. ++Choose an execution model for the X Print Service. The X ++Print Service can be run on a per-user session basis, per ++machine basis, or can be run on a few machines globally ++available to a number of users. ++.TP 0.4i ++2. ++If print jobs are to be submitted to a spooler (almost always ++the case), make sure all needed printers are available to the ++spooler subsystem (most often \fBlp\fR(1)) ++on the same machine running the X Print Service. ++.TP 0.4i ++3. ++Configure the X Print Server. See ``X Print Server ++Configuration''. ++.TP 0.4i ++4. ++Depending on #1, start the X Print Server process "Xprt", and ++then the toolkit-specific Print Dialog Manager Daemon process ++(such as CDEnext's "dtpdmd") at the appropriate times. ++Note that libXprintUtils-based applications/toolkits do not need ++a Print Dialog Manager Daemon process to use Xprint. ++.PP ++The details are described below. ++.PP ++Because the X Print Service is based on X, it can be easily distributed. ++The most significant factors in which execution model to choose will be ++driven by: ++.TP 0.2i ++\(bu ++how many printers will be accessable through the printer ++subsystem on any given machine. A system administrator may ++choose to cluster printers on a few given machines, or ++scatter them across an organization and possibly make ++extensive use of remote spoolers to make them globally ++available. ++.TP 0.2i ++\(bu ++how many machines will need a copy of the X Print Server ++configuration files. The files have been architected so ++that one super-set version of them can be maintained and ++distributed (e.g. via NFS), and a per-machine or per-user ++version of the `Xprinters' is all that is needed to have the ++appropriate information in them utilized or ignored. ++.TP 0.2i ++\(bu ++how many users can demand services from a given X Print ++Service. ++.PP ++With the above in mind, some obvious execution models include: ++.TP 0.2i ++\(bu ++Global - in this model, the system administrator is choosing ++to run the X Print Service on a *few* select machines with ++appropriate printers configured, and allow clients access to ++the global resource. This can centralize the administration ++of printers and configuration files, but may have to be ++monitored for performance loading. ++ ++Startup would likely be done by boot-up scripts (such as \fB/etc/init.d/xprint\fR). ++.TP 0.2i ++\(bu ++Per-machine - every machine with potential X Print Service ++users would run the service. Printer and configuration file ++administration is decentralized, and usage would be limited ++to the users on the machine. ++ ++Startup would likely be done by boot-up scripts (such as \fB/etc/init.d/xprint\fR). ++.TP 0.2i ++\(bu ++Per-user session - every user would run an entire X Print ++Service for themselves. In the future, the Video X Server ++normally started may contain Print X Server capability, so ++this model becomes very natural. ++ ++Startup would likely be done at session login or by ++launching actions or processes manually once the user ++logs in. Note: Deamons like "dtpdmd" must be started after Xprt. ++.PP ++.PP ++Starting of the processes is straight forward. In strict order (example is for manually starting the X print server for CDEnext usage): ++.TP 0.4i ++1. ++ ++.nf ++[machineA] % Xprt [\-XpFile <Xprinters file>] [:dispNum] & ++.fi ++ ++ ++Note that Xprt will look for configuration files in either ++a default location or where \fBXPCONFIGDIR\fR points. ++ ++\fB\-XpFile\fR specifies an alternate `Xprinters' file, rather ++than the default one or `\fB${XPCONFIGDIR}/C/print/Xprinters\fR'. ++.TP 0.4i ++2. ++ ++.nf ++[machineA] % dtpdmd \-d machineA[:dispNum] [\-l /tmp/dtpdmd.log] & ++.fi ++ ++ ++The dtpdmd will maintain an X-Selection on the X-Server, ++and will start dtpdm's as required to service requests. ++.PP ++.PP ++In all but the per-user session model, the machine running the dtpdmd ++(thus dtpdm's) will need display authorization to the users video ++display. ++.SH "CLIENT CONFIGURATION" ++Once a X Print Server and dtpdmd have been started -- many of them ++in some cases -- clients will need to find and use them. There are ++two mechanisms that allow clients to discover X Print Servers and ++printers. ++.TP 0.2i ++\(bu ++"X Print Specifier" - assuming usage of the DtPrint/XprintUtils-based print ++applications, the following notation is understood: ++ ++ ++.nf ++printer_name@machine[:dispNum] ++.fi ++ ++ ++For example: ++ ++ ++.nf ++colorlj7@printhub:2 ++.fi ++ ++ ++In the above example, the X Print Server running at `printhub:2' ++is assumed to support the printer named `colorlj7'. ++.TP 0.2i ++\(bu ++\fB${XPSERVERLIST}\fR - assuming usage of the DtPrint print dialogs, ++the environment variable \fB${XPSERVERLIST}\fR can contain a list ++of X Print Servers. For example: ++ ++ ++.nf ++XPSERVERLIST="printhub:2 printhub:3 otherdept:0" ++.fi ++ ++ ++Then in the dialogs, only a printer name needs to be entered. ++The dialog will then search the X Print Servers in \fB${XPSERVERLIST}\fR ++for a server than supports the printer, and then establish ++contact. ++.PP ++.SH "END-USER SEQUENCE" ++From most CDEnext applications, printing is accomplished by bringing ++down the <File> menu and selecting <Print...>. This will result in ++the DtPrintSetupBox dialog, which will request the name of a printer, ++and offer limited capability to configure print options (e.g. number ++of copies). If the user wishes, they can select <Setup...>, which ++will start a dtpdm capable of modifying additional print options. ++Finally, the user should select <Print>. ++.SH ENVIRONMENT ++.TP ++\fB${XPCONFIGDIR}\fR ++This environment variable points to the root ++of the Xprint server configuration directory hierarchy. ++If the variable is not defined, the default ++path is be assumed. The default path may be ++\fB/usr/X11R6/lib/X11/xserver/\fR, ++\fB/usr/lib/X11/xserver/\fR, ++\fB/usr/share/Xprint/xserver/\fR or ++\fB/usr/openwin/server/etc/XpConfig\fR, depending on the ++system, and may be configured in \fB/etc/init.d/xprint\fR. ++.TP ++\fB${LANG}\fR ++This environment variable selects the locale settings used by the Xprint server. ++Xprt allows language-specific settings (stored in \fB${XPCONFIGDIR}/${LANG}/print/\fR) ++which will override the default settings (stored in \fB${XPCONFIGDIR}/C/print/\fR). ++If \fB${LANG}\fR is not set "C" is assumed. ++.TP ++\fB${XPSERVERLIST}\fR ++The environment variable \fB${XPSERVERLIST}\fR contains a list ++of display identifiers (separated by whitespace) which tell an ++application where it can find the Xprint servers. Usually ++\fB${XPSERVERLIST}\fR is set by the profile startup scripts (e.g. ++\fB/etc/profile\fR or \fB/etc/profile.d/xprint.sh\fR) using the output of ++\fB/etc/init.d/xprint get_xpserverlist\fR. ++ ++Example: ++ ++.nf ++ ++ export XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`" ++.fi ++ ++ ++Alternatively \fB${XPSERVERLIST}\fR can be set ++manually. Example: ++ ++.nf ++ ++ export XPSERVERLIST="littlecat:80 bitdog:72" ++.fi ++ ++instructs an application to find an Xprint server at display ++80 on the machine "littlecat" and at display 72 on the ++machine bigdog. ++.TP ++\fB${XPRINTER}\fR ++The environment variable \fB${XPRINTER}\fR ++defines the default printer used by print ++applications. The syntax is either ++\fIprintername\fR or ++\fIprintername\fR@\fIdisplay\fR. ++ ++Examples: ++.RS ++.TP ++\fBXPRINTER=ps003\fR ++tells an application to look for the ++first printer named "ps003" on all Xprint ++servers. ++.TP ++\fBXPRINTER=hplaser19@littlecat:80\fR ++tells an application to use the printer "hplaser19" ++on the Xprint server at display ++"littlecat:80". ++.RE ++ ++ ++If \fB${XPRINTER}\fR is not set the applications ++will examine the values of the \fB${PDPRINTER}\fR, ++\fB${LPDEST}\fR, and ++\fB${PRINTER}\fR environment variables (in that order). ++.SH "SEE ALSO" ++\fBX11\fR(__miscmansuffix__), \fBxplsprinters\fR(__appmansuffix__), \fBxprehashprinterlist\fR(__appmansuffix__), \fBxphelloworld\fR(__appmansuffix__), \fBxpxmhelloworld\fR(__appmansuffix__), \fBxpawhelloworld\fR(__appmansuffix__), \fBxpxthelloworld\fR(__appmansuffix__), \fBxpsimplehelloworld\fR(__appmansuffix__), \fBXserver\fR(__appmansuffix__), \fBXprt\fR(__appmansuffix__), \fBlibXp\fR(__libmansuffix__), \fBlibXprintUtils\fR(__libmansuffix__), \fBlibXprintAppUtils\fR(__libmansuffix__), \fBXmPrintShell\fR(__libmansuffix__), \fBXawPrintShell\fR(__libmansuffix__), Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html), Xprint main site (http://xprint.mozdev.org/) ++.SH AUTHORS ++This manual page was written by ++Roland Mainz <roland.mainz@nrubsig.org> based on the original X11R6.6 ++\fBxc/programs/Xserver/XpConfig/README\fR. diff --git a/x11/xorgproto/pkg-descr b/x11/xorgproto/pkg-descr new file mode 100644 index 000000000000..4e370976c98f --- /dev/null +++ b/x11/xorgproto/pkg-descr @@ -0,0 +1,3 @@ +This package contains X.Org protocol headers. +They where previously scattered through different packages, but have been +merged to one package. diff --git a/x11/xorgproto/pkg-plist b/x11/xorgproto/pkg-plist new file mode 100644 index 000000000000..896e4fe6b99e --- /dev/null +++ b/x11/xorgproto/pkg-plist @@ -0,0 +1,204 @@ +include/GL/glxint.h +include/GL/glxmd.h +include/GL/glxproto.h +include/GL/glxtokens.h +include/GL/internal/glcore.h +include/X11/DECkeysym.h +include/X11/HPkeysym.h +include/X11/PM/PM.h +include/X11/PM/PMproto.h +include/X11/Sunkeysym.h +include/X11/X.h +include/X11/XF86keysym.h +include/X11/XWDFile.h +include/X11/Xalloca.h +include/X11/Xarch.h +include/X11/Xatom.h +include/X11/Xdefs.h +include/X11/Xfuncproto.h +include/X11/Xfuncs.h +include/X11/Xmd.h +include/X11/Xos.h +include/X11/Xos_r.h +include/X11/Xosdefs.h +include/X11/Xpoll.h +include/X11/Xproto.h +include/X11/Xprotostr.h +include/X11/Xthreads.h +include/X11/Xw32defs.h +include/X11/Xwindows.h +include/X11/Xwinsock.h +include/X11/ap_keysym.h +include/X11/dri/xf86dri.h +include/X11/dri/xf86driproto.h +include/X11/dri/xf86dristr.h +include/X11/extensions/EVI.h +include/X11/extensions/EVIproto.h +include/X11/extensions/Print.h +include/X11/extensions/Printstr.h +include/X11/extensions/Xeviestr.h +include/X11/extensions/XI.h +include/X11/extensions/XI2.h +include/X11/extensions/XI2proto.h +include/X11/extensions/XIproto.h +include/X11/extensions/XKB.h +include/X11/extensions/XKBgeom.h +include/X11/extensions/XKBproto.h +include/X11/extensions/XKBsrv.h +include/X11/extensions/XKBstr.h +include/X11/extensions/XResproto.h +include/X11/extensions/Xv.h +include/X11/extensions/XvMC.h +include/X11/extensions/XvMCproto.h +include/X11/extensions/Xvproto.h +include/X11/extensions/ag.h +include/X11/extensions/agproto.h +include/X11/extensions/applewmconst.h +include/X11/extensions/applewmproto.h +include/X11/extensions/bigreqsproto.h +include/X11/extensions/bigreqstr.h +include/X11/extensions/composite.h +include/X11/extensions/compositeproto.h +include/X11/extensions/cup.h +include/X11/extensions/cupproto.h +include/X11/extensions/damageproto.h +include/X11/extensions/damagewire.h +include/X11/extensions/dbe.h +include/X11/extensions/dbeproto.h +include/X11/extensions/dmx.h +include/X11/extensions/dmxproto.h +include/X11/extensions/dpmsconst.h +include/X11/extensions/dpmsproto.h +include/X11/extensions/dri2proto.h +include/X11/extensions/dri2tokens.h +include/X11/extensions/dri3proto.h +include/X11/extensions/evieproto.h +include/X11/extensions/fontcache.h +include/X11/extensions/fontcacheP.h +include/X11/extensions/fontcachstr.h +include/X11/extensions/ge.h +include/X11/extensions/geproto.h +include/X11/extensions/lbx.h +include/X11/extensions/lbxproto.h +include/X11/extensions/lgewire.h +include/X11/extensions/mitmiscconst.h +include/X11/extensions/mitmiscproto.h +include/X11/extensions/multibufconst.h +include/X11/extensions/multibufproto.h +include/X11/extensions/panoramiXproto.h +include/X11/extensions/presentproto.h +include/X11/extensions/presenttokens.h +include/X11/extensions/randr.h +include/X11/extensions/randrproto.h +include/X11/extensions/recordconst.h +include/X11/extensions/recordproto.h +include/X11/extensions/recordstr.h +include/X11/extensions/render.h +include/X11/extensions/renderproto.h +include/X11/extensions/saver.h +include/X11/extensions/saverproto.h +include/X11/extensions/secur.h +include/X11/extensions/securproto.h +include/X11/extensions/shapeconst.h +include/X11/extensions/shapeproto.h +include/X11/extensions/shapestr.h +include/X11/extensions/shm.h +include/X11/extensions/shmproto.h +include/X11/extensions/shmstr.h +include/X11/extensions/syncconst.h +include/X11/extensions/syncproto.h +include/X11/extensions/syncstr.h +include/X11/extensions/vldXvMC.h +include/X11/extensions/windowswm.h +include/X11/extensions/windowswmstr.h +include/X11/extensions/xcalibrateproto.h +include/X11/extensions/xcalibratewire.h +include/X11/extensions/xcmiscproto.h +include/X11/extensions/xcmiscstr.h +include/X11/extensions/xf86bigfont.h +include/X11/extensions/xf86bigfproto.h +include/X11/extensions/xf86bigfstr.h +include/X11/extensions/xf86dga.h +include/X11/extensions/xf86dga1const.h +include/X11/extensions/xf86dga1proto.h +include/X11/extensions/xf86dga1str.h +include/X11/extensions/xf86dgaconst.h +include/X11/extensions/xf86dgaproto.h +include/X11/extensions/xf86dgastr.h +include/X11/extensions/xf86misc.h +include/X11/extensions/xf86mscstr.h +include/X11/extensions/xf86rush.h +include/X11/extensions/xf86rushstr.h +include/X11/extensions/xf86vm.h +include/X11/extensions/xf86vmproto.h +include/X11/extensions/xf86vmstr.h +include/X11/extensions/xfixesproto.h +include/X11/extensions/xfixeswire.h +include/X11/extensions/xtestconst.h +include/X11/extensions/xtestext1const.h +include/X11/extensions/xtestext1proto.h +include/X11/extensions/xtestproto.h +include/X11/extensions/xtrapbits.h +include/X11/extensions/xtrapddmi.h +include/X11/extensions/xtrapdi.h +include/X11/extensions/xtrapemacros.h +include/X11/extensions/xtraplib.h +include/X11/extensions/xtraplibp.h +include/X11/extensions/xtrapproto.h +include/X11/fonts/FS.h +include/X11/fonts/FSproto.h +include/X11/fonts/font.h +include/X11/fonts/fontproto.h +include/X11/fonts/fontstruct.h +include/X11/fonts/fsmasks.h +include/X11/keysym.h +include/X11/keysymdef.h +libdata/pkgconfig/applewmproto.pc +libdata/pkgconfig/bigreqsproto.pc +libdata/pkgconfig/compositeproto.pc +libdata/pkgconfig/damageproto.pc +libdata/pkgconfig/dmxproto.pc +libdata/pkgconfig/dri2proto.pc +libdata/pkgconfig/dri3proto.pc +libdata/pkgconfig/evieproto.pc +libdata/pkgconfig/fixesproto.pc +libdata/pkgconfig/fontcacheproto.pc +libdata/pkgconfig/fontsproto.pc +libdata/pkgconfig/glproto.pc +libdata/pkgconfig/inputproto.pc +libdata/pkgconfig/kbproto.pc +libdata/pkgconfig/lg3dproto.pc +libdata/pkgconfig/presentproto.pc +libdata/pkgconfig/printproto.pc +libdata/pkgconfig/randrproto.pc +libdata/pkgconfig/recordproto.pc +libdata/pkgconfig/renderproto.pc +libdata/pkgconfig/resourceproto.pc +libdata/pkgconfig/scrnsaverproto.pc +libdata/pkgconfig/trapproto.pc +libdata/pkgconfig/videoproto.pc +libdata/pkgconfig/windowswmproto.pc +libdata/pkgconfig/xcalibrateproto.pc +libdata/pkgconfig/xcmiscproto.pc +libdata/pkgconfig/xextproto.pc +libdata/pkgconfig/xf86bigfontproto.pc +libdata/pkgconfig/xf86dgaproto.pc +libdata/pkgconfig/xf86driproto.pc +libdata/pkgconfig/xf86rushproto.pc +libdata/pkgconfig/xf86miscproto.pc +libdata/pkgconfig/xf86vidmodeproto.pc +libdata/pkgconfig/xineramaproto.pc +libdata/pkgconfig/xproto.pc +libdata/pkgconfig/xproxymngproto.pc +man/man7/Xprint.7.gz +%%DOCSDIR%%/PM_spec +%%DOCSDIR%%/compositeproto.txt +%%DOCSDIR%%/damageproto.txt +%%DOCSDIR%%/dri2proto.txt +%%DOCSDIR%%/dri3proto.txt +%%DOCSDIR%%/fixesproto.txt +%%DOCSDIR%%/presentproto.txt +%%DOCSDIR%%/randrproto.txt +%%DOCSDIR%%/renderproto.txt +%%DOCSDIR%%/resproto.txt +%%DOCSDIR%%/xv-protocol-v2.txt diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile deleted file mode 100644 index f4c61852c5cf..000000000000 --- a/x11/xproto/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= xproto -PORTVERSION= 7.0.31 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= X11 protocol headers - -LICENSE= MIT - -XORG_CAT= proto - -CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc - -.include <bsd.port.mk> diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo deleted file mode 100644 index 73ecf8275049..000000000000 --- a/x11/xproto/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1478374150 -SHA256 (xorg/proto/xproto-7.0.31.tar.bz2) = c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747 -SIZE (xorg/proto/xproto-7.0.31.tar.bz2) = 300356 diff --git a/x11/xproto/pkg-descr b/x11/xproto/pkg-descr deleted file mode 100644 index 9889653a82e7..000000000000 --- a/x11/xproto/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X protocol and ancillary headers. - -WWW: http://www.freedesktop.org/wiki/Software/xlibs diff --git a/x11/xproto/pkg-plist b/x11/xproto/pkg-plist deleted file mode 100644 index 77c7571fa2ab..000000000000 --- a/x11/xproto/pkg-plist +++ /dev/null @@ -1,27 +0,0 @@ -include/X11/DECkeysym.h -include/X11/HPkeysym.h -include/X11/Sunkeysym.h -include/X11/X.h -include/X11/XF86keysym.h -include/X11/XWDFile.h -include/X11/Xalloca.h -include/X11/Xarch.h -include/X11/Xatom.h -include/X11/Xdefs.h -include/X11/Xfuncproto.h -include/X11/Xfuncs.h -include/X11/Xmd.h -include/X11/Xos.h -include/X11/Xos_r.h -include/X11/Xosdefs.h -include/X11/Xpoll.h -include/X11/Xproto.h -include/X11/Xprotostr.h -include/X11/Xthreads.h -include/X11/Xw32defs.h -include/X11/Xwindows.h -include/X11/Xwinsock.h -include/X11/ap_keysym.h -include/X11/keysym.h -include/X11/keysymdef.h -libdata/pkgconfig/xproto.pc diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile deleted file mode 100644 index 5a9d0a99a6ab..000000000000 --- a/x11/xproxymanagementprotocol/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xproxymanagementprotocol -PORTVERSION= 1.0.3 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= X Proxy Management Protocol headers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -XORG_CAT= proto - -.include <bsd.port.mk> diff --git a/x11/xproxymanagementprotocol/distinfo b/x11/xproxymanagementprotocol/distinfo deleted file mode 100644 index 9a9819aa97be..000000000000 --- a/x11/xproxymanagementprotocol/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/proto/xproxymanagementprotocol-1.0.3.tar.bz2) = 7382acd8c76fa577beb622cab86cc07fafdcecbbd9b4f209bfa72976c4fd26c2 -SIZE (xorg/proto/xproxymanagementprotocol-1.0.3.tar.bz2) = 84154 diff --git a/x11/xproxymanagementprotocol/pkg-descr b/x11/xproxymanagementprotocol/pkg-descr deleted file mode 100644 index 3724717fb30d..000000000000 --- a/x11/xproxymanagementprotocol/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X Proxy Management Protocol headers. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/xproxymanagementprotocol/pkg-plist b/x11/xproxymanagementprotocol/pkg-plist deleted file mode 100644 index 3c4b3fbabeec..000000000000 --- a/x11/xproxymanagementprotocol/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/X11/PM/PM.h -include/X11/PM/PMproto.h -libdata/pkgconfig/xproxymngproto.pc -%%DOCSDIR%%/PM_spec diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile index d12d5fc8e34e..cfe7d8fb6710 100644 --- a/x11/xrestop/Makefile +++ b/x11/xrestop/Makefile @@ -3,7 +3,7 @@ PORTNAME= xrestop PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= http://projects.o-hand.com/sources/${PORTNAME}/ @@ -11,7 +11,7 @@ MAINTAINER= bland@FreeBSD.org COMMENT= X11 server side resource usage statistics monitor USES= gmake pkgconfig ncurses -USE_XORG= x11 xext xrender xt xres xproto +USE_XORG= x11 xext xrender xt xres xorgproto GNU_CONFIGURE= yes CONFIGURE_ENV= XLIBS="-L${LOCALBASE}/lib -lX11" diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile index dd46b35be44d..12fcd020e569 100644 --- a/x11/xrx/Makefile +++ b/x11/xrx/Makefile @@ -2,14 +2,14 @@ PORTNAME= xrx PORTVERSION= 1.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= RX helper program XORG_CAT= app -USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw ice +USE_XORG= x11 xt xext xtrans xorgproto xau xaw ice USES= libtool USE_LDCONFIG= yes diff --git a/x11/xscope/Makefile b/x11/xscope/Makefile index 510e78499ed9..d4d756535b97 100644 --- a/x11/xscope/Makefile +++ b/x11/xscope/Makefile @@ -2,6 +2,7 @@ PORTNAME= xscope PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= XORG/individual/${XORG_CAT}/ @@ -11,7 +12,7 @@ COMMENT= X Window Protocol Viewer LICENSE= MIT XORG_CAT= app -USE_XORG= xproto x11 xext +USE_XORG= xorgproto x11 xext PLIST_FILES= bin/xscope man/man1/xscope.1.gz diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile index 2abd6091a73e..ee7a51d75502 100644 --- a/x11/xsel/Makefile +++ b/x11/xsel/Makefile @@ -3,7 +3,7 @@ PORTNAME= xsel PORTVERSION= 0.04.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 MASTER_SITES= http://BSDforge.com/projects/source/x11/xsel/ @@ -15,7 +15,7 @@ LICENSE= MIT CONFLICTS_INSTALL= xsel-conrad-[0-9]* USES= tar:bzip2 -USE_XORG= xmu xaw xt xproto xkbfile +USE_XORG= xmu xaw xt xorgproto xkbfile CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lXt -lXaw -lX11 -lXmu diff --git a/x11/xset/Makefile b/x11/xset/Makefile index d489b376d57d..a79d96340b5b 100644 --- a/x11/xset/Makefile +++ b/x11/xset/Makefile @@ -2,13 +2,14 @@ PORTNAME= xset PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= User preference utility for X XORG_CAT= app -USE_XORG= xmuu xproto x11 xext xfontcache +USE_XORG= xmuu xorgproto x11 xext xfontcache CONFIGURE_ARGS= --without-xf86misc PLIST_FILES= bin/xset man/man1/xset.1.gz diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 3923c233f9f3..103a686746e5 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -3,6 +3,7 @@ PORTNAME= xterm PORTVERSION= 333 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.invisible-island.net/xterm/:src1 \ https://invisible-mirror.net/archives/xterm/:src1 \ @@ -73,7 +74,7 @@ NEXTAW_CONFIGURE_WITH= neXtaw NEXTAW_LIB_DEPENDS= libneXtaw.so:x11-toolkits/neXtaw TOOLBAR_CONFIGURE_ENABLE= toolbar WCHAR_LIB_DEPENDS= libfreetype.so:print/freetype2 -XINERAMA_USE= XORG=xinerama,xineramaproto +XINERAMA_USE= XORG=xinerama,xorgproto XINERAMA_CONFIGURE_OFF= --without-xinerama LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile index df9e41da1c0f..ca557ba0dc52 100644 --- a/x11/xwininfo/Makefile +++ b/x11/xwininfo/Makefile @@ -2,6 +2,7 @@ PORTNAME= xwininfo PORTVERSION= 1.1.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -9,7 +10,7 @@ COMMENT= Window information utility for X XORG_CAT= app USES= iconv -USE_XORG= x11 xcb xproto xorg-macros +USE_XORG= x11 xcb xorgproto xorg-macros PLIST_FILES= bin/xwininfo man/man1/xwininfo.1.gz diff --git a/x11/xwinwrap/Makefile b/x11/xwinwrap/Makefile index 91532f9069f6..62def7acd1f5 100644 --- a/x11/xwinwrap/Makefile +++ b/x11/xwinwrap/Makefile @@ -3,7 +3,7 @@ PORTNAME= xwinwrap PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= LOCAL/vg @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} ONLY_FOR_ARCHS= amd64 i386 USES= tar:bzip2 -USE_XORG= x11 xproto xrender xext +USE_XORG= x11 xorgproto xrender xext PLIST_FILES= bin/${PORTNAME} MAKE_ARGS+= PREFIX=${PREFIX} |