ports/123345: x11/wrapper: [PATCH] xorg-wrapper should depend on xorg-server

[Craig Leres]

>Number:         123345
>Category:       ports
>Synopsis:       x11/wrapper: [PATCH] xorg-wrapper should depend on xorg-server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 02 22:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Craig Leres
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
Lawrence Berkeley National Laboratory
>Environment:
	FreeBSD fun.ee.lbl.gov 6.2-RELEASE FreeBSD 6.2-RELEASE #8: Mon Dec 17 17:25:55 PST 2007     leres at fun.ee.lbl.gov:/usr/src/6.2-RELEASE/sys/i386/compile/LBLSMP  i386

>Description:
	If you have xorg-wrapper and xorg-server installed and then
	uninstall and re-install xorg-server, the /usr/local/bin/X
	symlink will change from Xwrapper to Xorg and the system
	effectively reverts to non-wrapper mode even though
	xorg-wrapper is still "installed."

>How-To-Repeat:
	See attached txt file.

>Fix:
	Make wrapper depend on xorg-server since the wrapper port
	replaces /usr/local/bin/X -- patch appended.

	Perhaps a better solution would be to add a WRAPPER option
	to the xorg-server port have it build and install Xwrapper.
	If this would be prefered, I can generate a patch to do that.

------- =_aaaaaaaaaa0
Content-Type: text/plain; name="session.txt"; charset="us-ascii"
Content-ID: <60129.1209765913.2 at fun.ee.lbl.gov>

# uname -a
FreeBSD fun.ee.lbl.gov 6.2-RELEASE FreeBSD 6.2-RELEASE #8: Mon Dec 17 17:25:55 PST 2007     leres at fun.ee.lbl.gov:/usr/src/6.2-RELEASE/sys/i386/compile/LBLSMP  i386
# pkg_info | egrep "xorg-server|xorg-wrapper"
xorg-server-1.4_8,1 X.Org X server and related programs
xorg-wrapper-1.0_6  Wrapper for X.org X11 server
# ls -l /usr/local/bin/X*
lrwxr-xr-x  1 root  wheel       23 May  1 15:04 /usr/local/bin/X -> /usr/local/bin/Xwrapper
					/* *** X points to Xwrapper *** */
lrwxr-xr-x  1 root  wheel        4 May  1 09:52 /usr/local/bin/X.bck -> Xorg
-r-xr-xr-x  1 root  wheel  1724483 May  1 09:52 /usr/local/bin/Xorg
-r-sr-xr-x  1 root  wheel     6564 May  1 15:04 /usr/local/bin/Xwrapper
# cd /usr/ports/x11-servers/xorg-server
# make deinstall
===>  Deinstalling for x11-servers/xorg-server
[...]
# make install
===>  Installing for xorg-server-1.4_8,1
[...]
# !ls
ls -l /usr/local/bin/X*
lrwxr-xr-x  1 root  wheel        4 May  2 14:42 /usr/local/bin/X -> Xorg
					/* *** X points to Xorg *** */
lrwxr-xr-x  1 root  wheel        4 May  1 09:52 /usr/local/bin/X.bck -> Xorg
-r-xr-xr-x  1 root  wheel  1724483 May  2 14:42 /usr/local/bin/Xorg
-r-sr-xr-x  1 root  wheel     6564 May  1 15:04 /usr/local/bin/Xwrapper

------- =_aaaaaaaaaa0
Content-Type: text/plain; name="patch.txt"; charset="us-ascii"
Content-ID: <60129.1209765913.3 at fun.ee.lbl.gov>

--- Makefile.virgin	Sun Apr 20 04:28:57 2008
+++ Makefile	Fri May  2 14:55:36 2008
@@ -19,6 +19,8 @@
 PLIST_FILES=	bin/Xwrapper
 USE_XORG=	x11
 
+RUN_DEPENDS=	xorg-server:${PORTSDIR}/x11-servers/xorg-server
+
 .include <bsd.port.pre.mk>
 
 XSERVER=	-DXSERVER_PATH=\"${LOCALBASE}/bin/Xorg\"

------- =_aaaaaaaaaa0--
>Release-Note:
>Audit-Trail:
>Unformatted:
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="us-ascii"
 Content-ID: <60129.1209765913.1 at fun.ee.lbl.gov>