Bug 123345 - x11/wrapper: [PATCH] xorg-wrapper should depend on xorg-server
Summary: x11/wrapper: [PATCH] xorg-wrapper should depend on xorg-server
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: FreeBSD Ports Bugs (Mailing List)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-05-02 23:10 UTC by leres
Modified: 2008-06-20 15:40 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description leres 2008-05-02 23:10:02 UTC
	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."

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@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@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@fun.ee.lbl.gov>



------- =_aaaaaaaaaa0----neDlCdApvbpXqGffIi4cGruC7inuoV5qDy1z1Q54xeNtjovz
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- 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\"
How-To-Repeat: 	See attached txt file.
Comment 1 dfilter freebsd_committer 2008-06-20 15:39:04 UTC
miwi        2008-06-20 14:38:56 UTC

  FreeBSD ports repository

  Modified files:
    x11/wrapper          Makefile 
  Log:
  - Add missing xorg-server [1]
  - Drop Conflict with XFree
  - Pass maintainership to X11
  
  PR:             123345 [1]
  Submitted by:   Craig Leres (leres@ee.lbl.gov)
  Approved by:    flz
  
  Revision  Changes    Path
  1.31      +4 -3      ports/x11/wrapper/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 2 Martin Wilke freebsd_committer 2008-06-20 15:39:14 UTC
State Changed
From-To: open->closed

Committed. Thanks!