cvs commit: ports/Mk bsd.port.mk

[Dag-Erling Smørgrav]

Florent Thoumie <flz at FreeBSD.org> writes:
> Let's just set USE_XLIB=yes if X_WINDOW_SYSTEM == xfree86-4 and USE_XORG
> is defined.

Yes, that would be the easiest solution.

What about USE_X_PREFIX, BTW?  I assume that X.org-aware ports are not
supposed to define it?  Perhaps there should be a check for that,
issuing a warning (or aborting the build) if both USE_X_PREFIX and
USE_XORG are set at the same time.

> DES or I could prepare a bpm patch for this if there's an empty slot on
> pointyhat for a new exp-run.

Something like this?

@@ -1916,9 +1921,13 @@
        ${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
 .endif
 
+.if defined(USE_XPM)
+USE_XORG+=                     xpm
+.endif
+
 .if ${X_WINDOW_SYSTEM:L} == xfree86-4
 
-.if defined(USE_XPM)
+.if defined(USE_XORG)
 USE_XLIB=                      yes
 .endif
 
@@ -1927,14 +1936,6 @@
 
 .else
 
-.if defined(USE_XPM)
-LIB_DEPENDS+=                  Xpm.4:${PORTSDIR}/x11/libXpm
-# XXX - At some point we'll have to fix ports to use USE_XORG to
-# the right value and remove both USE_XPM and USE_XLIB. Hopefully
-# XFree86-4 will be gone in the meantime.
-USE_XLIB=                      yes
-.endif
-
 XAWVER=                                8
 PKG_IGNORE_DEPENDS?=           'this_port_does_not_exist'
 

Note that the file numbers won't line up, because I have other patches
in my bsd.port.mk.

DES
-- 
Dag-Erling Smørgrav - des at des.no