Define DRIVER_MAN_SUFFIX on Solaris to the same as every other system, this

diverges from the standard layout on Solaris but ensures a consistent
experience for pkgsrc packages.

Fixes 31 packages on Solaris.

39 files changed, 271 insertions, 40 deletions

diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index e70b5eda701..d71980294d5 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/05/06 20:00:23 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/27 10:06:28 jperkin Exp $
 
 DISTNAME=	xf86-input-keyboard-1.6.1
 CATEGORIES=	x11
@@ -15,6 +15,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile
index 29fb721b2c6..009805ef199 100644
--- a/x11/xf86-input-mouse/Makefile
+++ b/x11/xf86-input-mouse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/09/26 14:11:26 liamjfoy Exp $
+# $NetBSD: Makefile,v 1.16 2012/09/27 10:06:28 jperkin Exp $
 
 DISTNAME=	xf86-input-mouse-1.7.2
 PKGREVISION=	2
@@ -16,6 +16,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
diff --git a/x11/xf86-input-vmmouse/Makefile b/x11/xf86-input-vmmouse/Makefile
index 9cc495fb6ba..a285ad2536a 100644
--- a/x11/xf86-input-vmmouse/Makefile
+++ b/x11/xf86-input-vmmouse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/09/14 11:03:11 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/09/27 10:06:28 jperkin Exp $
 
 DISTNAME=	xf86-input-vmmouse-12.6.6
 PKGREVISION=	1
@@ -16,6 +16,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
diff --git a/x11/xf86-input-void/Makefile b/x11/xf86-input-void/Makefile
index e885984a08c..9da39861775 100644
--- a/x11/xf86-input-void/Makefile
+++ b/x11/xf86-input-void/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/09/14 11:03:11 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/27 10:06:28 jperkin Exp $
 
 DISTNAME=	xf86-input-void-1.2.0
 PKGREVISION=	2
@@ -16,6 +16,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
diff --git a/x11/xf86-video-apm/Makefile b/x11/xf86-video-apm/Makefile
index c2001ce77f8..6c9d8429a6b 100644
--- a/x11/xf86-video-apm/Makefile
+++ b/x11/xf86-video-apm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:29 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-apm-1.2.2
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-ark/Makefile b/x11/xf86-video-ark/Makefile
index ce42d67f038..435926f2f12 100644
--- a/x11/xf86-video-ark/Makefile
+++ b/x11/xf86-video-ark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/06/15 23:06:05 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2012/09/27 10:06:29 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-ark-0.7.1
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-ast/Makefile b/x11/xf86-video-ast/Makefile
index afbe3115fb2..f27fdba4c88 100644
--- a/x11/xf86-video-ast/Makefile
+++ b/x11/xf86-video-ast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:29 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-ast-0.89.9
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index db4e6e84724..6ab686b80fc 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/10/27 16:48:26 jakllsch Exp $
+# $NetBSD: Makefile,v 1.19 2012/09/27 10:06:29 jperkin Exp $
 
 DISTNAME=	xf86-video-ati-6.12.4
 PKGREVISION=	4
@@ -18,6 +18,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/xf86-video-chips/Makefile b/x11/xf86-video-chips/Makefile
index 2d6855af184..525a7ba734d 100644
--- a/x11/xf86-video-chips/Makefile
+++ b/x11/xf86-video-chips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/09/14 11:03:12 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/27 10:06:29 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-chips-1.2.1
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-cirrus/Makefile b/x11/xf86-video-cirrus/Makefile
index 70a62702f03..79b27d04b60 100644
--- a/x11/xf86-video-cirrus/Makefile
+++ b/x11/xf86-video-cirrus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:29 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-cirrus-1.3.2
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-cyrix/Makefile b/x11/xf86-video-cyrix/Makefile
index 0c85ff98ce8..fde2e8904c0 100644
--- a/x11/xf86-video-cyrix/Makefile
+++ b/x11/xf86-video-cyrix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/15 23:06:05 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/27 10:06:29 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-cyrix-1.1.0
@@ -19,6 +19,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile
index 9e590456802..926d0ec6d55 100644
--- a/x11/xf86-video-glint/Makefile
+++ b/x11/xf86-video-glint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:29 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-glint-1.2.4
@@ -19,6 +19,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
diff --git a/x11/xf86-video-i128/Makefile b/x11/xf86-video-i128/Makefile
index a849354e6b1..c8a57af9dc1 100644
--- a/x11/xf86-video-i128/Makefile
+++ b/x11/xf86-video-i128/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:29 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-i128-1.3.3
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-i740/Makefile b/x11/xf86-video-i740/Makefile
index bd314993b10..0a5dab7c381 100644
--- a/x11/xf86-video-i740/Makefile
+++ b/x11/xf86-video-i740/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:30 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-i740-1.3.2
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-imstt/Makefile b/x11/xf86-video-imstt/Makefile
index bb9c2f567d2..0780201d779 100644
--- a/x11/xf86-video-imstt/Makefile
+++ b/x11/xf86-video-imstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/06/15 23:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/27 10:06:30 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-imstt-1.1.0
@@ -19,6 +19,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index e04fedf1c8c..45f0c398887 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/09/16 02:19:20 khorben Exp $
+# $NetBSD: Makefile,v 1.28 2012/09/27 10:06:30 jperkin Exp $
 
 DISTNAME=	xf86-video-intel-2.7.1
 PKGREVISION=	6
@@ -20,6 +20,12 @@ GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.7
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-mach64/Makefile b/x11/xf86-video-mach64/Makefile
index f74bf4356d4..994b31d357c 100644
--- a/x11/xf86-video-mach64/Makefile
+++ b/x11/xf86-video-mach64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/09/14 11:03:14 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/27 10:06:30 jperkin Exp $
 
 DISTNAME=	xf86-video-mach64-6.8.2
 PKGREVISION=	2
@@ -19,6 +19,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile
index 79fc8f316be..a9e49f21730 100644
--- a/x11/xf86-video-mga/Makefile
+++ b/x11/xf86-video-mga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/06/15 23:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2012/09/27 10:06:30 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-mga-1.4.11
@@ -19,6 +19,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
diff --git a/x11/xf86-video-neomagic/Makefile b/x11/xf86-video-neomagic/Makefile
index fc2b886ed3a..bc8fa2e197c 100644
--- a/x11/xf86-video-neomagic/Makefile
+++ b/x11/xf86-video-neomagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:30 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-neomagic-1.2.4
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-nsc/Makefile b/x11/xf86-video-nsc/Makefile
index e2468b8caf3..eb6ce3159ed 100644
--- a/x11/xf86-video-nsc/Makefile
+++ b/x11/xf86-video-nsc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/06/15 23:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2012/09/27 10:06:30 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-nsc-2.8.3
@@ -19,6 +19,12 @@ USE_TOOLS+=	autoconf autoheader automake autoreconf pkg-config
 
 BUILD_DEPENDS+=	xorg-util-macros>=1.2.0:../../devel/xorg-util-macros
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 post-extract:
 	cp ${FILESDIR}/assyntax.h ${WRKSRC}/src/
 
diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile
index 74c98bfc02b..0dd8126d766 100644
--- a/x11/xf86-video-nv/Makefile
+++ b/x11/xf86-video-nv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2010/09/21 05:43:16 sno Exp $
+# $NetBSD: Makefile,v 1.22 2012/09/27 10:06:30 jperkin Exp $
 
 DISTNAME=	xf86-video-nv-2.1.18
 #PKGREVISION=	2
@@ -17,6 +17,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/xf86-video-nvxbox/Makefile b/x11/xf86-video-nvxbox/Makefile
index ac93dd0fc08..4476bd3626d 100644
--- a/x11/xf86-video-nvxbox/Makefile
+++ b/x11/xf86-video-nvxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/15 23:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/27 10:06:30 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-nvxbox-${VER}
@@ -19,6 +19,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-openchrome/Makefile b/x11/xf86-video-openchrome/Makefile
index 49825f3027a..7a5ea09f1f9 100644
--- a/x11/xf86-video-openchrome/Makefile
+++ b/x11/xf86-video-openchrome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/15 23:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/27 10:06:31 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-openchrome-0.2.904
@@ -27,6 +27,10 @@ PLIST_VARS+=		XvMC
 PLIST.XvMC=		yes
 .endif
 
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXvMC/buildlink3.mk"
diff --git a/x11/xf86-video-r128/Makefile b/x11/xf86-video-r128/Makefile
index 4b584f5816e..97bdfa5d149 100644
--- a/x11/xf86-video-r128/Makefile
+++ b/x11/xf86-video-r128/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/09/14 11:03:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/27 10:06:31 jperkin Exp $
 
 DISTNAME=	xf86-video-r128-6.8.1
 PKGREVISION=	2
@@ -19,6 +19,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/xf86-video-radeonhd/Makefile b/x11/xf86-video-radeonhd/Makefile
index acb45b1167c..080e4dae85b 100644
--- a/x11/xf86-video-radeonhd/Makefile
+++ b/x11/xf86-video-radeonhd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/06/15 23:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2012/09/27 10:06:31 jperkin Exp $
 
 DISTNAME=	xf86-video-radeonhd-1.3.0
 PKGREVISION=	2
@@ -19,6 +19,12 @@ USE_TOOLS+=	gmake pkg-config
 CONFIGURE_ENV+=	ac_cv_file___src_AtomBios_includes_atombios_h=yes
 CONFIGURE_ENV+=	ac_cv_file___src_AtomBios_includes_Decoder_h=yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-rendition/Makefile b/x11/xf86-video-rendition/Makefile
index 830f174449c..588523f4e09 100644
--- a/x11/xf86-video-rendition/Makefile
+++ b/x11/xf86-video-rendition/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:31 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-rendition-4.2.2
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-s3/Makefile b/x11/xf86-video-s3/Makefile
index 8446757f999..1a9ff13206a 100644
--- a/x11/xf86-video-s3/Makefile
+++ b/x11/xf86-video-s3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:31 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-s3-0.6.3
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-s3virge/Makefile b/x11/xf86-video-s3virge/Makefile
index c3e9c062ae9..d2bd66477af 100644
--- a/x11/xf86-video-s3virge/Makefile
+++ b/x11/xf86-video-s3virge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:31 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-s3virge-1.10.4
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile
index 0c2583768e8..08faa0b03e7 100644
--- a/x11/xf86-video-savage/Makefile
+++ b/x11/xf86-video-savage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:31 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-savage-2.3.1
@@ -19,6 +19,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
diff --git a/x11/xf86-video-siliconmotion/Makefile b/x11/xf86-video-siliconmotion/Makefile
index cb6965964b1..c4fe628a31f 100644
--- a/x11/xf86-video-siliconmotion/Makefile
+++ b/x11/xf86-video-siliconmotion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:31 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-siliconmotion-1.7.3
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index fd5d782a18d..d2d27e5ca81 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/27 10:06:31 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-sis-0.10.2
@@ -19,7 +19,8 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
-.include "../../mk/compiler.mk"
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(PKGSRC_COMPILER:Mclang)
 BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
 CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
@@ -27,6 +28,10 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
 CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .endif
 
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile
index e279ebc04e8..d45520012a4 100644
--- a/x11/xf86-video-tdfx/Makefile
+++ b/x11/xf86-video-tdfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:32 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-tdfx-1.4.3
@@ -19,6 +19,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-tga/Makefile b/x11/xf86-video-tga/Makefile
index f0b60991468..988a7e7ddfb 100644
--- a/x11/xf86-video-tga/Makefile
+++ b/x11/xf86-video-tga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/27 10:06:32 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-tga-1.2.0
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-trident/Makefile b/x11/xf86-video-trident/Makefile
index b788454c133..7cc20ccc5d9 100644
--- a/x11/xf86-video-trident/Makefile
+++ b/x11/xf86-video-trident/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:32 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-trident-1.3.3
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-tseng/Makefile b/x11/xf86-video-tseng/Makefile
index c4c64f74c1f..aa94fdb9bc3 100644
--- a/x11/xf86-video-tseng/Makefile
+++ b/x11/xf86-video-tseng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/27 10:06:32 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-tseng-1.2.2
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-vesa/Makefile b/x11/xf86-video-vesa/Makefile
index 173109604e8..b9836e5a29c 100644
--- a/x11/xf86-video-vesa/Makefile
+++ b/x11/xf86-video-vesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/06/15 23:06:08 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2012/09/27 10:06:32 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-vesa-2.3.0
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/xf86-video-vga/Makefile b/x11/xf86-video-vga/Makefile
index 7603945469f..af038574194 100644
--- a/x11/xf86-video-vga/Makefile
+++ b/x11/xf86-video-vga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/06/15 23:06:08 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2012/09/27 10:06:32 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-vga-4.1.0
@@ -19,6 +19,12 @@ USE_TOOLS+=	autoconf autoheader automake autoreconf pkg-config
 
 BUILD_DEPENDS+=	xorg-util-macros>=1.2.0:../../devel/xorg-util-macros
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 pre-configure:
 	cd ${WRKSRC} && autoreconf -vif
 
diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile
index ab9802053ea..122d470be78 100644
--- a/x11/xf86-video-vmware/Makefile
+++ b/x11/xf86-video-vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/09/14 11:03:17 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2012/09/27 10:06:33 jperkin Exp $
 #
 
 DISTNAME=	xf86-video-vmware-10.16.9
@@ -17,6 +17,12 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-wsfb/Makefile b/x11/xf86-video-wsfb/Makefile
index 455e1b9196a..fb2721acff9 100644
--- a/x11/xf86-video-wsfb/Makefile
+++ b/x11/xf86-video-wsfb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/09/14 11:03:17 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/27 10:06:33 jperkin Exp $
 
 DISTNAME=	xf86-video-wsfb-0.2.1
 PKGREVISION=	3
@@ -18,6 +18,12 @@ USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"