- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

5 files changed, 55 insertions, 134 deletions

diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile
index 4f3c6d6416d..ad79d66c09c 100644
--- a/x11-servers/xorg-printserver/Makefile
+++ b/x11-servers/xorg-printserver/Makefile
@@ -6,37 +6,34 @@
 #
 
 PORTNAME=	xorg-printserver
-PORTVERSION=	6.9.0
-PORTREVISION=	2
+PORTVERSION=	1.2.0
+PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Print server from X.Org
 
 CONFLICTS=	XFree86-PrintServer-*
 
-EXTRA_PATCHES=	${CF_PATCHES} ${SERVER_PATCHES}
+XORG_CAT=	xserver
 
-USE_XLIB=	yes
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-XBUILD_DIRS=	lib/font programs/Xserver
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/Xserver
+USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
+		damageproto xcmiscproto xextproto xf86miscproto \
+		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+		resourceproto fontsproto xf86dgaproto videoproto \
+		compositeproto trapproto recordproto resourceproto \
+		xineramaproto evieproto xkbfile xfont fontenc xkbui \
+		xxf86misc xxf86vm xaw7 xmu xpm xext
 
-# Ensure that we pick up imake's makedepend instead of devel/makedepend
-MAKE_ENV+=	PATH=${X11BASE}/bin:${PATH}
+CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg --disable-xnest \
+		--localstatedir=/var
 
 MAN1=		Xprt.1
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-.include <bsd.port.post.mk>
+do-install:
+	cd ${WRKSRC}/hw/xprint; ${MAKE} install
+
+.include <bsd.port.mk>
diff --git a/x11-servers/xorg-printserver/distinfo b/x11-servers/xorg-printserver/distinfo
index 177370c8789..b208692af41 100644
--- a/x11-servers/xorg-printserver/distinfo
+++ b/x11-servers/xorg-printserver/distinfo
@@ -1,6 +1,3 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
+SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
diff --git a/x11-servers/xorg-printserver/files/patch-Imakefile b/x11-servers/xorg-printserver/files/patch-Imakefile
deleted file mode 100644
index 8015a8b765d..00000000000
--- a/x11-servers/xorg-printserver/files/patch-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/Xprint/etc/init.d/Imakefile.orig	Thu Sep 15 00:57:36 2005
-+++ programs/Xserver/Xprint/etc/init.d/Imakefile	Thu Sep 15 00:59:01 2005
-@@ -33,7 +33,7 @@
- MakeScriptFromCpp(xprint, -DDEF_XPCUSTOMGLUE=$(XPCUSTOMGLUE) $(OS_DEFINES))
- 
- #if defined(FreeBSDArchitecture)
--InstallNamedProg(xprint,xprint,$(PROJECTROOT)/etc/rc.d)
-+InstallNamedProg(xprint,xprint.sh.sample,$(PROJECTROOT)/etc/rc.d)
- #else
- XCOMM Solaris, Linux, etc.
- InstallNamedProg(xprint,xprint,$(ETCDIR)/init.d)
diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist
index db513f54d61..3fc4b3cae64 100644
--- a/x11-servers/xorg-printserver/pkg-plist
+++ b/x11-servers/xorg-printserver/pkg-plist
@@ -1,11 +1,13 @@
 bin/Xprt
-etc/rc.d/xprint.sh.sample
+etc/X11/Xsession.d/92xprint-xpserverlist
 lib/X11/xserver/C/print/Xprinters
+lib/X11/xserver/C/print/Xprinters.ghostscript
 lib/X11/xserver/C/print/attributes/document
 lib/X11/xserver/C/print/attributes/job
 lib/X11/xserver/C/print/attributes/printer
 lib/X11/xserver/C/print/ddx-config/raster/pcl
 lib/X11/xserver/C/print/ddx-config/raster/postscript
+lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Book.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-BookOblique.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Demi.pmf
@@ -36,7 +38,9 @@ lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-BoldItalic.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Italic.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Roman.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/ZapfDingbats.pmf
+lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/fonts.dir
 lib/X11/xserver/C/print/models/CANONC3200-PS/model-config
+lib/X11/xserver/C/print/models/GSdefault/model-config
 lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
 lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
 lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
@@ -115,6 +119,7 @@ lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-BoldItalic.pmf
 lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Italic.pmf
 lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Roman.pmf
 lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/ZapfDingbats.pmf
+lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/fonts.dir
 lib/X11/xserver/C/print/models/HPLJ4050-PS/model-config
 lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00051.pmf
 lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00052.pmf
@@ -164,6 +169,8 @@ lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.alias
 lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir
 lib/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
 lib/X11/xserver/C/print/models/HPLJ4family/model-config
+lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config
+lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
 lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf
@@ -181,7 +188,6 @@ lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf
-lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf
@@ -194,8 +200,8 @@ lib/X11/xserver/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Italic.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Roman.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/ZapfDingbats.pmf
+lib/X11/xserver/C/print/models/PSdefault/fonts/fonts.dir
 lib/X11/xserver/C/print/models/PSdefault/model-config
-lib/X11/xserver/C/print/models/PSspooldir/fonts
 lib/X11/xserver/C/print/models/PSspooldir/model-config
 lib/X11/xserver/C/print/models/PSspooldir/spooltodir.sh
 lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf
@@ -211,14 +217,12 @@ lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Bold.pmf
 lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf
 lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Italic.pmf
 lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Roman.pmf
+lib/X11/xserver/C/print/models/SPSPARC2/fonts/fonts.dir
 lib/X11/xserver/C/print/models/SPSPARC2/model-config
 lib/X11/xserver/POSIX
 lib/X11/xserver/README
-lib/X11/xserver/af
 lib/X11/xserver/af_ZA
 lib/X11/xserver/af_ZA.iso88591
-lib/X11/xserver/af_ZA.utf8
-lib/X11/xserver/afrikaans
 lib/X11/xserver/ar
 lib/X11/xserver/ar_AE
 lib/X11/xserver/ar_AE.iso88596
@@ -406,12 +410,7 @@ lib/X11/xserver/en_US.UTF-8
 lib/X11/xserver/en_US.iso88591
 lib/X11/xserver/en_US.iso885915
 lib/X11/xserver/en_US.utf8
-lib/X11/xserver/en_US/print/Xprinters
 lib/X11/xserver/en_US/print/attributes/document
-lib/X11/xserver/en_US/print/attributes/job
-lib/X11/xserver/en_US/print/attributes/printer
-lib/X11/xserver/en_US/print/ddx-config
-lib/X11/xserver/en_US/print/models
 lib/X11/xserver/en_ZA
 lib/X11/xserver/en_ZA.iso88591
 lib/X11/xserver/en_ZA.utf8
@@ -633,9 +632,6 @@ lib/X11/xserver/korean
 lib/X11/xserver/korean.euc
 lib/X11/xserver/kw_GB
 lib/X11/xserver/kw_GB.iso88591
-lib/X11/xserver/ky_KG
-lib/X11/xserver/ky_KG.UTF-8
-lib/X11/xserver/ky_KG.utf8
 lib/X11/xserver/lithuanian
 lib/X11/xserver/lt
 lib/X11/xserver/lt.ISO8859-13
@@ -662,7 +658,6 @@ lib/X11/xserver/mt_MT
 lib/X11/xserver/mt_MT.iso88593
 lib/X11/xserver/nb_NO
 lib/X11/xserver/nb_NO.ISO-8859-1
-lib/X11/xserver/ndebele
 lib/X11/xserver/nl
 lib/X11/xserver/nl.ISO8859-1
 lib/X11/xserver/nl.ISO8859-15
@@ -690,14 +685,6 @@ lib/X11/xserver/no_NO.ISO8859-1@nynorsk
 lib/X11/xserver/no_NO.iso88591
 lib/X11/xserver/no_NO.utf8
 lib/X11/xserver/norwegian
-lib/X11/xserver/nr
-lib/X11/xserver/nr_ZA
-lib/X11/xserver/nr_ZA.iso88591
-lib/X11/xserver/nr_ZA.utf8
-lib/X11/xserver/nso
-lib/X11/xserver/nso_ZA
-lib/X11/xserver/nso_ZA.iso885915
-lib/X11/xserver/nso_ZA.utf8
 lib/X11/xserver/oc_FR
 lib/X11/xserver/oc_FR.iso88591
 lib/X11/xserver/pa_IN.UTF-8
@@ -732,7 +719,6 @@ lib/X11/xserver/pt_PT@euro
 lib/X11/xserver/ro_RO
 lib/X11/xserver/ro_RO.ISO8859-2
 lib/X11/xserver/ro_RO.iso88592
-lib/X11/xserver/ro_RO.utf8
 lib/X11/xserver/romanian
 lib/X11/xserver/ru
 lib/X11/xserver/ru.ISO8859-5
@@ -753,9 +739,6 @@ lib/X11/xserver/ru_UA.koi8u
 lib/X11/xserver/russian
 lib/X11/xserver/se_NO
 lib/X11/xserver/se_NO.utf8
-lib/X11/xserver/sepedi
-lib/X11/xserver/sesotho
-lib/X11/xserver/setswana
 lib/X11/xserver/sh
 lib/X11/xserver/sh.ISO8859-2
 lib/X11/xserver/sh_BA.ISO8859-2@bosnia
@@ -766,7 +749,6 @@ lib/X11/xserver/si
 lib/X11/xserver/si_LK
 lib/X11/xserver/si_LK.UTF8
 lib/X11/xserver/sinhala
-lib/X11/xserver/siswati
 lib/X11/xserver/sk
 lib/X11/xserver/sk.ISO8859-2
 lib/X11/xserver/sk_SK
@@ -793,14 +775,6 @@ lib/X11/xserver/sr_YU.iso88592
 lib/X11/xserver/sr_YU.iso88595@cyrillic
 lib/X11/xserver/sr_YU.utf8
 lib/X11/xserver/sr_YU@cyrillic
-lib/X11/xserver/ss
-lib/X11/xserver/ss_ZA
-lib/X11/xserver/ss_ZA.iso88591
-lib/X11/xserver/ss_ZA.utf8
-lib/X11/xserver/st
-lib/X11/xserver/st_ZA
-lib/X11/xserver/st_ZA.iso88591
-lib/X11/xserver/st_ZA.utf8
 lib/X11/xserver/su
 lib/X11/xserver/su.ISO8859-1
 lib/X11/xserver/sv
@@ -836,22 +810,12 @@ lib/X11/xserver/th_TH.utf8
 lib/X11/xserver/thai
 lib/X11/xserver/tl_PH
 lib/X11/xserver/tl_PH.iso88591
-lib/X11/xserver/tn
-lib/X11/xserver/tn_ZA
-lib/X11/xserver/tn_ZA.iso885915
-lib/X11/xserver/tn_ZA.utf8
 lib/X11/xserver/tr
 lib/X11/xserver/tr.ISO8859-9
-lib/X11/xserver/tr_TR
 lib/X11/xserver/tr_TR.ISO8859-9
 lib/X11/xserver/tr_TR.UTF-8
 lib/X11/xserver/tr_TR.iso88599
 lib/X11/xserver/tr_TR.utf8
-lib/X11/xserver/ts
-lib/X11/xserver/ts_ZA
-lib/X11/xserver/ts_ZA.iso88591
-lib/X11/xserver/ts_ZA.utf8
-lib/X11/xserver/tsonga
 lib/X11/xserver/turkish
 lib/X11/xserver/uk_UA
 lib/X11/xserver/uk_UA.koi8u
@@ -860,10 +824,6 @@ lib/X11/xserver/ur_PK
 lib/X11/xserver/ur_PK.utf8
 lib/X11/xserver/uz_UZ
 lib/X11/xserver/uz_UZ.iso88591
-lib/X11/xserver/ve
-lib/X11/xserver/ve_ZA
-lib/X11/xserver/ve_ZA.utf8
-lib/X11/xserver/venda
 lib/X11/xserver/vi_VN
 lib/X11/xserver/vi_VN.tcvn
 lib/X11/xserver/vi_VN.utf8
@@ -871,11 +831,6 @@ lib/X11/xserver/wa_BE
 lib/X11/xserver/wa_BE.iso88591
 lib/X11/xserver/wa_BE.iso885915@euro
 lib/X11/xserver/wa_BE@euro
-lib/X11/xserver/xh
-lib/X11/xserver/xh_ZA
-lib/X11/xserver/xh_ZA.iso88591
-lib/X11/xserver/xh_ZA.utf8
-lib/X11/xserver/xhosa
 lib/X11/xserver/yi_US
 lib/X11/xserver/yi_US.cp1255
 lib/X11/xserver/zh
@@ -890,7 +845,6 @@ lib/X11/xserver/zh_CN.GB18030
 lib/X11/xserver/zh_CN.GB18030@pinyin
 lib/X11/xserver/zh_CN.GB18030@radical
 lib/X11/xserver/zh_CN.GB18030@stroke
-lib/X11/xserver/zh_CN.GBK
 lib/X11/xserver/zh_CN.GBK@pinyin
 lib/X11/xserver/zh_CN.GBK@radical
 lib/X11/xserver/zh_CN.GBK@stroke
@@ -930,31 +884,36 @@ lib/X11/xserver/zh_TW.UTF-8@zhuyin
 lib/X11/xserver/zh_TW.big5
 lib/X11/xserver/zh_TW.euctw
 lib/X11/xserver/zh_TW.utf8
-lib/X11/xserver/zu
-lib/X11/xserver/zu_ZA
-lib/X11/xserver/zu_ZA.iso88591
-lib/X11/xserver/zu_ZA.utf8
-lib/X11/xserver/zulu
-@dirrm lib/X11/xserver/C/print/attributes
-@dirrm lib/X11/xserver/C/print/ddx-config/raster
-@dirrm lib/X11/xserver/C/print/ddx-config
-@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts
-@dirrm lib/X11/xserver/C/print/models/PSdefault
+lib/X11/xserver/ro_RO.utf8
+lib/X11/xserver/zh_CN.GBK
+lib/X11/xserver/tr_TR
+@dirrm lib/X11/xserver/en_US/print/attributes
+@dirrm lib/X11/xserver/en_US/print
+@dirrm lib/X11/xserver/en_US/print
+@dirrm lib/X11/xserver/en_US
 @dirrm lib/X11/xserver/C/print/models/SPSPARC2/fonts
 @dirrm lib/X11/xserver/C/print/models/SPSPARC2
+@dirrm lib/X11/xserver/C/print/models/SPSPARC2
+@dirrm lib/X11/xserver/C/print/models/PSspooldir
+@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts
+@dirrm lib/X11/xserver/C/print/models/PSdefault
+@dirrm lib/X11/xserver/C/print/models/PS2PDFspooldir-GS
+@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts
+@dirrm lib/X11/xserver/C/print/models/HPLJ4family
 @dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts
 @dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS
-@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts
-@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS
-@dirrm lib/X11/xserver/C/print/models/PSspooldir
 @dirrm lib/X11/xserver/C/print/models/HPDJ1600C/fonts
 @dirrm lib/X11/xserver/C/print/models/HPDJ1600C
-@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts
-@dirrm lib/X11/xserver/C/print/models/HPLJ4family
+@dirrm lib/X11/xserver/C/print/models/GSdefault
+@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts
+@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS
+@dirrm lib/X11/xserver/C/print/models/CANONBJ10E-GS
 @dirrm lib/X11/xserver/C/print/models
+@dirrm lib/X11/xserver/C/print/ddx-config/raster
+@dirrm lib/X11/xserver/C/print/ddx-config
+@dirrm lib/X11/xserver/C/print/attributes
 @dirrm lib/X11/xserver/C/print
 @dirrm lib/X11/xserver/C
-@dirrm lib/X11/xserver/en_US/print/attributes
-@dirrm lib/X11/xserver/en_US/print
-@dirrm lib/X11/xserver/en_US
-@dirrmtry lib/X11/xserver
+@dirrm lib/X11/xserver
+@dirrmtry etc/X11/Xsession.d
+@dirrm etc/X11
diff --git a/x11-servers/xorg-printserver/scripts/configure b/x11-servers/xorg-printserver/scripts/configure
deleted file mode 100644
index 16aed24afb9..00000000000
--- a/x11-servers/xorg-printserver/scripts/configure
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define XprtServer YES"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define XorgServer NO"			>> $LOCALDEF
-echo "#define XVirtualFramebufferServer NO"	>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define BuildXF86DRI NO"			>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-echo "#define InstallSecurityConfig NO"		>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen