Replace autotools based build by native BSD Makefiles in proto/.

tested by naddy@ and oga@. ok oga@.

61 files changed, 264 insertions, 100 deletions

diff --git a/proto/Makefile b/proto/Makefile
index 5ee4f56e7..8231c7a68 100644
--- a/proto/Makefile
+++ b/proto/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.4 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile,v 1.5 2008/03/25 23:28:19 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
 SUBDIR= bigreqsproto compositeproto dmxproto damageproto evieproto \
 	fixesproto fontcacheproto fontsproto glproto inputproto \
@@ -8,9 +8,9 @@ SUBDIR= bigreqsproto compositeproto dmxproto damageproto evieproto \
 	recordproto renderproto resourceproto scrnsaverproto \
 	trapproto videoproto x11proto xcmiscproto xextproto \
 	xf86bigfontproto xf86dgaproto xf86miscproto \
-	xf86rushproto xf86vidmodeproto
+	xf86rushproto xf86vidmodeproto 
 
-.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes"
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
 SUBDIR+= xf86driproto
 .endif
 
diff --git a/proto/bigreqsproto/Makefile b/proto/bigreqsproto/Makefile
new file mode 100644
index 000000000..4832d23ca
--- /dev/null
+++ b/proto/bigreqsproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS= 	bigreqstr.h
+PKGCONFIG=	bigreqsproto.pc
+
+.include <bsd.xorg.mk>	
diff --git a/proto/bigreqsproto/Makefile.bsd-wrapper b/proto/bigreqsproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/bigreqsproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/compositeproto/Makefile b/proto/compositeproto/Makefile
new file mode 100644
index 000000000..7ee028630
--- /dev/null
+++ b/proto/compositeproto/Makefile
@@ -0,0 +1,11 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS= 	composite.h compositeproto.h
+PKGCONFIG=	compositeproto.pc
+
+install:: compositeproto.txt
+	${INSTALL_DATA} ${.CURDIR}/compositeproto.txt \
+		${DESTDIR}${X11BASE}/share/doc/compositeproto
+
+.include <bsd.xorg.mk>
diff --git a/proto/compositeproto/Makefile.bsd-wrapper b/proto/compositeproto/Makefile.bsd-wrapper
deleted file mode 100644
index e76cffad5..000000000
--- a/proto/compositeproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
-
diff --git a/proto/damageproto/Makefile b/proto/damageproto/Makefile
new file mode 100644
index 000000000..c6703c821
--- /dev/null
+++ b/proto/damageproto/Makefile
@@ -0,0 +1,11 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	damageproto.h damagewire.h
+PKGCONFIG=	damageproto.pc
+
+install:: damageproto.txt
+	${INSTALL_DATA} ${.CURDIR}/damageproto.txt \
+		${DESTDIR}${X11BASE}/share/doc/damageproto
+
+.include <bsd.xorg.mk>
diff --git a/proto/damageproto/Makefile.bsd-wrapper b/proto/damageproto/Makefile.bsd-wrapper
deleted file mode 100644
index e76cffad5..000000000
--- a/proto/damageproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
-
diff --git a/proto/dmxproto/Makefile b/proto/dmxproto/Makefile
new file mode 100644
index 000000000..5f45ce942
--- /dev/null
+++ b/proto/dmxproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	dmxext.h dmxproto.h
+PKGCONFIG=	dmxproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/dmxproto/Makefile.bsd-wrapper b/proto/dmxproto/Makefile.bsd-wrapper
deleted file mode 100644
index e76cffad5..000000000
--- a/proto/dmxproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
-
diff --git a/proto/evieproto/Makefile b/proto/evieproto/Makefile
new file mode 100644
index 000000000..760ed4a86
--- /dev/null
+++ b/proto/evieproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	Xeviestr.h
+PKGCONFIG=	evieproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/evieproto/Makefile.bsd-wrapper b/proto/evieproto/Makefile.bsd-wrapper
deleted file mode 100644
index e76cffad5..000000000
--- a/proto/evieproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
-
diff --git a/proto/fixesproto/Makefile b/proto/fixesproto/Makefile
new file mode 100644
index 000000000..6d15b4cd6
--- /dev/null
+++ b/proto/fixesproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	xfixesproto.h xfixeswire.h
+PKGCONFIG=	fixesproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/fixesproto/Makefile.bsd-wrapper b/proto/fixesproto/Makefile.bsd-wrapper
deleted file mode 100644
index e76cffad5..000000000
--- a/proto/fixesproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
-
diff --git a/proto/fontcacheproto/Makefile b/proto/fontcacheproto/Makefile
new file mode 100644
index 000000000..90ace2176
--- /dev/null
+++ b/proto/fontcacheproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	fontcache.h fontcacheP.h fontcachstr.h
+PKGCONFIG=	fontcacheproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/fontcacheproto/Makefile.bsd-wrapper b/proto/fontcacheproto/Makefile.bsd-wrapper
deleted file mode 100644
index e76cffad5..000000000
--- a/proto/fontcacheproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
-
diff --git a/proto/fontsproto/Makefile b/proto/fontsproto/Makefile
new file mode 100644
index 000000000..00221aa12
--- /dev/null
+++ b/proto/fontsproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/fonts/
+HEADERS=	font.h fontproto.h fontstruct.h FS.h fsmasks.h FSproto.h
+PKGCONFIG=	fontsproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/fontsproto/Makefile.bsd-wrapper b/proto/fontsproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/fontsproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/glproto/Makefile b/proto/glproto/Makefile
new file mode 100644
index 000000000..cf5deb849
--- /dev/null
+++ b/proto/glproto/Makefile
@@ -0,0 +1,8 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIRS=	GL GL/internal
+HEADERS_GL=		glxint.h glxmd.h glxproto.h glxtokens.h
+HEADERS_GL_internal=	glcore.h
+PKGCONFIG=		glproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/glproto/Makefile.bsd-wrapper b/proto/glproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/glproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/inputproto/Makefile b/proto/inputproto/Makefile
new file mode 100644
index 000000000..b444fafbb
--- /dev/null
+++ b/proto/inputproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	XI.h XInput.h XIproto.h
+PKGCONFIG=	inputproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/inputproto/Makefile.bsd-wrapper b/proto/inputproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/inputproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/kbproto/Makefile b/proto/kbproto/Makefile
new file mode 100644
index 000000000..49b8ce580
--- /dev/null
+++ b/proto/kbproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	XKBgeom.h XKB.h XKBproto.h XKBsrv.h XKBstr.h
+PKGCONFIG=	kbproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/kbproto/Makefile.bsd-wrapper b/proto/kbproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/kbproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/pmproto/Makefile b/proto/pmproto/Makefile
new file mode 100644
index 000000000..1c9b76f94
--- /dev/null
+++ b/proto/pmproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/PM/
+HEADERS=	PM.h PMproto.h
+PKGCONFIG=	xproxymngproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/pmproto/Makefile.bsd-wrapper b/proto/pmproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/pmproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/printproto/Makefile b/proto/printproto/Makefile
new file mode 100644
index 000000000..1fd85d915
--- /dev/null
+++ b/proto/printproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	Print.h Printstr.h
+PKGCONFIG=	printproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/printproto/Makefile.bsd-wrapper b/proto/printproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/printproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/randrproto/Makefile b/proto/randrproto/Makefile
new file mode 100644
index 000000000..3932db4da
--- /dev/null
+++ b/proto/randrproto/Makefile
@@ -0,0 +1,11 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	randr.h randrproto.h
+PKGCONFIG=	randrproto.pc
+
+install:: randrproto.txt
+	${INSTALL_DATA} ${.CURDIR}/randrproto.txt \
+		${DESTDIR}${X11BASE}/share/doc/randrproto
+
+.include <bsd.xorg.mk>
diff --git a/proto/randrproto/Makefile.bsd-wrapper b/proto/randrproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/randrproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/recordproto/Makefile b/proto/recordproto/Makefile
new file mode 100644
index 000000000..a71113a2c
--- /dev/null
+++ b/proto/recordproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	record.h recordstr.h
+PKGCONFIG=	recordproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/recordproto/Makefile.bsd-wrapper b/proto/recordproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/recordproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/renderproto/Makefile b/proto/renderproto/Makefile
new file mode 100644
index 000000000..5d62fae59
--- /dev/null
+++ b/proto/renderproto/Makefile
@@ -0,0 +1,11 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	render.h renderproto.h
+PKGCONFIG=	renderproto.pc
+
+install:: renderproto.txt
+	${INSTALL_DATA} ${.CURDIR}/renderproto.txt \
+		${DESTDIR}${X11BASE}/share/doc/renderproto
+
+.include <bsd.xorg.mk>
diff --git a/proto/renderproto/Makefile.bsd-wrapper b/proto/renderproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/renderproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/resourceproto/Makefile b/proto/resourceproto/Makefile
new file mode 100644
index 000000000..e5ed329c3
--- /dev/null
+++ b/proto/resourceproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	XResproto.h
+PKGCONFIG=	resourceproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/resourceproto/Makefile.bsd-wrapper b/proto/resourceproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/resourceproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/scrnsaverproto/Makefile b/proto/scrnsaverproto/Makefile
new file mode 100644
index 000000000..b7de9c5d8
--- /dev/null
+++ b/proto/scrnsaverproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	saver.h saverproto.h scrnsaver.h
+PKGCONFIG=	scrnsaverproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/scrnsaverproto/Makefile.bsd-wrapper b/proto/scrnsaverproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/scrnsaverproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/trapproto/Makefile b/proto/trapproto/Makefile
new file mode 100644
index 000000000..f2d532195
--- /dev/null
+++ b/proto/trapproto/Makefile
@@ -0,0 +1,8 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
+		xtraplibp.h xtrapproto.h
+PKGCONFIG=	trapproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/trapproto/Makefile.bsd-wrapper b/proto/trapproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/trapproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/videoproto/Makefile b/proto/videoproto/Makefile
new file mode 100644
index 000000000..59464e444
--- /dev/null
+++ b/proto/videoproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	vldXvMC.h Xv.h XvMC.h XvMCproto.h Xvproto.h
+PKGCONFIG=	videoproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/videoproto/Makefile.bsd-wrapper b/proto/videoproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/videoproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/x11proto/Makefile b/proto/x11proto/Makefile
new file mode 100644
index 000000000..7d688e7de
--- /dev/null
+++ b/proto/x11proto/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/
+HEADERS=	ap_keysym.h DECkeysym.h HPkeysym.h keysymdef.h keysym.h \
+		Sunkeysym.h Xalloca.h Xarch.h Xatom.h Xdefs.h XF86keysym.h \
+		Xfuncs.h X.h Xmd.h Xosdefs.h Xos.h Xos_r.h Xproto.h \
+		Xprotostr.h Xthreads.h Xw32defs.h XWDFile.h Xwindows.h \
+		Xwinsock.h
+GENERATED_HEADERS= Xfuncproto.h Xpoll.h
+PKGCONFIG=	xproto.pc
+
+all:: ${GENERATED_HEADERS}
+
+Xfuncproto.h: Xfuncproto.h.in
+	@sed -e 's,^#undef NARROWPROTO,#define NARROWPROTO,' \
+	    -e 's,^#undef FUNCPROTO,#define FUNCPROTO 15,' \
+	    ${.CURDIR}/Xfuncproto.h.in > $@
+
+Xpoll.h: Xpoll.h.in
+	@sed -e 's#@USE_FDS_BITS@#fds_bits#g' ${.CURDIR}/Xpoll.h.in > $@
+
+install::  ${GENERATED_HEADERS}
+	@echo installing ${GENERATED_HEADERS} in ${INCSDIR}/${HEADERS_SUBDIR}
+	@for i in ${GENERATED_HEADERS}; do \
+	    cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
+		${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/${HEADERS_SUBDIR}$$i;\
+	done
+
+clean::
+	rm -f ${GENERATED_HEADERS}
+
+.include <bsd.xorg.mk>
diff --git a/proto/x11proto/Makefile.bsd-wrapper b/proto/x11proto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/x11proto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xcmiscproto/Makefile b/proto/xcmiscproto/Makefile
new file mode 100644
index 000000000..e6166ef2d
--- /dev/null
+++ b/proto/xcmiscproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	xcmiscstr.h
+PKGCONFIG=	xcmiscproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xcmiscproto/Makefile.bsd-wrapper b/proto/xcmiscproto/Makefile.bsd-wrapper
deleted file mode 100644
index da466804b..000000000
--- a/proto/xcmiscproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:25 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xextproto/Makefile b/proto/xextproto/Makefile
new file mode 100644
index 000000000..d364a2cee
--- /dev/null
+++ b/proto/xextproto/Makefile
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	dpms.h dpmsstr.h extutil.h lbxbuf.h lbxbufstr.h \
+		lbxdeltastr.h lbximage.h lbxopts.h lbxstr.h lbxzlib.h \
+		MITMisc.h mitmiscstr.h multibuf.h multibufst.h security.h \
+		securstr.h shape.h shapestr.h shmstr.h sync.h syncstr.h \
+		Xag.h Xagsrv.h Xagstr.h Xcup.h Xcupstr.h Xdbe.h \
+		Xdbeproto.h XEVI.h XEVIstr.h Xext.h XLbx.h XShm.h \
+		xtestext1.h XTest.h xteststr.h
+PKGCONFIG=	xextproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xextproto/Makefile.bsd-wrapper b/proto/xextproto/Makefile.bsd-wrapper
deleted file mode 100644
index 30831d400..000000000
--- a/proto/xextproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xf86bigfontproto/Makefile b/proto/xf86bigfontproto/Makefile
new file mode 100644
index 000000000..3005e1782
--- /dev/null
+++ b/proto/xf86bigfontproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	xf86bigfont.h xf86bigfstr.h
+PKGCONFIG=	xf86bigfontproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xf86bigfontproto/Makefile.bsd-wrapper b/proto/xf86bigfontproto/Makefile.bsd-wrapper
deleted file mode 100644
index 30831d400..000000000
--- a/proto/xf86bigfontproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xf86dgaproto/Makefile b/proto/xf86dgaproto/Makefile
new file mode 100644
index 000000000..6c36c1089
--- /dev/null
+++ b/proto/xf86dgaproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	xf86dga1.h xf86dga1str.h xf86dga.h xf86dgastr.h
+PKGCONFIG=	xf86dgaproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xf86dgaproto/Makefile.bsd-wrapper b/proto/xf86dgaproto/Makefile.bsd-wrapper
deleted file mode 100644
index 30831d400..000000000
--- a/proto/xf86dgaproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xf86driproto/Makefile b/proto/xf86driproto/Makefile
new file mode 100644
index 000000000..9e203e8c5
--- /dev/null
+++ b/proto/xf86driproto/Makefile
@@ -0,0 +1,8 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIRS=	X11/dri GL/internal
+HEADERS_X11_dri=	xf86dri.h xf86dristr.h
+HEADERS_GL_internal=	dri_interface.h
+PKGCONFIG=		xf86driproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xf86driproto/Makefile.bsd-wrapper b/proto/xf86driproto/Makefile.bsd-wrapper
deleted file mode 100644
index 30831d400..000000000
--- a/proto/xf86driproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xf86miscproto/Makefile b/proto/xf86miscproto/Makefile
new file mode 100644
index 000000000..c1b56e77e
--- /dev/null
+++ b/proto/xf86miscproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	xf86misc.h xf86mscstr.h
+PKGCONFIG=	xf86miscproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xf86miscproto/Makefile.bsd-wrapper b/proto/xf86miscproto/Makefile.bsd-wrapper
deleted file mode 100644
index 30831d400..000000000
--- a/proto/xf86miscproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xf86rushproto/Makefile b/proto/xf86rushproto/Makefile
new file mode 100644
index 000000000..e17e95cb5
--- /dev/null
+++ b/proto/xf86rushproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	xf86rush.h xf86rushstr.h
+PKGCONFIG=	xf86rushproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xf86rushproto/Makefile.bsd-wrapper b/proto/xf86rushproto/Makefile.bsd-wrapper
deleted file mode 100644
index 30831d400..000000000
--- a/proto/xf86rushproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xf86vidmodeproto/Makefile b/proto/xf86vidmodeproto/Makefile
new file mode 100644
index 000000000..3153e8712
--- /dev/null
+++ b/proto/xf86vidmodeproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	xf86vmode.h xf86vmstr.h
+PKGCONFIG=	xf86vidmodeproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xf86vidmodeproto/Makefile.bsd-wrapper b/proto/xf86vidmodeproto/Makefile.bsd-wrapper
deleted file mode 100644
index 30831d400..000000000
--- a/proto/xf86vidmodeproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
-
-.include <bsd.xorg.mk>
diff --git a/proto/xineramaproto/Makefile b/proto/xineramaproto/Makefile
new file mode 100644
index 000000000..c26115695
--- /dev/null
+++ b/proto/xineramaproto/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+
+HEADERS_SUBDIR=	X11/extensions/
+HEADERS=	panoramiXext.h panoramiXproto.h Xinerama.h
+PKGCONFIG=	xineramaproto.pc
+
+.include <bsd.xorg.mk>
diff --git a/proto/xineramaproto/Makefile.bsd-wrapper b/proto/xineramaproto/Makefile.bsd-wrapper
deleted file mode 100644
index 30831d400..000000000
--- a/proto/xineramaproto/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:28:26 matthieu Exp $
-
-.include <bsd.xorg.mk>