From owner-freebsd-x11@FreeBSD.ORG Fri Jul 2 22:17:58 2004 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55FFB16A4E3 for ; Fri, 2 Jul 2004 22:17:58 +0000 (GMT) Received: from niobe.ijs.si (mail.ijs.si [193.2.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0C3843EA0 for ; Fri, 2 Jul 2004 21:57:27 +0000 (GMT) (envelope-from dejan.lesjak@ijs.si) Received: from localhost (localhost.ijs.si [127.0.0.1]) by niobe.ijs.si (Postfix) with ESMTP id CFC491DD4AC for ; Fri, 2 Jul 2004 23:56:32 +0200 (CEST) Received: from niobe.ijs.si ([193.2.4.66]) by localhost (niobe.ijs.si [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23620-04 for ; Fri, 2 Jul 2004 23:56:31 +0200 (CEST) Received: from rincewind.ijs.si (rincewind.ijs.si [193.2.4.137]) by niobe.ijs.si (Postfix) with ESMTP id F36F31DD483 for ; Fri, 2 Jul 2004 23:56:30 +0200 (CEST) From: Dejan Lesjak To: freebsd-x11@freebsd.org Date: Fri, 2 Jul 2004 23:56:30 +0200 User-Agent: KMail/1.6.2 References: <200407012307.02733.dejan.lesjak@ijs.si> In-Reply-To: <200407012307.02733.dejan.lesjak@ijs.si> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200407022356.30876.dejan.lesjak@ijs.si> X-Virus-Scanned: by amavisd-new / Sophos+Sophie at ijs.si Subject: Re: Proposal for bsd.port.mk change to allow XFree86/XOrg coexistance in ports X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 22:17:59 -0000 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)