ports/62882: ports/x11/wrapper does not respect X11BASE

[Stefan Grundmann]

>Number:         62882
>Category:       ports
>Synopsis:       ports/x11/wrapper does not respect X11BASE
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 15 11:10:11 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Grundmann
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
waset.de
>Environment:
FreeBSD chons.hb.waset.de 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Sun Feb 15 11:50:3
9 CET 2004     marodeur at chons.hb.waset.de:/usr/obj/usr/src/sys/CHONS  i386

>Description:
	The path for the XFree Server defaults to /usr/X11R6/bin/XFree86
        in ports/x11/wrapper/files/wrapper.c unless XSERVER_PATH is defined
        during compilation. The port Makefile does not respect this.
>How-To-Repeat:
        set X11BASE to something different from /usr/X11R6
>Fix:

        
--- wrapper-patch begins here ---
*** Makefile.old	Sun Feb 15 19:47:42 2004
--- Makefile	Sun Feb 15 19:22:42 2004
***************
*** 22,28 ****
  do-fetch:
  
  do-build:
! 	${CC} ${CFLAGS} -o ${WRKSRC}/Xwrapper-4 ${FILESDIR}/wrapper.c
  
  do-install:
  	${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper-4 ${PREFIX}/bin
--- 22,28 ----
  do-fetch:
  
  do-build:
! 	${CC} ${CFLAGS} -DXSERVER_PATH=\"${X11BASE}/bin/XFree86\" -o ${WRKSRC}/Xwrapper-4 ${FILESDIR}/wrapper.c
  
  do-install:
  	${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper-4 ${PREFIX}/bin
--- wrapper-patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: