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)
This commit is contained in:
Joe Marcus Clarke 2004-02-11 06:18:14 +00:00
parent 294bf5a13f
commit 90e5926134
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=100629
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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