Proposal for bsd.port.mk change to allow XFree86/XOrg coexistance in ports

[Dejan Lesjak]

Ahem, and here is the patch inline this time...

--- bsd.port.mk.orig	Tue Jun 29 22:52:56 2004
+++ bsd.port.mk	Tue Jun 29 23:50:14 2004
@@ -1396,6 +1396,41 @@
 LIB_DEPENDS+=			ttf.4:${PORTSDIR}/print/freetype
 .endif
 
+.if defined(XWINDOW_SYSTEM) && ${XWINDOW_SYSTEM:L} == xorg
+X_IMAKE_PORT=           ${PORTSDIR}/devel/imake-6
+X_LIBRARIES_PORT=       ${PORTSDIR}/x11/xorg-libraries
+X_CLIENTS_PORT=         ${PORTSDIR}/x11/xorg-clients
+X_SERVER_PORT=          ${PORTSDIR}/x11-servers/xorg-server
+X_FONTSERVER_PORT=      ${PORTSDIR}/x11-servers/xorg-fontserver
+X_PRINTSERVER_PORT=     ${PORTSDIR}/x11-servers/xorg-printserver
+X_VFBSERVER_PORT=       ${PORTSDIR}/x11-servers/xorg-vfbserver
+X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-encodings
+X_FONTS_DEFAULT_PORT=   ${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps
+X_FONTS_100DPI_PORT=    ${PORTSDIR}/x11-fonts/xorg-fonts-100dpi
+X_FONTS_75DPI_PORT=     ${PORTSDIR}/x11-fonts/xorg-fonts-75dpi
+X_FONTS_CYRILLIC_PORT=  ${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic
+X_FONTS_TTF_PORT=       ${PORTSDIR}/x11-fonts/xorg-fonts-truetype
+X_FONTS_TYPE1_PORT=     ${PORTSDIR}/x11-fonts/xorg-fonts-type1
+X_MANUALS_PORT=         ${PORTSDIR}/x11/xorg-manpages
+.else
+X_IMAKE_PORT=           ${PORTSDIR}/devel/imake-4
+X_LIBRARIES_PORT=       ${PORTSDIR}/x11/XFree86-4-libraries
+X_CLIENTS_PORT=         ${PORTSDIR}/x11/XFree86-4-clients
+X_SERVER_PORT=          ${PORTSDIR}/x11-servers/XFree86-4-Server
+X_FONTSERVER_PORT=      ${PORTSDIR}/x11-servers/XFree86-4-FontServer
+X_PRINTSERVER_PORT=     ${PORTSDIR}/x11-servers/XFree86-4-PrintServer
+X_VFBSERVER_PORT=       
${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
+X_NESTSERVER_PORT=      ${PORTSDIR}/x11-servers/XFree86-4-NestServer
+X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+X_FONTS_DEFAULT_PORT=   ${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
+X_FONTS_100DPI_PORT=    ${PORTSDIR}/x11-fonts/XFree86-4-font100dpi
+X_FONTS_75DPI_PORT=     ${PORTSDIR}/x11-fonts/XFree86-4-font75dpi
+X_FONTS_CYRILLIC_PORT=  ${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic
+X_FONTS_TTF_PORT=       ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable
+X_FONTS_TYPE1_PORT=     ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable
+X_MANUALS_PORT=         ${PORTSDIR}/x11/XFree86-4-manuals
+.endif
+
 .if ${XFREE86_VERSION} == 3
 .if defined(USE_IMAKE)
 BUILD_DEPENDS+=			imake:${PORTSDIR}/x11/XFree86
@@ -1410,8 +1445,8 @@
 PKG_IGNORE_DEPENDS?=	'^XFree86-3\.'
 .else
 .if defined(USE_IMAKE)
-BUILD_DEPENDS+=			${X11BASE}/lib/X11/config/date.def:
${PORTSDIR}/devel/imake-4
-RUN_DEPENDS+=			mkhtmlindex:${PORTSDIR}/devel/imake-4
+BUILD_DEPENDS+=			${X11BASE}/lib/X11/config/date.def:${X_IMAKE_PORT}
+RUN_DEPENDS+=			mkhtmlindex:${X_IMAKE_PORT}
 .endif
 .if defined(USE_XPM) || defined(USE_GL)
 USE_XLIB=				yes
@@ -1511,7 +1546,7 @@
 LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/XFree86
 .endif
 .else
-LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+LIB_DEPENDS+=	X11.6:${X_LIBRARIES_PORT}
 .endif
 # Add explicit X options to avoid problems with false positives in configure
 .if defined(GNU_CONFIGURE)