2 files changed, 42 insertions, 23 deletions

diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index d32511bb6c76..1383071b1542 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -98,13 +98,29 @@ PLIST_SUB+=	PPC_NA=""
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64=""
 PLIST_SUB+=	SPARC64_NA="@comment "
-MAN4+=		sunbw2.4x \
+MAN4+=		apm.4x \
+		chips.4x \
+		cirrus.4x \
+		i128.4x \
+		i740.4x \
+		i810.4x \
+		imstt.4x \
+		neomagic.4x \
+		newport.4x \
+		nv.4x \
+		rendition.4x \
+		s3virge.4x \
+		savage.4x \
+		siliconmotion.4x \
+		sunbw2.4x \
 		suncg14.4x \
 		suncg3.4x \
 		suncg6.4x \
 		sunffb.4x \
 		sunleo.4x \
-		suntcx.4x
+		suntcx.4x \
+		trident.4x \
+		vmware.4x
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
index d76e63e936e6..a279cd4e7f6a 100644
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -78,34 +78,37 @@ lib/X11/getconfig/cfg.sample
 lib/X11/getconfig/xorg.cfg
 lib/X11/xorg.conf.eg
 lib/X11/xserver/SecurityPolicy
-%%AMD64_I386%%lib/modules/drivers/apm_drv.so
-%%AMD64_I386%%lib/modules/drivers/ark_drv.so
+%%ALPHA_NA%%lib/modules/drivers/apm_drv.so
+%%ALPHA_NA%%lib/modules/drivers/ark_drv.so
 lib/modules/drivers/ati_drv.so
 lib/modules/drivers/atimisc_drv.so
-%%AMD64_I386%%lib/modules/drivers/chips_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so
+%%ALPHA_NA%%lib/modules/drivers/chips_drv.so
+%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so
+%%PPC_NA%%lib/modules/drivers/cirrus_drv.so
+%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so
 %%AMD64_I386%%lib/modules/drivers/cyrix_drv.so
-%%AMD64_I386%%lib/modules/drivers/dummy_drv.so
+lib/modules/drivers/dummy_drv.so
 lib/modules/drivers/glint_drv.so
-%%AMD64_I386%%lib/modules/drivers/i128_drv.so
+%%ALPHA_NA%%lib/modules/drivers/i128_drv.so
 %%I386%%lib/modules/drivers/i740_drv.so
-%%AMD64_I386%%lib/modules/drivers/i810_drv.so
+%%SPARC64%%lib/modules/drivers/i740_drv.so
+%%ALPHA_NA%%lib/modules/drivers/i810_drv.so
 %%I386%%lib/modules/drivers/imstt_drv.so
+%%SPARC64%%lib/modules/drivers/imstt_drv.so
 lib/modules/drivers/mga_drv.so
-%%AMD64_I386%%lib/modules/drivers/neomagic_drv.so
+%%ALPHA_NA%%lib/modules/drivers/neomagic_drv.so
 %%I386%%lib/modules/drivers/newport_drv.so
+%%SPARC64%%lib/modules/drivers/newport_drv.so
 %%I386%%lib/modules/drivers/nsc_drv.so
-%%SPARC64_NA%%lib/modules/drivers/nv_drv.so
+lib/modules/drivers/nv_drv.so
 lib/modules/drivers/r128_drv.so
 lib/modules/drivers/radeon_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so
-%%SPARC64_NA%%lib/modules/drivers/riva128.so
+%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so
+lib/modules/drivers/riva128.so
 %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so
+%%IA64_NA%%lib/modules/drivers/s3virge_drv.so
+%%IA64_NA%%lib/modules/drivers/savage_drv.so
+%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so
 %%AMD64_I386%%lib/modules/drivers/sis_drv.so
 %%SPARC64%%lib/modules/drivers/sunbw2_drv.so
 %%SPARC64%%lib/modules/drivers/suncg14_drv.so
@@ -115,13 +118,13 @@ lib/modules/drivers/radeon_drv.so
 %%SPARC64%%lib/modules/drivers/sunleo_drv.so
 %%SPARC64%%lib/modules/drivers/suntcx_drv.so
 lib/modules/drivers/tdfx_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so
-%%AMD64_I386%%lib/modules/drivers/trident_drv.so
+%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so
+%%ALPHA_NA%%lib/modules/drivers/trident_drv.so
 %%AMD64_I386%%lib/modules/drivers/tseng_drv.so
 %%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so
 lib/modules/drivers/vga_drv.so
 %%I386%%lib/modules/drivers/via_drv.so
-%%AMD64_I386%%lib/modules/drivers/vmware_drv.so
+%%ALPHA_NA%%lib/modules/drivers/vmware_drv.so
 lib/modules/extensions/libGLcore.so
 lib/modules/extensions/libdbe.so
 lib/modules/extensions/libdri.so
@@ -193,8 +196,8 @@ lib/modules/multimedia/theatre200_drv.so
 lib/modules/multimedia/theatre_detect_drv.so
 lib/modules/multimedia/theatre_drv.so
 lib/modules/multimedia/uda1380_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/v10002d.uc
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/v20002d.uc
+%%PPC_NA%%lib/modules/v10002d.uc
+%%PPC_NA%%lib/modules/v20002d.uc
 @dirrm lib/modules/multimedia
 @dirrm lib/modules/internal
 @dirrm lib/modules/input