diff options
414 files changed, 653 insertions, 3887 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 292c4d59c48..71df2d9763e 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.123 2018/01/28 20:10:34 wiz Exp $ +# $NetBSD: Makefile,v 1.124 2018/03/07 11:57:28 wiz Exp $ DISTNAME= pulseaudio-11.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ EXTRACT_SUFX= .tar.xz diff --git a/audio/pulseaudio/options.mk b/audio/pulseaudio/options.mk index 78645d6e450..448c49639a5 100644 --- a/audio/pulseaudio/options.mk +++ b/audio/pulseaudio/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2016/08/06 15:56:50 richard Exp $ +# $NetBSD: options.mk,v 1.7 2018/03/07 11:57:28 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio PKG_SUPPORTED_OPTIONS= avahi fftw x11 @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --without-fftw .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXtst/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" PLIST.x11= yes .else CONFIGURE_ARGS+= --disable-x11 diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile index 40aaeda48c9..5a7910c98e0 100644 --- a/audio/terminatorx/Makefile +++ b/audio/terminatorx/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.46 2017/02/12 06:25:06 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.47 2018/03/07 11:57:28 wiz Exp $ DISTNAME= terminatorX-3.82 PKGNAME= ${DISTNAME:S/X/x/} -PKGREVISION= 30 +PKGREVISION= 31 CATEGORIES= audio MASTER_SITES= http://terminatorx.org/dist/ EXTRACT_SUFX= .tar.bz2 @@ -39,7 +38,7 @@ SUBST_MESSAGE.oss= Fixing hardcoded audio device. .include "../../mk/omf-scrollkeeper.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index edfdddc36d3..9ee1d8d63d1 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.79 2015/09/07 12:02:07 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.80 2018/03/07 11:57:29 wiz Exp $ .include "Makefile.common" -PKGREVISION= 5 +PKGREVISION= 6 USE_TOOLS+= msgfmt @@ -22,5 +21,5 @@ REPLACE_SH= xmms-config.in .include "../../devel/zlib/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index be7533a65b2..b8dd7d76582 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.128 2018/01/28 20:10:45 wiz Exp $ +# $NetBSD: Makefile,v 1.129 2018/03/07 11:57:29 wiz Exp $ DISTNAME= SDL-1.2.15 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= devel games MASTER_SITES= http://www.libsdl.org/release/ @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --disable-x11-shared .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .else CONFIGURE_ARGS+= --without-x .endif diff --git a/devel/SDL2/buildlink3.mk b/devel/SDL2/buildlink3.mk index 0ee071795e8..e9a40809f9e 100644 --- a/devel/SDL2/buildlink3.mk +++ b/devel/SDL2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2015/04/25 14:20:31 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:29 wiz Exp $ BUILDLINK_TREE+= SDL2 @@ -24,7 +24,7 @@ pkgbase := SDL2 .endif .if !empty(PKG_BUILD_OPTIONS.SDL2:Mx11) -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .endif diff --git a/devel/imake/Makefile b/devel/imake/Makefile index 159701051a2..13e28c784d1 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2016/09/17 17:49:36 richard Exp $ +# $NetBSD: Makefile,v 1.25 2018/03/07 11:57:29 wiz Exp $ DISTNAME= imake-1.0.7 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=util/} EXTRACT_SUFX= .tar.bz2 @@ -33,6 +33,5 @@ SUBST_SED.xmkmf= -e "s/^configdirspec= */configdirspec=/" .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile index 269d07c1c70..0060ea6589e 100644 --- a/devel/makedepend/Makefile +++ b/devel/makedepend/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2014/10/09 14:06:10 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:29 wiz Exp $ DISTNAME= makedepend-1.0.5 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_XORG:=util/} EXTRACT_SUFX= .tar.bz2 @@ -14,6 +15,5 @@ USE_TOOLS+= pkg-config .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-meson/build.mk b/devel/py-meson/build.mk index 8722221dacd..472a8741692 100644 --- a/devel/py-meson/build.mk +++ b/devel/py-meson/build.mk @@ -1,4 +1,4 @@ -# $NetBSD: build.mk,v 1.2 2017/08/31 05:00:16 wiz Exp $ +# $NetBSD: build.mk,v 1.3 2018/03/07 11:57:29 wiz Exp $ BUILD_DEPENDS+= ${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson @@ -6,7 +6,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson do-configure: meson-configure meson-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --buildtype=plain . output + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --buildtype=plain ${MESON_ARGS} . output do-build: meson-build meson-build: diff --git a/doc/CHANGES-2018 b/doc/CHANGES-2018 index 44e4031171a..df251487906 100644 --- a/doc/CHANGES-2018 +++ b/doc/CHANGES-2018 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2018,v 1.1088 2018/03/07 11:51:06 fhajny Exp $ +$NetBSD: CHANGES-2018,v 1.1089 2018/03/07 11:57:48 wiz Exp $ Changes to the packages collection and infrastructure in 2018: @@ -1497,3 +1497,33 @@ Changes to the packages collection and infrastructure in 2018: Updated lang/nodejs8 to 8.10.0 [fhajny 2018-03-07] Updated lang/nodejs6 to 6.13.1 [fhajny 2018-03-07] Updated devel/kafka to 1.0.1 [fhajny 2018-03-07] + Removed wm/applewmproto successor x11/xorgproto [wiz 2018-03-07] + Removed wm/windowswmproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/bigreqsproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/compositeproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/damageproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/dri2proto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/dri3proto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/fixesproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/fontsproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/glproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/inputproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/kbproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/presentproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/randrproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/recordproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/renderproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/resourceproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/scrnsaverproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/trapproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/videoproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xcmiscproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xextproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xf86bigfontproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xf86dgaproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xf86driproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xf86miscproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xf86vidmodeproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xineramaproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xproto successor x11/xorgproto [wiz 2018-03-07] + Removed x11/xproxymanagementprotocol successor x11/xorgproto [wiz 2018-03-07] diff --git a/emulators/kegs/Makefile b/emulators/kegs/Makefile index 440ea528ed7..e6e56f7e6a8 100644 --- a/emulators/kegs/Makefile +++ b/emulators/kegs/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2018/03/06 15:29:13 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:29 wiz Exp $ DISTNAME= kegs.0.91 PKGNAME= kegs-0.91 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= emulators MASTER_SITES= http://kegs.sourceforge.net/ @@ -53,7 +53,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/config.kegs ${DESTDIR}${PREFIX}/share/${PKGBASE} -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile index 7b718b76896..28f25c448f2 100644 --- a/emulators/tuxnes/Makefile +++ b/emulators/tuxnes/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2016/02/25 12:50:49 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:29 wiz Exp $ DISTNAME= tuxnes-0.75 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxnes/} @@ -39,6 +38,6 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xbeeb/options.mk b/emulators/xbeeb/options.mk index 954e1569258..d621dee2826 100644 --- a/emulators/xbeeb/options.mk +++ b/emulators/xbeeb/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2016/12/14 08:51:53 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2018/03/07 11:57:29 wiz Exp $ .include "../../mk/bsd.prefs.mk" @@ -21,9 +21,7 @@ SUBST_SED.nomitshm= -e "s|\#define *MITSHM|\#undef MITSHM|" PLIST_VARS+= xbeeb-roms .if !empty(PKG_OPTIONS:Mmitshm) - -.include "../../x11/xextproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mxbeeb-roms) diff --git a/emulators/xhomer/Makefile b/emulators/xhomer/Makefile index 72e3e74f035..dc8c9b8c786 100644 --- a/emulators/xhomer/Makefile +++ b/emulators/xhomer/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2013/07/24 21:15:54 shattered Exp $ +# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:29 wiz Exp $ DISTNAME= xhomer-9-16-06 PKGNAME= xhomer-9.16.06 +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://xhomer.isani.org/xhomer/ EXTRACT_SUFX= .tgz @@ -29,5 +30,5 @@ do-install: .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/bdftopcf/Makefile b/fonts/bdftopcf/Makefile index 9b42e8bc7cf..a43c0f95edc 100644 --- a/fonts/bdftopcf/Makefile +++ b/fonts/bdftopcf/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2017/11/08 08:43:45 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:29 wiz Exp $ DISTNAME= bdftopcf-1.1 +PKGREVISION= 1 CATEGORIES= fonts MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -14,6 +15,5 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= APP_MAN_SUFFIX=1 -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/libfontenc/Makefile b/fonts/libfontenc/Makefile index 29e1171287f..5f2f8084f19 100644 --- a/fonts/libfontenc/Makefile +++ b/fonts/libfontenc/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/05/01 08:36:12 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2018/03/07 11:57:30 wiz Exp $ DISTNAME= libfontenc-1.1.3 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -17,6 +18,5 @@ GNU_CONFIGURE= yes .include "../../meta-pkgs/modular-xorg/hacks.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/mkfontscale/Makefile b/fonts/mkfontscale/Makefile index c90a892e368..cdf0094b641 100644 --- a/fonts/mkfontscale/Makefile +++ b/fonts/mkfontscale/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2015/01/17 09:12:53 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2018/03/07 11:57:30 wiz Exp $ DISTNAME= mkfontscale-1.1.2 +PKGREVISION= 1 CATEGORIES= fonts x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -20,6 +21,5 @@ CONFIGURE_ARGS+= --with-bzip2 .include "../../archivers/bzip2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-client/options.mk b/games/freeciv-client/options.mk index 5255861a4a4..c8f28fe3fac 100644 --- a/games/freeciv-client/options.mk +++ b/games/freeciv-client/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2015/10/14 20:17:25 wiz Exp $ +# $NetBSD: options.mk,v 1.9 2018/03/07 11:57:30 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freeciv-client PKG_OPTIONS_REQUIRED_GROUPS= backend @@ -52,6 +52,6 @@ CONFIGURE_ARGS+= --enable-client=xaw CONFIGURE_ARGS+= --enable-fcmp=cli CONFIGURE_ARGS+= --with-xaw3d .include "../../x11/libXaw3d/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" PLIST_SRC= ${PKGDIR}/PLIST.xaw .endif diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile index e19d95fdcd5..db78943c895 100644 --- a/games/powermanga/Makefile +++ b/games/powermanga/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2018/01/14 15:26:48 rillig Exp $ -# +# $NetBSD: Makefile,v 1.29 2018/03/07 11:57:30 wiz Exp $ DISTNAME= powermanga-0.90 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= games MASTER_SITES= http://linux.tlk.fr/games/Powermanga/download/ @@ -52,5 +51,5 @@ SUBST_FILES.path+= texts/Makefile.in .include "../../devel/SDL/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quake/Makefile b/games/quake/Makefile index 6ee850a1f88..b0c812a8938 100644 --- a/games/quake/Makefile +++ b/games/quake/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2018/01/14 15:26:48 rillig Exp $ +# $NetBSD: Makefile,v 1.53 2018/03/07 11:57:30 wiz Exp $ DISTNAME= q1source PKGNAME= quake-2.30 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= games x11 MASTER_SITES= ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/source/ MASTER_SITES+= ftp://ftp.idsoftware.com/idstuff/source/ @@ -56,6 +56,6 @@ do-install: .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 943ed0fdc3f..0b1034e8799 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2018/01/01 23:47:44 rillig Exp $ +# $NetBSD: Makefile,v 1.34 2018/03/07 11:57:30 wiz Exp $ DISTNAME= quakeforge-0.5.5 -PKGREVISION= 15 +PKGREVISION= 16 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quake/} @@ -55,7 +55,6 @@ INSTALLATION_DIRS= include/QF/GL include/QF/plugin include/QF/ruamoko/gui .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/tyrquake/Makefile b/games/tyrquake/Makefile index 6b39c374484..472aa884ef3 100644 --- a/games/tyrquake/Makefile +++ b/games/tyrquake/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2018/01/14 10:42:03 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:30 wiz Exp $ DISTNAME= tyrquake-0.61_20140630 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= games x11 #MASTER_SITES= https://disenchant.net/files/engine/ MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/snj/tyrquake/ @@ -33,7 +33,7 @@ do-install: .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/MesaLib/dri.mk b/graphics/MesaLib/dri.mk index 68eb95d093e..e4362c876ac 100644 --- a/graphics/MesaLib/dri.mk +++ b/graphics/MesaLib/dri.mk @@ -1,4 +1,4 @@ -# $NetBSD: dri.mk,v 1.16 2016/03/10 05:29:56 tnn Exp $ +# $NetBSD: dri.mk,v 1.17 2018/03/07 11:57:30 wiz Exp $ # # Currently, this is for convenience only. # @@ -12,8 +12,6 @@ CHECK_BUILTIN.MesaLib:= no . endif . if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo]) -BUILDLINK_API_DEPENDS.dri2proto+= dri2proto>=2.1 -BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.11 . if ${OPSYS} != "Darwin" BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.60 . endif @@ -22,22 +20,17 @@ BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9.3 . endif . endif . include "../../textproc/expat/buildlink3.mk" -. include "../../x11/dri2proto/buildlink3.mk" +. include "../../x11/xorgproto/buildlink3.mk" # XXX these do not have builtin.mk . if ${X11_TYPE} == "modular" -. include "../../x11/dri3proto/buildlink3.mk" . include "../../x11/libxshmfence/buildlink3.mk" -. include "../../x11/presentproto/buildlink3.mk" . endif -. include "../../x11/glproto/buildlink3.mk" . include "../../x11/libXdamage/buildlink3.mk" . include "../../x11/libXfixes/buildlink3.mk" . include "../../x11/libXxf86vm/buildlink3.mk" . if ${OPSYS} != "Darwin" . include "../../x11/libdrm/buildlink3.mk" . endif -. include "../../x11/xf86driproto/buildlink3.mk" -. include "../../x11/xf86vidmodeproto/buildlink3.mk" . if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" . include "../../devel/libdevq/buildlink3.mk" . endif diff --git a/graphics/MesaLib7/Makefile b/graphics/MesaLib7/Makefile index f0e687f9d27..a2ff24b716d 100644 --- a/graphics/MesaLib7/Makefile +++ b/graphics/MesaLib7/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2017/09/03 08:53:09 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:30 wiz Exp $ DISTNAME?= ${MESA_DISTNAME} PKGNAME= MesaLib7-${MESA_PKGVERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MESA_SITES} EXTRACT_SUFX= .tar.bz2 @@ -129,8 +129,7 @@ pre-install: .include "../../lang/python/tool.mk" BUILDLINK_DEPMETHOD.libxml2?= build .include "../../textproc/libxml2/buildlink3.mk" -BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.11 -.include "../../x11/glproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" diff --git a/graphics/MesaLib7/glx-config.mk b/graphics/MesaLib7/glx-config.mk index 58d92501291..9e73f588ac1 100644 --- a/graphics/MesaLib7/glx-config.mk +++ b/graphics/MesaLib7/glx-config.mk @@ -1,15 +1,10 @@ -# $NetBSD: glx-config.mk,v 1.1 2015/04/05 17:01:37 tnn Exp $ +# $NetBSD: glx-config.mk,v 1.2 2018/03/07 11:57:30 wiz Exp $ # # used by x11/modular-xorg-server112/options.mk .if !defined(GLX_CONFIG_MK) GLX_CONFIG_MK= # empty -### XXX Older versions of xf86driproto installed dri_interface.h, which -### is now installed by Mesa. -### -BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4 - . include "../../mk/bsd.fast.prefs.mk" CFLAGS.NetBSD+= -D_NETBSD_SOURCE diff --git a/graphics/evas-software-x11/Makefile b/graphics/evas-software-x11/Makefile index cca07793596..a20c2725ff4 100644 --- a/graphics/evas-software-x11/Makefile +++ b/graphics/evas-software-x11/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2016/03/05 11:28:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:30 wiz Exp $ PKGNAME= evas-software-x11-${EVAS_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Evas software X11 engine EVAS_ENGINES= software-xlib @@ -15,15 +15,14 @@ MAKE_FLAGS+= module_la_LIBADD="\$${EINA_LIBS} \$${evas_engine_software_x11_libs} INSTALLATION_DIRS+= lib/pkgconfig PKGCONFIG_OVERRIDE= evas-software-x11.pc.in +post-install: + ${INSTALL_DATA} ${WRKSRC}/evas-software-x11.pc \ + ${DESTDIR}${PREFIX}/lib/pkgconfig + .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/evas/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - -post-install: - ${INSTALL_DATA} ${WRKSRC}/evas-software-x11.pc \ - ${DESTDIR}${PREFIX}/lib/pkgconfig - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk index 466bf96f23c..36f77c5266a 100644 --- a/graphics/imlib/buildlink3.mk +++ b/graphics/imlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2014/09/08 20:40:30 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2018/03/07 11:57:30 wiz Exp $ BUILDLINK_TREE+= imlib @@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib .include "../../graphics/giflib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # IMLIB_BUILDLINK3_MK BUILDLINK_TREE+= -imlib diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index cf559eb1b75..75ffbeddaf5 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.58 2018/01/14 14:58:39 rillig Exp $ -# +# $NetBSD: Makefile,v 1.59 2018/03/07 11:57:31 wiz Exp $ DISTNAME= libggi-2.2.2.src PKGNAME= ${DISTNAME:S/.src//} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=ggi/} @@ -51,7 +50,7 @@ PLIST.libvgl= yes exists(${X11BASE}/include/X11/extensions/xf86dga.h) .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" PLIST.xf86dga= yes .endif diff --git a/inputmethod/librime/Makefile b/inputmethod/librime/Makefile index 56ec73b74ce..329896f0d45 100644 --- a/inputmethod/librime/Makefile +++ b/inputmethod/librime/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2018/03/07 09:34:55 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:31 wiz Exp $ DISTNAME= librime-1.0 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= inputmethod chinese MASTER_SITES= http://rimeime.googlecode.com/files/ #MASTER_SITES= http://dl.bintray.com/lotem/rime/ @@ -26,5 +26,5 @@ PKGCONFIG_OVERRIDE+= rime.pc.in .include "../../devel/google-glog/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/yaml-cpp/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/meta-pkgs/modular-xorg-protos/Makefile b/meta-pkgs/modular-xorg-protos/Makefile index 5b9a86ade09..830ff4cd0cf 100644 --- a/meta-pkgs/modular-xorg-protos/Makefile +++ b/meta-pkgs/modular-xorg-protos/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2013/12/11 16:29:47 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:31 wiz Exp $ DISTNAME= # empty -PKGNAME= modular-xorg-protos-1.6 +PKGNAME= modular-xorg-protos-1.7 CATEGORIES= meta-pkgs x11 MASTER_SITES= # empty DISTFILES= # empty @@ -13,35 +13,6 @@ LICENSE= 2-clause-bsd META_PACKAGE= yes -.include "../../mk/bsd.fast.prefs.mk" - -.if ${OPSYS} == "Darwin" -DEPENDS+= applewmproto-[0-9]*:../../wm/applewmproto -.endif -DEPENDS+= bigreqsproto-[0-9]*:../../x11/bigreqsproto -DEPENDS+= compositeproto-[0-9]*:../../x11/compositeproto -DEPENDS+= damageproto-[0-9]*:../../x11/damageproto -DEPENDS+= dri2proto-[0-9]*:../../x11/dri2proto -DEPENDS+= dri3proto-[0-9]*:../../x11/dri3proto -DEPENDS+= fixesproto-[0-9]*:../../x11/fixesproto -DEPENDS+= fontsproto-[0-9]*:../../x11/fontsproto -DEPENDS+= glproto-[0-9]*:../../x11/glproto -DEPENDS+= inputproto-[0-9]*:../../x11/inputproto -DEPENDS+= kbproto-[0-9]*:../../x11/kbproto -DEPENDS+= presentproto-[0-9]*:../../x11/presentproto -DEPENDS+= randrproto-[0-9]*:../../x11/randrproto -DEPENDS+= recordproto-[0-9]*:../../x11/recordproto -DEPENDS+= renderproto-[0-9]*:../../x11/renderproto -DEPENDS+= resourceproto-[0-9]*:../../x11/resourceproto -DEPENDS+= scrnsaverproto-[0-9]*:../../x11/scrnsaverproto -DEPENDS+= videoproto-[0-9]*:../../x11/videoproto -DEPENDS+= windowswmproto-[0-9]*:../../wm/windowswmproto -DEPENDS+= xcb-proto-[0-9]*:../../x11/xcb-proto -DEPENDS+= xcmiscproto-[0-9]*:../../x11/xcmiscproto -DEPENDS+= xextproto-[0-9]*:../../x11/xextproto -DEPENDS+= xf86driproto-[0-9]*:../../x11/xf86driproto -DEPENDS+= xf86vidmodeproto-[0-9]*:../../x11/xf86vidmodeproto -DEPENDS+= xineramaproto-[0-9]*:../../x11/xineramaproto -DEPENDS+= xproto-[0-9]*:../../x11/xproto +DEPENDS+= xorgproto-[0-9]*:../../x11/xorgproto .include "../../mk/bsd.pkg.mk" diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 924c6aacca0..ecd0415863c 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.292 2018/02/27 23:43:21 khorben Exp $ +# $NetBSD: mk.conf,v 1.293 2018/03/07 11:57:31 wiz Exp $ # # This file provides default values for variables that may be overridden @@ -287,7 +287,7 @@ PREFER_PKGSRC?= .elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ exists(/usr/lib/libexpat.so)) PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender fontconfig \ - freetype2 glu randrproto renderproto xcursor + freetype2 glu xcursor .elif !empty(MACHINE_PLATFORM:MLinux-*-*) && \ (!defined(X11_TYPE) || ${X11_TYPE} == "native") PREFER_PKGSRC?= @@ -302,7 +302,7 @@ PREFER_PKGSRC?= fontconfig pixman Xft2 PREFER_PKGSRC?= .else PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ - freetype2 glu randrproto renderproto xcursor + freetype2 glu xcursor .endif PREFER_NATIVE?= yes # diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index 00b31934eca..f5fe7505300 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2018/03/06 15:36:11 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2018/03/07 11:57:31 wiz Exp $ DISTNAME= fxtv-1.03 -PKGREVISION= 22 +PKGREVISION= 23 CATEGORIES= multimedia MASTER_SITES= ${HOMEPAGE:Q} EXTRACT_SUFX= .tgz @@ -42,7 +42,7 @@ pre-configure: .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk index 0192732358e..58f7a2786eb 100644 --- a/multimedia/gnash/options.mk +++ b/multimedia/gnash/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.22 2017/09/27 13:37:28 wiz Exp $ +# $NetBSD: options.mk,v 1.23 2018/03/07 11:57:31 wiz Exp $ # # @@ -72,7 +72,7 @@ GNASH_RENDER+= cairo .if !empty(PKG_OPTIONS:Mopengl) GNASH_RENDER+= ogl -.include "../../x11/glproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . if !empty(PKG_OPTIONS:Mgtk) .include "../../graphics/gtkglext/buildlink3.mk" . endif diff --git a/multimedia/libvdpau/Makefile b/multimedia/libvdpau/Makefile index 43e74e80e68..ee997461ef0 100644 --- a/multimedia/libvdpau/Makefile +++ b/multimedia/libvdpau/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2017/02/24 00:59:13 maya Exp $ +# $NetBSD: Makefile,v 1.12 2018/03/07 11:57:31 wiz Exp $ DISTNAME= libvdpau-1.1.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://people.freedesktop.org/~aplattner/vdpau/ EXTRACT_SUFX= .tar.bz2 @@ -32,5 +32,5 @@ PKG_SKIP_REASON+= "VDPAU is not available on this platform" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/dri2proto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index d3928b5226c..7d107b4329a 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2016/07/09 06:38:40 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2018/03/07 11:57:31 wiz Exp $ DISTNAME= xawtv-3.95 -PKGREVISION= 19 +PKGREVISION= 20 CATEGORIES= multimedia MASTER_SITES= http://dl.bytesex.org/releases/xawtv/ @@ -75,7 +75,7 @@ PLIST.bsd= yes .include "../../x11/libXv/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile index b59495c6e0a..78cd6ba1e20 100644 --- a/multimedia/xine-ui/Makefile +++ b/multimedia/xine-ui/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.83 2018/02/26 08:19:31 adam Exp $ +# $NetBSD: Makefile,v 1.84 2018/03/07 11:57:31 wiz Exp $ DISTNAME= xine-ui-0.99.8 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} EXTRACT_SUFX= .tar.xz @@ -41,7 +41,7 @@ PTHREAD_AUTO_VARS= yes .include "../../x11/libXtst/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index 9cd8162793f..cdd2ff0949e 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2017/12/04 19:46:34 bouyer Exp $ +# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:31 wiz Exp $ DISTNAME= tigervnc-1.8.0 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -88,19 +89,8 @@ pre-configure: BUILDLINK_API_DEPENDS.fltk+= fltk>=1.3.3 .include "../../x11/fltk13/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/xcmiscproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" -.include "../../x11/bigreqsproto/buildlink3.mk" -.include "../../x11/compositeproto/buildlink3.mk" -.include "../../x11/damageproto/buildlink3.mk" -.include "../../x11/dri2proto/buildlink3.mk" .include "../../x11/libXfont/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" -.include "../../x11/presentproto/buildlink3.mk" -.include "../../x11/resourceproto/buildlink3.mk" -.include "../../x11/scrnsaverproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile index 512a4d99d48..1f93e94d2b6 100644 --- a/net/vncviewer/Makefile +++ b/net/vncviewer/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2018/01/02 05:37:22 maya Exp $ +# $NetBSD: Makefile,v 1.32 2018/03/07 11:57:31 wiz Exp $ DISTNAME= vnc-4_1_2-unixsrc PKGNAME= vncviewer-4.1.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net x11 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -31,7 +31,7 @@ do-install: BUILDLINK_DEPMETHOD.libXt?= build .include "../../devel/zlib/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/net/x2vnc/Makefile b/net/x2vnc/Makefile index bb689cbaa0c..a9341224423 100644 --- a/net/x2vnc/Makefile +++ b/net/x2vnc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2015/04/23 09:17:48 abs Exp $ +# $NetBSD: Makefile,v 1.24 2018/03/07 11:57:32 wiz Exp $ DISTNAME= x2vnc-1.7.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net x11 MASTER_SITES= http://fredrik.hubbe.net/x2vnc/ @@ -20,7 +20,6 @@ LDFLAGS.SunOS+= -lresolv -lsocket -lnsl .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" -.include "../../x11/scrnsaverproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/x2vnc/options.mk b/net/x2vnc/options.mk index eef21c0c8b4..2c1662a7e23 100644 --- a/net/x2vnc/options.mk +++ b/net/x2vnc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2015/04/23 09:17:48 abs Exp $ +# $NetBSD: options.mk,v 1.3 2018/03/07 11:57:32 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.x2vnc @@ -10,5 +10,5 @@ PKG_SUGGESTED_OPTIONS= .if !empty(PKG_OPTIONS:Mdga) . include "../../x11/libXxf86dga/buildlink3.mk" -. include "../../x11/xf86dgaproto/buildlink3.mk" +. include "../../x11/xorgproto/buildlink3.mk" .endif diff --git a/net/xfindproxy/Makefile b/net/xfindproxy/Makefile index 13901e84db4..d9a84cad855 100644 --- a/net/xfindproxy/Makefile +++ b/net/xfindproxy/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:06 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:32 wiz Exp $ DISTNAME= xfindproxy-1.0.4 +PKGREVISION= 1 CATEGORIES= net x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -13,7 +14,7 @@ LICENSE= x11 GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../x11/xproxymanagementprotocol/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk index f6ad2a48a1f..b9af8c50506 100644 --- a/pkgtools/x11-links/xfree.mk +++ b/pkgtools/x11-links/xfree.mk @@ -1,4 +1,4 @@ -# $NetBSD: xfree.mk,v 1.18 2018/01/27 19:07:48 rillig Exp $ +# $NetBSD: xfree.mk,v 1.19 2018/03/07 11:57:32 wiz Exp $ FILES_LIST= ${FILESDIR}/xfree @@ -12,8 +12,7 @@ FILES_LIST= ${FILESDIR}/xfree .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" # Check if any headers and libraries for ${X11_MODULES} found in # ${X11BASE} actually belong to the base XFree86 or not. diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index fa3c18935fd..d88920414b2 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.30 2018/03/02 15:14:12 wiz Exp $ +# $NetBSD: xorg.mk,v 1.31 2018/03/07 11:57:32 wiz Exp $ # # This is for X.org, but use "xfree" files also. @@ -14,15 +14,7 @@ FILES_LIST= ${FILESDIR}/xorg .include "../../graphics/glut/buildlink3.mk" .include "../../sysutils/libpciaccess/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" -.include "../../x11/bigreqsproto/buildlink3.mk" -.include "../../x11/compositeproto/buildlink3.mk" -.include "../../x11/damageproto/buildlink3.mk" -.include "../../x11/dri2proto/buildlink3.mk" .include "../../x11/evieext/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libFS/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" @@ -53,27 +45,11 @@ FILES_LIST= ${FILESDIR}/xorg .include "../../x11/libdrm/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/presentproto/buildlink3.mk" -.include "../../x11/printproto/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/recordproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/resourceproto/buildlink3.mk" -.include "../../x11/scrnsaverproto/buildlink3.mk" -.include "../../x11/trapproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" .include "../../x11/xbitmaps/buildlink3.mk" -.include "../../x11/xcmiscproto/buildlink3.mk" .include "../../x11/xcb-proto/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" -.include "../../x11/xf86bigfontproto/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" .include "../../x11/xkeyboard-config/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" -.include "../../x11/xproxymanagementprotocol/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" # XXX what is ${X11_MODULES} ? diff --git a/print/xpdfopen/Makefile b/print/xpdfopen/Makefile index b300a734775..53e259084e6 100644 --- a/print/xpdfopen/Makefile +++ b/print/xpdfopen/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:47 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:32 wiz Exp $ DISTNAME= texlive-20170524-source PKGNAME= xpdfopen-0.86 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2017/ EXTRACT_SUFX= .tar.xz @@ -20,5 +20,5 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/utils/xpdfopen .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/Makefile b/wm/Makefile index af6f23772d3..fb562a4df05 100644 --- a/wm/Makefile +++ b/wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2016/11/13 22:04:51 kamil Exp $ +# $NetBSD: Makefile,v 1.134 2018/03/07 11:57:32 wiz Exp $ # COMMENT= X11 window managers, configuration tools, and themes @@ -10,7 +10,6 @@ SUBDIR+= aewm++ SUBDIR+= afterstep SUBDIR+= amaterus SUBDIR+= amiwm -SUBDIR+= applewmproto SUBDIR+= awesome SUBDIR+= bbkeys SUBDIR+= bbkeys09 @@ -89,7 +88,6 @@ SUBDIR+= wbar SUBDIR+= weewm SUBDIR+= windowlab SUBDIR+= windowmaker -SUBDIR+= windowswmproto SUBDIR+= wm2 SUBDIR+= wmakerconf SUBDIR+= wmctrl diff --git a/wm/applewmproto/DESCR b/wm/applewmproto/DESCR deleted file mode 100644 index d95edda5ea3..00000000000 --- a/wm/applewmproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the AppleWM extension headers from modular X.org X11 -project. diff --git a/wm/applewmproto/Makefile b/wm/applewmproto/Makefile deleted file mode 100644 index 4030b7f9bef..00000000000 --- a/wm/applewmproto/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2013/05/31 00:33:43 rodent Exp $ -# - -DISTNAME= applewmproto-1.4.2 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= AppleWM extension headers from X.org -LICENSE= mit - -PREV_PKGPATH= x11/applewmproto - -ONLY_FOR_PLATFORM= Darwin-*-* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/applewmproto.pc.in - -.include "../../x11/xproto/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/wm/applewmproto/PLIST b/wm/applewmproto/PLIST deleted file mode 100644 index f2c82914196..00000000000 --- a/wm/applewmproto/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2013/05/31 00:33:43 rodent Exp $ -include/X11/extensions/applewmconst.h -include/X11/extensions/applewmproto.h -lib/pkgconfig/applewmproto.pc diff --git a/wm/applewmproto/buildlink3.mk b/wm/applewmproto/buildlink3.mk deleted file mode 100644 index ff0ff871c62..00000000000 --- a/wm/applewmproto/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/05/31 00:33:43 rodent Exp $ - -BUILDLINK_TREE+= applewmproto - -.if !defined(APPLEWMPROTO_BUILDLINK3_MK) -APPLEWMPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.applewmproto?= build - -BUILDLINK_API_DEPENDS.applewmproto+= applewmproto>=1.4.1 -BUILDLINK_PKGSRCDIR.applewmproto?= ../../wm/applewmproto - -.include "../../x11/xproto/buildlink3.mk" -.endif # APPLEWMPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -applewmproto diff --git a/wm/applewmproto/distinfo b/wm/applewmproto/distinfo deleted file mode 100644 index 071385be767..00000000000 --- a/wm/applewmproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/02 23:42:50 agc Exp $ - -SHA1 (applewmproto-1.4.2.tar.bz2) = 71dd2374e745a7db7ae0e94410e55ba721683d10 -RMD160 (applewmproto-1.4.2.tar.bz2) = b6ba0eb3e12d783d73d18934587acd1b11fb3989 -SHA512 (applewmproto-1.4.2.tar.bz2) = d4fd66b1566a1250a5c5d30fa19d2bb017f01ab39db5f9791951e738d323c54bb308f0223f52c781a59605c5691b217ae04379ebf211dc8b49fdd1c280c22b3d -Size (applewmproto-1.4.2.tar.bz2) = 97192 bytes diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile index 39a4e8f6702..5ea7bdbf1d0 100644 --- a/wm/awesome/Makefile +++ b/wm/awesome/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.60 2017/08/18 10:16:11 triaxx Exp $ -# +# $NetBSD: Makefile,v 1.61 2018/03/07 11:57:32 wiz Exp $ DISTNAME= awesome-4.2 +PKGREVISION= 1 CATEGORIES= wm MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -77,7 +77,7 @@ pre-configure: .include "../../x11/xcb-util-keysyms/buildlink3.mk" .include "../../x11/xcb-util-wm/buildlink3.mk" .include "../../x11/xcb-util-xrm/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile index 5ecb94a4d1d..41700e922c0 100644 --- a/wm/bbrun/Makefile +++ b/wm/bbrun/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2018/03/06 15:53:07 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2018/03/07 11:57:32 wiz Exp $ DISTNAME= bbrun-1.3 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= wm x11 MASTER_SITES= http://www.dwave.net/~jking/bbrun/ @@ -21,5 +21,5 @@ do-install: .include "../../x11/gtk/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile index 23afaca52af..7d67937f82d 100644 --- a/wm/jwm/Makefile +++ b/wm/jwm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2017/10/21 18:07:33 tsutsui Exp $ -# +# $NetBSD: Makefile,v 1.34 2018/03/07 11:57:32 wiz Exp $ DISTNAME= jwm-2.3.7 +PKGREVISION= 1 CATEGORIES= wm x11 MASTER_SITES= http://www.joewing.net/programs/jwm/releases/ EXTRACT_SUFX= .tar.xz @@ -50,5 +50,5 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/libAppleWM/Makefile b/wm/libAppleWM/Makefile index 6d69a7eaf76..c51b606862a 100644 --- a/wm/libAppleWM/Makefile +++ b/wm/libAppleWM/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2016/02/22 20:02:36 jperkin Exp $ +# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:32 wiz Exp $ DISTNAME= libAppleWM-1.4.1 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -25,7 +26,7 @@ MY_XCODE_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path .endif MAKE_ENV+= OSX_SDK_PATH=${MY_XCODE_SDK_PATH} -.include "../../wm/applewmproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/libAppleWM/buildlink3.mk b/wm/libAppleWM/buildlink3.mk index 0376e6f364c..39c4875e614 100644 --- a/wm/libAppleWM/buildlink3.mk +++ b/wm/libAppleWM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2014/11/16 20:14:59 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/03/07 11:57:32 wiz Exp $ BUILDLINK_TREE+= libAppleWM @@ -8,7 +8,7 @@ LIBAPPLEWM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libAppleWM+= libAppleWM>=1.4.0 BUILDLINK_PKGSRCDIR.libAppleWM?= ../../wm/libAppleWM -.include "../../wm/applewmproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .endif # LIBAPPLEWM_BUILDLINK3_MK diff --git a/wm/libWindowsWM/Makefile b/wm/libWindowsWM/Makefile index dcda51eb3ed..302ee261154 100644 --- a/wm/libWindowsWM/Makefile +++ b/wm/libWindowsWM/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:22 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:32 wiz Exp $ DISTNAME= libWindowsWM-1.0.1 +PKGREVISION= 1 CATEGORIES= wm x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -25,8 +26,7 @@ PKGCONFIG_OVERRIDE+= windowswm.pc.in CONFIGURE_ARGS+= --enable-malloc0returnsnull .endif -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.include "../../wm/windowswmproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/musca/Makefile b/wm/musca/Makefile index b51f6417317..acbe4f8e660 100644 --- a/wm/musca/Makefile +++ b/wm/musca/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/03 08:37:01 wiz Exp $ -# +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:32 wiz Exp $ DISTNAME= musca-0.9.24 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= wm MASTER_SITES= http://aerosuidae.net/ EXTRACT_SUFX= .tgz @@ -30,5 +29,5 @@ do-install: .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/quartz-wm/Makefile b/wm/quartz-wm/Makefile index 2c18e77f9f0..dd83bf47803 100644 --- a/wm/quartz-wm/Makefile +++ b/wm/quartz-wm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2015/10/01 11:06:08 tnn Exp $ +# $NetBSD: Makefile,v 1.2 2018/03/07 11:57:33 wiz Exp $ DISTNAME= quartz-wm-1.3.1 +PKGREVISION= 1 CATEGORIES= wm MASTER_SITES= http://xquartz.macosforge.org/downloads/src/ EXTRACT_SUFX= .tar.xz @@ -22,5 +23,5 @@ ONLY_FOR_PLATFORM= Darwin-*-* .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/spectrwm/Makefile b/wm/spectrwm/Makefile index ed24669d32a..b318984c4ca 100644 --- a/wm/spectrwm/Makefile +++ b/wm/spectrwm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2017/09/04 18:01:03 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:33 wiz Exp $ DISTNAME= spectrwm-2.5.1 +PKGREVISION= 1 CATEGORIES= wm MASTER_SITES= https://opensource.conformal.com/snapshots/spectrwm/ EXTRACT_SUFX= .tgz @@ -47,7 +48,7 @@ post-install: BUILDLINK_DEPMETHOD.libXt= build .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" .include "../../x11/xcb-util-keysyms/buildlink3.mk" .include "../../x11/xcb-util-wm/buildlink3.mk" diff --git a/wm/windowswmproto/DESCR b/wm/windowswmproto/DESCR deleted file mode 100644 index 307b1f8e39d..00000000000 --- a/wm/windowswmproto/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This module provides the definition of the WindowsWM extension to the X11 -protocol, used for coordination between an X11 server and the Microsoft Windows -native window manager. - -WindowsWM is only intended to be used on Cygwin when running a rootless XWin -server. diff --git a/wm/windowswmproto/Makefile b/wm/windowswmproto/Makefile deleted file mode 100644 index 97a3cbd9d90..00000000000 --- a/wm/windowswmproto/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2017/09/16 19:27:22 wiz Exp $ - -DISTNAME= windowswmproto-1.0.4 -CATEGORIES= wm -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Provides definition of the WindowsWM extension to the X11 protocol -LICENSE= mit - -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config -USE_LANGUAGES= c - -PKGCONFIG_OVERRIDE+= windowswmproto.pc.in - -.include "../../x11/xproto/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/wm/windowswmproto/PLIST b/wm/windowswmproto/PLIST deleted file mode 100644 index a78b8e10b8a..00000000000 --- a/wm/windowswmproto/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2013/05/31 00:27:37 rodent Exp $ -include/X11/extensions/windowswm.h -include/X11/extensions/windowswmstr.h -lib/pkgconfig/windowswmproto.pc diff --git a/wm/windowswmproto/buildlink3.mk b/wm/windowswmproto/buildlink3.mk deleted file mode 100644 index 1a6cefe47fa..00000000000 --- a/wm/windowswmproto/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/05/31 00:27:37 rodent Exp $ - -BUILDLINK_TREE+= windowswmproto - -.if !defined(WINDOWSWMPROTO_BUILDLINK3_MK) -WINDOWSWMPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.windowswmproto?= build - -BUILDLINK_API_DEPENDS.windowswmproto+= windowswmproto>=1.0.4 -BUILDLINK_PKGSRCDIR.windowswmproto?= ../../wm/windowswmproto - -.include "../../x11/xproto/buildlink3.mk" -.endif # WINDOWSWMPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -windowswmproto diff --git a/wm/windowswmproto/distinfo b/wm/windowswmproto/distinfo deleted file mode 100644 index 4919261d97c..00000000000 --- a/wm/windowswmproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/02 23:42:55 agc Exp $ - -SHA1 (windowswmproto-1.0.4.tar.bz2) = 1c9b522c66325f08bb989700b4b31911b6ae60ae -RMD160 (windowswmproto-1.0.4.tar.bz2) = 1825537af9cb3aba21901789dd3330089e948adf -SHA512 (windowswmproto-1.0.4.tar.bz2) = d62d13846b0852e6517276d031f571c65440e468d8098d95b74895861059a315a1fa47108a0110878fbc42579ed56fe4ff9dffc7d895cacb96f03d308e3e1703 -Size (windowswmproto-1.0.4.tar.bz2) = 84371 bytes diff --git a/x11/Makefile b/x11/Makefile index 51cf8c26463..73fdceeb5a7 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.817 2018/03/02 15:15:50 wiz Exp $ +# $NetBSD: Makefile,v 1.818 2018/03/07 11:57:33 wiz Exp $ # COMMENT= Packages to support the X window system @@ -21,7 +21,6 @@ SUBDIR+= autocutsel SUBDIR+= avant-window-navigator SUBDIR+= bbapm SUBDIR+= beforelight -SUBDIR+= bigreqsproto SUBDIR+= bitmap SUBDIR+= blt SUBDIR+= c++-gtk-utils @@ -29,9 +28,7 @@ SUBDIR+= clipit SUBDIR+= clisp-gtk2 SUBDIR+= clisp-mit-clx SUBDIR+= clisp-new-clx -SUBDIR+= compositeproto SUBDIR+= compton -SUBDIR+= damageproto SUBDIR+= deforaos-integration SUBDIR+= deforaos-keyboard SUBDIR+= deforaos-libdesktop @@ -43,8 +40,6 @@ SUBDIR+= deskmenu SUBDIR+= devilspie SUBDIR+= dmenu SUBDIR+= docker -SUBDIR+= dri2proto -SUBDIR+= dri3proto SUBDIR+= driconf SUBDIR+= dtx11session SUBDIR+= dunst @@ -61,12 +56,10 @@ SUBDIR+= evieext SUBDIR+= fast-user-switch-applet SUBDIR+= fbdesk SUBDIR+= filerunner -SUBDIR+= fixesproto SUBDIR+= fixesproto4 SUBDIR+= fltk SUBDIR+= fltk13 SUBDIR+= fltk2 -SUBDIR+= fontsproto SUBDIR+= fox SUBDIR+= frameworkintegration SUBDIR+= fspanel @@ -75,7 +68,6 @@ SUBDIR+= fvwm-wharf SUBDIR+= gcolor2 SUBDIR+= gdm SUBDIR+= ggiterm -SUBDIR+= glproto SUBDIR+= gnome-applets SUBDIR+= gnome-control-center SUBDIR+= gnome-desktop @@ -136,11 +128,9 @@ SUBDIR+= i3lock SUBDIR+= iceauth SUBDIR+= ico SUBDIR+= imwheel -SUBDIR+= inputproto SUBDIR+= kactivities SUBDIR+= kactivities-stats SUBDIR+= kactivities5 -SUBDIR+= kbproto SUBDIR+= kconfigwidgets SUBDIR+= kde-baseapps4 SUBDIR+= kde-runtime4 @@ -331,7 +321,6 @@ SUBDIR+= p5-gtk2 SUBDIR+= paragui SUBDIR+= pixman SUBDIR+= plasma-framework -SUBDIR+= presentproto SUBDIR+= printproto SUBDIR+= proxymngr SUBDIR+= py-Pmw @@ -398,15 +387,11 @@ SUBDIR+= qt5-qtxmlpatterns SUBDIR+= qwt-qt4 SUBDIR+= qwt6-qt4 SUBDIR+= qwtplot3d-qt4 -SUBDIR+= randrproto SUBDIR+= ratmen -SUBDIR+= recordproto SUBDIR+= redshift SUBDIR+= rendercheck -SUBDIR+= renderproto SUBDIR+= renderproto9 SUBDIR+= rep-gtk2 -SUBDIR+= resourceproto SUBDIR+= rgb SUBDIR+= rofi SUBDIR+= rox-session @@ -423,7 +408,6 @@ SUBDIR+= ruby-wxruby SUBDIR+= rxvt SUBDIR+= rxvt-unicode SUBDIR+= sakura -SUBDIR+= scrnsaverproto SUBDIR+= sessreg SUBDIR+= setxkbmap SUBDIR+= slock @@ -445,11 +429,9 @@ SUBDIR+= tk85 SUBDIR+= tkinfo SUBDIR+= tktable SUBDIR+= transset -SUBDIR+= trapproto SUBDIR+= tzosdclock SUBDIR+= unclutter SUBDIR+= unicode-screensaver -SUBDIR+= videoproto SUBDIR+= viewres SUBDIR+= vte SUBDIR+= vte029 @@ -492,7 +474,6 @@ SUBDIR+= xcb-util-xrm SUBDIR+= xcb-util036 SUBDIR+= xclip SUBDIR+= xclipboard -SUBDIR+= xcmiscproto SUBDIR+= xcmsdb SUBDIR+= xcolors SUBDIR+= xcolorsel @@ -517,7 +498,6 @@ SUBDIR+= xearth SUBDIR+= xedit SUBDIR+= xephem SUBDIR+= xev -SUBDIR+= xextproto SUBDIR+= xeyes SUBDIR+= xf86-input-acecad SUBDIR+= xf86-input-elographics @@ -577,12 +557,7 @@ SUBDIR+= xf86-video-vmware SUBDIR+= xf86-video-voodoo SUBDIR+= xf86-video-wsfb SUBDIR+= xf86-video-xgi -SUBDIR+= xf86bigfontproto SUBDIR+= xf86dga -SUBDIR+= xf86dgaproto -SUBDIR+= xf86driproto -SUBDIR+= xf86miscproto -SUBDIR+= xf86vidmodeproto SUBDIR+= xfce4-clipman-plugin SUBDIR+= xfce4-dashboard SUBDIR+= xfce4-desktop @@ -617,7 +592,6 @@ SUBDIR+= xgrk SUBDIR+= xhangglider SUBDIR+= xhost SUBDIR+= xicc -SUBDIR+= xineramaproto SUBDIR+= xinit SUBDIR+= xinput SUBDIR+= xjman @@ -674,8 +648,6 @@ SUBDIR+= xpostit SUBDIR+= xpr SUBDIR+= xprehashprinterlist SUBDIR+= xprop -SUBDIR+= xproto -SUBDIR+= xproxymanagementprotocol SUBDIR+= xrandr SUBDIR+= xrdb SUBDIR+= xrefresh diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile index f2d3a99c183..1f61d838511 100644 --- a/x11/Xrender/Makefile +++ b/x11/Xrender/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2017/09/06 09:03:05 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2018/03/07 11:57:33 wiz Exp $ DISTNAME= libXrender-0.9.0 PKGNAME= ${DISTNAME:S/lib//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= https://xlibs.freedesktop.org/release/ EXTRACT_SUFX= .tar.bz2 @@ -25,6 +25,6 @@ CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:Q} PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead." .endif -.include "../../x11/renderproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index dfca28c50ca..6bb75bdec97 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.45 2009/03/20 19:25:39 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.46 2018/03/07 11:57:33 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -12,7 +12,7 @@ BUILDLINK_ABI_DEPENDS.Xrender+= Xrender>=0.9.0nb1 BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender .include "../../mk/x11.buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # XRENDER_BUILDLINK3_MK BUILDLINK_TREE+= -Xrender diff --git a/x11/bigreqsproto/DESCR b/x11/bigreqsproto/DESCR deleted file mode 100644 index 6676f80c446..00000000000 --- a/x11/bigreqsproto/DESCR +++ /dev/null @@ -1 +0,0 @@ -BigReqs extension headers from modular Xorg X11. diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile deleted file mode 100644 index 06ffd6b43ac..00000000000 --- a/x11/bigreqsproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2012/10/29 05:06:08 asau Exp $ -# - -DISTNAME= bigreqsproto-1.1.2 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= BigReqs extension headers from modular Xorg X11 - -CONFLICTS+= xextensions-[0-9]* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/bigreqsproto.pc.in -USE_LANGUAGES= c - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/bigreqsproto/PLIST b/x11/bigreqsproto/PLIST deleted file mode 100644 index 2c3a6215d05..00000000000 --- a/x11/bigreqsproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2012/06/03 18:36:16 wiz Exp $ -include/X11/extensions/bigreqsproto.h -include/X11/extensions/bigreqstr.h -lib/pkgconfig/bigreqsproto.pc -share/doc/bigreqsproto/bigreq.xml diff --git a/x11/bigreqsproto/buildlink3.mk b/x11/bigreqsproto/buildlink3.mk deleted file mode 100644 index ced714c6dc0..00000000000 --- a/x11/bigreqsproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:34 rodent Exp $ - -BUILDLINK_TREE+= bigreqsproto - -.if !defined(BIGREQSPROTO_BUILDLINK3_MK) -BIGREQSPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.bigreqsproto?= build - -BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.0 -BUILDLINK_PKGSRCDIR.bigreqsproto?= ../../x11/bigreqsproto -.endif # BIGREQSPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -bigreqsproto diff --git a/x11/bigreqsproto/builtin.mk b/x11/bigreqsproto/builtin.mk deleted file mode 100644 index ccc4bd13eea..00000000000 --- a/x11/bigreqsproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $ - -BUILTIN_PKG:= bigreqsproto -PKGCONFIG_FILE.bigreqsproto= ${X11BASE}/lib/pkgconfig/bigreqsproto.pc -PKGCONFIG_FILE.bigreqsproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/bigreqsproto.pc -PKGCONFIG_FILE.bigreqsproto+= ${X11BASE}/share/pkgconfig/bigreqsproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo deleted file mode 100644 index 2b36f932fe1..00000000000 --- a/x11/bigreqsproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 03:28:26 agc Exp $ - -SHA1 (bigreqsproto-1.1.2.tar.bz2) = ef1765eeb5e9e38d080225fe6a64ed7cd2984b46 -RMD160 (bigreqsproto-1.1.2.tar.bz2) = 3bff3c4c05a0061e492181d4e687469e590b3900 -SHA512 (bigreqsproto-1.1.2.tar.bz2) = 9c2f98191169f7bca69601fcea5ddcb45d50b3a6bae087a2d6ee2d83f9729155b23268ad4c46a3cc99162cdacf4c8e3d7f061e58d73237da96f23123444f67d8 -Size (bigreqsproto-1.1.2.tar.bz2) = 113218 bytes diff --git a/x11/compositeproto/DESCR b/x11/compositeproto/DESCR deleted file mode 100644 index 830f905e3af..00000000000 --- a/x11/compositeproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This package provides Composite extension headers from the modular -X.org X11 project. diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile deleted file mode 100644 index 525e29a387a..00000000000 --- a/x11/compositeproto/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2012/10/29 05:06:08 asau Exp $ -# - -DISTNAME= compositeproto-0.4.2 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Composite extension headers from modular X.org - -CONFLICTS+= compositeext-[0-9]* - -GNU_CONFIGURE= YES -PKGCONFIG_OVERRIDE+= compositeproto.pc.in - -.include "../../x11/fixesproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/compositeproto/PLIST b/x11/compositeproto/PLIST deleted file mode 100644 index 10ad917463c..00000000000 --- a/x11/compositeproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:24:45 joerg Exp $ -include/X11/extensions/composite.h -include/X11/extensions/compositeproto.h -lib/pkgconfig/compositeproto.pc -share/doc/compositeproto/compositeproto.txt diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk deleted file mode 100644 index 1079642ae88..00000000000 --- a/x11/compositeproto/buildlink3.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:39 joerg Exp $ - -.include "../../mk/bsd.fast.prefs.mk" - -BUILDLINK_DEPMETHOD.compositeproto?= build - -BUILDLINK_TREE+= compositeproto - -.if !defined(COMPOSITEPROTO_BUILDLINK3_MK) -COMPOSITEPROTO_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.3.1 -BUILDLINK_PKGSRCDIR.compositeproto?= ../../x11/compositeproto - -.include "../../x11/fixesproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" -.endif # COMPOSITEPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -compositeproto diff --git a/x11/compositeproto/builtin.mk b/x11/compositeproto/builtin.mk deleted file mode 100644 index d92fc0dda84..00000000000 --- a/x11/compositeproto/builtin.mk +++ /dev/null @@ -1,76 +0,0 @@ -# $NetBSD: builtin.mk,v 1.5 2008/10/05 21:36:32 cube Exp $ - -BUILTIN_PKG:= compositeproto - -BUILTIN_FIND_FILES_VAR:= H_COMPOSITE H_COMPOSITEPROTO -BUILTIN_FIND_FILES.H_COMPOSITE= \ - ${X11BASE}/include/X11/extensions/composite.h -BUILTIN_FIND_FILES.H_COMPOSITEPROTO= \ - ${X11BASE}/include/X11/extensions/compositeproto.h - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if ${X11BASE} == ${LOCALBASE} -IS_BUILTIN.compositeproto= no -.elif !defined(IS_BUILTIN.compositeproto) -IS_BUILTIN.compositeproto= no -# -# Here, we skip checking whether the files are under ${LOCALBASE} since -# we'll consider this X11 package to be built-in even if it's a part -# of one of the pkgsrc-installed X11 distributions. -# -. if empty(H_COMPOSITE:M__nonexistent__) && \ - empty(H_COMPOSITEPROTO:M__nonexistent__) -IS_BUILTIN.compositeproto= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.compositeproto - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.compositeproto) -. if ${PREFER.compositeproto} == "pkgsrc" -USE_BUILTIN.compositeproto= no -. else -USE_BUILTIN.compositeproto= ${IS_BUILTIN.compositeproto} -. if defined(BUILTIN_PKG.compositeproto) && \ - !empty(IS_BUILTIN.compositeproto:M[yY][eE][sS]) -USE_BUILTIN.compositeproto= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.compositeproto} -. if !empty(USE_BUILTIN.compositeproto:M[yY][eE][sS]) -USE_BUILTIN.compositeproto!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.compositeproto:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.compositeproto -.endif -MAKEVARS+= USE_BUILTIN.compositeproto - -.include "../../mk/x11.builtin.mk" - -CHECK_BUILTIN.compositeproto?= no -.if !empty(CHECK_BUILTIN.compositeproto:M[nN][oO]) - -# following so old pkg-config name compositeext.pc will be available -BUILDLINK_TARGETS+= compositeext-symlink-pc - -compositeext-symlink-pc: - src=${BUILDLINK_PREFIX.compositeproto}/lib/pkgconfig/compositeproto.pc \ - dst=${BUILDLINK_DIR}/lib/pkgconfig/compositeext.pc; \ - ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ - if ${TEST} -f $${src}; then \ - ${LN} -sf $${src} $${dst}; \ - fi - -.endif # CHECK_BUILTIN.compositeproto diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo deleted file mode 100644 index 3295e86c93c..00000000000 --- a/x11/compositeproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 03:28:26 agc Exp $ - -SHA1 (compositeproto-0.4.2.tar.gz) = c58c2e2ce9a21336cf28cfae1a5b150a33a18477 -RMD160 (compositeproto-0.4.2.tar.gz) = c13ff4811d5b0303447111881a6db1b0248d6157 -SHA512 (compositeproto-0.4.2.tar.gz) = 9fd8dd319986c63c1a0f552a1c4a0445d4ba8e9ee9e47209d43d7a91a730f3c6e11f2ab0d6689ba31a5143f1f9e0c5b700cc08af055785d6af1717b660e4ccd8 -Size (compositeproto-0.4.2.tar.gz) = 122402 bytes diff --git a/x11/damageproto/DESCR b/x11/damageproto/DESCR deleted file mode 100644 index fb1d6258b71..00000000000 --- a/x11/damageproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This package contains header files and documentation for the X Damage -extension of X RandR. This is from the modular X.org X11 project. diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile deleted file mode 100644 index 4d894bad91c..00000000000 --- a/x11/damageproto/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: Makefile,v 1.6 2012/10/29 05:06:09 asau Exp $ -# - -DISTNAME= damageproto-1.2.1 -CATEGORIES= x11 devel -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Damage extension headers from modular X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= damageproto.pc.in -# for configure -USE_LANGUAGES= c - -.include "../../x11/xproto/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/damageproto/PLIST b/x11/damageproto/PLIST deleted file mode 100644 index 32d17dfcc11..00000000000 --- a/x11/damageproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:24:45 joerg Exp $ -include/X11/extensions/damageproto.h -include/X11/extensions/damagewire.h -lib/pkgconfig/damageproto.pc -share/doc/damageproto/damageproto.txt diff --git a/x11/damageproto/buildlink3.mk b/x11/damageproto/buildlink3.mk deleted file mode 100644 index c00b33caa69..00000000000 --- a/x11/damageproto/buildlink3.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2012/05/29 15:06:54 wiz Exp $ - -BUILDLINK_TREE+= damageproto - -.if !defined(DAMAGEPROTO_BUILDLINK3_MK) -DAMAGEPROTO_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1.0 -BUILDLINK_PKGSRCDIR.damageproto?= ../../x11/damageproto - -BUILDLINK_DEPMETHOD.damageproto?= build - -.include "../../x11/xproto/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" -.endif # DAMAGEPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -damageproto diff --git a/x11/damageproto/builtin.mk b/x11/damageproto/builtin.mk deleted file mode 100644 index 37d5e6b6503..00000000000 --- a/x11/damageproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:51 jperkin Exp $ - -BUILTIN_PKG:= damageproto -PKGCONFIG_FILE.damageproto= ${X11BASE}/lib/pkgconfig/damageproto.pc -PKGCONFIG_FILE.damageproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/damageproto.pc -PKGCONFIG_FILE.damageproto+= ${X11BASE}/share/pkgconfig/damageproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo deleted file mode 100644 index b6f31ca9508..00000000000 --- a/x11/damageproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 03:28:26 agc Exp $ - -SHA1 (damageproto-1.2.1.tar.bz2) = bd0f0f4dc8f37eaabd9279d10fe2889710507358 -RMD160 (damageproto-1.2.1.tar.bz2) = 3354e2f38d443818ff7cd40fd19d72e8fd183043 -SHA512 (damageproto-1.2.1.tar.bz2) = f124e85fb3cc70ed3536cb9db57ac93461bbb5df1a713bc6b67a5ea49122556c321781ca150df681502f6ccfb7305f290e131ad25ce9ccbff5af268df11c86fc -Size (damageproto-1.2.1.tar.bz2) = 98392 bytes diff --git a/x11/dri2proto/DESCR b/x11/dri2proto/DESCR deleted file mode 100644 index 71fdec46534..00000000000 --- a/x11/dri2proto/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This provides the DRI2 extension headers from modular X.org X11 -project. - -The headers contain the types and functions that define the interface -between a DRI2 (direct rendering infrastructure) driver and driver -loader. diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile deleted file mode 100644 index f51b4936b74..00000000000 --- a/x11/dri2proto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2012/10/29 05:06:09 asau Exp $ -# - -DISTNAME= dri2proto-2.8 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= DRI2 extension headers from modular X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= dri2proto.pc.in - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/dri2proto/PLIST b/x11/dri2proto/PLIST deleted file mode 100644 index 187ce46604f..00000000000 --- a/x11/dri2proto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2012/04/26 10:50:43 wiz Exp $ -include/X11/extensions/dri2proto.h -include/X11/extensions/dri2tokens.h -lib/pkgconfig/dri2proto.pc -share/doc/dri2proto/dri2proto.txt diff --git a/x11/dri2proto/buildlink3.mk b/x11/dri2proto/buildlink3.mk deleted file mode 100644 index fd48a46d1e6..00000000000 --- a/x11/dri2proto/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2013/04/06 13:46:34 rodent Exp $ - -BUILDLINK_TREE+= dri2proto - -.if !defined(DRI2PROTO_BUILDLINK3_MK) -DRI2PROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.dri2proto?= build - -BUILDLINK_API_DEPENDS.dri2proto+= dri2proto>=2.0 -BUILDLINK_PKGSRCDIR.dri2proto?= ../../x11/dri2proto - -.endif # DRI2PROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -dri2proto diff --git a/x11/dri2proto/builtin.mk b/x11/dri2proto/builtin.mk deleted file mode 100644 index b52be566c47..00000000000 --- a/x11/dri2proto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2015/08/03 09:53:01 jperkin Exp $ - -BUILTIN_PKG:= dri2proto -PKGCONFIG_FILE.dri2proto= ${X11BASE}/lib/pkgconfig/dri2proto.pc -PKGCONFIG_FILE.dri2proto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/dri2proto.pc -PKGCONFIG_FILE.dri2proto+= ${X11BASE}/share/pkgconfig/dri2proto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo deleted file mode 100644 index 2e3358fbbeb..00000000000 --- a/x11/dri2proto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 03:28:27 agc Exp $ - -SHA1 (dri2proto-2.8.tar.bz2) = 2bc4e8f00778b1f3fe58b4c4f93607ac2adafbbf -RMD160 (dri2proto-2.8.tar.bz2) = 61d47793b3abbb04016824c68decc1a313976f25 -SHA512 (dri2proto-2.8.tar.bz2) = 1602f58cd8a3371dacf894cde4889b9147fc08e83f98d8e0d1c748abe43ecb74cf4e0e3d5eb2f33568ba5e6d9f310303b98ba43ae3bc956ae693824b1ae0745a -Size (dri2proto-2.8.tar.bz2) = 108746 bytes diff --git a/x11/dri3proto/DESCR b/x11/dri3proto/DESCR deleted file mode 100644 index 1d89fa0a756..00000000000 --- a/x11/dri3proto/DESCR +++ /dev/null @@ -1,13 +0,0 @@ -The DRI3 extension provides mechanisms to translate between direct -rendered buffers and X pixmaps. When combined with the Present -extension, a complete direct rendering solution for OpenGL is -provided. - -The direct rendered buffers are passed across the protocol via -standard POSIX file descriptor passing mechanisms. On Linux, these -buffers are DMA-BUF objects. - -DRI3 also includes a mechanism to translate between Linux Futexes -and X Sync extension Fences. This provides a synchronization -mechanism which can be used to serialize access to shared render -buffers. diff --git a/x11/dri3proto/Makefile b/x11/dri3proto/Makefile deleted file mode 100644 index 4286bf6bf9b..00000000000 --- a/x11/dri3proto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2013/11/01 20:42:32 wiz Exp $ - -DISTNAME= dri3proto-1.0 -CATEGORIES= x11 -MASTER_SITES= http://xorg.freedesktop.org/archive/individual/proto/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= -COMMENT= X11 extension for Direct Rendering Infrastructure V3 -#LICENSE= # TODO: (see mk/license.mk) - -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config -USE_LANGUAGES= c - -PKGCONFIG_OVERRIDE+= dri3proto.pc.in - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/dri3proto/PLIST b/x11/dri3proto/PLIST deleted file mode 100644 index fea812dcc00..00000000000 --- a/x11/dri3proto/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2013/11/01 20:42:32 wiz Exp $ -include/X11/extensions/dri3proto.h -lib/pkgconfig/dri3proto.pc -share/doc/dri3proto/dri3proto.txt diff --git a/x11/dri3proto/buildlink3.mk b/x11/dri3proto/buildlink3.mk deleted file mode 100644 index 3785e629e88..00000000000 --- a/x11/dri3proto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:37 rillig Exp $ - -BUILDLINK_TREE+= dri3proto - -.if !defined(DRI3PROTO_BUILDLINK3_MK) -DRI3PROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.dri3proto?= build - -BUILDLINK_API_DEPENDS.dri3proto+= dri3proto>=1.0 -BUILDLINK_PKGSRCDIR.dri3proto?= ../../x11/dri3proto -.endif # DRI3PROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -dri3proto diff --git a/x11/dri3proto/builtin.mk b/x11/dri3proto/builtin.mk deleted file mode 100644 index a5aaa90a9c9..00000000000 --- a/x11/dri3proto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.1 2015/09/30 09:08:43 leot Exp $ - -BUILTIN_PKG:= dri3proto -PKGCONFIG_FILE.dri3proto= ${X11BASE}/lib/pkgconfig/dri3proto.pc -PKGCONFIG_FILE.dri3proto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/dri3proto.pc -PKGCONFIG_FILE.dri3proto+= ${X11BASE}/share/pkgconfig/dri3proto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/dri3proto/distinfo b/x11/dri3proto/distinfo deleted file mode 100644 index d5f27d1cb11..00000000000 --- a/x11/dri3proto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 03:28:27 agc Exp $ - -SHA1 (dri3proto-1.0.tar.bz2) = 1007eaa2f83022653a224f7d2e676ea51cba2f2b -RMD160 (dri3proto-1.0.tar.bz2) = e6cca0d2b5ca91c80de57ee1bc185a814ef397ba -SHA512 (dri3proto-1.0.tar.bz2) = d2925bc2e2bfb3f30c4dc3082d84dc6a2e7d8ea02021ea02d681cbf92e6b256e9e4e0f5abfc394aa0c7762d841b1c8f82d2098c616ca1d7f4a3b5fd8a54f01f8 -Size (dri3proto-1.0.tar.bz2) = 105366 bytes diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile index ab4583f2a3c..ec1ed484b20 100644 --- a/x11/dxpc/Makefile +++ b/x11/dxpc/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2012/12/27 20:19:35 ryoon Exp $ +# $NetBSD: Makefile,v 1.33 2018/03/07 11:57:34 wiz Exp $ DISTNAME= dxpc-3.9.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.vigor.nu/dxpc/ EXTRACT_SUFX= .tgz @@ -20,5 +21,5 @@ INSTALL_MAKE_FLAGS+= man1dir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 LIBS.SunOS+= -lsocket -lnsl .include "../../archivers/lzo/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fixesproto/DESCR b/x11/fixesproto/DESCR deleted file mode 100644 index 5945fb3ce97..00000000000 --- a/x11/fixesproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the Fixes extension headers from modular X.org X11 -project. diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile deleted file mode 100644 index eefd637306a..00000000000 --- a/x11/fixesproto/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: Makefile,v 1.11 2012/10/29 05:06:11 asau Exp $ -# - -DISTNAME= fixesproto-5.0 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Fixes extension headers from X.org - -CONFLICTS+= fixesext-[0-9]* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/fixesproto.pc.in - -.include "../../converters/libiconv/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/fixesproto/PLIST b/x11/fixesproto/PLIST deleted file mode 100644 index 707a6b10c92..00000000000 --- a/x11/fixesproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2010/04/09 08:15:48 tnn Exp $ -include/X11/extensions/xfixesproto.h -include/X11/extensions/xfixeswire.h -lib/pkgconfig/fixesproto.pc -share/doc/fixesproto/fixesproto.txt diff --git a/x11/fixesproto/buildlink3.mk b/x11/fixesproto/buildlink3.mk deleted file mode 100644 index 91d63c6db93..00000000000 --- a/x11/fixesproto/buildlink3.mk +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:38 rillig Exp $ - -.include "../../mk/bsd.fast.prefs.mk" - -.if ${X11_TYPE} != "modular" && \ - !exists(${X11BASE}/lib/pkgconfig/fixesproto.pc) && \ - !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fixesproto.pc) && \ - !exists(${X11BASE}/share/pkgconfig/fixesproto.pc) -.include "../../x11/fixesproto4/buildlink3.mk" -.else - -BUILDLINK_DEPMETHOD.fixesproto?= build - -BUILDLINK_TREE+= fixesproto - -. if !defined(FIXESPROTO_BUILDLINK3_MK) -FIXESPROTO_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0.0 -BUILDLINK_PKGSRCDIR.fixesproto?= ../../x11/fixesproto - -. if !defined(USE_BUILTIN.fixesproto) -CHECK_BUILTIN.fixesproto:= yes -.include "../../x11/fixesproto/builtin.mk" -CHECK_BUILTIN.fixesproto:= no -. endif - -. if !empty(USE_BUILTIN.fixesproto:M[Nn][Oo]) -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 -. endif - -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" -. endif # FIXESPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -fixesproto - -.endif diff --git a/x11/fixesproto/builtin.mk b/x11/fixesproto/builtin.mk deleted file mode 100644 index f7c5f70b663..00000000000 --- a/x11/fixesproto/builtin.mk +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: builtin.mk,v 1.10 2015/06/18 21:48:52 jperkin Exp $ - -BUILTIN_PKG:= fixesproto -PKGCONFIG_FILE.fixesproto= ${X11BASE}/lib/pkgconfig/fixesproto.pc -PKGCONFIG_FILE.fixesproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fixesproto.pc -PKGCONFIG_FILE.fixesproto+= ${X11BASE}/share/pkgconfig/fixesproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" - -CHECK_BUILTIN.fixesproto?= no -.if !empty(CHECK_BUILTIN.fixesproto:M[nN][oO]) - -# following so old pkg-config name fixesext.pc will be available -# this is temporary and can be removed once not used -BUILDLINK_TARGETS+= fixesext-symlink-pc - -fixesext-symlink-pc: - src=${FIND_FILES_fixesproto} \ - dst=${BUILDLINK_DIR}/lib/pkgconfig/fixesext.pc; \ - ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ - if ${TEST} -f $${src}; then \ - ${LN} -sf $${src} $${dst}; \ - fi - -.endif # CHECK_BUILTIN.fixesproto diff --git a/x11/fixesproto/distinfo b/x11/fixesproto/distinfo deleted file mode 100644 index 926b29a9825..00000000000 --- a/x11/fixesproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 03:28:28 agc Exp $ - -SHA1 (fixesproto-5.0.tar.bz2) = ab605af5da8c98c0c2f8b2c578fed7c864ee996a -RMD160 (fixesproto-5.0.tar.bz2) = e6733c26d84c58ba74263e90c79f2f6a1974c34a -SHA512 (fixesproto-5.0.tar.bz2) = 93c6a8b6e4345c3049c08f2f3960f5eb5f92c487f26d227430964361bf82041b49e61f873fbbb8ee0e111556f90532b852c20e6082ee8008be641373251fa78c -Size (fixesproto-5.0.tar.bz2) = 100886 bytes diff --git a/x11/fixesproto4/Makefile b/x11/fixesproto4/Makefile index 432e1d7f8e2..5a6192a5758 100644 --- a/x11/fixesproto4/Makefile +++ b/x11/fixesproto4/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2012/10/29 05:06:12 asau Exp $ +# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:34 wiz Exp $ # # This package is for use with Xfixes only. Do not update to later versions. DISTNAME= fixesproto-4.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=proto/} EXTRACT_SUFX= .tar.bz2 @@ -24,7 +25,5 @@ PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead." .endif .include "../../converters/libiconv/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fixesproto4/buildlink3.mk b/x11/fixesproto4/buildlink3.mk index 772d52649f6..5e361552140 100644 --- a/x11/fixesproto4/buildlink3.mk +++ b/x11/fixesproto4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/03/26 13:07:34 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:34 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -12,8 +12,7 @@ FIXESPROTO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=3.0.0<5 BUILDLINK_PKGSRCDIR.fixesproto?= ../../x11/fixesproto4 -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # FIXESPROTO_BUILDLINK3_MK BUILDLINK_TREE+= -fixesproto diff --git a/x11/fontsproto/DESCR b/x11/fontsproto/DESCR deleted file mode 100644 index 01e025d930d..00000000000 --- a/x11/fontsproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This package provides the fonts extension headers from the modular -X.org X11 project. diff --git a/x11/fontsproto/Makefile b/x11/fontsproto/Makefile deleted file mode 100644 index b5681e0963d..00000000000 --- a/x11/fontsproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.7 2014/04/15 08:22:53 wiz Exp $ - -DISTNAME= fontsproto-2.1.3 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Fonts extension headers from X.org - -USE_PKGLOCALEDIR= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/fontsproto.pc.in -GNU_CONFIGURE= yes - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/fontsproto/PLIST b/x11/fontsproto/PLIST deleted file mode 100644 index 2ef5cceb666..00000000000 --- a/x11/fontsproto/PLIST +++ /dev/null @@ -1,9 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2012/06/03 19:43:14 wiz Exp $ -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 -lib/pkgconfig/fontsproto.pc -share/doc/fontsproto/fsproto.xml diff --git a/x11/fontsproto/buildlink3.mk b/x11/fontsproto/buildlink3.mk deleted file mode 100644 index 719fd49c78f..00000000000 --- a/x11/fontsproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2013/04/06 13:46:34 rodent Exp $ - -BUILDLINK_TREE+= fontsproto - -.if !defined(FONTSPROTO_BUILDLINK3_MK) -FONTSPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.fontsproto?= build - -BUILDLINK_API_DEPENDS.fontsproto+= fontsproto>=2.0 -BUILDLINK_PKGSRCDIR.fontsproto?= ../../x11/fontsproto -.endif # FONTSPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -fontsproto diff --git a/x11/fontsproto/builtin.mk b/x11/fontsproto/builtin.mk deleted file mode 100644 index 7244266f640..00000000000 --- a/x11/fontsproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:01 jperkin Exp $ - -BUILTIN_PKG:= fontsproto -PKGCONFIG_FILE.fontsproto= ${X11BASE}/lib/pkgconfig/fontsproto.pc -PKGCONFIG_FILE.fontsproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/fontsproto.pc -PKGCONFIG_FILE.fontsproto+= ${X11BASE}/share/pkgconfig/fontsproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/fontsproto/distinfo b/x11/fontsproto/distinfo deleted file mode 100644 index 6056c3f1716..00000000000 --- a/x11/fontsproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 03:28:29 agc Exp $ - -SHA1 (fontsproto-2.1.3.tar.bz2) = 28c108bd6438c332122c10871c1fc6415591755f -RMD160 (fontsproto-2.1.3.tar.bz2) = caa89b1818cc4ee5bd202faa25224aa6c89db1ed -SHA512 (fontsproto-2.1.3.tar.bz2) = f46d5b733aa48644aa3aa75d4ed47231ef78cb60f747f7200d82331a1ba566190bf37b5b9926c690dec6356043ce7c85a5b59fc1b4b11667ef432518b5d4cc87 -Size (fontsproto-2.1.3.tar.bz2) = 154087 bytes diff --git a/x11/glproto/DESCR b/x11/glproto/DESCR deleted file mode 100644 index afca1b37280..00000000000 --- a/x11/glproto/DESCR +++ /dev/null @@ -1 +0,0 @@ -This package provides the GL extension headers from modular X.org. diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile deleted file mode 100644 index 445b164097e..00000000000 --- a/x11/glproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.12 2013/12/31 17:31:44 wiz Exp $ - -DISTNAME= glproto-1.4.17 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= GL extension headers - -PKGCONFIG_OVERRIDE+= glproto.pc.in -USE_TOOLS+= pkg-config -GNU_CONFIGURE= yes - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/glproto/PLIST b/x11/glproto/PLIST deleted file mode 100644 index a54dc2bbff2..00000000000 --- a/x11/glproto/PLIST +++ /dev/null @@ -1,7 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:06:39 joerg Exp $ -include/GL/glxint.h -include/GL/glxmd.h -include/GL/glxproto.h -include/GL/glxtokens.h -include/GL/internal/glcore.h -lib/pkgconfig/glproto.pc diff --git a/x11/glproto/buildlink3.mk b/x11/glproto/buildlink3.mk deleted file mode 100644 index 0458494d390..00000000000 --- a/x11/glproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:34 rodent Exp $ - -BUILDLINK_TREE+= glproto - -.if !defined(GLPROTO_BUILDLINK3_MK) -GLPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.glproto?= build - -BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.6 -BUILDLINK_PKGSRCDIR.glproto?= ../../x11/glproto -.endif # GLPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -glproto diff --git a/x11/glproto/builtin.mk b/x11/glproto/builtin.mk deleted file mode 100644 index 31fda66b98a..00000000000 --- a/x11/glproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:01 jperkin Exp $ - -BUILTIN_PKG:= glproto -PKGCONFIG_FILE.glproto= ${X11BASE}/lib/pkgconfig/glproto.pc -PKGCONFIG_FILE.glproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/glproto.pc -PKGCONFIG_FILE.glproto+= ${X11BASE}/share/pkgconfig/glproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo deleted file mode 100644 index 3e960e80dac..00000000000 --- a/x11/glproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.10 2015/11/04 03:28:29 agc Exp $ - -SHA1 (glproto-1.4.17.tar.bz2) = 20e061c463bed415051f0f89e968e331a2078551 -RMD160 (glproto-1.4.17.tar.bz2) = 85ca52a3752d8618ed0e16dfb2b1020a464a83a8 -SHA512 (glproto-1.4.17.tar.bz2) = 3e5bb1949ab9993e07d2ed7e829b9e0a8803eab476e9f4082fc01087c3dce01f3bcb9d55261eaf60e55977a689b326ed1dcf40f74d5e1fc660c83bea094b6754 -Size (glproto-1.4.17.tar.bz2) = 126969 bytes diff --git a/x11/gtk3/options.mk b/x11/gtk3/options.mk index 401d8952ce7..a519e5689cf 100644 --- a/x11/gtk3/options.mk +++ b/x11/gtk3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2017/11/12 15:37:00 khorben Exp $ +# $NetBSD: options.mk,v 1.11 2018/03/07 11:57:34 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3 PKG_SUPPORTED_OPTIONS= gtk3-atk-bridge cups debug @@ -44,9 +44,8 @@ CONFIGURE_ARGS+= --without-atk-bridge . endif BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.0 -.include "../../x11/inputproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile index 874ec2ec105..9bce14558e2 100644 --- a/x11/iceauth/Makefile +++ b/x11/iceauth/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2018/03/05 09:31:00 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:34 wiz Exp $ DISTNAME= iceauth-1.0.8 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -15,5 +16,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 .include "../../x11/libICE/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/inputproto/DESCR b/x11/inputproto/DESCR deleted file mode 100644 index 39a7c7b3adb..00000000000 --- a/x11/inputproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the input extension headers from modular X.org X11 -project. diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile deleted file mode 100644 index 1888fc9d44c..00000000000 --- a/x11/inputproto/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.18 2016/04/08 14:50:03 wiz Exp $ - -DISTNAME= inputproto-2.3.2 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Input extension headers from X.org - -CONFLICTS+= xextensions-[0-9]* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= inputproto.pc.in -CONFIGURE_ARGS+= --with-asciidoc=no - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/inputproto/PLIST b/x11/inputproto/PLIST deleted file mode 100644 index 4cffe753c62..00000000000 --- a/x11/inputproto/PLIST +++ /dev/null @@ -1,6 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2010/04/09 08:21:48 tnn Exp $ -include/X11/extensions/XI.h -include/X11/extensions/XI2.h -include/X11/extensions/XI2proto.h -include/X11/extensions/XIproto.h -lib/pkgconfig/inputproto.pc diff --git a/x11/inputproto/buildlink3.mk b/x11/inputproto/buildlink3.mk deleted file mode 100644 index 699a30d940c..00000000000 --- a/x11/inputproto/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.6 2010/04/10 21:09:20 tnn Exp $ - -BUILDLINK_TREE+= inputproto - -.if !defined(INPUTPROTO_BUILDLINK3_MK) -INPUTPROTO_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.4 -BUILDLINK_PKGSRCDIR.inputproto?= ../../x11/inputproto -BUILDLINK_DEPMETHOD.inputproto?= build -.endif # INPUTPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -inputproto diff --git a/x11/inputproto/builtin.mk b/x11/inputproto/builtin.mk deleted file mode 100644 index d2dd1d899d0..00000000000 --- a/x11/inputproto/builtin.mk +++ /dev/null @@ -1,65 +0,0 @@ -# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ - -BUILTIN_PKG:= inputproto - -BUILTIN_FIND_FILES_VAR:= PC_INPUTPROTO -BUILTIN_FIND_FILES.PC_INPUTPROTO= ${X11BASE}/lib/pkgconfig/inputproto.pc -BUILTIN_FIND_FILES.PC_INPUTPROTO+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/inputproto.pc -BUILTIN_FIND_FILES.PC_INPUTPROTO+= ${X11BASE}/share/pkgconfig/inputproto.pc - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if ${X11BASE} == ${LOCALBASE} -IS_BUILTIN.inputproto= no -.elif !defined(IS_BUILTIN.inputproto) -IS_BUILTIN.inputproto= no -. if empty(PC_INPUTPROTO:M__nonexistent__) -IS_BUILTIN.inputproto= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.inputproto - -### -### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to -### a package name to represent the built-in package. -### -.if !defined(BUILTIN_PKG.inputproto) && \ - !empty(IS_BUILTIN.inputproto:M[yY][eE][sS]) && \ - empty(PC_INPUTPROTO:M__nonexistent__) -BUILTIN_VERSION.inputproto!= ${SED} -n -e 's/Version: //p' ${PC_INPUTPROTO} -BUILTIN_PKG.inputproto= inputproto-${BUILTIN_VERSION.inputproto} -.endif -MAKEVARS+= BUILTIN_PKG.inputproto - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.inputproto) -. if ${PREFER.inputproto} == "pkgsrc" -USE_BUILTIN.inputproto= no -. else -USE_BUILTIN.inputproto= ${IS_BUILTIN.inputproto} -. if defined(BUILTIN_PKG.inputproto) && \ - !empty(IS_BUILTIN.inputproto:M[yY][eE][sS]) -USE_BUILTIN.inputproto= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.inputproto} -. if !empty(USE_BUILTIN.inputproto:M[yY][eE][sS]) -USE_BUILTIN.inputproto!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.inputproto:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.inputproto -.endif -MAKEVARS+= USE_BUILTIN.inputproto - -.include "../../mk/x11.builtin.mk" diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo deleted file mode 100644 index c6370df87f5..00000000000 --- a/x11/inputproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.16 2016/04/08 14:50:03 wiz Exp $ - -SHA1 (inputproto-2.3.2.tar.bz2) = 62b29a0c3b4ede9d129a0598cc6becf628a2158a -RMD160 (inputproto-2.3.2.tar.bz2) = 907705001d5eb86641cf10d41ac5a45797880e7d -SHA512 (inputproto-2.3.2.tar.bz2) = 23d41e9ff4f49d80cd00a436e6dbae09adb7b72d3a3d7909c340b4b132b5908b32a497d5e2ec2c994cf0598a788c0481270bf36ce95171c0be4f74b52715fedd -Size (inputproto-2.3.2.tar.bz2) = 200857 bytes diff --git a/x11/kbproto/DESCR b/x11/kbproto/DESCR deleted file mode 100644 index 5dcb921838e..00000000000 --- a/x11/kbproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the KB extension headers from modular X.org X11 -project. diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile deleted file mode 100644 index 225664dca9b..00000000000 --- a/x11/kbproto/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.7 2015/05/01 08:45:17 wiz Exp $ - -DISTNAME= kbproto-1.0.7 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= KB extension headers from X.org -LICENSE= mit - -CONFLICTS+= xextensions-[0-9]* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= kbproto.pc.in - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/kbproto/PLIST b/x11/kbproto/PLIST deleted file mode 100644 index 14784e82dd8..00000000000 --- a/x11/kbproto/PLIST +++ /dev/null @@ -1,40 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2012/06/03 18:37:15 wiz Exp $ -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 -lib/pkgconfig/kbproto.pc -share/doc/kbproto/XKBproto-1.svg -share/doc/kbproto/XKBproto-10.svg -share/doc/kbproto/XKBproto-11.svg -share/doc/kbproto/XKBproto-2.svg -share/doc/kbproto/XKBproto-3.svg -share/doc/kbproto/XKBproto-4.svg -share/doc/kbproto/XKBproto-5.svg -share/doc/kbproto/XKBproto-6.svg -share/doc/kbproto/XKBproto-7.svg -share/doc/kbproto/XKBproto-8.svg -share/doc/kbproto/XKBproto-9.svg -share/doc/kbproto/acknowledgements.xml -share/doc/kbproto/appA.xml -share/doc/kbproto/appB.xml -share/doc/kbproto/appC.xml -share/doc/kbproto/appD.xml -share/doc/kbproto/ch01.xml -share/doc/kbproto/ch02.xml -share/doc/kbproto/ch03.xml -share/doc/kbproto/ch04.xml -share/doc/kbproto/ch05.xml -share/doc/kbproto/ch06.xml -share/doc/kbproto/ch07.xml -share/doc/kbproto/ch08.xml -share/doc/kbproto/ch09.xml -share/doc/kbproto/ch10.xml -share/doc/kbproto/ch11.xml -share/doc/kbproto/ch12.xml -share/doc/kbproto/ch13.xml -share/doc/kbproto/ch14.xml -share/doc/kbproto/ch15.xml -share/doc/kbproto/ch16.xml -share/doc/kbproto/xkbproto.xml diff --git a/x11/kbproto/buildlink3.mk b/x11/kbproto/buildlink3.mk deleted file mode 100644 index e03cfb84d7f..00000000000 --- a/x11/kbproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:35 rodent Exp $ - -BUILDLINK_TREE+= kbproto - -.if !defined(KBPROTO_BUILDLINK3_MK) -KBPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.kbproto?= build - -BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.2 -BUILDLINK_PKGSRCDIR.kbproto?= ../../x11/kbproto -.endif # KBPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -kbproto diff --git a/x11/kbproto/builtin.mk b/x11/kbproto/builtin.mk deleted file mode 100644 index 05b0101e6ca..00000000000 --- a/x11/kbproto/builtin.mk +++ /dev/null @@ -1,51 +0,0 @@ -# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $ - -BUILTIN_PKG:= kbproto - -BUILTIN_FIND_FILES_VAR:= H_XKB -BUILTIN_FIND_FILES.H_XKB= ${X11BASE}/include/X11/extensions/XKB.h - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if ${X11BASE} == ${LOCALBASE} -IS_BUILTIN.kbproto= no -.elif !defined(IS_BUILTIN.kbproto) -IS_BUILTIN.kbproto= no -. if empty(H_XKB:M__nonexistent__) -IS_BUILTIN.kbproto= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.kbproto - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.kbproto) -. if ${PREFER.kbproto} == "pkgsrc" -USE_BUILTIN.kbproto= no -. else -USE_BUILTIN.kbproto= ${IS_BUILTIN.kbproto} -. if defined(BUILTIN_PKG.kbproto) && \ - !empty(IS_BUILTIN.kbproto:M[yY][eE][sS]) -USE_BUILTIN.kbproto= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.kbproto} -. if !empty(USE_BUILTIN.kbproto:M[yY][eE][sS]) -USE_BUILTIN.kbproto!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.kbproto:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.kbproto -.endif -MAKEVARS+= USE_BUILTIN.kbproto - -.include "../../mk/x11.builtin.mk" diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo deleted file mode 100644 index 349a73f75dc..00000000000 --- a/x11/kbproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 03:28:34 agc Exp $ - -SHA1 (kbproto-1.0.7.tar.bz2) = bc9c0fa7d39edf4ac043e6eeaa771d3e245ac5b2 -RMD160 (kbproto-1.0.7.tar.bz2) = 4fa5c2faf7e8558da2bab347c5027cc44fa678f8 -SHA512 (kbproto-1.0.7.tar.bz2) = 49f24bfd11ee4ef0de658a1f55bcfb4b3a1f7057d90137b899ea3d4ecc40cebde97926a3f4315ddca4ae28d32b2d15f16fda993296acffdb4c007d2f84a39a22 -Size (kbproto-1.0.7.tar.bz2) = 250178 bytes diff --git a/x11/lbxproxy/Makefile b/x11/lbxproxy/Makefile index cb639c7dec4..c3dbbc06b62 100644 --- a/x11/lbxproxy/Makefile +++ b/x11/lbxproxy/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2017/09/16 19:27:26 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:34 wiz Exp $ DISTNAME= lbxproxy-1.0.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -24,8 +24,7 @@ INSTALLATION_DIRS+= share/examples/lbxproxy post-install: ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/AtomControl ${DESTDIR}${EGDIR}/ -.include "../../x11/bigreqsproto/buildlink3.mk" -.include "../../x11/xproxymanagementprotocol/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/liblbxutil/buildlink3.mk" diff --git a/x11/libFS/Makefile b/x11/libFS/Makefile index f0838f6465c..b3e4ea9b0bc 100644 --- a/x11/libFS/Makefile +++ b/x11/libFS/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libFS-1.0.7 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -19,8 +20,6 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libFS/buildlink3.mk b/x11/libFS/buildlink3.mk index b1e216d0fd3..f3e62f58c95 100644 --- a/x11/libFS/buildlink3.mk +++ b/x11/libFS/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:43 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:35 wiz Exp $ BUILDLINK_TREE+= libFS @@ -8,8 +8,7 @@ LIBFS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libFS+= libFS>=1.0.0 BUILDLINK_PKGSRCDIR.libFS?= ../../x11/libFS -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBFS_BUILDLINK3_MK BUILDLINK_TREE+= -libFS diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile index c5ef043ed16..49897e0ca3f 100644 --- a/x11/libICE/Makefile +++ b/x11/libICE/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2014/10/09 14:07:13 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libICE-1.0.9 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -19,7 +20,6 @@ PKGCONFIG_OVERRIDE+= ice.pc.in .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index 8b3bc8d81b6..6b337b2c9db 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2014/10/09 14:07:14 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libSM-1.2.2 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -22,7 +23,6 @@ CONFIGURE_ARGS+= --without-libuuid .include "../../meta-pkgs/modular-xorg/hacks.mk" .include "../../x11/libICE/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index e5d0e58d7e7..77313f665c8 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2017/02/27 09:09:50 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libX11-1.6.5 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -30,7 +31,6 @@ LDFLAGS.MirBSD+= ${PTHREAD_LDFLAGS} LDFLAGS.OpenBSD+= ${PTHREAD_LDFLAGS} BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.11.1 -BUILDLINK_API_DEPENDS.xproto+=xproto>=7.0.17 TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" @@ -42,19 +42,12 @@ CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} # XXX This needs to match the version of xcb-proto we get for the # target by buildlink3. -TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto +TOOL_DEPENDS+= xorgproto-[0-9]*:../../x11/xorgproto .endif -.include "../../x11/bigreqsproto/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXdmcp/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" -.include "../../x11/xcmiscproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xf86bigfontproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk index 5c3ad3c9671..b1be055bddc 100644 --- a/x11/libX11/buildlink3.mk +++ b/x11/libX11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:38 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/03/07 11:57:35 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -24,7 +24,6 @@ X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib .include "../../mk/pthread.buildlink3.mk" . endif -.include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXdmcp/buildlink3.mk" @@ -34,7 +33,7 @@ X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib .include "../../x11/libxcb/buildlink3.mk" . endif -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBX11_BUILDLINK3_MK BUILDLINK_TREE+= -libX11 diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile index 05c9e626f9c..618e17b42b1 100644 --- a/x11/libXScrnSaver/Makefile +++ b/x11/libXScrnSaver/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2016/02/26 11:27:14 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.12 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libXScrnSaver-1.2.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -10,8 +10,6 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= X11 Screen Saver Library -CONFLICTS+= scrnsaverproto<1.2.0 - USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config @@ -24,7 +22,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.2.0 -.include "../../x11/scrnsaverproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXScrnSaver/buildlink3.mk b/x11/libXScrnSaver/buildlink3.mk index 15ddc4c21fc..72c7723cf12 100644 --- a/x11/libXScrnSaver/buildlink3.mk +++ b/x11/libXScrnSaver/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:43 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:35 wiz Exp $ BUILDLINK_TREE+= libXScrnSaver @@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.libXScrnSaver?= ../../x11/libXScrnSaver .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/scrnsaverproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXSCRNSAVER_BUILDLINK3_MK BUILDLINK_TREE+= -libXScrnSaver diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile index 5fe08cd836e..af68a30e4b3 100644 --- a/x11/libXTrap/Makefile +++ b/x11/libXTrap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2014/10/09 14:07:14 wiz Exp $ -# +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libXTrap-1.0.1 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -19,6 +19,5 @@ PKGCONFIG_OVERRIDE+= xtrap.pc.in .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/trapproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile index aa19be26532..55773580c80 100644 --- a/x11/libXau/Makefile +++ b/x11/libXau/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2014/10/09 14:07:14 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libXau-1.0.8 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -22,6 +23,5 @@ CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXau/buildlink3.mk b/x11/libXau/buildlink3.mk index c477be048dd..7e2c6f3e87c 100644 --- a/x11/libXau/buildlink3.mk +++ b/x11/libXau/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:35 wiz Exp $ BUILDLINK_TREE+= libXau @@ -8,7 +8,7 @@ LIBXAU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXau+= libXau>=1.0 BUILDLINK_PKGSRCDIR.libXau?= ../../x11/libXau -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXAU_BUILDLINK3_MK BUILDLINK_TREE+= -libXau diff --git a/x11/libXau/builtin.mk b/x11/libXau/builtin.mk index 99de98fc33a..b50c956fac0 100644 --- a/x11/libXau/builtin.mk +++ b/x11/libXau/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:56:02 jperkin Exp $ +# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:35 wiz Exp $ BUILTIN_PKG:= libXau @@ -71,7 +71,7 @@ xau-fake-pc: else \ req=""; \ if ${TEST} -f \ - ${BUILDLINK_PREFIX.xproto}/lib/pkgconfig/xproto.pc; then \ + ${BUILDLINK_PREFIX.xorgproto}/lib/pkgconfig/xproto.pc; then \ req="xproto"; \ fi; \ { ${ECHO} "Name: Xau"; \ diff --git a/x11/libXaw/Makefile b/x11/libXaw/Makefile index 135d022b87c..09f39d7dc16 100644 --- a/x11/libXaw/Makefile +++ b/x11/libXaw/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2015/05/01 08:40:12 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libXaw-1.0.13 +PKGREVISION= 1 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -23,6 +24,5 @@ CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXaw/buildlink3.mk b/x11/libXaw/buildlink3.mk index 84ac86dbf93..83b0985ddc0 100644 --- a/x11/libXaw/buildlink3.mk +++ b/x11/libXaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/03/07 11:57:35 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -22,7 +22,7 @@ BUILDLINK_TRANSFORM+= l:Xaw:Xaw7 .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXAW_BUILDLINK3_MK BUILDLINK_TREE+= -libXaw diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile index 594bf4112c9..fdddb4cacb6 100644 --- a/x11/libXcomposite/Makefile +++ b/x11/libXcomposite/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2014/10/09 14:07:14 wiz Exp $ -# +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libXcomposite-0.4.4 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -17,10 +17,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xcomposite.pc.in -BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 - -.include "../../x11/compositeproto/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" diff --git a/x11/libXcomposite/buildlink3.mk b/x11/libXcomposite/buildlink3.mk index 4e6698825c2..6a97d5eddb6 100644 --- a/x11/libXcomposite/buildlink3.mk +++ b/x11/libXcomposite/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2013/12/14 09:36:57 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:35 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,8 +10,7 @@ LIBXCOMPOSITE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.3.1 BUILDLINK_PKGSRCDIR.libXcomposite?= ../../x11/libXcomposite -.include "../../x11/compositeproto/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile index f04aa68af7f..f98072617ae 100644 --- a/x11/libXcursor/Makefile +++ b/x11/libXcursor/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2017/11/28 14:57:20 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libXcursor-1.1.15 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -19,10 +20,8 @@ PKGCONFIG_OVERRIDE+= xcursor.pc.in .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/fixesproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXcursor/buildlink3.mk b/x11/libXcursor/buildlink3.mk index a9dfe489eb1..c051a8bf2a4 100644 --- a/x11/libXcursor/buildlink3.mk +++ b/x11/libXcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:35 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXcursor?= ../../x11/libXcursor .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXCURSOR_BUILDLINK3_MK BUILDLINK_TREE+= -libXcursor diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile index 6480f811b9e..63a1672a48b 100644 --- a/x11/libXdamage/Makefile +++ b/x11/libXdamage/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2013/01/21 13:27:28 wiz Exp $ -# +# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:35 wiz Exp $ DISTNAME= libXdamage-1.1.4 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -17,11 +17,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xdamage.pc.in -.include "../../x11/damageproto/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXdamage/buildlink3.mk b/x11/libXdamage/buildlink3.mk index e7f2f9aea9e..bb8e118ccc5 100644 --- a/x11/libXdamage/buildlink3.mk +++ b/x11/libXdamage/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:35 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,10 +10,9 @@ LIBXDAMAGE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXdamage+= libXdamage>=1.0.3 BUILDLINK_PKGSRCDIR.libXdamage?= ../../x11/libXdamage -.include "../../x11/damageproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXDAMAGE_BUILDLINK3_MK BUILDLINK_TREE+= -libXdamage diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile index ba905f7f760..248ae5f276b 100644 --- a/x11/libXdmcp/Makefile +++ b/x11/libXdmcp/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2015/04/02 22:35:06 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXdmcp-1.1.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -16,6 +17,5 @@ GNU_CONFIGURE= yes .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXdmcp/builtin.mk b/x11/libXdmcp/builtin.mk index 9fbac7b12c7..eea4d8e27cc 100644 --- a/x11/libXdmcp/builtin.mk +++ b/x11/libXdmcp/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:56:02 jperkin Exp $ +# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:36 wiz Exp $ BUILTIN_PKG:= libXdmcp @@ -71,7 +71,7 @@ xdmcp-fake-pc: else \ req=""; \ if ${TEST} -f \ - ${BUILDLINK_PREFIX.xproto}/lib/pkgconfig/xproto.pc; then \ + ${BUILDLINK_PREFIX.xorgproto}/lib/pkgconfig/xproto.pc; then \ req="xproto"; \ fi; \ { ${ECHO} "Name: Xdmcp"; \ diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile index 353484ecc4c..567a6426a5a 100644 --- a/x11/libXevie/Makefile +++ b/x11/libXevie/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2016/02/26 11:27:14 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXevie-1.0.3 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -24,6 +24,5 @@ pre-configure: .include "../../x11/evieext/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXevie/buildlink3.mk b/x11/libXevie/buildlink3.mk index 337cb5d7a6a..9a986d057a8 100644 --- a/x11/libXevie/buildlink3.mk +++ b/x11/libXevie/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:36 wiz Exp $ BUILDLINK_TREE+= libXevie @@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.libXevie?= ../../x11/libXevie .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXEVIE_BUILDLINK3_MK BUILDLINK_TREE+= -libXevie diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index 845944ca45a..0fd50ac283e 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2016/02/26 11:27:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.24 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXext-1.3.3 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -26,9 +27,5 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99 -.include "../../x11/xextproto/buildlink3.mk" -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13 -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk index 0fcd21471f3..1a7d4fbef9d 100644 --- a/x11/libXext/buildlink3.mk +++ b/x11/libXext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/03/07 11:57:36 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -17,7 +17,7 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=0.99.0 BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXEXT_BUILDLINK3_MK BUILDLINK_TREE+= -libXext diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile index 794af261fd9..2b97a1620e9 100644 --- a/x11/libXfixes/Makefile +++ b/x11/libXfixes/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2016/10/04 21:59:07 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXfixes-5.0.3 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +19,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= xfixes.pc.in -BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0 -.include "../../x11/fixesproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXfixes/buildlink3.mk b/x11/libXfixes/buildlink3.mk index 60bb9d027b1..78b8127fb2a 100644 --- a/x11/libXfixes/buildlink3.mk +++ b/x11/libXfixes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/03/07 11:57:36 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -16,7 +16,7 @@ LIBXFIXES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=4.0.1 BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes -.include "../../x11/fixesproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" . endif # LIBXFIXES_BUILDLINK3_MK diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile index 367a0597510..98071864e08 100644 --- a/x11/libXfont/Makefile +++ b/x11/libXfont/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2018/03/02 15:09:06 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXfont-1.5.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 devel fonts MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -24,9 +24,7 @@ CONFIGURE_ARGS+= --disable-devel-docs .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" -BUILDLINK_API_DEPENDS.fontsproto+= fontsproto>=2.1.3 -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXfont/buildlink3.mk b/x11/libXfont/buildlink3.mk index ce1abd9b2ab..dc86893d4db 100644 --- a/x11/libXfont/buildlink3.mk +++ b/x11/libXfont/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/03/07 11:57:36 wiz Exp $ BUILDLINK_TREE+= libXfont @@ -11,8 +11,7 @@ BUILDLINK_PKGSRCDIR.libXfont?= ../../x11/libXfont .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXFONT_BUILDLINK3_MK BUILDLINK_TREE+= -libXfont diff --git a/x11/libXfont2/Makefile b/x11/libXfont2/Makefile index d920009b70c..7bccec991db 100644 --- a/x11/libXfont2/Makefile +++ b/x11/libXfont2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2018/03/02 15:09:44 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXfont2-2.0.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 devel fonts MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -24,9 +24,6 @@ CONFIGURE_ARGS+= --disable-devel-docs .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" -BUILDLINK_API_DEPENDS.fontsproto+= fontsproto>=2.1.3 -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXfont2/buildlink3.mk b/x11/libXfont2/buildlink3.mk index 10b1214e4f8..dab86d10414 100644 --- a/x11/libXfont2/buildlink3.mk +++ b/x11/libXfont2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/03/07 11:57:36 wiz Exp $ BUILDLINK_TREE+= libXfont2 @@ -10,8 +10,7 @@ BUILDLINK_PKGSRCDIR.libXfont2?= ../../x11/libXfont2 .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXFONT2_BUILDLINK3_MK BUILDLINK_TREE+= -libXfont2 diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile index e9bc3ca777a..6f5b7e53031 100644 --- a/x11/libXft/Makefile +++ b/x11/libXft/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2014/10/09 14:07:14 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXft-2.3.2 +PKGREVISION= 1 CATEGORIES= fonts x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -22,6 +23,5 @@ BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.6 .include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXft/buildlink3.mk b/x11/libXft/buildlink3.mk index c378d8d6e16..0ccdba0d425 100644 --- a/x11/libXft/buildlink3.mk +++ b/x11/libXft/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/03/07 11:57:36 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.libXft?= ../../x11/libXft .include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXFT_BUILDLINK3_MK BUILDLINK_TREE+= -libXft diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index f54cff87fe8..38e9612298a 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2017/01/23 07:41:27 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXi-1.7.9 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -24,16 +25,10 @@ SUBST_SED.sosubdir= -e 's|\.so X|.so manlibmansuffix/X|' CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.3 BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1 -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.3 -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13 -.include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXi/buildlink3.mk b/x11/libXi/buildlink3.mk index 15e80699d83..3abedc75781 100644 --- a/x11/libXi/buildlink3.mk +++ b/x11/libXi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:39 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/03/07 11:57:36 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -22,17 +22,13 @@ BUILDLINK_API_DEPENDS.libXi+= libXi>=1.0.0 BUILDLINK_PKGSRCDIR.libXi?= ../../x11/libXi . if !empty(USE_BUILTIN.libXi:M[Nn][Oo]) -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.3 BUILDLINK_API_DEPENDS.libX11+= libX11>=1.5 BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1 -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.3 -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13 . endif -.include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXI_BUILDLINK3_MK BUILDLINK_TREE+= -libXi diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index f6bfa6f7b55..940d5080a58 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2016/02/26 11:27:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXinerama-1.1.3 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -22,7 +23,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -BUILDLINK_API_DEPENDS.xineramaproto+= xineramaproto>=1.1.99.1 -.include "../../x11/xineramaproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXinerama/buildlink3.mk b/x11/libXinerama/buildlink3.mk index 8af017bc387..73f86b53b2f 100644 --- a/x11/libXinerama/buildlink3.mk +++ b/x11/libXinerama/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/03/07 11:57:36 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXinerama?= ../../x11/libXinerama .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXINERAMA_BUILDLINK3_MK BUILDLINK_TREE+= -libXinerama diff --git a/x11/libXmu/buildlink3.mk b/x11/libXmu/buildlink3.mk index ed663b41330..c7047057669 100644 --- a/x11/libXmu/buildlink3.mk +++ b/x11/libXmu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:36 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXmu?= ../../x11/libXmu .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXMU_BUILDLINK3_MK BUILDLINK_TREE+= -libXmu diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile index af11a33e91c..1fd92f0766f 100644 --- a/x11/libXpm/Makefile +++ b/x11/libXpm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2016/12/15 23:02:51 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:36 wiz Exp $ DISTNAME= libXpm-3.5.12 +PKGREVISION= 1 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -46,6 +47,5 @@ CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \ .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXpm/buildlink3.mk b/x11/libXpm/buildlink3.mk index 969ab5f8cf3..1f7781b785e 100644 --- a/x11/libXpm/buildlink3.mk +++ b/x11/libXpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2009/12/16 19:57:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/03/07 11:57:36 wiz Exp $ BUILDLINK_TREE+= libXpm @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libXpm+= libXpm>=3.5.4.2 BUILDLINK_PKGSRCDIR.libXpm?= ../../x11/libXpm .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXPM_BUILDLINK3_MK BUILDLINK_TREE+= -libXpm diff --git a/x11/libXpresent/Makefile b/x11/libXpresent/Makefile index 77de4661c44..57596dbaa50 100644 --- a/x11/libXpresent/Makefile +++ b/x11/libXpresent/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2015/04/17 19:54:46 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXpresent-1.0.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -17,7 +18,6 @@ GNU_CONFIGURE= yes .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/presentproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXpresent/buildlink3.mk b/x11/libXpresent/buildlink3.mk index ed70b2a3ed7..9bd915d21c7 100644 --- a/x11/libXpresent/buildlink3.mk +++ b/x11/libXpresent/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/04/17 19:59:25 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/03/07 11:57:37 wiz Exp $ BUILDLINK_TREE+= libXpresent @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libXpresent?= ../../x11/libXpresent .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" -.include "../../x11/presentproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .endif # LIBXPRESENT_BUILDLINK3_MK diff --git a/x11/libXpresent/builtin.mk b/x11/libXpresent/builtin.mk index 6046528b99d..682b3d87526 100644 --- a/x11/libXpresent/builtin.mk +++ b/x11/libXpresent/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2017/01/24 14:25:00 mrg Exp $ +# $NetBSD: builtin.mk,v 1.2 2018/03/07 11:57:37 wiz Exp $ BUILTIN_PKG:= libXpresent PKGCONFIG_FILE.libXpresent= ${X11BASE}/lib/pkgconfig/xpresent.pc @@ -6,12 +6,3 @@ PKGCONFIG_FILE.libXpresent+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xpresent.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" .include "../../mk/x11.builtin.mk" - -CHECK_BUILTIN.libXpresent?= no -.if !empty(CHECK_BUILTIN.libXpresent:M[nN][oO]) - -. if !empty(USE_BUILTIN.libXpresent:M[nN][oO]) -BUILDLINK_API_DEPENDS.presentproto+= presentproto>=1.0 -. endif - -.endif # CHECK_BUILTIN.libXpresent diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index ad488be00c7..83bf92954a8 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2016/10/04 22:01:03 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXrandr-1.5.1 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -24,8 +25,5 @@ BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5 -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXrandr/buildlink3.mk b/x11/libXrandr/buildlink3.mk index e8641dbe81c..e01cbbb03d7 100644 --- a/x11/libXrandr/buildlink3.mk +++ b/x11/libXrandr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/03/07 11:57:37 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXrandr?= ../../x11/libXrandr .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXRANDR_BUILDLINK3_MK BUILDLINK_TREE+= -libXrandr diff --git a/x11/libXrandr/builtin.mk b/x11/libXrandr/builtin.mk index 126f15fa7b7..0df8c7b7f6c 100644 --- a/x11/libXrandr/builtin.mk +++ b/x11/libXrandr/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:37 wiz Exp $ BUILTIN_PKG:= libXrandr PKGCONFIG_FILE.libXrandr= ${X11BASE}/lib/pkgconfig/xrandr.pc @@ -6,12 +6,3 @@ PKGCONFIG_FILE.libXrandr+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xrandr.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" .include "../../mk/x11.builtin.mk" - -CHECK_BUILTIN.libXrandr?= no -.if !empty(CHECK_BUILTIN.libXrandr:M[nN][oO]) - -. if !empty(USE_BUILTIN.libXrandr:M[nN][oO]) -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4 -. endif - -.endif # CHECK_BUILTIN.libXrandr diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index f35b51c1772..c57dbd6af23 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2016/10/04 22:01:41 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXrender-0.9.10 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -22,9 +23,8 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/renderproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXrender/buildlink3.mk b/x11/libXrender/buildlink3.mk index 61e65d8ff13..2cadf5513f5 100644 --- a/x11/libXrender/buildlink3.mk +++ b/x11/libXrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:37 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -16,7 +16,7 @@ LIBXRENDER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXrender+= libXrender>=0.9.2 BUILDLINK_PKGSRCDIR.libXrender?= ../../x11/libXrender -.include "../../x11/renderproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" . endif # LIBXRENDER_BUILDLINK3_MK diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index 06cc57f73c1..1417f4893fb 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2017/10/11 16:45:43 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXres-1.2.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -21,7 +22,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/resourceproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXres/buildlink3.mk b/x11/libXres/buildlink3.mk index 43afeba8866..85ebc5af72c 100644 --- a/x11/libXres/buildlink3.mk +++ b/x11/libXres/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:37 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.libXres?= ../../x11/libXres .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXRES_BUILDLINK3_MK BUILDLINK_TREE+= -libXres diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile index 9047c916480..2eefa90f818 100644 --- a/x11/libXt/Makefile +++ b/x11/libXt/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2016/02/26 11:27:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.25 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXt-1.1.5 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -36,7 +37,5 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXt/buildlink3.mk b/x11/libXt/buildlink3.mk index 1d1efdbcf5d..4f975834cb0 100644 --- a/x11/libXt/buildlink3.mk +++ b/x11/libXt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/03/07 11:57:37 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXt?= ../../x11/libXt .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXT_BUILDLINK3_MK BUILDLINK_TREE+= -libXt diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile index c1cea3001da..bb7a9e7fae5 100644 --- a/x11/libXtst/Makefile +++ b/x11/libXtst/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2016/10/04 22:02:50 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXtst-1.2.3 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -34,15 +35,10 @@ SUBST_MESSAGE.sofix= Fix .so arguments. .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/inputproto/buildlink3.mk" -BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1 -.include "../../x11/recordproto/buildlink3.mk" -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.3 -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" BUILDLINK_API_DEPENDS.libXext+= libXext>=1.0.99.4 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXtst/buildlink3.mk b/x11/libXtst/buildlink3.mk index 33e11b267f4..31d2ef318da 100644 --- a/x11/libXtst/buildlink3.mk +++ b/x11/libXtst/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2012/10/23 10:24:19 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/03/07 11:57:37 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ LIBXTST_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXtst+= libXtst>=1.0.1 BUILDLINK_PKGSRCDIR.libXtst?= ../../x11/libXtst -.include "../../x11/recordproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index 31fcac83c22..5057f4cef0d 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2016/10/04 22:03:54 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXv-1.0.11 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -21,7 +22,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXv/buildlink3.mk b/x11/libXv/buildlink3.mk index 19dcccad9d3..5d66d31c7bd 100644 --- a/x11/libXv/buildlink3.mk +++ b/x11/libXv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2012/10/23 10:24:19 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:37 wiz Exp $ BUILDLINK_TREE+= libXv @@ -10,8 +10,7 @@ BUILDLINK_PKGSRCDIR.libXv?= ../../x11/libXv .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXV_BUILDLINK3_MK BUILDLINK_TREE+= -libXv diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile index 1a39781da08..31bf41d09a0 100644 --- a/x11/libXvMC/Makefile +++ b/x11/libXvMC/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2016/10/04 22:05:30 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXvMC-1.0.10 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -24,6 +25,5 @@ BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXvMC/buildlink3.mk b/x11/libXvMC/buildlink3.mk index 258bb75b613..7985e5a542b 100644 --- a/x11/libXvMC/buildlink3.mk +++ b/x11/libXvMC/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2011/01/19 17:50:48 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:37 wiz Exp $ BUILDLINK_TREE+= libXvMC @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libXvMC?= ../../x11/libXvMC .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXVMC_BUILDLINK3_MK BUILDLINK_TREE+= -libXvMC diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile index 5e7b223c908..78adca0382e 100644 --- a/x11/libXxf86dga/Makefile +++ b/x11/libXxf86dga/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXxf86dga-1.1.4 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -23,6 +24,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXxf86dga/buildlink3.mk b/x11/libXxf86dga/buildlink3.mk index a1a705ba765..a145c563335 100644 --- a/x11/libXxf86dga/buildlink3.mk +++ b/x11/libXxf86dga/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:37 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libXxf86dga?= ../../x11/libXxf86dga .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXXF86DGA_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86dga diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile index e227d9b17d2..c898f36835f 100644 --- a/x11/libXxf86misc/Makefile +++ b/x11/libXxf86misc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2016/02/26 11:27:15 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXxf86misc-1.0.3 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -19,9 +19,7 @@ CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXxf86misc/buildlink3.mk b/x11/libXxf86misc/buildlink3.mk index b992cfd7be3..939f774245c 100644 --- a/x11/libXxf86misc/buildlink3.mk +++ b/x11/libXxf86misc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:37 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libXxf86misc?= ../../x11/libXxf86misc .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXXF86MISC_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86misc diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index de3a739ba5a..7eed68eef62 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:37 wiz Exp $ DISTNAME= libXxf86vm-1.1.4 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -24,7 +25,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libXxf86vm/buildlink3.mk b/x11/libXxf86vm/buildlink3.mk index 021ae95b955..6dd6365829c 100644 --- a/x11/libXxf86vm/buildlink3.mk +++ b/x11/libXxf86vm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/03/07 11:57:37 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libXxf86vm?= ../../x11/libXxf86vm .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" . endif # LIBXXF86VM_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86vm diff --git a/x11/liblbxutil/Makefile b/x11/liblbxutil/Makefile index 8c0e8b8ee8a..6e51f2c0ef6 100644 --- a/x11/liblbxutil/Makefile +++ b/x11/liblbxutil/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2017/09/16 19:27:27 wiz Exp $ -# +# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:38 wiz Exp $ DISTNAME= liblbxutil-1.1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -20,7 +19,5 @@ USE_TOOLS+= gsed pkg-config PKGCONFIG_OVERRIDE+= lbxutil.pc.in .include "../../devel/zlib/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/liblbxutil/buildlink3.mk b/x11/liblbxutil/buildlink3.mk index 02d0e7e0112..1d48c1f1b34 100644 --- a/x11/liblbxutil/buildlink3.mk +++ b/x11/liblbxutil/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2015/10/22 14:34:45 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/03/07 11:57:38 wiz Exp $ BUILDLINK_TREE+= liblbxutil @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.liblbxutil+= liblbxutil>=1.1.0nb1 BUILDLINK_PKGSRCDIR.liblbxutil?= ../../x11/liblbxutil .include "../../devel/zlib/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBLBXUTIL_BUILDLINK3_MK BUILDLINK_TREE+= -liblbxutil diff --git a/x11/liboldXrandr/Makefile b/x11/liboldXrandr/Makefile index 2db95d04767..5f42c49f1dc 100644 --- a/x11/liboldXrandr/Makefile +++ b/x11/liboldXrandr/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2017/09/06 09:03:05 wiz Exp $ -# +# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:38 wiz Exp $ DISTNAME= libXrandr-1.0.2 PKGNAME= Xrandr-1.0.2 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 devel MASTER_SITES= https://xlibs.freedesktop.org/release/ EXTRACT_SUFX= .tar.bz2 @@ -24,6 +23,5 @@ BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/liboldXrandr/buildlink3.mk b/x11/liboldXrandr/buildlink3.mk index b73ea11e6bd..fd5d7d935be 100644 --- a/x11/liboldXrandr/buildlink3.mk +++ b/x11/liboldXrandr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:38 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -12,7 +12,7 @@ BUILDLINK_ABI_DEPENDS.Xrandr+= Xrandr>=1.0.2nb3 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/liboldXrandr .include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # XRANDR_BUILDLINK3_MK BUILDLINK_TREE+= -Xrandr diff --git a/x11/liboldXrandr/builtin.mk b/x11/liboldXrandr/builtin.mk index f21a49de725..487f7fef15c 100644 --- a/x11/liboldXrandr/builtin.mk +++ b/x11/liboldXrandr/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2012/03/19 12:34:21 joerg Exp $ +# $NetBSD: builtin.mk,v 1.4 2018/03/07 11:57:38 wiz Exp $ BUILTIN_PKG:= Xrandr @@ -64,9 +64,6 @@ MAKEVARS+= BUILTIN_PKG.Xrandr .if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO]) USE_BUILTIN.Xrender= no .endif -.if defined(USE_BUILTIN.randrproto) && !empty(USE_BUILTIN.randrproto:M[nN][oO]) -USE_BUILTIN.randrproto= no -.endif .if !defined(USE_BUILTIN.Xrandr) . if ${PREFER.Xrandr} == "pkgsrc" @@ -109,7 +106,6 @@ BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 . if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) BUILDLINK_PREFIX.Xrandr= ${X11BASE} USE_BUILTIN.Xrender= yes -USE_BUILTIN.randrproto= yes . endif .endif # CHECK_BUILTIN.Xrandr diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile index 885b4e4c2c8..480c743da76 100644 --- a/x11/libxkbfile/Makefile +++ b/x11/libxkbfile/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2015/05/01 08:41:32 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:38 wiz Exp $ DISTNAME= libxkbfile-1.0.9 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -16,7 +17,6 @@ USE_TOOLS+= pkg-config .include "../../meta-pkgs/modular-xorg/hacks.mk" -.include "../../x11/kbproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxkbfile/buildlink3.mk b/x11/libxkbfile/buildlink3.mk index e483e511c49..cd4f0e1743e 100644 --- a/x11/libxkbfile/buildlink3.mk +++ b/x11/libxkbfile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:38 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -14,7 +14,7 @@ LIBXKBFILE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libxkbfile+= libxkbfile>=0.99.1 BUILDLINK_PKGSRCDIR.libxkbfile?= ../../x11/libxkbfile -.include "../../x11/kbproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" . endif # LIBXKBFILE_BUILDLINK3_MK diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile index 67356f745f1..c40e40db5bc 100644 --- a/x11/libxshmfence/Makefile +++ b/x11/libxshmfence/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2018/02/27 08:16:03 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:38 wiz Exp $ DISTNAME= libxshmfence-1.3 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/archive/individual/lib/ EXTRACT_SUFX= .tar.bz2 @@ -33,5 +34,5 @@ pre-configure: cd ${WRKSRC} && autoreconf -vif .include "../../devel/xorg-util-macros/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxshmfence/buildlink3.mk b/x11/libxshmfence/buildlink3.mk index 7e1a6aa9e70..ec1149890ac 100644 --- a/x11/libxshmfence/buildlink3.mk +++ b/x11/libxshmfence/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/04/29 16:09:43 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/03/07 11:57:38 wiz Exp $ BUILDLINK_TREE+= libxshmfence @@ -8,7 +8,7 @@ LIBXSHMFENCE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libxshmfence+= libxshmfence>=1.2 BUILDLINK_PKGSRCDIR.libxshmfence?= ../../x11/libxshmfence -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # LIBXSHMFENCE_BUILDLINK3_MK BUILDLINK_TREE+= -libxshmfence diff --git a/x11/mate-settings-daemon/Makefile b/x11/mate-settings-daemon/Makefile index c155b4d60cb..8b4ea2cb7f1 100644 --- a/x11/mate-settings-daemon/Makefile +++ b/x11/mate-settings-daemon/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2018/01/28 20:11:09 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:38 wiz Exp $ -PKGREVISION= 3 +PKGREVISION= 4 .include "../../meta-pkgs/mate/Makefile.common" DISTNAME= mate-settings-daemon-${VERSION:R}.1 @@ -32,6 +32,6 @@ CONF_FILES+= ${PREFIX}/share/examples/mate-settings-daemon/xdg/autostart/mate-se .include "../../fonts/fontconfig/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libxklavier/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index 77bb2c01815..87ddec2efc2 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.114 2017/10/05 15:34:13 wiz Exp $ +# $NetBSD: Makefile,v 1.115 2018/03/07 11:57:38 wiz Exp $ DISTNAME= xorg-server-${XORG_VERSION} PKGNAME= modular-${DISTNAME} +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Modular X11 server from modular X.org diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common index 1fe1ce43220..f9e9b8c7d4f 100644 --- a/x11/modular-xorg-server/Makefile.common +++ b/x11/modular-xorg-server/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2017/12/20 22:40:48 wiz Exp $ +# $NetBSD: Makefile.common,v 1.21 2018/03/07 11:57:38 wiz Exp $ # used by x11/modular-xorg-server/Makefile # used by x11/modular-xorg-xephyr/Makefile @@ -105,27 +105,10 @@ CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0 -BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 -BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0 -BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1 -BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0 BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 -BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0 -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.31 -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99 -BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1 -BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1 -BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0 BUILDLINK_API_DEPENDS.dri+= dri>=7.8 BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 -BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16 -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6 -BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0 -BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11 -BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 -BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0 BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" @@ -143,13 +126,7 @@ CONFIGURE_ARGS+= --with-sha1=libnettle BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 BUILDLINK_DEPMETHOD.libpciaccess= full .include "../../sysutils/libpciaccess/buildlink3.mk" -.include "../../x11/bigreqsproto/buildlink3.mk" -.include "../../x11/compositeproto/buildlink3.mk" -.include "../../x11/damageproto/buildlink3.mk" .include "../../x11/evieext/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" @@ -164,22 +141,7 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 .include "../../x11/libxkbfile/buildlink3.mk" .include "../../x11/libxkbui/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/recordproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/resourceproto/buildlink3.mk" -.include "../../x11/scrnsaverproto/buildlink3.mk" -.include "../../x11/trapproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xcmiscproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" .include "../../x11/xcb-util-keysyms/buildlink3.mk" -.include "../../x11/xf86bigfontproto/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk index 417e7a1289d..5912606e85d 100644 --- a/x11/modular-xorg-server/buildlink3.mk +++ b/x11/modular-xorg-server/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2017/01/07 22:34:56 maya Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/03/07 11:57:38 wiz Exp $ BUILDLINK_TREE+= modular-xorg-server @@ -21,30 +21,14 @@ BUILDLINK_DEPMETHOD.libpciaccess= full .include "../../sysutils/libpciaccess/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/compositeproto/buildlink3.mk" -.include "../../x11/dri2proto/buildlink3.mk" -.include "../../x11/dri3proto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" .if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS]) .include "../../graphics/MesaLib7/buildlink3.mk" # XXX should not be needed for non-dri build .include "../../x11/libXfont/buildlink3.mk" .else .include "../../x11/libXfont2/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build -.include "../../x11/resourceproto/buildlink3.mk" -.include "../../x11/scrnsaverproto/buildlink3.mk" -.include "../../x11/presentproto/buildlink3.mk" .endif -.include "../../x11/inputproto/buildlink3.mk" -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0 -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.31 -.include "../../x11/xproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # MODULAR_XORG_SERVER_BUILDLINK3_MK BUILDLINK_TREE+= -modular-xorg-server diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk index 20751bb3f20..85c8d56aa9f 100644 --- a/x11/modular-xorg-server/options.mk +++ b/x11/modular-xorg-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.17 2017/02/21 14:56:14 wiz Exp $ +# $NetBSD: options.mk,v 1.18 2018/03/07 11:57:38 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server PKG_SUPPORTED_OPTIONS= inet6 debug dtrace @@ -16,13 +16,9 @@ PLIST_VARS+= dri dtrace .include "../../graphics/libepoxy/buildlink3.mk" BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11 .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" -.include "../../x11/dri2proto/buildlink3.mk" -.include "../../x11/dri3proto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" .include "../../x11/libxshmfence/buildlink3.mk" -.include "../../x11/presentproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" PLIST.dri= yes CONFIGURE_ARGS+= --enable-dri CONFIGURE_ARGS+= --enable-dri2 diff --git a/x11/modular-xorg-server112/Makefile b/x11/modular-xorg-server112/Makefile index 472badbca9a..b0dfa9a3a4a 100644 --- a/x11/modular-xorg-server112/Makefile +++ b/x11/modular-xorg-server112/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2016/03/05 11:29:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:38 wiz Exp $ DISTNAME= xorg-server-1.12.4 PKGNAME= modular-${DISTNAME} -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.bz2 @@ -111,27 +111,10 @@ CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input BUILDLINK_API_DEPENDS.MesaLib7+= MesaLib7>=7.8.0<10 -BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 -BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0 -BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1 -BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0 BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 -BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0 -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22 -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99 -BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1 -BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1 -BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0 BUILDLINK_API_DEPENDS.dri+= dri>=7.8 BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 -BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16 -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6 -BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0 -BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11 -BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 -BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0 BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" @@ -146,15 +129,7 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 BUILDLINK_DEPMETHOD.libpciaccess= full .include "../../sysutils/libpciaccess/buildlink3.mk" -.include "../../x11/bigreqsproto/buildlink3.mk" -.include "../../x11/compositeproto/buildlink3.mk" -.include "../../x11/damageproto/buildlink3.mk" -.include "../../x11/dri2proto/buildlink3.mk" .include "../../x11/evieext/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" @@ -170,23 +145,7 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 .include "../../x11/libxkbfile/buildlink3.mk" .include "../../x11/libxkbui/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/recordproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/resourceproto/buildlink3.mk" -.include "../../x11/scrnsaverproto/buildlink3.mk" -.include "../../x11/trapproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xcmiscproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" -.include "../../x11/xf86bigfontproto/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/modular-xorg-xephyr/Makefile b/x11/modular-xorg-xephyr/Makefile index bad5870fcba..88f1d9b21b9 100644 --- a/x11/modular-xorg-xephyr/Makefile +++ b/x11/modular-xorg-xephyr/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2017/02/26 22:28:52 khorben Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:38 wiz Exp $ DISTNAME= xorg-server-${XORG_VERSION} PKGNAME= modular-xorg-xephyr-${XORG_VERSION} +PKGREVISION= 1 DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile index c05f8bf4c7b..236654db7a5 100644 --- a/x11/modular-xorg-xquartz/Makefile +++ b/x11/modular-xorg-xquartz/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2017/09/03 08:53:17 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:38 wiz Exp $ DISTNAME= xorg-server-1.17.2 PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/} +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= https://www.x.org/releases/individual/xserver/ EXTRACT_SUFX= .tar.bz2 @@ -94,15 +95,8 @@ MESSAGE_SUBST+= PREFIX=${PREFIX} .include "../../graphics/libepoxy/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../wm/libAppleWM/buildlink3.mk" -.include "../../wm/applewmproto/buildlink3.mk" -.include "../../x11/bigreqsproto/buildlink3.mk" -.include "../../x11/compositeproto/buildlink3.mk" -.include "../../x11/damageproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/evieext/buildlink3.mk" -.include "../../x11/fixesproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" @@ -116,27 +110,7 @@ MESSAGE_SUBST+= PREFIX=${PREFIX} .include "../../x11/libxkbfile/buildlink3.mk" .include "../../x11/libxkbui/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/presentproto/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/recordproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/resourceproto/buildlink3.mk" -.include "../../x11/scrnsaverproto/buildlink3.mk" -.include "../../x11/trapproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xcmiscproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xcb-util-keysyms/buildlink3.mk" -.include "../../x11/xf86bigfontproto/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" -.include "../../x11/dri2proto/buildlink3.mk" -.include "../../x11/dri3proto/buildlink3.mk" .include "../../x11/libxshmfence/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/presentproto/DESCR b/x11/presentproto/DESCR deleted file mode 100644 index 2dcf3b89e51..00000000000 --- a/x11/presentproto/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -The Present extension provides a way for applications to update -their window contents from a pixmap in a well defined fashion, -synchronizing with the display refresh and potentially using a more -efficient mechanism than copying the contents of the source pixmap. diff --git a/x11/presentproto/Makefile b/x11/presentproto/Makefile deleted file mode 100644 index 76315d40116..00000000000 --- a/x11/presentproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2017/01/26 08:40:32 wiz Exp $ - -DISTNAME= presentproto-1.1 -CATEGORIES= x11 -MASTER_SITES= http://xorg.freedesktop.org/archive/individual/proto/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= -COMMENT= X11 extension for efficient window updates -#LICENSE= # TODO: (see mk/license.mk) - -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config -USE_LANGUAGES= c - -PKGCONFIG_OVERRIDE+= presentproto.pc.in - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/presentproto/PLIST b/x11/presentproto/PLIST deleted file mode 100644 index cde21a9d13e..00000000000 --- a/x11/presentproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2013/11/01 20:36:57 wiz Exp $ -include/X11/extensions/presentproto.h -include/X11/extensions/presenttokens.h -lib/pkgconfig/presentproto.pc -share/doc/presentproto/presentproto.txt diff --git a/x11/presentproto/buildlink3.mk b/x11/presentproto/buildlink3.mk deleted file mode 100644 index 9952ed34a5e..00000000000 --- a/x11/presentproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/03/09 21:33:28 tnn Exp $ - -BUILDLINK_TREE+= presentproto - -.if !defined(PRESENTPROTO_BUILDLINK3_MK) -PRESENTPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.presentproto?= build - -BUILDLINK_API_DEPENDS.presentproto+= presentproto>=1.0 -BUILDLINK_PKGSRCDIR.presentproto?= ../../x11/presentproto -.endif # PRESENTPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -presentproto diff --git a/x11/presentproto/builtin.mk b/x11/presentproto/builtin.mk deleted file mode 100644 index 573396996f4..00000000000 --- a/x11/presentproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.1 2015/09/30 09:10:39 leot Exp $ - -BUILTIN_PKG:= presentproto -PKGCONFIG_FILE.presentproto= ${X11BASE}/lib/pkgconfig/presentproto.pc -PKGCONFIG_FILE.presentproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/presentproto.pc -PKGCONFIG_FILE.presentproto+= ${X11BASE}/share/pkgconfig/presentproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/presentproto/distinfo b/x11/presentproto/distinfo deleted file mode 100644 index 9f15427b024..00000000000 --- a/x11/presentproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.3 2017/01/26 08:40:32 wiz Exp $ - -SHA1 (presentproto-1.1.tar.bz2) = b1294dbb3a8337f79252142b45aa123ee1aa7602 -RMD160 (presentproto-1.1.tar.bz2) = e382eac1dcabef6cf031f4a12e0badb380ba15df -SHA512 (presentproto-1.1.tar.bz2) = 2c712136c8b4e99190932928d98e1a628197d0bf25180cac196ab8768720d61f7907006315bc3610e23666a8fbe39cfa9115c5fd72914aee2498776c8b46f7b2 -Size (presentproto-1.1.tar.bz2) = 116156 bytes diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile index 639e8aa4c66..4e475b5d1ec 100644 --- a/x11/printproto/Makefile +++ b/x11/printproto/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2012/10/29 05:06:43 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:39 wiz Exp $ DISTNAME= printproto-1.0.5 +PKGREVISION= 1 CATEGORIES= x11 print MASTER_SITES= ${MASTER_SITE_XORG:=proto/} EXTRACT_SUFX= .tar.bz2 @@ -17,5 +17,5 @@ PKGCONFIG_OVERRIDE+= printproto.pc.in CONFIGURE_ENV+= MISC_MAN_SUFFIX=7 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/printproto/buildlink3.mk b/x11/printproto/buildlink3.mk index cc298909b1a..57c8a8a0ced 100644 --- a/x11/printproto/buildlink3.mk +++ b/x11/printproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/05/29 14:18:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:39 wiz Exp $ BUILDLINK_TREE+= printproto @@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.printproto?= ../../x11/printproto BUILDLINK_DEPMETHOD.printproto?= build -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .endif # PRINTPROTO_BUILDLINK3_MK BUILDLINK_TREE+= -printproto diff --git a/x11/proxymngr/Makefile b/x11/proxymngr/Makefile index 9cc0850e044..464a99afc62 100644 --- a/x11/proxymngr/Makefile +++ b/x11/proxymngr/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:27 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:39 wiz Exp $ DISTNAME= proxymngr-1.0.4 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -10,6 +11,8 @@ HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= X proxy manager service LICENSE= x11 +DEPENDS+= lbxproxy-[0-9]*:../../x11/lbxproxy + GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config @@ -24,11 +27,8 @@ post-install: ${RM} ${DESTDIR}${PKG_SYSCONFDIR}/X11/proxymngr/pmconfig ${INSTALL_DATA} ${WRKSRC}/pmconfig ${DESTDIR}${PREFIX}/${EGDIR} -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17 -.include "../../x11/xproto/buildlink3.mk" -.include "../../x11/xproxymanagementprotocol/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" -DEPENDS+= lbxproxy-[0-9]*:../../x11/lbxproxy .include "../../mk/bsd.pkg.mk" diff --git a/x11/randrproto/DESCR b/x11/randrproto/DESCR deleted file mode 100644 index a26ebc8b75d..00000000000 --- a/x11/randrproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the Randr extension headers from modular X.org X11 -project. diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile deleted file mode 100644 index a7a55cf2e71..00000000000 --- a/x11/randrproto/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2015/05/27 06:42:07 wiz Exp $ - -DISTNAME= randrproto-1.5.0 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Randr extension headers from modular X.org - -CONFLICTS+= randrext-[0-9]* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= randrproto.pc.in - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/randrproto/PLIST b/x11/randrproto/PLIST deleted file mode 100644 index 5e1383800c6..00000000000 --- a/x11/randrproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:25:05 joerg Exp $ -include/X11/extensions/randr.h -include/X11/extensions/randrproto.h -lib/pkgconfig/randrproto.pc -share/doc/randrproto/randrproto.txt diff --git a/x11/randrproto/buildlink3.mk b/x11/randrproto/buildlink3.mk deleted file mode 100644 index b0d5efc73a6..00000000000 --- a/x11/randrproto/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:50 joerg Exp $ - -.include "../../mk/bsd.fast.prefs.mk" - -BUILDLINK_DEPMETHOD.randrproto?= build - -BUILDLINK_TREE+= randrproto - -.if !defined(RANDRPROTO_BUILDLINK3_MK) -RANDRPROTO_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.0 -BUILDLINK_PKGSRCDIR.randrproto?= ../../x11/randrproto -.endif # RANDRPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -randrproto diff --git a/x11/randrproto/builtin.mk b/x11/randrproto/builtin.mk deleted file mode 100644 index 9493963e4d4..00000000000 --- a/x11/randrproto/builtin.mk +++ /dev/null @@ -1,89 +0,0 @@ -# $NetBSD: builtin.mk,v 1.5 2008/10/05 21:36:34 cube Exp $ - -# TODO: builtin.mk failed to use native on XFree86 -# the two headers are identical with native XFree86 - -BUILTIN_PKG:= randrproto - -BUILTIN_FIND_FILES_VAR:= H_RANDR -BUILTIN_FIND_FILES.H_RANDR= ${X11BASE}/include/X11/extensions/randr.h - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if ${X11BASE} == ${LOCALBASE} -IS_BUILTIN.randrproto= no -.elif !defined(IS_BUILTIN.randrproto) -IS_BUILTIN.randrproto= no -# -# Here, we skip checking whether the files are under ${LOCALBASE} since -# we'll consider this X11 package to be built-in even if it's a part -# of one of the pkgsrc-installed X11 distributions. -# -. if empty(H_RANDR:M__nonexistent__) -IS_BUILTIN.randrproto= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.randrproto - -### -### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to -### a package name to represent the built-in package. -### -.if !defined(BUILTIN_PKG.randrproto) && \ - !empty(IS_BUILTIN.randrproto:M[yY][eE][sS]) && \ - empty(H_RANDR:M__nonexistent__) -BUILTIN_VERSION.randrproto!= \ - ${AWK} '/\#define[ ]*RANDR_MAJOR/ { M = $$3 } \ - /\#define[ ]*RANDR_MINOR/ { m = "."$$3 } \ - END { printf "%s%s\n", M, m }' \ - ${H_RANDR} -BUILTIN_PKG.randrproto= randrproto-${BUILTIN_VERSION.randrproto} -.endif -MAKEVARS+= BUILTIN_PKG.randrproto - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.randrproto) -. if ${PREFER.randrproto} == "pkgsrc" -USE_BUILTIN.randrproto= no -. else -USE_BUILTIN.randrproto= ${IS_BUILTIN.randrproto} -. if defined(BUILTIN_PKG.randrproto) && \ - !empty(IS_BUILTIN.randrproto:M[yY][eE][sS]) -USE_BUILTIN.randrproto= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.randrproto} -. if !empty(USE_BUILTIN.randrproto:M[yY][eE][sS]) -USE_BUILTIN.randrproto!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.randrproto:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.randrproto -.endif -MAKEVARS+= USE_BUILTIN.randrproto - -### -### The section below only applies if we are not including this file -### solely to determine whether a built-in implementation exists. -### - -.include "../../mk/x11.builtin.mk" - -CHECK_BUILTIN.randrproto?= no -.if !empty(CHECK_BUILTIN.randrproto:M[nN][oO]) - -. if !empty(USE_BUILTIN.randrproto:M[nN][oO]) -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.0 -. endif - -.endif # CHECK_BUILTIN.randrproto diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo deleted file mode 100644 index f1cd650a017..00000000000 --- a/x11/randrproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.13 2015/11/04 03:28:52 agc Exp $ - -SHA1 (randrproto-1.5.0.tar.bz2) = bc420745dc4af011988e9dcabdadf8829cbc2374 -RMD160 (randrproto-1.5.0.tar.bz2) = de8e411bf59e65ecece5a8a8e04dd63d93d9512b -SHA512 (randrproto-1.5.0.tar.bz2) = 5c56f6acfe3a9da5ffda45e4af2da5081a5116d53f4d2dafe399eae168656727927ca0fb4c29fc6583e87709ac83b025ae206fba9356ebf9e26d3ff545da57f4 -Size (randrproto-1.5.0.tar.bz2) = 142168 bytes diff --git a/x11/recordproto/DESCR b/x11/recordproto/DESCR deleted file mode 100644 index 96bc976084f..00000000000 --- a/x11/recordproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the Record extension headers from modular X.org X11 -project. diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile deleted file mode 100644 index 604da4d7a6b..00000000000 --- a/x11/recordproto/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.6 2012/10/29 05:06:48 asau Exp $ -# - -DISTNAME= recordproto-1.14.2 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Record extension headers from X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= recordproto.pc.in - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/recordproto/PLIST b/x11/recordproto/PLIST deleted file mode 100644 index 61de83e1b17..00000000000 --- a/x11/recordproto/PLIST +++ /dev/null @@ -1,6 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2012/06/03 19:49:38 wiz Exp $ -include/X11/extensions/recordconst.h -include/X11/extensions/recordproto.h -include/X11/extensions/recordstr.h -lib/pkgconfig/recordproto.pc -share/doc/recordproto/record.xml diff --git a/x11/recordproto/buildlink3.mk b/x11/recordproto/buildlink3.mk deleted file mode 100644 index d8547bba669..00000000000 --- a/x11/recordproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.6 2013/04/06 13:46:35 rodent Exp $ - -BUILDLINK_TREE+= recordproto - -.if !defined(RECORDPROTO_BUILDLINK3_MK) -RECORDPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.recordproto?= build - -BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.1 -BUILDLINK_PKGSRCDIR.recordproto?= ../../x11/recordproto -.endif # RECORDPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -recordproto diff --git a/x11/recordproto/builtin.mk b/x11/recordproto/builtin.mk deleted file mode 100644 index 2c29762dd1a..00000000000 --- a/x11/recordproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $ - -BUILTIN_PKG:= recordproto -PKGCONFIG_FILE.recordproto= ${X11BASE}/lib/pkgconfig/recordproto.pc -PKGCONFIG_FILE.recordproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/recordproto.pc -PKGCONFIG_FILE.recordproto+= ${X11BASE}/share/pkgconfig/recordproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/recordproto/distinfo b/x11/recordproto/distinfo deleted file mode 100644 index a83df33e992..00000000000 --- a/x11/recordproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 03:28:53 agc Exp $ - -SHA1 (recordproto-1.14.2.tar.bz2) = 1f48c4b0004d8b133efd0498e8d88d68d3b9199c -RMD160 (recordproto-1.14.2.tar.bz2) = 7cf5ab53e3c06fcb917d67fdbfe235be5b019b23 -SHA512 (recordproto-1.14.2.tar.bz2) = ab82d966ffacb46c001df15b272ca58f996826dc6f6835d3dc4d385b31c682acacb073a380d61938e2f242bffdabdd9b8f7107cd5ac67cb7aa3a28cc14a8ea02 -Size (recordproto-1.14.2.tar.bz2) = 123033 bytes diff --git a/x11/renderproto/DESCR b/x11/renderproto/DESCR deleted file mode 100644 index e3c762cd177..00000000000 --- a/x11/renderproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the Render extension headers from modular X.org X11 -project. diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile deleted file mode 100644 index 25c75a461e7..00000000000 --- a/x11/renderproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2012/10/29 05:06:49 asau Exp $ -# - -DISTNAME= renderproto-0.11.1 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Render extension headers from modular X.org - -CONFLICTS+= renderext-[0-9]* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/renderproto.pc.in -USE_LANGUAGES= c - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/renderproto/PLIST b/x11/renderproto/PLIST deleted file mode 100644 index b1a716a6b1f..00000000000 --- a/x11/renderproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:25:05 joerg Exp $ -include/X11/extensions/render.h -include/X11/extensions/renderproto.h -lib/pkgconfig/renderproto.pc -share/doc/renderproto/renderproto.txt diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk deleted file mode 100644 index a98e39c0a5a..00000000000 --- a/x11/renderproto/buildlink3.mk +++ /dev/null @@ -1,31 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:42 rillig Exp $ - -.include "../../mk/bsd.fast.prefs.mk" - -BUILDLINK_TREE+= renderproto - -.if !defined(RENDERPROTO_BUILDLINK3_MK) -RENDERPROTO_BUILDLINK3_MK:= - -.if ${X11_TYPE} == "native" -. include "../../mk/x11.buildlink3.mk" -. if ${BUILTIN_X11_TYPE.native} == "XFree86" || \ - ${BUILTIN_X11_TYPE.native} == "xorg" && \ - empty(BUILTIN_X11_VERSION.xorg) -RENDERPROTO_RENDERPROTO9=1 -. endif -.endif - -.if defined(RENDERPROTO_RENDERPROTO9) -BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3nb1 -BUILDLINK_PKGSRCDIR.renderproto?= ../../x11/renderproto9 -BUILDLINK_BUILTIN_MK.renderproto= ../../x11/renderproto/builtin.mk -.else -BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3nb1 -BUILDLINK_PKGSRCDIR.renderproto?= ../../x11/renderproto -.endif - -BUILDLINK_DEPMETHOD.renderproto?= build -.endif # RENDERPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -renderproto diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk deleted file mode 100644 index b83a1cfa16f..00000000000 --- a/x11/renderproto/builtin.mk +++ /dev/null @@ -1,106 +0,0 @@ -# $NetBSD: builtin.mk,v 1.10 2009/05/26 21:59:58 rillig Exp $ - -BUILTIN_PKG:= renderproto - -BUILTIN_FIND_FILES_VAR:= H_RENDER -BUILTIN_FIND_FILES.H_RENDER= ${X11BASE}/include/X11/extensions/render.h - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if ${X11BASE} == ${LOCALBASE} -IS_BUILTIN.renderproto= no -.elif !defined(IS_BUILTIN.renderproto) -IS_BUILTIN.renderproto= no -# -# Here, we skip checking whether the files are under ${LOCALBASE} since -# we'll consider this X11 package to be built-in even if it's a part -# of one of the pkgsrc-installed X11 distributions. This does not apply -# to modular Xorg which is caught above. -# -. if empty(H_RENDER:M__nonexistent__) -IS_BUILTIN.renderproto= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.renderproto - -### -### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to -### a package name to represent the built-in package. -### -.if !defined(BUILTIN_PKG.renderproto) && \ - !empty(IS_BUILTIN.renderproto:M[yY][eE][sS]) && \ - empty(H_RENDER:M__nonexistent__) -BUILTIN_VERSION.renderproto!= \ - ${AWK} '/\#define[ ]*RENDER_MAJOR/ { M = $$3 } \ - /\#define[ ]*RENDER_MINOR/ { m = "."$$3 } \ - END { printf "%s%s\n", M, m }' \ - ${H_RENDER} -BUILTIN_PKG.renderproto= renderproto-${BUILTIN_VERSION.renderproto} -.endif -MAKEVARS+= BUILTIN_PKG.renderproto - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.renderproto) -. if ${PREFER.renderproto} == "pkgsrc" -USE_BUILTIN.renderproto= no -. else -USE_BUILTIN.renderproto= ${IS_BUILTIN.renderproto} -. if defined(BUILTIN_PKG.renderproto) && \ - !empty(IS_BUILTIN.renderproto:M[yY][eE][sS]) -USE_BUILTIN.renderproto= yes -. for dep in ${BUILDLINK_API_DEPENDS.renderproto} -. if !empty(USE_BUILTIN.renderproto:M[yY][eE][sS]) -USE_BUILTIN.renderproto!= \ - if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.renderproto:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.renderproto -.endif -MAKEVARS+= USE_BUILTIN.renderproto - -### -### The section below only applies if we are not including this file -### solely to determine whether a built-in implementation exists. -### - -.include "../../mk/x11.builtin.mk" - -CHECK_BUILTIN.renderproto?= no -.if !empty(CHECK_BUILTIN.renderproto:M[nN][oO]) - -. if !empty(USE_BUILTIN.renderproto:M[nN][oO]) -BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9 -. endif - -.endif # CHECK_BUILTIN.renderproto - -CHECK_BUILTIN.renderproto?= no -.if !empty(CHECK_BUILTIN.renderproto:M[nN][oO]) - -# this is temporary and can be removed once not used -BUILDLINK_TARGETS+= render-symlink-pc - -.PHONY: render-symlink-pc -render-symlink-pc: - ${RUN} \ - src=${BUILDLINK_PREFIX.renderproto}/lib/pkgconfig/renderproto.pc; \ - dst=${BUILDLINK_DIR}/lib/pkgconfig/render.pc; \ - ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ - if ${TEST} -f "$$src"; then \ - ${RM} -f "$$dst"; \ - ${LN} -sf "$$src" "$$dst"; \ - fi - -.endif # CHECK_BUILTIN.renderproto diff --git a/x11/renderproto/distinfo b/x11/renderproto/distinfo deleted file mode 100644 index bfaaa88dbb2..00000000000 --- a/x11/renderproto/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 03:28:53 agc Exp $ - -SHA1 (renderproto-0.11.1.tar.bz2) = 7ae9868a358859fe539482b02414aa15c2d8b1e4 -RMD160 (renderproto-0.11.1.tar.bz2) = ec176a258b707fa560f8f0190e31fed6478fec74 -SHA512 (renderproto-0.11.1.tar.bz2) = c38bc7247fd7b89732c892ee41c061b20397f4e79195601b7015dd55054b966f0797ac3990b147f80234596ba2c201ce90e292ecefed2e133167955bca70acc5 -Size (renderproto-0.11.1.tar.bz2) = 105741 bytes -SHA1 (patch-aa) = 932af57551cbde10f0402b2704fe4967842e95c9 diff --git a/x11/renderproto/patches/patch-aa b/x11/renderproto/patches/patch-aa deleted file mode 100644 index 32e6fb17c34..00000000000 --- a/x11/renderproto/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2012/06/03 18:38:01 wiz Exp $ - ---- render.h.orig 2010-08-10 14:04:55.000000000 +0000 -+++ render.h -@@ -28,6 +28,8 @@ - - #include <X11/Xdefs.h> - -+#include <X11/X.h> -+ - typedef XID Glyph; - typedef XID GlyphSet; - typedef XID Picture; diff --git a/x11/resourceproto/DESCR b/x11/resourceproto/DESCR deleted file mode 100644 index fc5e95497f4..00000000000 --- a/x11/resourceproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the Resource extension headers from modular X.org X11 -project. diff --git a/x11/resourceproto/Makefile b/x11/resourceproto/Makefile deleted file mode 100644 index 31706d75db7..00000000000 --- a/x11/resourceproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2012/10/29 05:06:50 asau Exp $ -# - -DISTNAME= resourceproto-1.2.0 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Resource extension headers from X.org - -CONFLICTS+= resourceext-[0-9]* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= resourceproto.pc.in -USE_LANGUAGES= c - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/resourceproto/PLIST b/x11/resourceproto/PLIST deleted file mode 100644 index 99a58591a51..00000000000 --- a/x11/resourceproto/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2012/06/03 19:55:10 wiz Exp $ -include/X11/extensions/XResproto.h -lib/pkgconfig/resourceproto.pc -share/doc/resourceproto/resproto.txt diff --git a/x11/resourceproto/buildlink3.mk b/x11/resourceproto/buildlink3.mk deleted file mode 100644 index 53c4bb5f4b7..00000000000 --- a/x11/resourceproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:35 rodent Exp $ - -BUILDLINK_TREE+= resourceproto - -.if !defined(RESOURCEPROTO_BUILDLINK3_MK) -RESOURCEPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.resourceproto?= build - -BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.0.1 -BUILDLINK_PKGSRCDIR.resourceproto?= ../../x11/resourceproto -.endif # RESOURCEPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -resourceproto diff --git a/x11/resourceproto/builtin.mk b/x11/resourceproto/builtin.mk deleted file mode 100644 index a0036eba868..00000000000 --- a/x11/resourceproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:01 jperkin Exp $ - -BUILTIN_PKG:= resourceproto -PKGCONFIG_FILE.resourceproto= ${X11BASE}/lib/pkgconfig/resourceproto.pc -PKGCONFIG_FILE.resourceproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/resourceproto.pc -PKGCONFIG_FILE.resourceproto+= ${X11BASE}/share/pkgconfig/resourceproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/resourceproto/distinfo b/x11/resourceproto/distinfo deleted file mode 100644 index 7b6864b2cad..00000000000 --- a/x11/resourceproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 03:28:53 agc Exp $ - -SHA1 (resourceproto-1.2.0.tar.bz2) = 9ff9bb9243b0474330959dc3853973523c9dd9ce -RMD160 (resourceproto-1.2.0.tar.bz2) = 651aa6eef3fd2c8e6e1b532eb48f81bddbdc1799 -SHA512 (resourceproto-1.2.0.tar.bz2) = ce8c8fda178ac7fb22b192d4a0f707a96f42ecd550ae8e6ddd7e1ed0067951ef955f7bee60f63a2b2422176e5f093c38e3903f7c4e5e3bea230b934b7abcc4ca -Size (resourceproto-1.2.0.tar.bz2) = 102992 bytes diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile index 06e11b6b8da..d66cc905cf5 100644 --- a/x11/rgb/Makefile +++ b/x11/rgb/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2014/11/08 21:59:21 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:39 wiz Exp $ DISTNAME= rgb-1.0.6 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -14,5 +15,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile index e80eed73c21..dbd3ebcfb6b 100644 --- a/x11/rstart/Makefile +++ b/x11/rstart/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2017/09/16 19:27:27 wiz Exp $ -# +# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:39 wiz Exp $ DISTNAME= rstart-1.0.5 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -9,11 +9,10 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Implements "A Flexible Remote Execution Protocol Based on rsh" -#LICENSE= # TODO: (see mk/license.mk) GNU_CONFIGURE= yes USE_TOOLS+= pkg-config .include "../../devel/xorg-util-macros/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/scrnsaverproto/DESCR b/x11/scrnsaverproto/DESCR deleted file mode 100644 index 37abfce7817..00000000000 --- a/x11/scrnsaverproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the ScrnSaver extension headers from modular X.org X11 -project. diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile deleted file mode 100644 index 4c279c294ca..00000000000 --- a/x11/scrnsaverproto/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.6 2012/10/29 05:06:52 asau Exp $ -# - -DISTNAME= scrnsaverproto-1.2.2 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= ScrnSaver extension headers from X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= scrnsaverproto.pc.in -USE_LANGUAGES= c - -.include "../../x11/xproto/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/scrnsaverproto/PLIST b/x11/scrnsaverproto/PLIST deleted file mode 100644 index 3ba98089aa9..00000000000 --- a/x11/scrnsaverproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2012/06/03 19:55:47 wiz Exp $ -include/X11/extensions/saver.h -include/X11/extensions/saverproto.h -lib/pkgconfig/scrnsaverproto.pc -share/doc/scrnsaverproto/saver.xml diff --git a/x11/scrnsaverproto/buildlink3.mk b/x11/scrnsaverproto/buildlink3.mk deleted file mode 100644 index 9a2b092587c..00000000000 --- a/x11/scrnsaverproto/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:35 rodent Exp $ - -BUILDLINK_TREE+= scrnsaverproto - -.if !defined(SCRNSAVERPROTO_BUILDLINK3_MK) -SCRNSAVERPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.scrnsaverproto?= build - -BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1.0 -BUILDLINK_PKGSRCDIR.scrnsaverproto?= ../../x11/scrnsaverproto - -.include "../../x11/xproto/buildlink3.mk" -.endif # SCRNSAVERPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -scrnsaverproto diff --git a/x11/scrnsaverproto/builtin.mk b/x11/scrnsaverproto/builtin.mk deleted file mode 100644 index 015d98b9ab2..00000000000 --- a/x11/scrnsaverproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $ - -BUILTIN_PKG:= scrnsaverproto -PKGCONFIG_FILE.scrnsaverproto= ${X11BASE}/lib/pkgconfig/scrnsaverproto.pc -PKGCONFIG_FILE.scrnsaverproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/scrnsaverproto.pc -PKGCONFIG_FILE.scrnsaverproto+= ${X11BASE}/share/pkgconfig/scrnsaverproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/scrnsaverproto/distinfo b/x11/scrnsaverproto/distinfo deleted file mode 100644 index 154a9a94ae0..00000000000 --- a/x11/scrnsaverproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 03:28:54 agc Exp $ - -SHA1 (scrnsaverproto-1.2.2.tar.bz2) = 640a2cbef5893aacda74799e6fa4d973e629b753 -RMD160 (scrnsaverproto-1.2.2.tar.bz2) = 7822f18bef696129485d86c83824e35f6ffbc0fa -SHA512 (scrnsaverproto-1.2.2.tar.bz2) = e74a512a6101967983a1d713d22a1f456f77519998116ef0f0a9e4b44ae4730ecd41eb9c0f7fa53e9f5c94967541daf10693d701af832597f5347461c5990ebc -Size (scrnsaverproto-1.2.2.tar.bz2) = 118820 bytes diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile index 2934fa4d9dc..4b34596c3c4 100644 --- a/x11/sessreg/Makefile +++ b/x11/sessreg/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2017/02/28 07:34:29 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:39 wiz Exp $ DISTNAME= sessreg-1.1.1 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -21,6 +22,5 @@ CONFIGURE_ARGS+=--localstatedir=${VARBASE:Q} CPPFLAGS+= -P .endif -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.25 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/trapproto/DESCR b/x11/trapproto/DESCR deleted file mode 100644 index 4e382a41610..00000000000 --- a/x11/trapproto/DESCR +++ /dev/null @@ -1 +0,0 @@ -This package provides the Trap extension headers from modular X.org. diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile deleted file mode 100644 index 61ad563f97b..00000000000 --- a/x11/trapproto/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.3 2012/10/29 05:06:54 asau Exp $ -# - -DISTNAME= trapproto-3.4.3 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Trap extension headers - -PKGCONFIG_OVERRIDE+= ${WRKSRC}/trapproto.pc.in -USE_TOOLS+= pkg-config -GNU_CONFIGURE= yes - -BUILDLINK_DEPMETHOD.libX11?= build -BUILDLINK_DEPMETHOD.libXi?= build - -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXi/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/trapproto/PLIST b/x11/trapproto/PLIST deleted file mode 100644 index 4ea233b1b80..00000000000 --- a/x11/trapproto/PLIST +++ /dev/null @@ -1,9 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:07 joerg Exp $ -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 -lib/pkgconfig/trapproto.pc diff --git a/x11/trapproto/buildlink3.mk b/x11/trapproto/buildlink3.mk deleted file mode 100644 index 8349e6e9c02..00000000000 --- a/x11/trapproto/buildlink3.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:43 rillig Exp $ - -BUILDLINK_TREE+= trapproto - -.if !defined(TRAPPROTO_BUILDLINK3_MK) -TRAPPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.trapproto?= build - -BUILDLINK_API_DEPENDS.trapproto+= trapproto>=3.4.3 -BUILDLINK_PKGSRCDIR.trapproto?= ../../x11/trapproto - -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" -.endif # TRAPPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -trapproto diff --git a/x11/trapproto/builtin.mk b/x11/trapproto/builtin.mk deleted file mode 100644 index 683f032987f..00000000000 --- a/x11/trapproto/builtin.mk +++ /dev/null @@ -1,8 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $ - -BUILTIN_PKG:= trapproto -PKGCONFIG_FILE.trapproto= ${X11BASE}/lib/pkgconfig/trapproto.pc -PKGCONFIG_FILE.trapproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/trapproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/trapproto/distinfo b/x11/trapproto/distinfo deleted file mode 100644 index b6796ee88a0..00000000000 --- a/x11/trapproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 03:28:55 agc Exp $ - -SHA1 (trapproto-3.4.3.tar.bz2) = b108aa39a7bfde530d5cd347fda7c58770d5b8da -RMD160 (trapproto-3.4.3.tar.bz2) = f4adc2687aabd0f6e69fde6949675930ad241869 -SHA512 (trapproto-3.4.3.tar.bz2) = a5bf93bfa2f675e874ece8510a693d3a1ca4ba0b3981740249d4c78273a74724209f5f6d83c6207038bce1c3edca0bdd98ca3e1dd7aba04dcea146c9a1a2e8ef -Size (trapproto-3.4.3.tar.bz2) = 48785 bytes diff --git a/x11/unicode-screensaver/Makefile b/x11/unicode-screensaver/Makefile index f9385562a44..ab27ffdf8b9 100644 --- a/x11/unicode-screensaver/Makefile +++ b/x11/unicode-screensaver/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2017/01/29 06:26:51 mef Exp $ -# +# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:40 wiz Exp $ DISTNAME= unicode-screensaver-0.5 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.joachim-breitner.de/archive/unicode-screensaver/ @@ -23,5 +23,5 @@ post-install: .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/videoproto/DESCR b/x11/videoproto/DESCR deleted file mode 100644 index 06ed09fca36..00000000000 --- a/x11/videoproto/DESCR +++ /dev/null @@ -1 +0,0 @@ -Video extension headers from modular X.org X11 project. diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile deleted file mode 100644 index 925b94adcb6..00000000000 --- a/x11/videoproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2016/03/12 08:14:05 wiz Exp $ - -DISTNAME= videoproto-2.3.3 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Video extension headers from modular X.org X11 -LICENSE= mit - -PKGCONFIG_OVERRIDE+= videoproto.pc.in -GNU_CONFIGURE= yes - -BUILDLINK_DEPMETHOD.libX11?= build # uses headers -.include "../../x11/libX11/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/videoproto/PLIST b/x11/videoproto/PLIST deleted file mode 100644 index bce401bbd7b..00000000000 --- a/x11/videoproto/PLIST +++ /dev/null @@ -1,8 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2010/09/10 19:19:06 joerg Exp $ -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 -lib/pkgconfig/videoproto.pc -share/doc/videoproto/xv-protocol-v2.txt diff --git a/x11/videoproto/buildlink3.mk b/x11/videoproto/buildlink3.mk deleted file mode 100644 index d2750a61a46..00000000000 --- a/x11/videoproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:35 rodent Exp $ - -BUILDLINK_TREE+= videoproto - -.if !defined(VIDEOPROTO_BUILDLINK3_MK) -VIDEOPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.videoproto?= build - -BUILDLINK_API_DEPENDS.videoproto+= videoproto>=2.2.1 -BUILDLINK_PKGSRCDIR.videoproto?= ../../x11/videoproto -.endif # VIDEOPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -videoproto diff --git a/x11/videoproto/builtin.mk b/x11/videoproto/builtin.mk deleted file mode 100644 index 8518c3f8f8e..00000000000 --- a/x11/videoproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $ - -BUILTIN_PKG:= videoproto -PKGCONFIG_FILE.videoproto= ${X11BASE}/lib/pkgconfig/videoproto.pc -PKGCONFIG_FILE.videoproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/videoproto.pc -PKGCONFIG_FILE.videoproto+= ${X11BASE}/share/pkgconfig/videoproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/videoproto/distinfo b/x11/videoproto/distinfo deleted file mode 100644 index a3ab8fbbba8..00000000000 --- a/x11/videoproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.6 2016/03/12 08:14:05 wiz Exp $ - -SHA1 (videoproto-2.3.3.tar.bz2) = 4556b5c2243a2ca290ea2140dc1a427c4bac8ba2 -RMD160 (videoproto-2.3.3.tar.bz2) = 1c0b0e4b8bd6f205da9d8df3b4a2d477b9fde8be -SHA512 (videoproto-2.3.3.tar.bz2) = 84136f7ba15e86ef7e178af4ca70c4c0f0a83fb37e9e39c2564c31762439453c5e7b85934366b711261d454615a57314cf75ac35a17544cb186bad301e920cf5 -Size (videoproto-2.3.3.tar.bz2) = 121016 bytes diff --git a/x11/xcalib/Makefile b/x11/xcalib/Makefile index 04080cb6ff1..3573144211e 100644 --- a/x11/xcalib/Makefile +++ b/x11/xcalib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2018/03/06 15:31:13 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:40 wiz Exp $ DISTNAME= xcalib-source-0.8 -PKGREVISION= 2 +PKGREVISION= 3 PKGNAME= ${DISTNAME:C/-source//} CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcalib/} @@ -31,7 +31,7 @@ do-build: do-install: ${SETENV} ${MAKE_ENV} ${LIBTOOL} --tag=CC --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/xcalib ${DESTDIR}${PREFIX}/bin/ -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xcmiscproto/DESCR b/x11/xcmiscproto/DESCR deleted file mode 100644 index 7d299f711a3..00000000000 --- a/x11/xcmiscproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the XCMisc extension headers from modular X.org X11 -project. diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile deleted file mode 100644 index fac48a67ca6..00000000000 --- a/x11/xcmiscproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2012/10/29 05:07:00 asau Exp $ -# - -DISTNAME= xcmiscproto-1.2.2 -CATEGORIES= x11 devel -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= XCMisc extension headers from X.org - -CONFLICTS+= xextensions-[0-9]* - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/xcmiscproto.pc.in -USE_LANGUAGES= c - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xcmiscproto/PLIST b/x11/xcmiscproto/PLIST deleted file mode 100644 index 253e7027951..00000000000 --- a/x11/xcmiscproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2012/06/03 18:38:41 wiz Exp $ -include/X11/extensions/xcmiscproto.h -include/X11/extensions/xcmiscstr.h -lib/pkgconfig/xcmiscproto.pc -share/doc/xcmiscproto/xc-misc.xml diff --git a/x11/xcmiscproto/buildlink3.mk b/x11/xcmiscproto/buildlink3.mk deleted file mode 100644 index 3154cb53f81..00000000000 --- a/x11/xcmiscproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:35 rodent Exp $ - -BUILDLINK_TREE+= xcmiscproto - -.if !defined(XCMISCPROTO_BUILDLINK3_MK) -XCMISCPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.xcmiscproto?= build - -BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.1 -BUILDLINK_PKGSRCDIR.xcmiscproto?= ../../x11/xcmiscproto -.endif # XCMISCPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xcmiscproto diff --git a/x11/xcmiscproto/builtin.mk b/x11/xcmiscproto/builtin.mk deleted file mode 100644 index d2c32d8075a..00000000000 --- a/x11/xcmiscproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $ - -BUILTIN_PKG:= xcmiscproto -PKGCONFIG_FILE.xcmiscproto= ${X11BASE}/lib/pkgconfig/xcmiscproto.pc -PKGCONFIG_FILE.xcmiscproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcmiscproto.pc -PKGCONFIG_FILE.xcmiscproto+= ${X11BASE}/share/pkgconfig/xcmiscproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/xcmiscproto/distinfo b/x11/xcmiscproto/distinfo deleted file mode 100644 index 185a681234f..00000000000 --- a/x11/xcmiscproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 03:28:58 agc Exp $ - -SHA1 (xcmiscproto-1.2.2.tar.bz2) = 59ae9ec6414964440bf654b207618e5dd66a32fb -RMD160 (xcmiscproto-1.2.2.tar.bz2) = 06890647d88499b9533669837c0091e424b06ba2 -SHA512 (xcmiscproto-1.2.2.tar.bz2) = 33060d0f9bba92670fce6e42f5d9094e84b803fd07e61b159aafdbee40a9876b49cf844bc7bae4c628fbb11a6a0883a9ee07041b59290488f1e9dbfe6e5128a8 -Size (xcmiscproto-1.2.2.tar.bz2) = 112486 bytes diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile index c3977185b5d..cf421b64c76 100644 --- a/x11/xcompmgr/Makefile +++ b/x11/xcompmgr/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2015/04/17 07:00:35 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2018/03/07 11:57:40 wiz Exp $ DISTNAME= xcompmgr-1.1.7 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES = ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -25,7 +26,7 @@ XCOMPMGR_DEFS+= -DCAN_DO_USABLE=1 # default: 0 (damage notification) CPPFLAGS+= ${XCOMPMGR_DEFS} -.include "../../x11/compositeproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile index 9656b4075a4..3fe749ebbf5 100644 --- a/x11/xdriinfo/Makefile +++ b/x11/xdriinfo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2015/04/25 14:25:21 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:40 wiz Exp $ DISTNAME= xdriinfo-1.0.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -24,7 +24,6 @@ USE_TOOLS+= pkg-config ### graphics/MesaLib/builtin.mk? ### .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xev/Makefile b/x11/xev/Makefile index b7c10336cbb..89a01272f5e 100644 --- a/x11/xev/Makefile +++ b/x11/xev/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2015/04/17 07:05:50 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:40 wiz Exp $ DISTNAME= xev-1.2.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -18,6 +19,5 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xextproto/DESCR b/x11/xextproto/DESCR deleted file mode 100644 index 425841c4a1e..00000000000 --- a/x11/xextproto/DESCR +++ /dev/null @@ -1 +0,0 @@ -This provides the XExt extension headers from modular Xorg X11. diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile deleted file mode 100644 index 05e6b018431..00000000000 --- a/x11/xextproto/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: Makefile,v 1.15 2013/12/31 17:34:27 wiz Exp $ - -DISTNAME= xextproto-7.3.0 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= XExt extension headers from X.org -LICENSE= mit - -CONFLICTS+= xextensions-[0-9]* - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --without-xmlto -PKGCONFIG_OVERRIDE+= ${WRKSRC}/xextproto.pc.in - -post-install: - ${INSTALL_DATA} ${FILESDIR}/shmstr.h ${DESTDIR}${PREFIX}/include/X11/extensions - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xextproto/PLIST b/x11/xextproto/PLIST deleted file mode 100644 index 5384cb0ce63..00000000000 --- a/x11/xextproto/PLIST +++ /dev/null @@ -1,49 +0,0 @@ -@comment $NetBSD: PLIST,v 1.6 2011/10/16 17:05:38 cheusov Exp $ -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 -lib/pkgconfig/xextproto.pc -share/doc/xextproto/appendix.xml -share/doc/xextproto/appgrp.xml -share/doc/xextproto/dbe.xml -share/doc/xextproto/dpms.xml -share/doc/xextproto/evi.xml -share/doc/xextproto/geproto.xml -share/doc/xextproto/lbx.xml -share/doc/xextproto/multibuf.xml -share/doc/xextproto/security.xml -share/doc/xextproto/shape.xml -share/doc/xextproto/shm.xml -share/doc/xextproto/sync.xml -share/doc/xextproto/tog-cup.xml -share/doc/xextproto/xtest.xml diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk deleted file mode 100644 index 1da66a717e2..00000000000 --- a/x11/xextproto/buildlink3.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:43 rillig Exp $ - -.include "../../mk/bsd.fast.prefs.mk" - -BUILDLINK_DEPMETHOD.xextproto?= build - -BUILDLINK_TREE+= xextproto - -.if !defined(XEXTPROTO_BUILDLINK3_MK) -XEXTPROTO_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0 -BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto - -.include "../../x11/inputproto/buildlink3.mk" -.endif # XEXTPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xextproto diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk deleted file mode 100644 index fe350dd20f4..00000000000 --- a/x11/xextproto/builtin.mk +++ /dev/null @@ -1,110 +0,0 @@ -# $NetBSD: builtin.mk,v 1.10 2014/07/18 14:30:15 jperkin Exp $ - -BUILTIN_PKG:= xextproto - -BUILTIN_FIND_FILES_VAR:= H_XEXTPROTO PC_XEXTPROTO -BUILTIN_FIND_FILES.H_XEXTPROTO= \ - ${X11BASE}/include/X11/extensions/extutil.h -BUILTIN_FIND_FILES.PC_XEXTPROTO= ${X11BASE}/lib/pkgconfig/xextproto.pc -BUILTIN_FIND_FILES.PC_XEXTPROTO+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xextproto.pc -BUILTIN_FIND_FILES.PC_XEXTPROTO+= ${X11BASE}/share/pkgconfig/xextproto.pc - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if ${X11BASE} == ${LOCALBASE} -IS_BUILTIN.xextproto= no -.elif !defined(IS_BUILTIN.xextproto) -IS_BUILTIN.xextproto= no -# -# Here, we skip checking whether the files are under ${LOCALBASE} since -# we'll consider this X11 package to be built-in even if it's a part -# of one of the pkgsrc-installed X11 distributions. -# -. if empty(H_XEXTPROTO:M__nonexistent__) -IS_BUILTIN.xextproto= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.xextproto - -### -### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to -### a package name to represent the built-in package. -### -.if !defined(BUILTIN_PKG.xextproto) && \ - !empty(IS_BUILTIN.xextproto:M[yY][eE][sS]) -. if empty(PC_XEXTPROTO:M__nonexistent__) -BUILTIN_VERSION.xextproto!= ${SED} -n -e 's/Version: //p' ${PC_XEXTPROTO} -. else -BUILTIN_VERSION.xextproto= 1.0.1 -. endif -BUILTIN_PKG.xextproto= xextproto-${BUILTIN_VERSION.xextproto} -.endif -MAKEVARS+= BUILTIN_PKG.xextproto - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.xextproto) -. if ${PREFER.xextproto} == "pkgsrc" -USE_BUILTIN.xextproto= no -. else -USE_BUILTIN.xextproto= ${IS_BUILTIN.xextproto} -. if defined(BUILTIN_PKG.xextproto) && \ - !empty(IS_BUILTIN.xextproto:M[yY][eE][sS]) -USE_BUILTIN.xextproto= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.xextproto} -. if !empty(USE_BUILTIN.xextproto:M[yY][eE][sS]) -USE_BUILTIN.xextproto!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xextproto:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.xextproto -.endif -MAKEVARS+= USE_BUILTIN.xextproto - -### -### The section below only applies if we are not including this file -### solely to determine whether a built-in implementation exists. -### - -.include "../../mk/x11.builtin.mk" - -CHECK_BUILTIN.xextproto?= no -.if !empty(CHECK_BUILTIN.xextproto:M[nN][oO]) - -# If we are using the builtin version, check whether it has a xextproto.pc -# file or not. If the latter, generate a fake one. -. if !empty(USE_BUILTIN.xextproto:M[Yy][Ee][Ss]) && \ - !empty(PC_XEXTPROTO:M__nonexistent__) -BUILDLINK_TARGETS+= xextproto-fake-pc - -xextproto-fake-pc: - ${RUN} \ - for dir in lib lib${LIBABISUFFIX} share; do \ - ${TEST} -f ${BUILDLINK_PREFIX.xextproto}/$${dir}/pkgconfig/xextproto.pc && exit; \ - done; \ - src=${BUILDLINK_PREFIX.xextproto}/lib/pkgconfig/xextproto.pc; \ - dst=${BUILDLINK_DIR}/lib/pkgconfig/xextproto.pc; \ - ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ - if ${TEST} -f $${src}; then \ - ${LN} -sf $${src} $${dst}; \ - else \ - { ${ECHO} "Name: XExtensions"; \ - ${ECHO} "Description: Sundry X extension headers"; \ - ${ECHO} "Version: ${BUILTIN_VERSION.xextproto}"; \ - ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.xextproto}/include"; \ - } >$${dst}; \ - fi -. endif - -.endif # CHECK_BUILTIN.xextproto diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo deleted file mode 100644 index a661ea8b6c5..00000000000 --- a/x11/xextproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.10 2015/11/04 03:29:00 agc Exp $ - -SHA1 (xextproto-7.3.0.tar.bz2) = b8d736342dcb73b71584d99a1cb9806d93c25ff8 -RMD160 (xextproto-7.3.0.tar.bz2) = 241a3050c149fc00d308723fed10eed837406359 -SHA512 (xextproto-7.3.0.tar.bz2) = 238beed85fcf6fe5b0809e52814dd44fa45fe6868239990086cb8dd2c446292dd4794698abd07ed10bd146a7096c1679f7160da226f9e861dfaf6c8e22315d61 -Size (xextproto-7.3.0.tar.bz2) = 229310 bytes diff --git a/x11/xextproto/files/shmstr.h b/x11/xextproto/files/shmstr.h deleted file mode 100644 index 2333445050c..00000000000 --- a/x11/xextproto/files/shmstr.h +++ /dev/null @@ -1,37 +0,0 @@ -/* $NetBSD: shmstr.h,v 1.2 2010/04/09 09:06:52 tnn Exp $ */ - -#ifndef _SHMSTR_H_ -#define _SHMSTR_H_ - -#warning this file is deprecated and provided only for source compatibility - -#include "shmproto.h" - -#define XSHM_PUT_IMAGE_ARGS \ - DrawablePtr /* dst */, \ - GCPtr /* pGC */, \ - int /* depth */, \ - unsigned int /* format */, \ - int /* w */, \ - int /* h */, \ - int /* sx */, \ - int /* sy */, \ - int /* sw */, \ - int /* sh */, \ - int /* dx */, \ - int /* dy */, \ - char * /* data */ - -#define XSHM_CREATE_PIXMAP_ARGS \ - ScreenPtr /* pScreen */, \ - int /* width */, \ - int /* height */, \ - int /* depth */, \ - char * /* addr */ - -typedef struct _ShmFuncs { - PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS); - void (* PutImage)(XSHM_PUT_IMAGE_ARGS); -} ShmFuncs, *ShmFuncsPtr; - -#endif diff --git a/x11/xf86-input-acecad/Makefile b/x11/xf86-input-acecad/Makefile index 21504091b47..d6a8bc24697 100644 --- a/x11/xf86-input-acecad/Makefile +++ b/x11/xf86-input-acecad/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:28 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-acecad-1.5.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,8 +18,6 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../devel/xorg-util-macros/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-elographics/Makefile b/x11/xf86-input-elographics/Makefile index 390b154b25c..fa5ed8f93bc 100644 --- a/x11/xf86-input-elographics/Makefile +++ b/x11/xf86-input-elographics/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:28 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-elographics-1.4.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,6 +17,6 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-fpit/Makefile b/x11/xf86-input-fpit/Makefile index e736a4587bc..2d1c7b87803 100644 --- a/x11/xf86-input-fpit/Makefile +++ b/x11/xf86-input-fpit/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:28 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-fpit-1.4.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,6 +18,6 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../devel/xorg-util-macros/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-hyperpen/Makefile b/x11/xf86-input-hyperpen/Makefile index 639ffb518f7..00d3ac9ae46 100644 --- a/x11/xf86-input-hyperpen/Makefile +++ b/x11/xf86-input-hyperpen/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:28 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-hyperpen-1.4.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,6 +18,6 @@ USE_LANGUAGES+= c99 CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-joystick/Makefile b/x11/xf86-input-joystick/Makefile index 84913d40372..b7a4280015a 100644 --- a/x11/xf86-input-joystick/Makefile +++ b/x11/xf86-input-joystick/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2017/12/27 14:13:55 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-joystick-1.6.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -26,8 +26,7 @@ SUBST_FILES.usbhid+= src/backend_bsd.c SUBST_SED.usbhid= -e 's,dev/usb/,bus/u4b/,g' SUBST_MESSAGE.usbhid= Correct usbhid include paths -.include "../../x11/kbproto/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile index 969c1cfd101..2a60b8d4e0e 100644 --- a/x11/xf86-input-keyboard/Makefile +++ b/x11/xf86-input-keyboard/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2018/01/21 13:42:26 triaxx Exp $ +# $NetBSD: Makefile,v 1.26 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-keyboard-1.9.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,11 +17,7 @@ USE_TOOLS+= gmake pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile index ec481f62738..75c1d0576fc 100644 --- a/x11/xf86-input-mouse/Makefile +++ b/x11/xf86-input-mouse/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2018/01/21 10:47:47 triaxx Exp $ +# $NetBSD: Makefile,v 1.29 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-mouse-1.9.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -16,10 +17,6 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-mutouch/Makefile b/x11/xf86-input-mutouch/Makefile index 1a998e51eff..035075736f8 100644 --- a/x11/xf86-input-mutouch/Makefile +++ b/x11/xf86-input-mutouch/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:28 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-mutouch-1.3.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Microtouch input driver for the Xorg X server -#LICENSE= # TODO: (see mk/license.mk) GNU_CONFIGURE= yes USE_LANGUAGES= c99 @@ -18,6 +17,6 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-penmount/Makefile b/x11/xf86-input-penmount/Makefile index 8c32a67b1cb..56161acf76f 100644 --- a/x11/xf86-input-penmount/Makefile +++ b/x11/xf86-input-penmount/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:29 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-penmount-1.5.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-vmmouse/Makefile b/x11/xf86-input-vmmouse/Makefile index 7e815da81e3..35a964db2d6 100644 --- a/x11/xf86-input-vmmouse/Makefile +++ b/x11/xf86-input-vmmouse/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2016/08/20 14:48:18 kamil Exp $ +# $NetBSD: Makefile,v 1.23 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-vmmouse-13.1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -20,10 +20,6 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 # Currently libudev is unsupported in pkgsrc CONFIGURE_ARGS+= --without-libudev -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" -.include "../../x11/kbproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-void/Makefile b/x11/xf86-input-void/Makefile index 340f35daa4e..3dda69793a8 100644 --- a/x11/xf86-input-void/Makefile +++ b/x11/xf86-input-void/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:18 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:41 wiz Exp $ DISTNAME= xf86-input-void-1.4.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -16,9 +16,6 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/inputproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-input-ws/Makefile b/x11/xf86-input-ws/Makefile index fb8efbe0ca4..e61ee01dcd0 100644 --- a/x11/xf86-input-ws/Makefile +++ b/x11/xf86-input-ws/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2016/01/05 13:11:42 tnn Exp $ -# +# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-input-ws-1.3.0.20151010 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -17,7 +16,5 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" -.include "../../x11/inputproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-apm/Makefile b/x11/xf86-video-apm/Makefile index 1835dce042d..441d7baf9a6 100644 --- a/x11/xf86-video-apm/Makefile +++ b/x11/xf86-video-apm/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:18 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-apm-1.2.5 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-ark/Makefile b/x11/xf86-video-ark/Makefile index d72cbf256de..79c44b650a1 100644 --- a/x11/xf86-video-ark/Makefile +++ b/x11/xf86-video-ark/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:18 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-ark-0.7.5 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,8 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile index c5794a3377f..707015e6fe8 100644 --- a/x11/xf86-video-ati/Makefile +++ b/x11/xf86-video-ati/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2017/09/08 08:45:49 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-ati-7.10.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -25,17 +26,7 @@ BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.18.1 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.58 .include "../../x11/libdrm/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-ati6/Makefile b/x11/xf86-video-ati6/Makefile index 33b1ad094a9..d1d880ac673 100644 --- a/x11/xf86-video-ati6/Makefile +++ b/x11/xf86-video-ati6/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:18 jperkin Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-ati-6.14.6 PKGNAME= ${DISTNAME:S/ati/ati6/} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -30,16 +30,6 @@ pre-configure: .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-chips/Makefile b/x11/xf86-video-chips/Makefile index 0607df8db1c..7b8fe337572 100644 --- a/x11/xf86-video-chips/Makefile +++ b/x11/xf86-video-chips/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2017/01/18 18:28:03 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-chips-1.2.7 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -24,9 +25,7 @@ post-extract: .endif .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-cirrus/Makefile b/x11/xf86-video-cirrus/Makefile index 48038612db9..f306c63f454 100644 --- a/x11/xf86-video-cirrus/Makefile +++ b/x11/xf86-video-cirrus/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:18 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-cirrus-1.5.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-dummy/Makefile b/x11/xf86-video-dummy/Makefile index cf5415c3cb8..3cce357a268 100644 --- a/x11/xf86-video-dummy/Makefile +++ b/x11/xf86-video-dummy/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2017/09/16 19:27:29 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-dummy-0.3.8 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -8,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Virtual/offscreen frame buffer driver for the Xorg X server -#LICENSE= # TODO: (see mk/license.mk) GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -16,9 +16,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-fbdev/Makefile b/x11/xf86-video-fbdev/Makefile index 771a08f1b17..b554ce2f2bb 100644 --- a/x11/xf86-video-fbdev/Makefile +++ b/x11/xf86-video-fbdev/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2017/09/16 19:27:29 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-fbdev-0.4.4 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,8 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile index 742965c5108..46001f98101 100644 --- a/x11/xf86-video-glint/Makefile +++ b/x11/xf86-video-glint/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2017/01/18 20:17:32 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-glint-1.2.9 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +19,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-i128/Makefile b/x11/xf86-video-i128/Makefile index 4ac7cc746d2..9dd7a75901c 100644 --- a/x11/xf86-video-i128/Makefile +++ b/x11/xf86-video-i128/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:19 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:42 wiz Exp $ DISTNAME= xf86-video-i128-1.3.6 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-i740/Makefile b/x11/xf86-video-i740/Makefile index 305fe45434e..23c7253ad5d 100644 --- a/x11/xf86-video-i740/Makefile +++ b/x11/xf86-video-i740/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2017/01/18 20:21:14 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-i740-1.3.6 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -16,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile index 2a93342c472..6d512d90b0f 100644 --- a/x11/xf86-video-intel/Makefile +++ b/x11/xf86-video-intel/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2016/12/07 21:59:54 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-intel-2.99.917 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -25,6 +25,6 @@ BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.7 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/libXvMC/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-mach64/Makefile b/x11/xf86-video-mach64/Makefile index a4487b14c6f..2e5c23eb46f 100644 --- a/x11/xf86-video-mach64/Makefile +++ b/x11/xf86-video-mach64/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:19 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-mach64-6.9.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -22,16 +22,6 @@ CPPFLAGS.SunOS+= -D__EXTENSIONS__ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile index c521299858d..6cbd38171b4 100644 --- a/x11/xf86-video-mga/Makefile +++ b/x11/xf86-video-mga/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2017/01/18 18:26:41 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-mga-1.6.5 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,8 +19,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-modesetting/Makefile b/x11/xf86-video-modesetting/Makefile index d58508be780..74b1bbf8d93 100644 --- a/x11/xf86-video-modesetting/Makefile +++ b/x11/xf86-video-modesetting/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:29 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-modesetting-0.9.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,13 +19,10 @@ USE_OLD_MODULAR_XORG_SERVER= yes CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../sysutils/libpciaccess/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-newport/Makefile b/x11/xf86-video-newport/Makefile index e95d725cd5c..603bed660fd 100644 --- a/x11/xf86-video-newport/Makefile +++ b/x11/xf86-video-newport/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:29 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-newport-0.2.4 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -21,8 +21,7 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 USE_OLD_MODULAR_XORG_SERVER= yes -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-nouveau/Makefile b/x11/xf86-video-nouveau/Makefile index 8c4562f2e0c..9c90c37e9ae 100644 --- a/x11/xf86-video-nouveau/Makefile +++ b/x11/xf86-video-nouveau/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2017/04/24 07:25:47 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-nouveau-1.0.15 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/archive/individual/driver/ EXTRACT_SUFX= .tar.bz2 @@ -18,12 +19,5 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile index 10657d50097..3c913df9df8 100644 --- a/x11/xf86-video-nv/Makefile +++ b/x11/xf86-video-nv/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2017/01/18 20:16:04 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-nv-2.1.21 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,17 +19,8 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-openchrome/Makefile b/x11/xf86-video-openchrome/Makefile index a629dc03088..37203e0b70b 100644 --- a/x11/xf86-video-openchrome/Makefile +++ b/x11/xf86-video-openchrome/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2017/12/24 10:19:02 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-openchrome-0.6.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/archive/individual/driver/ EXTRACT_SUFX= .tar.bz2 @@ -28,8 +29,5 @@ PLIST.XvMC= yes .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/libXvMC/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-qxl/Makefile b/x11/xf86-video-qxl/Makefile index 9423cc22c42..9ba812d36da 100644 --- a/x11/xf86-video-qxl/Makefile +++ b/x11/xf86-video-qxl/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2017/09/16 19:27:29 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-qxl-0.1.5 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -24,9 +25,7 @@ BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.46 .include "../../x11/libdrm/buildlink3.mk" .include "../../sysutils/libpciaccess/buildlink3.mk" .include "../../sysutils/spice-protocol/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-r128/Makefile b/x11/xf86-video-r128/Makefile index d3580adf980..b96c06604f6 100644 --- a/x11/xf86-video-r128/Makefile +++ b/x11/xf86-video-r128/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2017/01/18 20:22:39 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:43 wiz Exp $ DISTNAME= xf86-video-r128-6.10.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -21,16 +22,6 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xf86driproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-rendition/Makefile b/x11/xf86-video-rendition/Makefile index 4a7b313d6ad..87fe608f64c 100644 --- a/x11/xf86-video-rendition/Makefile +++ b/x11/xf86-video-rendition/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:20 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-rendition-4.2.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,8 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-s3/Makefile b/x11/xf86-video-s3/Makefile index 2975d30daa2..4163938f85c 100644 --- a/x11/xf86-video-s3/Makefile +++ b/x11/xf86-video-s3/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:20 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-s3-0.6.5 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-s3virge/Makefile b/x11/xf86-video-s3virge/Makefile index 0de1d1edbd2..5ac5f9dc1c6 100644 --- a/x11/xf86-video-s3virge/Makefile +++ b/x11/xf86-video-s3virge/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:20 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-s3virge-1.10.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile index c76d5a6d466..e38cbfa7c71 100644 --- a/x11/xf86-video-savage/Makefile +++ b/x11/xf86-video-savage/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2017/01/18 20:19:57 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-savage-2.3.9 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,8 +19,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-siliconmotion/Makefile b/x11/xf86-video-siliconmotion/Makefile index 6dbf7f4c628..9bfed449579 100644 --- a/x11/xf86-video-siliconmotion/Makefile +++ b/x11/xf86-video-siliconmotion/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2017/01/18 18:31:17 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-siliconmotion-1.7.9 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -16,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile index 41593a7a346..d8e27bff478 100644 --- a/x11/xf86-video-sis/Makefile +++ b/x11/xf86-video-sis/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2017/01/18 18:25:18 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-sis-0.10.9 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -23,11 +24,5 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/xf86miscproto/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-suncg14/Makefile b/x11/xf86-video-suncg14/Makefile index 525bcc3a80d..c5afb14d507 100644 --- a/x11/xf86-video-suncg14/Makefile +++ b/x11/xf86-video-suncg14/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:29 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-suncg14-1.1.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -19,8 +19,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-suncg3/Makefile b/x11/xf86-video-suncg3/Makefile index f8fcfa5cd5a..0b96b1dfc0d 100644 --- a/x11/xf86-video-suncg3/Makefile +++ b/x11/xf86-video-suncg3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:29 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-suncg3-1.1.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,8 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-suncg6/Makefile b/x11/xf86-video-suncg6/Makefile index 2cfac08c6c7..92191c2583c 100644 --- a/x11/xf86-video-suncg6/Makefile +++ b/x11/xf86-video-suncg6/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:30 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-suncg6-1.1.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= GX/Turbo GX video driver for the Xorg X server -#LICENSE= # TODO: (see mk/license.mk) GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -19,8 +18,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-sunffb/Makefile b/x11/xf86-video-sunffb/Makefile index 9deb13d89be..e73ae47ea4b 100644 --- a/x11/xf86-video-sunffb/Makefile +++ b/x11/xf86-video-sunffb/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:30 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-sunffb-1.2.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -19,10 +19,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-sunleo/Makefile b/x11/xf86-video-sunleo/Makefile index 63cac84dd0d..5bf6c5a7461 100644 --- a/x11/xf86-video-sunleo/Makefile +++ b/x11/xf86-video-sunleo/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2017/01/25 11:39:37 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2018/03/07 11:57:44 wiz Exp $ DISTNAME= xf86-video-sunleo-1.2.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -16,9 +17,6 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-suntcx/Makefile b/x11/xf86-video-suntcx/Makefile index 515d64ed9b1..a9953b1e14f 100644 --- a/x11/xf86-video-suntcx/Makefile +++ b/x11/xf86-video-suntcx/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:30 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-suntcx-1.1.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= TCX video driver for the Xorg X server -#LICENSE= # TODO: (see mk/license.mk) GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -19,8 +18,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile index 3304e90b271..b754fa48a76 100644 --- a/x11/xf86-video-tdfx/Makefile +++ b/x11/xf86-video-tdfx/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2017/01/18 18:23:24 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-tdfx-1.4.7 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +19,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/glproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-tga/Makefile b/x11/xf86-video-tga/Makefile index 54ab2cb3f14..67844f5bbb3 100644 --- a/x11/xf86-video-tga/Makefile +++ b/x11/xf86-video-tga/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:21 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-tga-1.2.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-trident/Makefile b/x11/xf86-video-trident/Makefile index df270e8b079..825ebb078e7 100644 --- a/x11/xf86-video-trident/Makefile +++ b/x11/xf86-video-trident/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2017/01/18 20:19:21 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-trident-1.3.8 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -16,10 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-tseng/Makefile b/x11/xf86-video-tseng/Makefile index c7fa4f07167..63805e39dc9 100644 --- a/x11/xf86-video-tseng/Makefile +++ b/x11/xf86-video-tseng/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:21 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-tseng-1.2.5 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/renderproto/buildlink3.mk" -.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile index 9ac42fbbcbd..e773ff408c9 100644 --- a/x11/xf86-video-vmware/Makefile +++ b/x11/xf86-video-vmware/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2016/11/18 08:07:47 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-vmware-13.2.1 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -34,8 +35,7 @@ pre-configure: .endif .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/randrproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xineramaproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-voodoo/Makefile b/x11/xf86-video-voodoo/Makefile index d75ee2352ab..39642d21155 100644 --- a/x11/xf86-video-voodoo/Makefile +++ b/x11/xf86-video-voodoo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:30 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-voodoo-1.2.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -19,12 +19,8 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 -BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../sysutils/libpciaccess/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-wsfb/Makefile b/x11/xf86-video-wsfb/Makefile index 29f18926050..d80adf6b0ec 100644 --- a/x11/xf86-video-wsfb/Makefile +++ b/x11/xf86-video-wsfb/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:21 jperkin Exp $ +# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-wsfb-0.4.0 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -19,5 +19,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-xgi/Makefile b/x11/xf86-video-xgi/Makefile index 3db2767aeca..17651bb791e 100644 --- a/x11/xf86-video-xgi/Makefile +++ b/x11/xf86-video-xgi/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2016/02/26 11:27:21 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:45 wiz Exp $ DISTNAME= xf86-video-xgi-1.6.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -17,8 +17,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" -#.include "../../x11/randrproto/buildlink3.mk" -.include "../../x11/xf86dgaproto/buildlink3.mk" -#.include "../../x11/renderproto/buildlink3.mk" -#.include "../../x11/videoproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86bigfontproto/DESCR b/x11/xf86bigfontproto/DESCR deleted file mode 100644 index 1ee1593936a..00000000000 --- a/x11/xf86bigfontproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the XF86BigFont extension headers from modular X.org -X11 project. diff --git a/x11/xf86bigfontproto/Makefile b/x11/xf86bigfontproto/Makefile deleted file mode 100644 index a880600544c..00000000000 --- a/x11/xf86bigfontproto/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2012/10/29 05:07:07 asau Exp $ -# - -DISTNAME= xf86bigfontproto-1.2.0 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= XF86BigFont extension headers from X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= xf86bigfontproto.pc.in -USE_LANGUAGES= # empty - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86bigfontproto/PLIST b/x11/xf86bigfontproto/PLIST deleted file mode 100644 index d3805b0940e..00000000000 --- a/x11/xf86bigfontproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/08/29 15:31:55 wiz Exp $ -include/X11/extensions/xf86bigfont.h -include/X11/extensions/xf86bigfproto.h -include/X11/extensions/xf86bigfstr.h -lib/pkgconfig/xf86bigfontproto.pc diff --git a/x11/xf86bigfontproto/buildlink3.mk b/x11/xf86bigfontproto/buildlink3.mk deleted file mode 100644 index f8ab85b5656..00000000000 --- a/x11/xf86bigfontproto/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $ - -BUILDLINK_TREE+= xf86bigfontproto - -.if !defined(XF86BIGFONTPROTO_BUILDLINK3_MK) -XF86BIGFONTPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.xf86bigfontproto?= build - -BUILDLINK_API_DEPENDS.xf86bigfontproto+= xf86bigfontproto>=1.1 -BUILDLINK_PKGSRCDIR.xf86bigfontproto?= ../../x11/xf86bigfontproto -.endif # XF86BIGFONTPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xf86bigfontproto diff --git a/x11/xf86bigfontproto/builtin.mk b/x11/xf86bigfontproto/builtin.mk deleted file mode 100644 index 00fe5b47ea4..00000000000 --- a/x11/xf86bigfontproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:54 jperkin Exp $ - -BUILTIN_PKG:= xf86bigfontproto -PKGCONFIG_FILE.xf86bigfontproto= ${X11BASE}/lib/pkgconfig/xf86bigfontproto.pc -PKGCONFIG_FILE.xf86bigfontproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86bigfontproto.pc -PKGCONFIG_FILE.xf86bigfontproto+= ${X11BASE}/share/pkgconfig/xf86bigfontproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86bigfontproto/distinfo b/x11/xf86bigfontproto/distinfo deleted file mode 100644 index c79b91b9d0a..00000000000 --- a/x11/xf86bigfontproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 03:29:04 agc Exp $ - -SHA1 (xf86bigfontproto-1.2.0.tar.bz2) = 312a2ea708b257520c1af4393b69d73a393a478f -RMD160 (xf86bigfontproto-1.2.0.tar.bz2) = 847c3ecfe705ede5e9292586835d0fe2bc7ccf45 -SHA512 (xf86bigfontproto-1.2.0.tar.bz2) = 35b53ee1f428fee6777733264a7534a28ec6ffb29fc0ad9ab02337101d651ec94007bf840d0b591ee36a063280d4a4c71ff08f37100a63bb27581b5a9f69a710 -Size (xf86bigfontproto-1.2.0.tar.bz2) = 49191 bytes diff --git a/x11/xf86dgaproto/DESCR b/x11/xf86dgaproto/DESCR deleted file mode 100644 index 0de47c7b3c6..00000000000 --- a/x11/xf86dgaproto/DESCR +++ /dev/null @@ -1 +0,0 @@ -This package provides the XF86DGA extension headers from modular X.org. diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile deleted file mode 100644 index b8e8e3ab4b4..00000000000 --- a/x11/xf86dgaproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2012/10/29 05:07:08 asau Exp $ -# - -DISTNAME= xf86dgaproto-2.1 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= XF86DGA extension headers - -PKGCONFIG_OVERRIDE+= xf86dgaproto.pc.in -USE_TOOLS+= pkg-config -GNU_CONFIGURE= yes - -.include "../../x11/xproto/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86dgaproto/PLIST b/x11/xf86dgaproto/PLIST deleted file mode 100644 index e7a170de52f..00000000000 --- a/x11/xf86dgaproto/PLIST +++ /dev/null @@ -1,9 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2010/01/15 18:14:50 tnn Exp $ -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 -lib/pkgconfig/xf86dgaproto.pc diff --git a/x11/xf86dgaproto/buildlink3.mk b/x11/xf86dgaproto/buildlink3.mk deleted file mode 100644 index adc7173057f..00000000000 --- a/x11/xf86dgaproto/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2013/04/06 13:46:36 rodent Exp $ - -BUILDLINK_TREE+= xf86dgaproto - -.if !defined(XF86DGAPROTO_BUILDLINK3_MK) -XF86DGAPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.xf86dgaproto?= build - -BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.1 -BUILDLINK_PKGSRCDIR.xf86dgaproto?= ../../x11/xf86dgaproto - -.include "../../x11/xproto/buildlink3.mk" -.endif # XF86DGAPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xf86dgaproto diff --git a/x11/xf86dgaproto/builtin.mk b/x11/xf86dgaproto/builtin.mk deleted file mode 100644 index c4501efa391..00000000000 --- a/x11/xf86dgaproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:01 jperkin Exp $ - -BUILTIN_PKG:= xf86dgaproto -PKGCONFIG_FILE.xf86dgaproto= ${X11BASE}/lib/pkgconfig/xf86dgaproto.pc -PKGCONFIG_FILE.xf86dgaproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86dgaproto.pc -PKGCONFIG_FILE.xf86dgaproto+= ${X11BASE}/share/pkgconfig/xf86dgaproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86dgaproto/distinfo b/x11/xf86dgaproto/distinfo deleted file mode 100644 index b78edf1c8f0..00000000000 --- a/x11/xf86dgaproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 03:29:04 agc Exp $ - -SHA1 (xf86dgaproto-2.1.tar.bz2) = 97a06120e7195c968875e8ba42e82c90ab54948b -RMD160 (xf86dgaproto-2.1.tar.bz2) = 5fe5b3a2a8929c2a661b41fa733610917c7d74c5 -SHA512 (xf86dgaproto-2.1.tar.bz2) = dab56f5e59d1099d0d462e2f056e073c0ebde46aae6b9cf1c12b1fda43b5f21fb438dc811305c3114e04eb2fd2b1d13ddbe0a1d9a5c8155525db82db00e1461c -Size (xf86dgaproto-2.1.tar.bz2) = 85934 bytes diff --git a/x11/xf86driproto/DESCR b/x11/xf86driproto/DESCR deleted file mode 100644 index ecd921ff938..00000000000 --- a/x11/xf86driproto/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This provides the XF86DRI extension headers from modular X.org X11 -project. - -The headers contain the types and functions that define the interface -between a DRI (direct rendering infrastructure) driver and driver -loader. diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile deleted file mode 100644 index 0fc0ff729ae..00000000000 --- a/x11/xf86driproto/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2015/09/27 05:17:49 tnn Exp $ -# - -DISTNAME= xf86driproto-2.1.1 -PKGREVISION= 1 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= XF86DRI extension headers from modular X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= xf86driproto.pc.in -USE_LANGUAGES= c - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86driproto/PLIST b/x11/xf86driproto/PLIST deleted file mode 100644 index 566ad68c004..00000000000 --- a/x11/xf86driproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2009/08/29 15:32:55 wiz Exp $ -include/X11/dri/xf86dri.h -include/X11/dri/xf86driproto.h -include/X11/dri/xf86dristr.h -lib/pkgconfig/xf86driproto.pc diff --git a/x11/xf86driproto/buildlink3.mk b/x11/xf86driproto/buildlink3.mk deleted file mode 100644 index 8a049ef06fc..00000000000 --- a/x11/xf86driproto/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2015/09/27 05:17:49 tnn Exp $ - -BUILDLINK_TREE+= xf86driproto - -.if !defined(XF86DRIPROTO_BUILDLINK3_MK) -XF86DRIPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.xf86driproto?= build - -BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3 -BUILDLINK_PKGSRCDIR.xf86driproto?= ../../x11/xf86driproto - -.endif # XF86DRIPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xf86driproto diff --git a/x11/xf86driproto/builtin.mk b/x11/xf86driproto/builtin.mk deleted file mode 100644 index 437965e47f5..00000000000 --- a/x11/xf86driproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:01 jperkin Exp $ - -BUILTIN_PKG:= xf86driproto -PKGCONFIG_FILE.xf86driproto= ${X11BASE}/lib/pkgconfig/xf86driproto.pc -PKGCONFIG_FILE.xf86driproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86driproto.pc -PKGCONFIG_FILE.xf86driproto+= ${X11BASE}/share/pkgconfig/xf86driproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo deleted file mode 100644 index 754f9e3e931..00000000000 --- a/x11/xf86driproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 03:29:04 agc Exp $ - -SHA1 (xf86driproto-2.1.1.tar.bz2) = 23e861f40ba0f0cbbfd7db7ba2ef623762ffca17 -RMD160 (xf86driproto-2.1.1.tar.bz2) = d7da476ce21b8e695d14e796daf1e25315798927 -SHA512 (xf86driproto-2.1.1.tar.bz2) = dce0d4da1dd703a6cdfe7676537034d43c9e84d70f20afdfe59be7929a97fbd077fa7026e41c0fca8aafd5fe666b2ee99265c8e94e69263bdf46e2be9ff34df2 -Size (xf86driproto-2.1.1.tar.bz2) = 96528 bytes diff --git a/x11/xf86miscproto/DESCR b/x11/xf86miscproto/DESCR deleted file mode 100644 index 7c9f5763414..00000000000 --- a/x11/xf86miscproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the XF86Misc extension headers from modular X.org X11 -project. diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile deleted file mode 100644 index e84b42ad9a5..00000000000 --- a/x11/xf86miscproto/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2012/10/29 05:07:08 asau Exp $ -# - -DISTNAME= xf86miscproto-0.9.3 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= XF86Misc extension headers from modular X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= xf86miscproto.pc.in - -.include "../../x11/xproto/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86miscproto/PLIST b/x11/xf86miscproto/PLIST deleted file mode 100644 index de74a1853f0..00000000000 --- a/x11/xf86miscproto/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:15 joerg Exp $ -include/X11/extensions/xf86misc.h -include/X11/extensions/xf86mscstr.h -lib/pkgconfig/xf86miscproto.pc diff --git a/x11/xf86miscproto/buildlink3.mk b/x11/xf86miscproto/buildlink3.mk deleted file mode 100644 index 06fcc9cca81..00000000000 --- a/x11/xf86miscproto/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:36 rodent Exp $ - -BUILDLINK_TREE+= xf86miscproto - -.if !defined(XF86MISCPROTO_BUILDLINK3_MK) -XF86MISCPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.xf86miscproto?= build - -BUILDLINK_API_DEPENDS.xf86miscproto+= xf86miscproto>=0.9.2 -BUILDLINK_PKGSRCDIR.xf86miscproto?= ../../x11/xf86miscproto - -.include "../../x11/xproto/buildlink3.mk" -.endif # XF86MISCPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xf86miscproto diff --git a/x11/xf86miscproto/builtin.mk b/x11/xf86miscproto/builtin.mk deleted file mode 100644 index ad3c6603b22..00000000000 --- a/x11/xf86miscproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:01 jperkin Exp $ - -BUILTIN_PKG:= xf86miscproto -PKGCONFIG_FILE.xf86miscproto= ${X11BASE}/lib/pkgconfig/xf86miscproto.pc -PKGCONFIG_FILE.xf86miscproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86miscproto.pc -PKGCONFIG_FILE.xf86miscproto+= ${X11BASE}/share/pkgconfig/xf86miscproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86miscproto/distinfo b/x11/xf86miscproto/distinfo deleted file mode 100644 index 5a1e316608f..00000000000 --- a/x11/xf86miscproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 03:29:04 agc Exp $ - -SHA1 (xf86miscproto-0.9.3.tar.bz2) = 52c54ed17e55f26b26654ff16d61da97f9fd36bc -RMD160 (xf86miscproto-0.9.3.tar.bz2) = 644b08dae757338464273be818e28414b99aeba5 -SHA512 (xf86miscproto-0.9.3.tar.bz2) = b82370ee3aff3ee13c15ce645a74e6d927df0a2db01830a21fea4c36445495849d24410639525f02f369aabe8e1b6e6ab9acbfd3a41cb3cd7e6060a9c8ae320d -Size (xf86miscproto-0.9.3.tar.bz2) = 84950 bytes diff --git a/x11/xf86vidmodeproto/DESCR b/x11/xf86vidmodeproto/DESCR deleted file mode 100644 index d7f454c93bc..00000000000 --- a/x11/xf86vidmodeproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the XF86VidMode extension headers from modular X.org X11 -project. diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile deleted file mode 100644 index 98cadb26204..00000000000 --- a/x11/xf86vidmodeproto/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2012/10/29 05:07:08 asau Exp $ -# - -DISTNAME= xf86vidmodeproto-2.3.1 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= XF86VidMode extension headers from modular X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= xf86vidmodeproto.pc.in - -.include "../../x11/xproto/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86vidmodeproto/PLIST b/x11/xf86vidmodeproto/PLIST deleted file mode 100644 index 5a35458c2d0..00000000000 --- a/x11/xf86vidmodeproto/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2010/01/15 18:20:47 tnn Exp $ -include/X11/extensions/xf86vm.h -include/X11/extensions/xf86vmproto.h -include/X11/extensions/xf86vmstr.h -lib/pkgconfig/xf86vidmodeproto.pc diff --git a/x11/xf86vidmodeproto/buildlink3.mk b/x11/xf86vidmodeproto/buildlink3.mk deleted file mode 100644 index 5691baed884..00000000000 --- a/x11/xf86vidmodeproto/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:43 rillig Exp $ - -BUILDLINK_TREE+= xf86vidmodeproto - -.if !defined(XF86VIDMODEPROTO_BUILDLINK3_MK) -XF86VIDMODEPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.xf86vidmodeproto?= build - -BUILDLINK_API_DEPENDS.xf86vidmodeproto+= xf86vidmodeproto>=2.3 -BUILDLINK_PKGSRCDIR.xf86vidmodeproto?= ../../x11/xf86vidmodeproto - -.include "../../x11/xproto/buildlink3.mk" -.endif # XF86VIDMODEPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xf86vidmodeproto diff --git a/x11/xf86vidmodeproto/builtin.mk b/x11/xf86vidmodeproto/builtin.mk deleted file mode 100644 index 035613339c4..00000000000 --- a/x11/xf86vidmodeproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:01 jperkin Exp $ - -BUILTIN_PKG:= xf86vidmodeproto -PKGCONFIG_FILE.xf86vidmodeproto= ${X11BASE}/lib/pkgconfig/xf86vidmodeproto.pc -PKGCONFIG_FILE.xf86vidmodeproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xf86vidmodeproto.pc -PKGCONFIG_FILE.xf86vidmodeproto+= ${X11BASE}/share/pkgconfig/xf86vidmodeproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86vidmodeproto/distinfo b/x11/xf86vidmodeproto/distinfo deleted file mode 100644 index f3eca9a0698..00000000000 --- a/x11/xf86vidmodeproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 03:29:05 agc Exp $ - -SHA1 (xf86vidmodeproto-2.3.1.tar.bz2) = 11d54c3210887631ea71e8f8030a77692e964fc4 -RMD160 (xf86vidmodeproto-2.3.1.tar.bz2) = 200a5911d46be3306a85d9684ac5aea695bfc653 -SHA512 (xf86vidmodeproto-2.3.1.tar.bz2) = d68784339271226a71360253b5f35d9cbec483801b4df3684bd070b1208a478edf9e5f55f1ff8ff186c81c56fb6e105e8cebad43d650cdbe605eed10bb7c7c50 -Size (xf86vidmodeproto-2.3.1.tar.bz2) = 96822 bytes diff --git a/x11/xfsinfo/Makefile b/x11/xfsinfo/Makefile index eb31f7d223b..79dc6c4f212 100644 --- a/x11/xfsinfo/Makefile +++ b/x11/xfsinfo/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2017/09/16 19:27:30 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2018/03/07 11:57:46 wiz Exp $ DISTNAME= xfsinfo-1.0.5 +PKGREVISION= 1 CATEGORIES= fonts x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -14,7 +15,6 @@ GNU_CONFIGURE= yes USE_TOOLS+= pkg-config .include "../../x11/libFS/buildlink3.mk" -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index 3d64a971be0..cd26636de4e 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2017/01/29 05:54:21 mef Exp $ +# $NetBSD: Makefile,v 1.42 2018/03/07 11:57:46 wiz Exp $ DISTNAME= xfstt-1.9.3 +PKGREVISION= 1 CATEGORIES= x11 net fonts MASTER_SITES= http://archive.hadrons.org/software/xfstt/ EXTRACT_SUFX= .tar.xz @@ -44,6 +45,5 @@ do-install: ${DESTDIR}${PREFIX}/share/examples/xfstt/ \ ) -.include "../../x11/fontsproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile index da0da0c9c2f..053d3016afc 100644 --- a/x11/xfwp/Makefile +++ b/x11/xfwp/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:30 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:46 wiz Exp $ DISTNAME= xfwp-1.0.3 -CATEGORIES= net +PKGREVISION= 1 +CATEGORIES= net x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -15,8 +16,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ARGS.Linux+= --disable-strict-compilation --disable-selective-werror -.include "../../x11/xproxymanagementprotocol/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile index f8e90f0fc5b..d9cb59a31fa 100644 --- a/x11/xgamma/Makefile +++ b/x11/xgamma/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2015/04/17 07:07:27 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:46 wiz Exp $ DISTNAME= xgamma-1.0.6 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -17,5 +18,5 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xf86vidmodeproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xineramaproto/DESCR b/x11/xineramaproto/DESCR deleted file mode 100644 index 496a8060d58..00000000000 --- a/x11/xineramaproto/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This provides the Xinerama extension headers from modular X.org X11 -project. diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile deleted file mode 100644 index 0180acbe95c..00000000000 --- a/x11/xineramaproto/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2012/10/29 05:07:12 asau Exp $ -# - -DISTNAME= xineramaproto-1.2.1 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= Xinerama extension headers from X.org - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= xineramaproto.pc.in - -BUILDLINK_DEPMETHOD.libX11?= build # uses headers -.include "../../x11/libX11/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xineramaproto/PLIST b/x11/xineramaproto/PLIST deleted file mode 100644 index fce7be652cc..00000000000 --- a/x11/xineramaproto/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2010/04/09 08:36:30 tnn Exp $ -include/X11/extensions/panoramiXproto.h -lib/pkgconfig/xineramaproto.pc diff --git a/x11/xineramaproto/buildlink3.mk b/x11/xineramaproto/buildlink3.mk deleted file mode 100644 index 99d70a285b6..00000000000 --- a/x11/xineramaproto/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2013/04/06 13:46:36 rodent Exp $ - -BUILDLINK_TREE+= xineramaproto - -.if !defined(XINERAMAPROTO_BUILDLINK3_MK) -XINERAMAPROTO_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.xineramaproto?= build - -BUILDLINK_API_DEPENDS.xineramaproto+= xineramaproto>=1.1.1 -BUILDLINK_PKGSRCDIR.xineramaproto?= ../../x11/xineramaproto - -.include "../../x11/libX11/buildlink3.mk" -.endif # XINERAMAPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xineramaproto diff --git a/x11/xineramaproto/builtin.mk b/x11/xineramaproto/builtin.mk deleted file mode 100644 index b0cbfa90273..00000000000 --- a/x11/xineramaproto/builtin.mk +++ /dev/null @@ -1,65 +0,0 @@ -# $NetBSD: builtin.mk,v 1.6 2015/08/03 09:53:02 jperkin Exp $ - -BUILTIN_PKG:= xineramaproto - -BUILTIN_FIND_FILES_VAR:= PC_XINERAMAPROTO -BUILTIN_FIND_FILES.PC_XINERAMAPROTO= ${X11BASE}/lib/pkgconfig/xineramaproto.pc -BUILTIN_FIND_FILES.PC_XINERAMAPROTO+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xineramaproto.pc -BUILTIN_FIND_FILES.PC_XINERAMAPROTO+= ${X11BASE}/share/pkgconfig/xineramaproto.pc - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if ${X11BASE} == ${LOCALBASE} -IS_BUILTIN.xineramaproto= no -.elif !defined(IS_BUILTIN.xineramaproto) -IS_BUILTIN.xineramaproto= no -. if empty(PC_XINERAMAPROTO:M__nonexistent__) -IS_BUILTIN.xineramaproto= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.xineramaproto - -### -### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to -### a package name to represent the built-in package. -### -.if !defined(BUILTIN_PKG.xineramaproto) && \ - !empty(IS_BUILTIN.xineramaproto:M[yY][eE][sS]) && \ - empty(PC_XINERAMAPROTO:M__nonexistent__) -BUILTIN_VERSION.xineramaproto!= ${SED} -n -e 's/Version: //p' ${PC_XINERAMAPROTO} -BUILTIN_PKG.xineramaproto= xineramaproto-${BUILTIN_VERSION.xineramaproto} -.endif -MAKEVARS+= BUILTIN_PKG.xineramaproto - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.xineramaproto) -. if ${PREFER.xineramaproto} == "pkgsrc" -USE_BUILTIN.xineramaproto= no -. else -USE_BUILTIN.xineramaproto= ${IS_BUILTIN.xineramaproto} -. if defined(BUILTIN_PKG.xineramaproto) && \ - !empty(IS_BUILTIN.xineramaproto:M[yY][eE][sS]) -USE_BUILTIN.xineramaproto= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.xineramaproto} -. if !empty(USE_BUILTIN.xineramaproto:M[yY][eE][sS]) -USE_BUILTIN.xineramaproto!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xineramaproto:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.xineramaproto -.endif -MAKEVARS+= USE_BUILTIN.xineramaproto - -.include "../../mk/x11.builtin.mk" diff --git a/x11/xineramaproto/distinfo b/x11/xineramaproto/distinfo deleted file mode 100644 index ec21e562137..00000000000 --- a/x11/xineramaproto/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 03:29:07 agc Exp $ - -SHA1 (xineramaproto-1.2.1.tar.bz2) = 818bffc16139d6e3de4344c83f00c495d3536753 -RMD160 (xineramaproto-1.2.1.tar.bz2) = ec5d4878b93766bf9e12bf981f4b419db5fa5853 -SHA512 (xineramaproto-1.2.1.tar.bz2) = ec2194c9bcad3f0f3eb3e9298792272213aa032ae9d6c00dcad567f31d7278a8c676fc67f47aae1a6deef5bade0b204346ed16da4a4c4d5a507c04d109d3dbb3 -Size (xineramaproto-1.2.1.tar.bz2) = 96239 bytes diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile index 991e91bbcc9..fd67a4e833f 100644 --- a/x11/xinput/Makefile +++ b/x11/xinput/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2015/10/19 22:56:32 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2018/03/07 11:57:46 wiz Exp $ DISTNAME= xinput-1.6.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} @@ -12,11 +13,9 @@ LICENSE= mit GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.6 -.include "../../x11/inputproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" BUILDLINK_API_DEPENDS.libXi+= libXi>=1.2.0 .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile index ddfcfe7ada7..1524bf30d79 100644 --- a/x11/xkbcomp/Makefile +++ b/x11/xkbcomp/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2018/03/01 23:48:07 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2018/03/07 11:57:46 wiz Exp $ DISTNAME= xkbcomp-1.4.1 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -18,6 +19,5 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile index 42276870319..1ef8065dd7c 100644 --- a/x11/xkbutils/Makefile +++ b/x11/xkbutils/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2013/02/11 08:59:57 wiz Exp $ -# +# $NetBSD: Makefile,v 1.4 2018/03/07 11:57:46 wiz Exp $ DISTNAME= xkbutils-1.0.4 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -13,7 +13,7 @@ COMMENT= Small utilities utilizing the X11 XKeyboard (XKB) extension GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index de891dfaa1d..991b2cb953c 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2018/02/01 10:06:18 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2018/03/07 11:57:47 wiz Exp $ DISTNAME= xkeyboard-config-2.23.1 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=data/${PKGBASE}/} EXTRACT_SUFX= .tar.bz2 @@ -57,6 +58,5 @@ BUILDLINK_DEPMETHOD.gettext= build # for the configure only BUILDLINK_API_DEPENDS.libX11+= libX11>=1.4.3 .include "../../x11/libX11/buildlink3.mk" -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.20 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile index 42324a86109..2a918d27965 100644 --- a/x11/xlockmore-lite/Makefile +++ b/x11/xlockmore-lite/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2015/04/15 07:31:15 spz Exp $ +# $NetBSD: Makefile,v 1.22 2018/03/07 11:57:47 wiz Exp $ .include "../../x11/xlockmore/Makefile.common" PKGNAME= ${DISTNAME:S/-/-lite-/} +PKGREVISION= 1 COMMENT= "lite" version of xlockmore CONFIGURE_ARGS+= --without-xpm diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index db57afbb3a8..fa0b14cec80 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.129 2018/02/08 16:03:12 jaapb Exp $ +# $NetBSD: Makefile,v 1.130 2018/03/07 11:57:47 wiz Exp $ -PKGREVISION= 10 +PKGREVISION= 11 .include "Makefile.common" COMMENT= Like the XLock session-locker/screensaver, but with more @@ -16,7 +16,7 @@ MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_ CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q} #BUILDLINK_TRANSFORM+= l:MesaGL:GL #BUILDLINK_TRANSFORM+= l:MesaGLU:GLU -XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xextproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib +XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q} PLIST_SUBST+= LITE="" diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index 45c69e65a6c..afed9c4a48c 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.77 2017/10/09 08:50:24 wiz Exp $ +# $NetBSD: Makefile.common,v 1.78 2018/03/07 11:57:47 wiz Exp $ # # used by x11/xlockmore/Makefile # used by x11/xlockmore-lite/Makefile @@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --without-dpms . if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a) BUILDLINK_TRANSFORM+= l:Xdpms:Xext . endif -DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xextproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib +DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib CONFIGURE_ENV+= ac_cv_path_dpms=${DPMS_ENV:Q} .endif @@ -106,7 +106,7 @@ INSTALLATION_DIRS+= ${EGDIR}/pam.d .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" XINERAMA_ENV= no_xenerama= ac_xinerama_includes=${BUILDLINK_PREFIX.libXinerama}/include ac_xinerama_libraries=${BUILDLINK_PREFIX.libXinerama}/lib CONFIGURE_ENV+= ac_cv_path_xinerama=${XINERAMA_ENV:Q} diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile index 26465e0bd7f..c9e044ab363 100644 --- a/x11/xmx/Makefile +++ b/x11/xmx/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2018/03/06 15:48:09 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:47 wiz Exp $ DISTNAME= xmx-2.1alpha.pl7 PKGNAME= xmx-2.1a7 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= x11 MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/ @@ -20,7 +20,7 @@ MAKE_FLAGS+= EXTRA_LDOPTIONS=${LDFLAGS:Q} MAKE_FLAGS+= SHLIBGLOBALSFLAGS=${LDFLAGS:Q} .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index 3350a0df4a5..51d25194bc0 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2018/01/25 13:01:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.35 2018/03/07 11:57:47 wiz Exp $ DISTNAME= xorg-cf-files-1.0.6 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=util/} EXTRACT_SUFX= .tar.bz2 @@ -54,6 +54,5 @@ pre-configure: ${ECHO} '#define RealProjectRoot ${X11BASE}' >> ${WRKSRC}/host.def; \ fi -.include "../../x11/xproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpr/Makefile b/x11/xpr/Makefile index b13d0125fde..ac7360a7ea4 100644 --- a/x11/xpr/Makefile +++ b/x11/xpr/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2017/09/16 19:27:31 wiz Exp $ -# +# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:47 wiz Exp $ DISTNAME= xpr-1.0.4 +PKGREVISION= 1 CATEGORIES= print x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -9,13 +9,11 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Formats xwd dump files as output for various types of printers -#LICENSE= # TODO: (see mk/license.mk) GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" diff --git a/x11/xproto/DESCR b/x11/xproto/DESCR deleted file mode 100644 index 248e57701ed..00000000000 --- a/x11/xproto/DESCR +++ /dev/null @@ -1 +0,0 @@ -X protocol and ancillary headers from modular Xorg X11. diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile deleted file mode 100644 index d86efa1250c..00000000000 --- a/x11/xproto/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: Makefile,v 1.32 2016/09/30 10:33:50 wiz Exp $ - -DISTNAME= xproto-7.0.31 -CATEGORIES= x11 devel -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= X protocol and ancillary headers from Xorg X11 -LICENSE= mit - -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= xproto.pc.in -USE_LANGUAGES= c - -post-extract: - ${MV} ${WRKSRC}/Xos_r.h ${WRKSRC}/Xos_r.h.in - -pre-configure: - sleep 1 && ${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xproto/PLIST b/x11/xproto/PLIST deleted file mode 100644 index 41c951766f2..00000000000 --- a/x11/xproto/PLIST +++ /dev/null @@ -1,33 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2012/06/03 19:57:33 wiz Exp $ -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 -lib/pkgconfig/xproto.pc -share/doc/xproto/encoding.xml -share/doc/xproto/glossary.xml -share/doc/xproto/keysyms.xml -share/doc/xproto/sect1-9.xml -share/doc/xproto/x11protocol.xml diff --git a/x11/xproto/buildlink3.mk b/x11/xproto/buildlink3.mk deleted file mode 100644 index 0dd0d87a404..00000000000 --- a/x11/xproto/buildlink3.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 02:45:48 dholland Exp $ -# -# This Makefile fragment is included by packages that use xproto. -# - -.include "../../mk/bsd.fast.prefs.mk" - -BUILDLINK_TREE+= xproto - -.if !defined(XPROTO_BUILDLINK3_MK) -XPROTO_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.9 -BUILDLINK_PKGSRCDIR.xproto?= ../../x11/xproto -BUILDLINK_DEPMETHOD.xproto?= build -.endif # XPROTO_BUILDLINK3_MK - -BUILDLINK_TREE+= -xproto diff --git a/x11/xproto/builtin.mk b/x11/xproto/builtin.mk deleted file mode 100644 index 610be8ff4bd..00000000000 --- a/x11/xproto/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.6 2015/08/03 09:53:02 jperkin Exp $ - -BUILTIN_PKG:= xproto -PKGCONFIG_FILE.xproto= ${X11BASE}/lib/pkgconfig/xproto.pc -PKGCONFIG_FILE.xproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xproto.pc -PKGCONFIG_FILE.xproto+= ${X11BASE}/share/pkgconfig/xproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo deleted file mode 100644 index c3011910dc9..00000000000 --- a/x11/xproto/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.30 2016/09/30 10:33:50 wiz Exp $ - -SHA1 (xproto-7.0.31.tar.bz2) = 779fa333c5522cca40ca810c25a8fa60b6ccedfb -RMD160 (xproto-7.0.31.tar.bz2) = 27350d33fd2bbc14201231d9fd30629f899b6005 -SHA512 (xproto-7.0.31.tar.bz2) = bba6141525c21fd9a3cf210853658cc7af69f82e1ac15bacfffb9280efc3fe3c6fa708095b541b6f33f114c11e808bde8c8839ae63ff88e30963abdfac12702b -Size (xproto-7.0.31.tar.bz2) = 300356 bytes -SHA1 (patch-Xos_r.h.in) = 6de176ec5bef08d67286a14eca651b1968d0b4bb -SHA1 (patch-Xpoll.h.in) = fa2d2aafe2e1ab834068237a9df141549350eaeb -SHA1 (patch-configure) = a589cc4b75bbaa4c93789d4ffc85a05fcaf0e25c -SHA1 (patch-configure.ac) = 8bc7d4b8c9c98d8902404d2e67755e0145173b36 diff --git a/x11/xproto/patches/patch-Xos_r.h.in b/x11/xproto/patches/patch-Xos_r.h.in deleted file mode 100644 index 83b3c8d7e3a..00000000000 --- a/x11/xproto/patches/patch-Xos_r.h.in +++ /dev/null @@ -1,134 +0,0 @@ -$NetBSD: patch-Xos_r.h.in,v 1.1 2013/05/17 13:17:40 joerg Exp $ - ---- Xos_r.h.in.orig 2013-03-29 23:26:53.000000000 +0000 -+++ Xos_r.h.in -@@ -73,13 +73,7 @@ in this Software without prior written a - # include <X11/Xfuncs.h> - - # ifndef X_NOT_POSIX --# ifdef _POSIX_SOURCE --# include <limits.h> --# else --# define _POSIX_SOURCE --# include <limits.h> --# undef _POSIX_SOURCE --# endif -+# include <limits.h> - # ifndef LINE_MAX - # define X_LINE_MAX 2048 - # else -@@ -88,6 +82,10 @@ in this Software without prior written a - # endif - #endif /* _XOS_R_H */ - -+# ifdef __APPLE__ -+# include <sys/param.h> -+# endif -+ - #ifndef WIN32 - - #ifdef __cplusplus -@@ -185,6 +183,13 @@ extern void XtProcessUnlock( - # endif - # endif - -+#undef _XOS_R_H_MTSAFE_DIRENTAPI -+#undef _XOS_R_H_MTSAFE_NETDBAPI -+#undef _XOS_R_H_MTSAFE_PWDAPI -+#undef _XOS_R_H_MTSAFE_UNISTDAPI -+#undef _XOS_R_H_MTSAFE_STRINGAPI -+#undef _XOS_R_H_MTSAFE_TIMEAPI -+#undef _XOS_R_H_MTSAFE_GRPAPI - #endif /* !defined WIN32 */ - - /* -@@ -214,7 +219,7 @@ extern void XtProcessUnlock( - - #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H) - # include <pwd.h> --# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_PWDAPI) -+# if defined(_XOS_R_H_MTSAFE_PWDAPI) - # define XOS_USE_MTSAFE_PWDAPI 1 - # endif - #endif -@@ -318,7 +323,7 @@ static __inline__ void _Xpw_copyPasswd(_ - (_Xos_processUnlock), \ - (p).pwp ) - --#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) -+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__) - # define X_NEEDS_PWPARAMS - typedef struct { - struct passwd pws; -@@ -384,7 +389,7 @@ typedef int _Xgetpwret; - #if defined(X_INCLUDE_NETDB_H) && !defined(_XOS_INCLUDED_NETDB_H) \ - && !defined(WIN32) - # include <netdb.h> --# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_NETDBAPI) -+# if defined(_XOS_R_H_MTSAFE_NETDBAPI) - # define XOS_USE_MTSAFE_NETDBAPI 1 - # endif - #endif -@@ -543,7 +548,7 @@ typedef int _Xgetservbynameparams; /* du - # define dirent direct - # endif - # endif --# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_DIRENTAPI) -+# if defined(_XOS_R_H_MTSAFE_DIRENTAPI) - # define XOS_USE_MTSAFE_DIRENTAPI 1 - # endif - #endif -@@ -604,15 +609,8 @@ typedef struct { - /* Pre-POSIX API, returns non-NULL on success. */ - # define _XReaddir(d,p) (readdir_r((d), &(p).dir_entry)) - # else --/* We have no idea what is going on. Fake it all using process locks. */ --# define _XReaddir(d,p) \ -- ( (_Xos_processLock), \ -- (((p).result = readdir((d))) ? \ -- (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen), \ -- ((p).result = &(p).dir_entry), 0) : \ -- 0), \ -- (_Xos_processUnlock), \ -- (p).result ) -+# define _XReaddir(d,p) \ -+ (readdir_r((d), &((p).dir_entry), &((p).result)) ? NULL : (p).result) - # endif - #endif /* X_INCLUDE_DIRENT_H */ - -@@ -639,7 +637,7 @@ typedef struct { - - #if defined(X_INCLUDE_UNISTD_H) && !defined(_XOS_INCLUDED_UNISTD_H) - /* <unistd.h> already included by <X11/Xos.h> */ --# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_UNISTDAPI) -+# if defined(_XOS_R_H__MTSAFE_UNISTDAPI) - # define XOS_USE_MTSAFE_UNISTDAPI 1 - # endif - #endif -@@ -779,7 +777,7 @@ typedef struct { - - #if defined(X_INCLUDE_STRING_H) && !defined(_XOS_INCLUDED_STRING_H) - /* <string.h> has already been included by <X11/Xos.h> */ --# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_STRINGAPI) -+# if defined(_XOS_R_H_MTSAFE_STRINGAPI) - # define XOS_USE_MTSAFE_STRINGAPI 1 - # endif - #endif -@@ -831,7 +829,7 @@ typedef char * _Xstrtokparams; - - #if defined(X_INCLUDE_TIME_H) && !defined(_XOS_INCLUDED_TIME_H) - # include <time.h> --# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_TIMEAPI) -+# if defined(_XOS_R_H_MTSAFE_TIMEAPI) - # define XOS_USE_MTSAFE_TIMEAPI 1 - # endif - #endif -@@ -987,7 +985,7 @@ typedef struct tm _Xltimeparams; - - #if defined(X_INCLUDE_GRP_H) && !defined(_XOS_INCLUDED_GRP_H) - # include <grp.h> --# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_GRPAPI) -+# if defined(_XOS_R_H_MTSAFE_GRPAPI) - # define XOS_USE_MTSAFE_GRPAPI 1 - # endif - #endif diff --git a/x11/xproto/patches/patch-Xpoll.h.in b/x11/xproto/patches/patch-Xpoll.h.in deleted file mode 100644 index 12703436dec..00000000000 --- a/x11/xproto/patches/patch-Xpoll.h.in +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-Xpoll.h.in,v 1.2 2016/05/16 21:54:30 wiz Exp $ - -Fix FD_SETSIZE definition. - -Move the define of FD_SETSIZE before the include of select.h, so that -is actually does something useful. - ---- Xpoll.h.in.orig 2016-05-13 08:26:10.000000000 +0000 -+++ Xpoll.h.in -@@ -54,6 +54,15 @@ from The Open Group. - - #ifndef USE_POLL - -+#if defined(FD_SETSIZE) && FD_SETSIZE < 512 -+# define XFD_SETSIZE FD_SETSIZE -+#else -+# define XFD_SETSIZE 512 -+# ifndef FD_SETSIZE -+# define FD_SETSIZE XFD_SETSIZE -+# endif -+#endif -+ - #include <X11/Xos.h> - - #include <sys/select.h> /* Get the FD_* macros. */ -@@ -67,15 +76,6 @@ typedef long fd_mask; - # endif - #endif - --#if defined(FD_SETSIZE) && FD_SETSIZE < 512 --# define XFD_SETSIZE FD_SETSIZE --#else --# define XFD_SETSIZE 512 --# ifndef FD_SETSIZE --# define FD_SETSIZE XFD_SETSIZE --# endif --#endif -- - #ifndef NBBY - #define NBBY 8 /* number of bits in a byte */ - #endif diff --git a/x11/xproto/patches/patch-configure b/x11/xproto/patches/patch-configure deleted file mode 100644 index 89ff411fd61..00000000000 --- a/x11/xproto/patches/patch-configure +++ /dev/null @@ -1,152 +0,0 @@ -$NetBSD: patch-configure,v 1.3 2013/05/17 13:17:40 joerg Exp $ - ---- configure.orig 2013-03-29 23:27:02.000000000 +0000 -+++ configure -@@ -1959,6 +1971,73 @@ $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - - } # ac_fn_c_check_member -+ -+# ac_fn_c_check_func LINENO FUNC VAR -+# ---------------------------------- -+# Tests whether FUNC exists, setting the cache variable VAR accordingly -+ac_fn_c_check_func () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case <limits.h> declares $2. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main () -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_func - cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. -@@ -11073,6 +11237,8 @@ ac_config_headers="$ac_config_headers do - - ac_config_headers="$ac_config_headers Xfuncproto.h" - -+ac_config_headers="$ac_config_headers Xos_r.h" -+ - - - -@@ -11324,6 +11490,56 @@ $as_echo "#define NARROWPROTO /**/" >>co - - fi - -+# Handle Xos_r.h -+ac_fn_c_check_func "$LINENO" "readdir_r" "ac_cv_func_readdir_r" -+if test "x$ac_cv_func_readdir_r" = xyes; then : -+ -+$as_echo "#define _XOS_R_H_MTSAFE_DIRENTAPI /**/" >>confdefs.h -+ -+fi -+ -+ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r" -+if test "x$ac_cv_func_getgrgid_r" = xyes; then : -+ -+$as_echo "#define _XOS_R_H_MTSAFE_GRPAPI /**/" >>confdefs.h -+ -+fi -+ -+ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r" -+if test "x$ac_cv_func_getpwuid_r" = xyes; then : -+ -+$as_echo "#define _XOS_R_H_MTSAFE_PWDAPI /**/" >>confdefs.h -+ -+fi -+ -+ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r" -+if test "x$ac_cv_func_gethostbyname_r" = xyes; then : -+ -+$as_echo "#define _XOS_R_H_MTSAFE_NETDBAPI /**/" >>confdefs.h -+ -+fi -+ -+ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r" -+if test "x$ac_cv_func_strtok_r" = xyes; then : -+ -+$as_echo "#define _XOS_R_H_MTSAFE_STRINGAPI /**/" >>confdefs.h -+ -+fi -+ -+ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r" -+if test "x$ac_cv_func_gmtime_r" = xyes; then : -+ -+$as_echo "#define _XOS_R_H_MTSAFE_TIMEAPI /**/" >>confdefs.h -+ -+fi -+ -+ac_fn_c_check_func "$LINENO" "ttyname_r" "ac_cv_func_ttyname_r" -+if test "x$ac_cv_func_ttyname_r" = xyes; then : -+ -+$as_echo "#define _XOS_R_H_MTSAFE_UNISTDAPI /**/" >>confdefs.h -+ -+fi -+ - - ac_config_files="$ac_config_files Makefile specs/Makefile specs/SIAddresses/Makefile Xpoll.h xproto.pc" - -@@ -12083,6 +12307,7 @@ do - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "do-not-use-config.h") CONFIG_HEADERS="$CONFIG_HEADERS do-not-use-config.h" ;; - "Xfuncproto.h") CONFIG_HEADERS="$CONFIG_HEADERS Xfuncproto.h" ;; -+ "Xos_r.h") CONFIG_HEADERS="$CONFIG_HEADERS Xos_r.h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "specs/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Makefile" ;; - "specs/SIAddresses/Makefile") CONFIG_FILES="$CONFIG_FILES specs/SIAddresses/Makefile" ;; diff --git a/x11/xproto/patches/patch-configure.ac b/x11/xproto/patches/patch-configure.ac deleted file mode 100644 index 141063be128..00000000000 --- a/x11/xproto/patches/patch-configure.ac +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.2 2014/04/15 08:29:23 wiz Exp $ - - ---- configure.ac.orig 2014-04-14 13:33:50.000000000 +0000 -+++ configure.ac -@@ -16,6 +16,7 @@ XORG_CHECK_SGML_DOCTOOLS(1.8) - - AC_CONFIG_HEADERS([do-not-use-config.h]) - AC_CONFIG_HEADERS([Xfuncproto.h]) -+AC_CONFIG_HEADER([Xos_r.h]) - - AC_CANONICAL_HOST - -@@ -208,6 +209,14 @@ if test "x$WIDEPROTO" = xno; then - AC_DEFINE(NARROWPROTO, [], [Narrow prototypes]) - fi - -+# Handle Xos_r.h -+AC_CHECK_FUNC(readdir_r, [AC_DEFINE(_XOS_R_H_MTSAFE_DIRENTAPI,[],[Assume has readdir_r and friends from dirent.h])],) -+AC_CHECK_FUNC(getgrgid_r, [AC_DEFINE(_XOS_R_H_MTSAFE_GRPAPI,[],[Assume has getgrgid_r and friends from grp.h])],) -+AC_CHECK_FUNC(getpwuid_r, [AC_DEFINE(_XOS_R_H_MTSAFE_PWDAPI,[],[Assume has getpwuid_r and friends from pwd.h])],) -+AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_NETDBAPI,[],[Assume has gethostbyname_r and friends from netdb.h])],) -+AC_CHECK_FUNC(strtok_r, [AC_DEFINE(_XOS_R_H_MTSAFE_STRINGAPI,[],[Assume has strtok_r from string.h])],) -+AC_CHECK_FUNC(gmtime_r, [AC_DEFINE(_XOS_R_H_MTSAFE_TIMEAPI,[],[Assume has gmtime_r and friends from time.h])],) -+AC_CHECK_FUNC(ttyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_UNISTDAPI,[],[Assume has ttyname_r and friends from unistd.h])],) - - AC_CONFIG_FILES([Makefile - specs/Makefile diff --git a/x11/xproxymanagementprotocol/DESCR b/x11/xproxymanagementprotocol/DESCR deleted file mode 100644 index 5f3e3daf8f7..00000000000 --- a/x11/xproxymanagementprotocol/DESCR +++ /dev/null @@ -1 +0,0 @@ -X Proxy Management extension headers from modular X.org X11 project. diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile deleted file mode 100644 index e581ce66eec..00000000000 --- a/x11/xproxymanagementprotocol/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2012/10/29 05:07:19 asau Exp $ -# - -DISTNAME= xproxymanagementprotocol-1.0.3 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG:=proto/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://xorg.freedesktop.org/ -COMMENT= X Proxy Management extension headers from modular X.org X11 - -PKGCONFIG_OVERRIDE+= xproxymngproto.pc.in -GNU_CONFIGURE= yes - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xproxymanagementprotocol/PLIST b/x11/xproxymanagementprotocol/PLIST deleted file mode 100644 index 89c91757745..00000000000 --- a/x11/xproxymanagementprotocol/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2010/01/15 17:59:26 tnn Exp $ -include/X11/PM/PM.h -include/X11/PM/PMproto.h -lib/pkgconfig/xproxymngproto.pc -share/doc/xproxymanagementprotocol/PM_spec diff --git a/x11/xproxymanagementprotocol/buildlink3.mk b/x11/xproxymanagementprotocol/buildlink3.mk deleted file mode 100644 index ac6c7fbc091..00000000000 --- a/x11/xproxymanagementprotocol/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:44 rillig Exp $ - -BUILDLINK_TREE+= xproxymanagementprotocol - -.if !defined(XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK) -XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK:= - -BUILDLINK_DEPMETHOD.xproxymanagementprotocol?= build - -BUILDLINK_API_DEPENDS.xproxymanagementprotocol+= xproxymanagementprotocol>=1.0.2 -BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?= ../../x11/xproxymanagementprotocol -.endif # XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK - -BUILDLINK_TREE+= -xproxymanagementprotocol diff --git a/x11/xproxymanagementprotocol/builtin.mk b/x11/xproxymanagementprotocol/builtin.mk deleted file mode 100644 index a16cf617f53..00000000000 --- a/x11/xproxymanagementprotocol/builtin.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:02 jperkin Exp $ - -BUILTIN_PKG:= xproxymanagementprotocol -PKGCONFIG_FILE.xproxymanagementprotocol= ${X11BASE}/lib/pkgconfig/xproxymngproto.pc -PKGCONFIG_FILE.xproxymanagementprotocol+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xproxymngproto.pc -PKGCONFIG_FILE.xproxymanagementprotocol+= ${X11BASE}/share/pkgconfig/xproxymngproto.pc - -.include "../../mk/buildlink3/pkgconfig-builtin.mk" -.include "../../mk/x11.builtin.mk" diff --git a/x11/xproxymanagementprotocol/distinfo b/x11/xproxymanagementprotocol/distinfo deleted file mode 100644 index f1d404a2e8c..00000000000 --- a/x11/xproxymanagementprotocol/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 03:29:11 agc Exp $ - -SHA1 (xproxymanagementprotocol-1.0.3.tar.bz2) = 4abb036371670ecc25d32e48b3277fe203ae5203 -RMD160 (xproxymanagementprotocol-1.0.3.tar.bz2) = b2a7ff26d7452dfa557185c4564958ec84c6191d -SHA512 (xproxymanagementprotocol-1.0.3.tar.bz2) = 123eca1bdb47db3d2adb2c90a33398de6b3e3cea5cb831348ce0ae9e31358efbb105e12c771994de867e7d2e3f65fe948ea60481250d1491cd8dc1fdddb44a8e -Size (xproxymanagementprotocol-1.0.3.tar.bz2) = 84154 bytes diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index e91401afd82..e21c147315c 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2016/03/14 01:47:44 tnn Exp $ +# $NetBSD: Makefile,v 1.23 2018/03/07 11:57:47 wiz Exp $ DISTNAME= xrandr-1.5.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -22,11 +23,8 @@ SUBST_STAGE.nickle= post-build SUBST_MESSAGE.nickle= Fixing path to nickle. BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.5.0 -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0 -.include "../../x11/randrproto/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile index a3757c0e834..db3fa6be24c 100644 --- a/x11/xrx/Makefile +++ b/x11/xrx/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2017/09/16 19:27:31 wiz Exp $ -# +# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:48 wiz Exp $ DISTNAME= xrx-1.0.4 +PKGREVISION= 1 CATEGORIES= net x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -21,7 +21,7 @@ USE_TOOLS+= pkg-config .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" -.include "../../x11/xproxymanagementprotocol/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/x11/xscope/Makefile b/x11/xscope/Makefile index 7194a60ab83..0abdd91f940 100644 --- a/x11/xscope/Makefile +++ b/x11/xscope/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2017/09/06 09:03:06 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:48 wiz Exp $ DISTNAME= xscope-1.4.1 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -12,6 +13,6 @@ COMMENT= Tool to monitor X11/Client conversations GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xstdcmap/Makefile b/x11/xstdcmap/Makefile index f53db7c4561..a45e4109ea7 100644 --- a/x11/xstdcmap/Makefile +++ b/x11/xstdcmap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2017/09/16 19:27:31 wiz Exp $ -# +# $NetBSD: Makefile,v 1.4 2018/03/07 11:57:48 wiz Exp $ DISTNAME= xstdcmap-1.0.3 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -15,8 +15,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= pkg-config .include "../../x11/libXmu/buildlink3.mk" -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17 -.include "../../x11/xproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xtrap/Makefile b/x11/xtrap/Makefile index fc0ac15d371..4be72348d5d 100644 --- a/x11/xtrap/Makefile +++ b/x11/xtrap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2017/09/16 19:27:31 wiz Exp $ -# +# $NetBSD: Makefile,v 1.4 2018/03/07 11:57:48 wiz Exp $ DISTNAME= xtrap-1.0.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -9,14 +9,13 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= XTrap sample clients -#LICENSE= # TODO: (see mk/license.mk) GNU_CONFIGURE= yes USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 -.include "../../x11/trapproto/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../x11/libXTrap/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xvidtune/hacks.mk b/x11/xvidtune/hacks.mk deleted file mode 100644 index f8bf06794ec..00000000000 --- a/x11/xvidtune/hacks.mk +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2012/06/03 18:06:11 dholland Exp $ - -# -# Work around x11-links lossage with native X on NetBSD 5. -# -# x11-links rejects xf86vidmodeproto because it's too old according -# to the pkgsrc X xf86vidmodeproto bl3 file (which is at best dubious -# logic) and doesn't link it. Then the .pc file isn't available, so -# this package's configure script silently fails running pkg-config -# and sets XVIDTUNE_LIBS to empty. The build then fails at link time -# because no X libs at all have been requested. Fix it by feeding in -# the result of running the same pkg-config invocation outside -# pkgsrc. The fact that the native xf86vidmode is "too old" does not -# itself break the package. -# -.include "../../mk/bsd.prefs.mk" -.if ${MACHINE_PLATFORM:MNetBSD-5*} && ${X11_TYPE} == "native" -NEEDED_LIBS= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -NEEDED_LIBS+= -lXxf86vm -lXaw7 -lXmu -lXt -lSM -lICE -lX11 -CONFIGURE_ENV+= XVIDTUNE_LIBS=${NEEDED_LIBS:Q} -.endif diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile index 9665064693e..213a9760abb 100644 --- a/x11/xwud/Makefile +++ b/x11/xwud/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2012/10/29 05:07:25 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:48 wiz Exp $ DISTNAME= xwud-1.0.4 +PKGREVISION= 1 CATEGORIES= x11 graphics MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -16,9 +16,5 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 .include "../../x11/libX11/buildlink3.mk" - -# Should this be in libX11/buildlink3.mk? -# Package 'inputproto', required by 'X11', not found -.include "../../x11/inputproto/buildlink3.mk" - +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |