From 90e59261345d2a91d307e689db11cefee1965f91 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Wed, 11 Feb 2004 06:18:14 +0000 Subject: [PATCH] Re-order RUN_DEPENDS so only one linux_base will be installed when -DWITH_XFT2 is set. PR: 62489 Submitted by: maintainer Reported by: Maxlor (user @ bsdforums.org) --- www/linux-opera-devel/Makefile | 4 ++-- www/linux-opera/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile index 9296cc4dcee1..0998d22a1e70 100644 --- a/www/linux-opera-devel/Makefile +++ b/www/linux-opera-devel/Makefile @@ -18,8 +18,6 @@ COMMENT= A blazingly fast, full-featured, standards-compliant browser CONFLICTS= opera-* RESTRICTED= "not redistributable; commercial software" -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif - .if defined(WITH_XFT2) RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \ ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ @@ -28,6 +26,8 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XF USE_LINUX= yes .endif +RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif + USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index 9296cc4dcee1..0998d22a1e70 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -18,8 +18,6 @@ COMMENT= A blazingly fast, full-featured, standards-compliant browser CONFLICTS= opera-* RESTRICTED= "not redistributable; commercial software" -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif - .if defined(WITH_XFT2) RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \ ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ @@ -28,6 +26,8 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XF USE_LINUX= yes .endif +RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif + USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes