ports/112870: [workaround] [PATCH] xterm will not install; broken x11/xorg-libraries?

[Alan Amesbury]

>Number:         112870
>Category:       ports
>Synopsis:       [workaround] [PATCH] xterm will not install; broken x11/xorg-libraries?
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 22 19:00:10 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alan Amesbury
>Release:        FreeBSD 6.1-RELEASE-p10/i386
>Organization:
University of Minnesota
>Environment:
FreeBSD mrtoad.oitsec.umn.edu 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #3: Wed Oct 11 12:25:48 CDT 2006     root at mrtoad.oitsec.umn.edu:/usr/obj/usr/src/sys/OITSEC-6  i386
>Description:
On a clean system with *NO* X11 apps installed (so this is not an upgrade), with X11BASE set to /usr/X11R6, and with USE_NONDEFAULT_X11BASE set, x11/xterm fails with this error:

  % sudo make install clean
  ===>   xterm-225_1 depends on file: /usr/X11R6/libdata/xorg/libraries - not found
  ===>    Verifying install for /usr/X11R6/libdata/xorg/libraries in /usr/ports/x11/xorg-libraries
  Read /usr/ports/UPDATING for the procedure to upgrade to xorg 7.2.
  *** Error code 1

  Stop in /usr/ports/x11/xorg-libraries.
  *** Error code 1

  Stop in /usr/ports/x11/xterm.
  % ls -la /usr/X11R6
  ls: /usr/X11R6: No such file or directory


Attempts to install x11/xorg-libraries (the missing dependency) fails:

  % cd /usr/ports/x11/xorg-libraries/
  % sudo make install clean
  Read /usr/ports/UPDATING for the procedure to upgrade to xorg 7.2.
  *** Error code 1

  Stop in /usr/ports/x11/xorg-libraries.


This appears to be related to this block in x11/xorg-libraries/Makefile:

  .if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING)
  pre-everything::
          @test -L /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade to xorg 7.2." && /usr/bin/false )
  .endif

>How-To-Repeat:
Attempt to install x11/xterm on a system that has NO X11 tree, and has X11BASE and USE_NONDEFAULT_X11BASE set as described above.
>Fix:
Check for existence of USE_NONDEFAULT_X11BASE.

Patch attached with submission follows:

--- Makefile.ORIG	Tue May 22 13:35:53 2007
+++ Makefile	Tue May 22 13:38:59 2007
@@ -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(USE_NONDEFAULT_X11BASE) && !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING)
 pre-everything::
 	@test -L /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade or install xorg 7.2." && /usr/bin/false )
 .endif

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