ports/112796: x11/xorg-libraries: does not build on clean environment

[NIIMI Satoshi]

>Number:         112796
>Category:       ports
>Synopsis:       x11/xorg-libraries: does not build on clean environment
>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 May 20 01:50:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     NIIMI Satoshi
>Release:        FreeBSD 6.2-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #1: Fri Apr 27 10:03:16 JST 2007 root at berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
x11/xorg-libraries does not build on clean environment, since /usr/X11R6
does not exists as directory nor symbolic link.

/usr/ports/Tools/scripts/mergebase.sh does not help.  It only creates
symbolic link iff /usr/X11R6 exists.
	
>How-To-Repeat:
# ls /usr/
bin	games	lib	libexec	ports	share
compat	include	libdata	obj	sbin	src
# pwd
/usr/ports/x11/xorg-libraries
# make install
Read /usr/ports/UPDATING for the procedure to upgrade to xorg 7.2.
*** Error code 1
	
>Fix:

	

--- xorg-libraries.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/xorg-libraries/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	19 May 2007 20:28:05 -0000	1.17
+++ Makefile	20 May 2007 01:27:24 -0000
@@ -64,7 +64,7 @@
 		${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
 		${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
 
-.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING)
+.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6)
 pre-everything::
 	@test -L /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade to xorg 7.2." && /usr/bin/false )
 .endif
--- xorg-libraries.diff ends here ---


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