aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Samorodov <bsam@FreeBSD.org>2009-03-19 17:28:51 +0000
committerBoris Samorodov <bsam@FreeBSD.org>2009-03-19 17:28:51 +0000
commit0263b9d868256500eb3f31df4c5a81d85d5389c8 (patch)
treebd3ef2dd232584e45f6077260b986d8a61cd6944
parente2ebded775e715fcec035ce1d61b9a2ba5fe6e17 (diff)
downloadports-0263b9d868256500eb3f31df4c5a81d85d5389c8.tar.gz
ports-0263b9d868256500eb3f31df4c5a81d85d5389c8.zip
Notes
-rw-r--r--Mk/bsd.linux-apps.mk350
-rw-r--r--Mk/bsd.linux-rpm.mk16
-rw-r--r--Mk/bsd.port.mk16
-rw-r--r--archivers/linux-f10-upx/Makefile3
-rw-r--r--archivers/linux-f8-upx/Makefile3
-rw-r--r--archivers/linux-upx/Makefile3
-rw-r--r--astro/google-earth/Makefile2
-rw-r--r--audio/baudline/Makefile2
-rw-r--r--audio/linux-esound/Makefile3
-rw-r--r--audio/linux-f10-esound/Makefile3
-rw-r--r--audio/linux-f10-freealut/Makefile3
-rw-r--r--audio/linux-f10-libvorbis/Makefile3
-rw-r--r--audio/linux-f10-openal/Makefile8
-rw-r--r--audio/linux-f10-sdl_mixer/Makefile3
-rw-r--r--audio/linux-f8-esound/Makefile3
-rw-r--r--audio/linux-f8-freealut/Makefile3
-rw-r--r--audio/linux-f8-libvorbis/Makefile3
-rw-r--r--audio/linux-f8-openal/Makefile8
-rw-r--r--audio/linux-f8-sdl_mixer/Makefile3
-rw-r--r--audio/linux-freealut/Makefile3
-rw-r--r--audio/linux-libvorbis/Makefile3
-rw-r--r--audio/linux-openal/Makefile8
-rw-r--r--audio/linux-sdl_mixer/Makefile3
-rw-r--r--audio/teamspeak_client/Makefile4
-rw-r--r--biology/consed/Makefile2
-rw-r--r--cad/linux-eagle/Makefile2
-rw-r--r--cad/linux-eagle5/Makefile2
-rw-r--r--cad/linux-gid/Makefile2
-rw-r--r--devel/linux-allegro/Makefile2
-rw-r--r--devel/linux-f10-allegro/Makefile2
-rw-r--r--devel/linux-f10-sdl12/Makefile2
-rw-r--r--devel/linux-f8-allegro/Makefile2
-rw-r--r--devel/linux-f8-sdl12/Makefile2
-rw-r--r--devel/linux-runrev/Makefile2
-rw-r--r--devel/linux-sdl12/Makefile2
-rw-r--r--devel/radrails/Makefile4
-rw-r--r--editors/edith/Makefile2
-rw-r--r--editors/komodo-edit/Makefile4
-rw-r--r--editors/staroffice5/Makefile2
-rw-r--r--editors/staroffice52/Makefile2
-rw-r--r--editors/staroffice60/Makefile2
-rw-r--r--editors/staroffice70/Makefile2
-rw-r--r--emulators/linux-ePSXe/Makefile4
-rw-r--r--emulators/linux-geepee32/Makefile4
-rw-r--r--emulators/linux-padjoy/Makefile5
-rw-r--r--emulators/linux-peops-softgpu/Makefile4
-rw-r--r--emulators/linux-peops-spu/Makefile4
-rw-r--r--emulators/linux-pete-mesagpu/Makefile4
-rw-r--r--emulators/linux-pete-xgl2gpu/Makefile4
-rw-r--r--emulators/linux-vmware-toolbox2/Makefile2
-rw-r--r--emulators/linux-vmware-toolbox4/Makefile2
-rw-r--r--emulators/linux-vmware-toolbox5/Makefile4
-rw-r--r--emulators/linux-vmware-toolbox6/Makefile4
-rw-r--r--emulators/vmware3/Makefile2
-rw-r--r--french/gibi/Makefile2
-rw-r--r--french/staroffice52/Makefile2
-rw-r--r--games/HeroesOfMightAndMagic/Makefile3
-rw-r--r--games/adom/Makefile2
-rw-r--r--games/dsnake/Makefile4
-rw-r--r--games/gish-demo/Makefile5
-rw-r--r--games/hohlin/Makefile2
-rw-r--r--games/linux-candycruncher-demo/Makefile10
-rw-r--r--games/linux-coldwar-demo/Makefile10
-rw-r--r--games/linux-darwinia-demo/Makefile6
-rw-r--r--games/linux-defcon/Makefile6
-rw-r--r--games/linux-doom3-demo/Makefile2
-rw-r--r--games/linux-doom3/Makefile2
-rw-r--r--games/linux-gorky17-demo/Makefile9
-rw-r--r--games/linux-hdb-demo/Makefile8
-rw-r--r--games/linux-majesty-demo/Makefile9
-rw-r--r--games/linux-nerogame/Makefile5
-rw-r--r--games/linux-ningpo-demo/Makefile10
-rw-r--r--games/linux-nwnclient/Makefile5
-rw-r--r--games/linux-quake4-demo/Makefile3
-rw-r--r--games/linux-quake4/Makefile3
-rw-r--r--games/linux-savage-samuraiwars/Makefile4
-rw-r--r--games/linux-savage/Makefile4
-rw-r--r--games/linux-sof/Makefile2
-rw-r--r--games/linux-spheresofchaos-demo/Makefile3
-rw-r--r--games/linux-ssamtfe/Makefile6
-rw-r--r--games/linux-ssamtse/Makefile6
-rw-r--r--games/linux-steam/Makefile2
-rw-r--r--games/linux-unrealgold/Makefile5
-rw-r--r--games/linux-uplink-demo/Makefile8
-rw-r--r--games/linux-ut/Makefile4
-rw-r--r--games/linux-ut2003-demo/Makefile2
-rw-r--r--games/linux-ut2004-demo/Makefile2
-rw-r--r--games/linux-virtual-jay-peak/Makefile2
-rw-r--r--games/linux-warsow/Makefile9
-rw-r--r--games/rtcw/Makefile2
-rw-r--r--games/stvef-paks/Makefile2
-rw-r--r--games/stvef-server/Makefile2
-rw-r--r--games/utserver/Makefile3
-rw-r--r--german/citrix_ica/Makefile3
-rw-r--r--german/citrix_xenapp/Makefile3
-rw-r--r--german/staroffice5/Makefile2
-rw-r--r--german/staroffice52/Makefile2
-rw-r--r--german/staroffice70/Makefile2
-rw-r--r--graphics/linux-XnViewMP/Makefile2
-rw-r--r--graphics/linux-ac3d/Makefile6
-rw-r--r--graphics/linux-adobesvg/Makefile2
-rw-r--r--graphics/linux-cairo/Makefile5
-rw-r--r--graphics/linux-f10-cairo/Makefile5
-rw-r--r--graphics/linux-f10-libmng/Makefile3
-rw-r--r--graphics/linux-f10-sdl_image/Makefile3
-rw-r--r--graphics/linux-f10-tiff/Makefile3
-rw-r--r--graphics/linux-f8-cairo/Makefile5
-rw-r--r--graphics/linux-f8-libmng/Makefile3
-rw-r--r--graphics/linux-f8-sdl_image/Makefile3
-rw-r--r--graphics/linux-f8-tiff/Makefile3
-rw-r--r--graphics/linux-libmng/Makefile3
-rw-r--r--graphics/linux-panorama-tools/Makefile5
-rw-r--r--graphics/linux-sdl_image/Makefile3
-rw-r--r--graphics/linux-sdl_ttf/Makefile3
-rw-r--r--graphics/linux-tiff/Makefile3
-rw-r--r--graphics/linux_dri-devel/Makefile2
-rw-r--r--graphics/linux_dri/Makefile2
-rw-r--r--japanese/citrix_ica/Makefile3
-rw-r--r--japanese/citrix_xenapp/Makefile3
-rw-r--r--japanese/slimeforest/Makefile3
-rw-r--r--java/linux-blackdown-jdk14/Makefile2
-rw-r--r--java/linux-sun-jdk13/Makefile2
-rw-r--r--java/linux-sun-jdk14/Makefile2
-rw-r--r--java/linux-sun-jdk15/Makefile2
-rw-r--r--java/linux-sun-jdk16/Makefile2
-rw-r--r--java/linux-sun-jre15/Makefile2
-rw-r--r--java/linux-sun-jre16/Makefile2
-rw-r--r--lang/visualworks/Makefile2
-rw-r--r--mail/mulberry/Makefile2
-rw-r--r--math/linux-relview/Makefile4
-rw-r--r--math/wingz/Makefile2
-rw-r--r--math/wingz3/Makefile2
-rw-r--r--misc/opencyc/Makefile2
-rw-r--r--multimedia/linux-realplayer/Makefile3
-rw-r--r--multimedia/linux-xmovie/Makefile2
-rw-r--r--multimedia/netshow/Makefile2
-rw-r--r--net-im/aim/Makefile4
-rw-r--r--net-im/skype/Makefile8
-rw-r--r--net-im/skype12/Makefile4
-rw-r--r--net-im/skype20/Makefile8
-rw-r--r--net-p2p/linux-agsatellite/Makefile2
-rw-r--r--net/citrix_ica/Makefile3
-rw-r--r--net/citrix_xenapp/Makefile3
-rw-r--r--net/linux-nx-client/Makefile5
-rw-r--r--net/skype/Makefile8
-rw-r--r--net/skype12/Makefile4
-rw-r--r--portuguese/staroffice52/Makefile2
-rw-r--r--print/acroread8/Makefile7
-rw-r--r--print/bjfiltercom/Makefile7
-rw-r--r--sysutils/linux-acu/Makefile4
-rw-r--r--sysutils/linux-afaapps/Makefile3
-rw-r--r--sysutils/linux-nero/Makefile3
-rw-r--r--textproc/linux-f10-scim-gtk/Makefile4
-rw-r--r--textproc/linux-f10-scim-libs/Makefile3
-rw-r--r--textproc/linux-f8-scim-gtk/Makefile4
-rw-r--r--textproc/linux-f8-scim-libs/Makefile3
-rw-r--r--textproc/linux-scim-gtk/Makefile4
-rw-r--r--textproc/linux-scim-libs/Makefile3
-rw-r--r--www/linux-flashplugin9/Makefile3
-rw-r--r--www/linux-mplayer-plugin/Makefile7
-rw-r--r--www/linux-opera-devel/Makefile4
-rw-r--r--www/linux-opera/Makefile4
-rw-r--r--www/linux-seamonkey/Makefile.common7
-rw-r--r--www/nspluginwrapper-devel/Makefile2
-rw-r--r--www/nspluginwrapper/Makefile2
-rw-r--r--www/opera-linuxplugins/Makefile2
-rw-r--r--x11-fonts/linux-f10-fontconfig/Makefile3
-rw-r--r--x11-fonts/linux-f8-fontconfig/Makefile3
-rw-r--r--x11-fonts/linux-fontconfig/Makefile3
-rw-r--r--x11-toolkits/linux-f10-gtk/Makefile2
-rw-r--r--x11-toolkits/linux-f10-gtk2/Makefile12
-rw-r--r--x11-toolkits/linux-f10-openmotif/Makefile2
-rw-r--r--x11-toolkits/linux-f10-pango/Makefile8
-rw-r--r--x11-toolkits/linux-f10-qt33/Makefile5
-rw-r--r--x11-toolkits/linux-f8-gtk/Makefile2
-rw-r--r--x11-toolkits/linux-f8-gtk2/Makefile12
-rw-r--r--x11-toolkits/linux-f8-openmotif/Makefile2
-rw-r--r--x11-toolkits/linux-f8-pango/Makefile8
-rw-r--r--x11-toolkits/linux-f8-qt33/Makefile5
-rw-r--r--x11-toolkits/linux-gtk/Makefile2
-rw-r--r--x11-toolkits/linux-gtk2/Makefile12
-rw-r--r--x11-toolkits/linux-openmotif/Makefile2
-rw-r--r--x11-toolkits/linux-pango/Makefile8
-rw-r--r--x11-toolkits/linux-qt33/Makefile5
-rw-r--r--x11/linux-f10-xorg-libs/Makefile3
-rw-r--r--x11/linux-f8-xorg-libs/Makefile3
-rw-r--r--x11/linux-xorg-libs/Makefile3
187 files changed, 586 insertions, 484 deletions
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk
new file mode 100644
index 000000000000..2993f12a16bc
--- /dev/null
+++ b/Mk/bsd.linux-apps.mk
@@ -0,0 +1,350 @@
+#-*- mode: Makefile; tab-width: 4; -*-
+# ex:ts=4
+#
+# $FreeBSD$
+#
+# Please view me with 4 column tabs!
+
+# This section defines possible names of linux infrastructure ports
+# (components) and all information necessary for ports to use those components.
+#
+# Ports can use this as follows:
+#
+# USE_LINUX_APPS= esound xorglibs
+#
+# .include <bsd.port.mk>
+#
+# As a result proper RUN_DEPENDS will be added.
+#
+# Variables:
+# LINUX_DIST_SUFFIX - Contains the value which is added to a port's name
+# (i.e. linux<this_variable>-port ) to get the right
+# linux infrastructure port.
+# _ALL_LINUX_APPS - A (sorted) list of all linux infrastructure ports
+# (components), covered here.
+
+.if !defined(_POSTMKINCLUDED) && !defined(Linux_APPS_Pre_Include)
+
+Linux_APPS_Include_MAINTAINER= emulation@FreeBSD.org
+Linux_APPS_Pre_Include= bsd.linux-apps.mk
+
+.endif
+
+.if defined(_POSTMKINCLUDED) && !defined(Linux_APPS_Post_Include)
+
+Linux_APPS_Post_Include= bsd.linux-apps.mk
+
+. if (${LINUX_OSRELEASE} == "2.6.16") && (${USE_LINUX} == "f8")
+LINUX_DIST_SUFFIX= -f8
+WEB_AUTH= kompozer
+. else
+LINUX_DIST_SUFFIX=
+WEB_AUTH= nvu
+. endif
+
+# Non-version specific components
+_LINUX_APPS_ALL= allegro alsalib arts aspell atk cairo curl esound expat fontconfig \
+ freealut gdkpixbuf gtk gtk2 hicontheme imlib jpeg libaudiofile \
+ libg2c libglade libglade2 libglu libmng libogg libsigcpp20 libtheora \
+ libvorbis libxml libxml2 mikmod openal openmotif openssl pango png png10 qt33 \
+ scimgtk scimlibs sdl12 sdlimage sdlmixer tiff xorglibs ucl ungif upx webauth
+
+# 2.4.2 components
+_LINUX_APPS_ALL+=
+
+# 2.6.16 components
+_LINUX_APPS_ALL+=
+
+# Component definition section
+#
+# component${LINUX_DIST_SUFFIX:S/-//}_FILE
+# - Variables are used to name a file to check,
+# file names may differ for different LINUX_DIST_SUFFIX.
+# The value is LINUX_DIST_SUFFIX without the leading dash.
+# component_DETECT - The resulting file to check for a dependency existence.
+# component_PORT - A port which will be used to install a missing dependency.
+# component_DEPENDS - A list of components the current component depends on.
+
+allegro_FILE= ${LINUXBASE}/usr/lib/liballeg-4.0.3.so
+allegro_f8_FILE= ${LINUXBASE}/usr/lib/liballeg-4.2.2.so
+allegro_DETECT= ${allegro${LINUX_DIST_SUFFIX:S/-//}_FILE}
+allegro_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-allegro
+allegro_DEPENDS= xorglibs
+
+alsalib_FILE= ${LINUXBASE}/lib/libasound.so.2.0.0
+alsalib_f8_FILE= ${alsalib_FILE}
+alsalib_DETECT= ${alsalib${LINUX_DIST_SUFFIX:S/-//}_FILE}
+alsalib_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-lib
+
+arts_FILE= ${LINUXBASE}/usr/lib/libartsc.so.0
+arts_f8_FILE= ${arts_FILE}
+arts_DETECT= ${arts${LINUX_DIST_SUFFIX:S/-//}_FILE}
+arts_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-arts
+
+aspell_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.0.2
+aspell_f8_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.1.4
+aspell_DETECT= ${aspell${LINUX_DIST_SUFFIX:S/-//}_FILE}
+aspell_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-aspell
+
+atk_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.901.0
+atk_f8_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.2009.1
+atk_DETECT= ${atk${LINUX_DIST_SUFFIX:S/-//}_FILE}
+atk_PORT= ${PORTSDIR}/accessibility/linux${LINUX_DIST_SUFFIX}-atk
+
+cairo_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.2.3
+cairo_f8_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.11.7
+cairo_DETECT= ${cairo${LINUX_DIST_SUFFIX:S/-//}_FILE}
+cairo_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-cairo
+cairo_DEPENDS= fontconfig png xorglibs
+
+curl_FILE= ${LINUXBASE}/usr/lib/libcurl.so.3.0.0
+curl_f8_FILE=
+curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-//}_FILE}
+curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
+
+esound_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.36
+esound_f8_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.38
+esound_DETECT= ${esound${LINUX_DIST_SUFFIX:S/-//}_FILE}
+esound_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-esound
+esound_DEPENDS= libaudiofile
+
+expat_FILE= ${LINUXBASE}/usr/lib/libexpat.so.0
+expat_f8_FILE= ${LINUXBASE}/lib/libexpat.so.1
+expat_DETECT= ${expat${LINUX_DIST_SUFFIX:S/-//}_FILE}
+expat_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-expat
+
+fontconfig_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1
+fontconfig_f8_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1.2.0
+fontconfig_DETECT= ${fontconfig${LINUX_DIST_SUFFIX:S/-//}_FILE}
+fontconfig_PORT= ${PORTSDIR}/x11-fonts/linux${LINUX_DIST_SUFFIX}-fontconfig
+fontconfig_DEPENDS= expat
+
+freealut_FILE= ${LINUXBASE}/usr/lib/libalut.so.0.1.0
+freealut_f8_FILE= ${freealut_FILE}
+freealut_DETECT= ${freealut${LINUX_DIST_SUFFIX:S/-//}_FILE}
+freealut_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-freealut
+freealut_DEPENDS= openal
+
+gdkpixbuf_FILE= ${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
+gdkpixbuf_f8_FILE= ${gdkpixbuf_FILE}
+gdkpixbuf_DETECT= ${gdkpixbuf${LINUX_DIST_SUFFIX:S/-//}_FILE}
+gdkpixbuf_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
+
+gtk_FILE= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0.9.1
+gtk_f8_FILE= ${gtk_FILE}
+gtk_DETECT= ${gtk${LINUX_DIST_SUFFIX:S/-//}_FILE}
+gtk_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk
+gtk_DEPENDS= xorglibs
+
+gtk2_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.600.10
+gtk2_f8_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.1200.5
+gtk2_DETECT= ${gtk2${LINUX_DIST_SUFFIX:S/-//}_FILE}
+gtk2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
+gtk2_DEPENDS= atk jpeg png pango tiff xorglibs
+
+hicontheme_FILE= ${LINUXBASE}/usr/share/icons/hicolor
+hicontheme_f8_FILE= ${hicontheme_FILE}
+hicontheme_DETECT= ${hicontheme${LINUX_DIST_SUFFIX:S/-//}_FILE}
+hicontheme_PORT= ${PORTSDIR}/x11-themes/linux-hicolor-icon-theme
+
+imlib_FILE= ${LINUXBASE}/usr/lib/libgdk_imlib.so.1.9.13
+imlib_f8_FILE= ${LINUXBASE}/usr/lib/libgdk_imlib.so.1.9.15
+imlib_DETECT= ${imlib${LINUX_DIST_SUFFIX:S/-//}_FILE}
+imlib_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-imlib
+
+jpeg_FILE= ${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
+jpeg_f8_FILE= ${jpeg_FILE}
+jpeg_DETECT= ${jpeg${LINUX_DIST_SUFFIX:S/-//}_FILE}
+jpeg_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-jpeg
+
+libaudiofile_FILE= ${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
+libaudiofile_f8_FILE= ${libaudiofile_FILE}
+libaudiofile_DETECT= ${libaudiofile${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libaudiofile_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libaudiofile
+
+libg2c_FILE= ${LINUXBASE}/usr/lib/libg2c.so.0.0.0
+libg2c_f8_FILE= ${libg2c_FILE}
+libg2c_DETECT= ${libg2c${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libg2c_PORT= ${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-libg2c
+
+libglade_FILE= ${LINUXBASE}/usr/lib/libglade.so.0.4.2
+libglade_f8_FILE= ${libglade_FILE}
+libglade_DETECT= ${libglade${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libglade_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libglade
+
+libglade2_FILE= ${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
+libglade2_f8_FILE= ${libglade2_FILE}
+libglade2_DETECT= ${libglade2${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libglade2_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libglade2
+
+libglu_FILE= ${LINUXBASE}/usr/X11R6/lib/libGLU.so.1.3
+libglu_f8_FILE= ${LINUXBASE}/usr/lib/libGLU.so.1.3.070002
+libglu_DETECT= ${libglu${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libglu_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libGLU
+
+libmng_FILE= ${LINUXBASE}/usr/lib/libmng.so.1.0.0
+libmng_f8_FILE= ${libmng_FILE}
+libmng_DETECT= ${libmng${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libmng_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libmng
+libmng_DEPENDS= jpeg
+
+libogg_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.5.2
+libogg_f8_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.5.3
+libogg_DETECT= ${libogg${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libogg_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libogg
+
+libsigcpp20_FILE= ${LINUXBASE}/usr/lib/libsigc-2.0.so.0
+libsigcpp20_f8_FILE= ${libsigcpp20_FILE}
+libsigcpp20_DETECT= ${libsigcpp20${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libsigcpp20_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libsigc++20
+
+libtheora_FILE= ${LINUXBASE}/usr/lib/libtheora.so.0.1.0
+libtheora_f8_FILE=
+libtheora_DETECT= ${libtheora${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libtheora_PORT= ${PORTSDIR}/multimedia/linux${LINUX_DIST_SUFFIX}-libtheora
+
+libvorbis_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.3.0
+libvorbis_f8_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.4.0
+libvorbis_DETECT= ${libvorbis${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libvorbis_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libvorbis
+libvorbis_DEPENDS= libogg
+
+libxml_FILE= ${LINUXBASE}/usr/lib/libxml.so.1.8.17
+libxml_f8_FILE= ${libxml_FILE}
+libxml_DETECT= ${libxml${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libxml_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-libxml
+
+libxml2_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.6.19
+libxml2_f8_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.6.31
+libxml2_DETECT= ${libxml2${LINUX_DIST_SUFFIX:S/-//}_FILE}
+libxml2_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-libxml2
+
+mikmod_FILE= ${LINUXBASE}/usr/lib/libmikmod.so.2.0.4
+mikmod_f8_FILE= ${mikmod_FILE}
+mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-//}_FILE}
+mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
+
+openmotif_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
+openmotif_f8_FILE=
+openmotif_DETECT= ${openmotif${LINUX_DIST_SUFFIX:S/-//}_FILE}
+openmotif_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-openmotif
+openmotif_DEPENDS= xorglibs
+
+openal_FILE= ${LINUXBASE}/usr/lib/libopenal.so.0.0.0
+openal_f8_FILE= ${openal_FILE}
+openal_DETECT= ${openal${LINUX_DIST_SUFFIX:S/-//}_FILE}
+openal_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-openal
+openal_DEPENDS= alsalib arts esound libaudiofile libvorbis sdl12
+
+openssl_FILE= ${LINUXBASE}/lib/libssl.so.0.9.7f
+openssl_f8_FILE= ${LINUXBASE}/lib/libssl.so.0.9.8b
+openssl_DETECT= ${openssl${LINUX_DIST_SUFFIX:S/-//}_FILE}
+openssl_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-openssl
+
+pango_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.1001.1
+pango_f8_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.1800.4
+pango_DETECT= ${pango${LINUX_DIST_SUFFIX:S/-//}_FILE}
+pango_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-pango
+pango_DEPENDS= cairo expat fontconfig xorglibs
+
+png_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.1.2.8
+png_f8_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.22.0
+png_DETECT= ${png${LINUX_DIST_SUFFIX:S/-//}_FILE}
+png_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-png
+
+png10_FILE= ${LINUXBASE}/usr/lib/libpng.so.2.1.0.18
+png10_f8_FILE= ${LINUXBASE}/usr/lib/libpng.so.2.1.0.30
+png10_DETECT= ${png10${LINUX_DIST_SUFFIX:S/-//}_FILE}
+png10_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-png10
+
+qt33_FILE= ${LINUXBASE}/usr/lib/qt-3.3/lib/libqt-mt.so.3.3.4
+qt33_f8_FILE= ${LINUXBASE}/usr/lib/qt-3.3/lib/libqt-mt.so.3.3.8
+qt33_DETECT= ${qt33${LINUX_DIST_SUFFIX:S/-//}_FILE}
+qt33_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-qt33
+qt33_DEPENDS= fontconfig libmng png
+
+sdl12_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.7.3
+sdl12_f8_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.2
+sdl12_DETECT= ${sdl12${LINUX_DIST_SUFFIX:S/-//}_FILE}
+sdl12_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-sdl12
+sdl12_DEPENDS= xorglibs
+
+sdlimage_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.4
+sdlimage_f8_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5
+sdlimage_DETECT= ${sdlimage${LINUX_DIST_SUFFIX:S/-//}_FILE}
+sdlimage_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_image
+sdlimage_DEPENDS= sdl12
+
+sdlmixer_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.4
+sdlmixer_f8_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.6
+sdlmixer_DETECT= ${sdlmixer${LINUX_DIST_SUFFIX:S/-//}_FILE}
+sdlmixer_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-sdl_mixer
+sdlmixer_DEPENDS= sdl12
+
+scimgtk_FILE= ${LINUXBASE}/usr/lib/gtk-2.0/immodules/im-scim.so
+scimgtk_f8_FILE=
+scimgtk_DETECT= ${scimgtk${LINUX_DIST_SUFFIX:S/-//}_FILE}
+scimgtk_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-gtk
+scimgtk_DEPENDS= gtk2 scimlibs
+
+scimlibs_FILE= ${LINUXBASE}/usr/lib/libscim-1.0.so.8.1.0
+scimlibs_f8_FILE= ${LINUXBASE}/usr/lib/libscim-1.0.so.8.2.3
+scimlibs_DETECT= ${scimlibs${LINUX_DIST_SUFFIX:S/-//}_FILE}
+scimlibs_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-libs
+scimlibs_DEPENDS= gtk2
+
+tiff_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.7.1
+tiff_f8_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.8.2
+tiff_DETECT= ${tiff${LINUX_DIST_SUFFIX:S/-//}_FILE}
+tiff_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-tiff
+tiff_DEPENDS= jpeg
+
+xorglibs_FILE= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2.0
+xorglibs_f8_FILE= ${LINUXBASE}/usr/lib/libXrandr.so.2.1.0
+xorglibs_DETECT= ${xorglibs${LINUX_DIST_SUFFIX:S/-//}_FILE}
+xorglibs_PORT= ${PORTSDIR}/x11/linux${LINUX_DIST_SUFFIX}-xorg-libs
+xorglibs_DEPENDS= fontconfig
+
+ucl_FILE= ${LINUXBASE}/usr/lib/libucl.so.1
+ucl_f8_FILE= ${ucl_FILE}
+ucl_DETECT= ${ucl${LINUX_DIST_SUFFIX:S/-//}_FILE}
+ucl_PORT= ${PORTSDIR}/archivers/linux${LINUX_DIST_SUFFIX}-ucl
+
+ungif_FILE= ${LINUXBASE}/usr/lib/libgif.so.4.1.3
+ungif_f8_FILE= ${ungif_FILE}
+ungif_DETECT= ${ungif${LINUX_DIST_SUFFIX:S/-//}_FILE}
+ungif_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-ungif
+
+upx_FILE= ${LINUXBASE}/usr/bin/upx
+upx_f8_FILE= ${upx_FILE}
+upx_DETECT= ${upx${LINUX_DIST_SUFFIX:S/-//}_FILE}
+upx_PORT= ${PORTSDIR}/archivers/linux${LINUX_DIST_SUFFIX}-upx
+upx_DEPENDS= ucl
+
+webauth_FILE= ${LOCALBASE}/bin/linux-nvu
+webauth_f8_FILE= ${LOCALBASE}/bin/linux-kompozer
+webauth_DETECT= ${webauth${LINUX_DIST_SUFFIX:S/-//}_FILE}
+webauth_PORT= ${PORTSDIR}/www/linux-${WEB_AUTH}
+webauth_DEPENDS= gtk2 atk pango fontconfig
+
+# End component definition section
+
+# Recursively expand all dependencies for each app at _LINUX_APPS_ALL
+. for component in ${_LINUX_APPS_ALL}
+. for subcomponent in ${${component}_DEPENDS}
+${component}_DEPENDS+=${${subcomponent}_DEPENDS}
+. endfor
+. endfor
+
+# Use just expanded dependencies (<app>_DEPENDS) to expand USE_LINUX_APPS
+. for component in ${USE_LINUX_APPS}
+_USE_LINUX_APPS+=${${component}_DEPENDS} ${component}
+. endfor
+
+# Set dependencies for _USE_LINUX_APPS which exists at _LINUX_APPS_ALL
+. for component in ${_LINUX_APPS_ALL}
+. if ${_USE_LINUX_APPS:M${component}}!=""
+RUN_DEPENDS+= ${${component}_DETECT}:${${component}_PORT}
+. endif
+. endfor
+.endif
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk
index f7aac003d566..553c4c3c7d4c 100644
--- a/Mk/bsd.linux-rpm.mk
+++ b/Mk/bsd.linux-rpm.mk
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.13 2008-08-15 12:29:42 bsam Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.14 2009-03-19 17:28:30 bsam Exp $
#
# Variables:
@@ -65,12 +65,24 @@ LINUX_DIST_VER?= 3
DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER}
. if ${LINUX_DIST} == "fedora"
+# we do not want to define MASTER_SITES and MASTER_SITE_* if they are already defined
+# ex.: MASTER_SITES=file:///...
. ifndef MASTER_SITES
-MASTER_SITES?= ${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
+. if ${LINUX_DIST_VER} == 8
+. if (${LINUX_OSRELEASE} != "2.6.16") && defined(PACKAGE_BUILDING)
+IGNORE= packages should be built with compat.linux.osrelease=2.6.16
+. endif
+MASTER_SITE_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages \
+ ../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}.newkey
+MASTER_SITE_SRC_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \
+ ../updates/${LINUX_DIST_VER}/SRPMS.newkey
+. else
MASTER_SITE_SUBDIR?= ${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
MASTER_SITE_SRC_SUBDIR?= ${LINUX_DIST_VER}/SRPMS \
updates/${LINUX_DIST_VER}/SRPMS
+. endif
. endif
. else
IGNORE= unknown LINUX_DIST in port Makefile
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 839966dab118..b619e840cc1a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -490,6 +490,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# RPM ports.
# Implies inclusion of bsd.linux-rpm.mk.
#
+# LINUX_OSRELEASE - Contains the value of compat.linux.osrelease sysctl.
+# Will be used to distinguish which linux
+# infrastructure ports should be used.
+# Valid values: 2.4.2, 2.6.16.
# AUTOMATIC_PLIST
# - Set to yes to enable automatic packing list generation.
# Currently has no effect unless USE_LINUX_RPM is set.
@@ -1338,6 +1342,10 @@ ETCDIR?= ${PREFIX}/etc/${PORTNAME}
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
.endif
+.if defined(USE_LINUX_APPS)
+.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
+.endif
+
.if defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} != "xorg"
IGNORE= cannot be installed: bad X_WINDOW_SYSTEM setting; valid value is 'xorg'
.endif
@@ -1786,6 +1794,10 @@ USE_LINUX?= yes
.if defined(USE_LINUX)
+. if !defined(LINUX_OSRELEASE)
+LINUX_OSRELEASE!= ${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null`
+. endif
+
# install(1) also does a brandelf on strip, so don't strip with FreeBSD tools.
STRIP=
. if exists(${LINUXBASE}/usr/bin/strip)
@@ -1953,6 +1965,10 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
.endif
+.if defined(USE_LINUX_APPS)
+.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
+.endif
+
.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
.include "${PORTSDIR}/Mk/bsd.qt.mk"
.endif
diff --git a/archivers/linux-f10-upx/Makefile b/archivers/linux-f10-upx/Makefile
index e68dfa35119f..e5abf413f4db 100644
--- a/archivers/linux-f10-upx/Makefile
+++ b/archivers/linux-f10-upx/Makefile
@@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of UPX, a high-performance executable packer
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libucl.so.1:${PORTSDIR}/archivers/linux-ucl
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= ucl
RPMVERSION= 4
LINUX_DIST_VER= 4
BRANDELF_FILES= usr/bin/upx
diff --git a/archivers/linux-f8-upx/Makefile b/archivers/linux-f8-upx/Makefile
index e68dfa35119f..e5abf413f4db 100644
--- a/archivers/linux-f8-upx/Makefile
+++ b/archivers/linux-f8-upx/Makefile
@@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of UPX, a high-performance executable packer
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libucl.so.1:${PORTSDIR}/archivers/linux-ucl
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= ucl
RPMVERSION= 4
LINUX_DIST_VER= 4
BRANDELF_FILES= usr/bin/upx
diff --git a/archivers/linux-upx/Makefile b/archivers/linux-upx/Makefile
index e68dfa35119f..e5abf413f4db 100644
--- a/archivers/linux-upx/Makefile
+++ b/archivers/linux-upx/Makefile
@@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of UPX, a high-performance executable packer
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libucl.so.1:${PORTSDIR}/archivers/linux-ucl
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= ucl
RPMVERSION= 4
LINUX_DIST_VER= 4
BRANDELF_FILES= usr/bin/upx
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index 83f0f15661b4..700f2c29791f 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -25,8 +25,8 @@ RESTRICTED= Not sure about redistribution rights
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
USE_GNOME= desktopfileutils
-USE_XLIB= yes
.include <bsd.port.pre.mk>
diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile
index f9eec4b6f768..02605a954b41 100644
--- a/audio/baudline/Makefile
+++ b/audio/baudline/Makefile
@@ -19,8 +19,8 @@ COMMENT= Real-time signal analysis and time-frequency browser
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
-USE_XLIB= yes
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386 amd64
RESTRICTED= author requests no distribution except from their site
diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index 0eb54ae43538..9e9ab0cb8c8f 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -13,9 +13,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-0.fc4.1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of esound
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= libaudiofile
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 0eb54ae43538..9e9ab0cb8c8f 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -13,9 +13,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-0.fc4.1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of esound
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= libaudiofile
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/audio/linux-f10-freealut/Makefile b/audio/linux-f10-freealut/Makefile
index 25b7563fa6d0..93d47290414b 100644
--- a/audio/linux-f10-freealut/Makefile
+++ b/audio/linux-f10-freealut/Makefile
@@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
MAINTAINER= ports@FreeBSD.org
COMMENT= A free implementation of OpenAL's ALUT standard (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= openal
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/audio/linux-f10-libvorbis/Makefile b/audio/linux-f10-libvorbis/Makefile
index 6e081b01de79..e21ca9b52cf8 100644
--- a/audio/linux-f10-libvorbis/Makefile
+++ b/audio/linux-f10-libvorbis/Makefile
@@ -12,10 +12,9 @@ CATEGORIES= audio linux
MAINTAINER= ports@FreeBSD.org
COMMENT= Audio compression codec library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= libogg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile
index 17f13446e84c..850736b2b4da 100644
--- a/audio/linux-f10-openal/Makefile
+++ b/audio/linux-f10-openal/Makefile
@@ -14,15 +14,9 @@ MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
MAINTAINER= ports@FreeBSD.org
COMMENT= A 3D positional spatialized sound library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
- ${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
- ${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
- ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
- ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= alsalib arts esound libaudiofile libvorbis sdl12
LINUX_DIST_VER= 4
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
USE_LDCONFIG= yes
diff --git a/audio/linux-f10-sdl_mixer/Makefile b/audio/linux-f10-sdl_mixer/Makefile
index 139e6300ae42..8a21370a5e18 100644
--- a/audio/linux-f10-sdl_mixer/Makefile
+++ b/audio/linux-f10-sdl_mixer/Makefile
@@ -14,10 +14,9 @@ DISTNAME= SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
MAINTAINER= mva@FreeBSD.org
COMMENT= A sample multi-channel audio mixer library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= sdl12
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index 0eb54ae43538..9e9ab0cb8c8f 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -13,9 +13,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-0.fc4.1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of esound
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= libaudiofile
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/audio/linux-f8-freealut/Makefile b/audio/linux-f8-freealut/Makefile
index 25b7563fa6d0..93d47290414b 100644
--- a/audio/linux-f8-freealut/Makefile
+++ b/audio/linux-f8-freealut/Makefile
@@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
MAINTAINER= ports@FreeBSD.org
COMMENT= A free implementation of OpenAL's ALUT standard (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= openal
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/audio/linux-f8-libvorbis/Makefile b/audio/linux-f8-libvorbis/Makefile
index 6e081b01de79..e21ca9b52cf8 100644
--- a/audio/linux-f8-libvorbis/Makefile
+++ b/audio/linux-f8-libvorbis/Makefile
@@ -12,10 +12,9 @@ CATEGORIES= audio linux
MAINTAINER= ports@FreeBSD.org
COMMENT= Audio compression codec library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= libogg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
diff --git a/audio/linux-f8-openal/Makefile b/audio/linux-f8-openal/Makefile
index 17f13446e84c..850736b2b4da 100644
--- a/audio/linux-f8-openal/Makefile
+++ b/audio/linux-f8-openal/Makefile
@@ -14,15 +14,9 @@ MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
MAINTAINER= ports@FreeBSD.org
COMMENT= A 3D positional spatialized sound library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
- ${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
- ${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
- ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
- ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= alsalib arts esound libaudiofile libvorbis sdl12
LINUX_DIST_VER= 4
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
USE_LDCONFIG= yes
diff --git a/audio/linux-f8-sdl_mixer/Makefile b/audio/linux-f8-sdl_mixer/Makefile
index 139e6300ae42..8a21370a5e18 100644
--- a/audio/linux-f8-sdl_mixer/Makefile
+++ b/audio/linux-f8-sdl_mixer/Makefile
@@ -14,10 +14,9 @@ DISTNAME= SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
MAINTAINER= mva@FreeBSD.org
COMMENT= A sample multi-channel audio mixer library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= sdl12
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
diff --git a/audio/linux-freealut/Makefile b/audio/linux-freealut/Makefile
index 25b7563fa6d0..93d47290414b 100644
--- a/audio/linux-freealut/Makefile
+++ b/audio/linux-freealut/Makefile
@@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
MAINTAINER= ports@FreeBSD.org
COMMENT= A free implementation of OpenAL's ALUT standard (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= openal
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/audio/linux-libvorbis/Makefile b/audio/linux-libvorbis/Makefile
index 6e081b01de79..e21ca9b52cf8 100644
--- a/audio/linux-libvorbis/Makefile
+++ b/audio/linux-libvorbis/Makefile
@@ -12,10 +12,9 @@ CATEGORIES= audio linux
MAINTAINER= ports@FreeBSD.org
COMMENT= Audio compression codec library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= libogg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile
index 17f13446e84c..850736b2b4da 100644
--- a/audio/linux-openal/Makefile
+++ b/audio/linux-openal/Makefile
@@ -14,15 +14,9 @@ MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
MAINTAINER= ports@FreeBSD.org
COMMENT= A 3D positional spatialized sound library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
- ${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
- ${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
- ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
- ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= alsalib arts esound libaudiofile libvorbis sdl12
LINUX_DIST_VER= 4
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
USE_LDCONFIG= yes
diff --git a/audio/linux-sdl_mixer/Makefile b/audio/linux-sdl_mixer/Makefile
index 139e6300ae42..8a21370a5e18 100644
--- a/audio/linux-sdl_mixer/Makefile
+++ b/audio/linux-sdl_mixer/Makefile
@@ -14,10 +14,9 @@ DISTNAME= SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
MAINTAINER= mva@FreeBSD.org
COMMENT= A sample multi-channel audio mixer library (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= sdl12
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
AUTOMATIC_PLIST=yes
diff --git a/audio/teamspeak_client/Makefile b/audio/teamspeak_client/Makefile
index dc2c5b6c944b..84ffc1386f02 100644
--- a/audio/teamspeak_client/Makefile
+++ b/audio/teamspeak_client/Makefile
@@ -18,12 +18,10 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Client side of a group voice chat system
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
-
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= jpeg xorglibs
NO_BUILD= yes
TSIMG= ${WRKSRC}/setup.data/image
diff --git a/biology/consed/Makefile b/biology/consed/Makefile
index ecd30f138d8a..c5f067276030 100644
--- a/biology/consed/Makefile
+++ b/biology/consed/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= phred:${PORTSDIR}/biology/phred \
USE_PERL5= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386 amd64
RESTRICTED= Redistribution is not permitted in any form. You must request access permission via e-mail to get the tarball. Free for academic use.
diff --git a/cad/linux-eagle/Makefile b/cad/linux-eagle/Makefile
index d64d5bd13611..b561e872ed75 100644
--- a/cad/linux-eagle/Makefile
+++ b/cad/linux-eagle/Makefile
@@ -29,7 +29,7 @@ RESTRICTED= Usage permitted for non-commercial purposes only
NO_CDROM= Sale for profit is not permitted
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_BUILD= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/cad/linux-eagle5/Makefile b/cad/linux-eagle5/Makefile
index d64d5bd13611..b561e872ed75 100644
--- a/cad/linux-eagle5/Makefile
+++ b/cad/linux-eagle5/Makefile
@@ -29,7 +29,7 @@ RESTRICTED= Usage permitted for non-commercial purposes only
NO_CDROM= Sale for profit is not permitted
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_BUILD= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/cad/linux-gid/Makefile b/cad/linux-gid/Makefile
index 4871f8b5d8c8..9a57926c506c 100644
--- a/cad/linux-gid/Makefile
+++ b/cad/linux-gid/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= id-utils-[0-9]* coreutils-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
REINPLACE_ARGS= -i ""
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile
index aecaafecf585..b855c36a7ad4 100644
--- a/devel/linux-allegro/Makefile
+++ b/devel/linux-allegro/Makefile
@@ -16,10 +16,10 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform game programming library (linux version)
USE_LINUX_RPM= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
USE_LDCONFIG= yes
-USE_XLIB= yes
SRC_DISTFILES=
MD5_FILE= ${MASTERDIR}/distinfo
diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile
index aecaafecf585..b855c36a7ad4 100644
--- a/devel/linux-f10-allegro/Makefile
+++ b/devel/linux-f10-allegro/Makefile
@@ -16,10 +16,10 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform game programming library (linux version)
USE_LINUX_RPM= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
USE_LDCONFIG= yes
-USE_XLIB= yes
SRC_DISTFILES=
MD5_FILE= ${MASTERDIR}/distinfo
diff --git a/devel/linux-f10-sdl12/Makefile b/devel/linux-f10-sdl12/Makefile
index fc353658bcf8..ec312f529c75 100644
--- a/devel/linux-f10-sdl12/Makefile
+++ b/devel/linux-f10-sdl12/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform multi-media development API (linux version)
USE_LINUX_RPM= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
INSTALL_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/devel/linux-f8-allegro/Makefile b/devel/linux-f8-allegro/Makefile
index aecaafecf585..b855c36a7ad4 100644
--- a/devel/linux-f8-allegro/Makefile
+++ b/devel/linux-f8-allegro/Makefile
@@ -16,10 +16,10 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform game programming library (linux version)
USE_LINUX_RPM= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
USE_LDCONFIG= yes
-USE_XLIB= yes
SRC_DISTFILES=
MD5_FILE= ${MASTERDIR}/distinfo
diff --git a/devel/linux-f8-sdl12/Makefile b/devel/linux-f8-sdl12/Makefile
index fc353658bcf8..ec312f529c75 100644
--- a/devel/linux-f8-sdl12/Makefile
+++ b/devel/linux-f8-sdl12/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform multi-media development API (linux version)
USE_LINUX_RPM= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
INSTALL_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/devel/linux-runrev/Makefile b/devel/linux-runrev/Makefile
index b41f844d51fd..6629d6ee1048 100644
--- a/devel/linux-runrev/Makefile
+++ b/devel/linux-runrev/Makefile
@@ -25,7 +25,7 @@ NO_CDROM= "Sale for profit is not permitted"
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
WRKSRC= ${WRKDIR}/Revolution-${PORTVERSION}
DATADIR= ${PREFIX}/share/Revolution-${PORTVERSION}
diff --git a/devel/linux-sdl12/Makefile b/devel/linux-sdl12/Makefile
index fc353658bcf8..ec312f529c75 100644
--- a/devel/linux-sdl12/Makefile
+++ b/devel/linux-sdl12/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform multi-media development API (linux version)
USE_LINUX_RPM= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
INSTALL_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/devel/radrails/Makefile b/devel/radrails/Makefile
index bd95425d560a..393341dc1348 100644
--- a/devel/radrails/Makefile
+++ b/devel/radrails/Makefile
@@ -15,14 +15,14 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-linux-gtk
MAINTAINER= alecn2002@yandex.ru
COMMENT= IDE for Ruby On Rails
-RUN_DEPENDS= ${LINUXBASE}/usr/bin/gtk-demo:${PORTSDIR}/x11-toolkits/linux-gtk2 \
- ${LOCALBASE}/bin/rails:${PORTSDIR}/www/rubygem-rails
+RUN_DEPENDS= ${LOCALBASE}/bin/rails:${PORTSDIR}/www/rubygem-rails
WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
+USE_LINUX_APPS= gtk2
USE_JAVA= yes
JAVA_VERSION= 1.4+
JAVA_OS= linux
diff --git a/editors/edith/Makefile b/editors/edith/Makefile
index 728e3c39b53a..32dc44eb5e9a 100644
--- a/editors/edith/Makefile
+++ b/editors/edith/Makefile
@@ -18,7 +18,7 @@ COMMENT= A X11 GUI editor for binary and plain text files
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
RESTRICTED= "Redistribution not allowed"
NO_BUILD= yes
diff --git a/editors/komodo-edit/Makefile b/editors/komodo-edit/Makefile
index 88ff81f9a4ca..dc1e633e102c 100644
--- a/editors/komodo-edit/Makefile
+++ b/editors/komodo-edit/Makefile
@@ -13,13 +13,11 @@ DISTNAME= Komodo-Edit-${PORTVERSION}-1774-linux-libcpp6-x86
MAINTAINER= gahr@FreeBSD.org
COMMENT= Multi-language editor from ActiveState
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/bin/gtk-demo:${PORTSDIR}/x11-toolkits/linux-gtk2
-
ONLY_FOR_ARCH= i386 amd64
RESTRICTED= Distribution not permitted
NO_BUILD= yes
USE_LINUX= yes
+USE_LINUX_APPS= gtk2 jpeg
USE_PYTHON= yes
post-patch:
diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile
index c3fdd6b3a485..92d06e0eb718 100644
--- a/editors/staroffice5/Makefile
+++ b/editors/staroffice5/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be downloaded direct from Sun via www interface'
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
IS_INTERACTIVE= yes
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_CMD= ${CAT}
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index 45430779fde6..a701ab065e04 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -41,7 +41,7 @@ CD_MOUNTPT= '/cdrom'
IS_INTERACTIVE= yes
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index b615d6a457a7..c81395d80215 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -31,7 +31,7 @@ ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
IS_INTERACTIVE= yes
NO_BUILD= yes
SOVERSION= ${PORTNAME}${PORTVERSION}
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 884a780761f4..19f9f7ed2692 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -34,7 +34,7 @@ ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
IS_INTERACTIVE= yes
NO_BUILD= yes
SOVERSION= ${PORTNAME}${PORTVERSION}
diff --git a/emulators/linux-ePSXe/Makefile b/emulators/linux-ePSXe/Makefile
index 9f20ab54ffeb..0ba785e9d395 100644
--- a/emulators/linux-ePSXe/Makefile
+++ b/emulators/linux-ePSXe/Makefile
@@ -16,10 +16,8 @@ DISTNAME= epsxe160lin
MAINTAINER= ports@FreeBSD.org
COMMENT= A Sony Playstation emulator (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
USE_ZIP= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/emulators/linux-geepee32/Makefile b/emulators/linux-geepee32/Makefile
index 996cf006e9d5..64d9a2ed1a32 100644
--- a/emulators/linux-geepee32/Makefile
+++ b/emulators/linux-geepee32/Makefile
@@ -15,11 +15,9 @@ DISTNAME= ${PORTNAME}_linux_sdl_${PORTVERSION}
MAINTAINER= arundel@h3c.de
COMMENT= The only GP32 emulator for i386
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
ONLY_FOR_ARCHS= i386
-USE_XLIB= yes
USE_LINUX= yes
+USE_LINUX_APPS= sdl12 xorglibs
USE_ZIP= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/emulators/linux-padjoy/Makefile b/emulators/linux-padjoy/Makefile
index 05c686fcad87..8d3db52e86d7 100644
--- a/emulators/linux-padjoy/Makefile
+++ b/emulators/linux-padjoy/Makefile
@@ -17,13 +17,12 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= A PSEmu Pro joystick plugin (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk \
- /boot/modules/linux_js.ko:${PORTSDIR}/devel/linux-js
+RUN_DEPENDS= /boot/modules/linux_js.ko:${PORTSDIR}/devel/linux-js
WRKSRC= ${WRKDIR}/padJoy
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
ONLY_FOR_ARCHS= i386 amd64
diff --git a/emulators/linux-peops-softgpu/Makefile b/emulators/linux-peops-softgpu/Makefile
index b2111bc4d59a..772950f8fc93 100644
--- a/emulators/linux-peops-softgpu/Makefile
+++ b/emulators/linux-peops-softgpu/Makefile
@@ -16,12 +16,10 @@ DISTNAME= gpupeopssoftx${MAJOR}${MINOR}
MAINTAINER= ports@FreeBSD.org
COMMENT= A PSEmu Pro GPU plugin using a software X11 renderer (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
ONLY_FOR_ARCHS= i386 amd64
diff --git a/emulators/linux-peops-spu/Makefile b/emulators/linux-peops-spu/Makefile
index 59844ba75a50..151799ffe005 100644
--- a/emulators/linux-peops-spu/Makefile
+++ b/emulators/linux-peops-spu/Makefile
@@ -16,12 +16,10 @@ DISTNAME= spupeopsoss${MAJOR}0${MINOR}
MAINTAINER= ports@FreeBSD.org
COMMENT= A PSEmu Pro SPU plugin using the OSS interface (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
ONLY_FOR_ARCHS= i386 amd64
diff --git a/emulators/linux-pete-mesagpu/Makefile b/emulators/linux-pete-mesagpu/Makefile
index 57f8294fbbf1..0c092262ea0d 100644
--- a/emulators/linux-pete-mesagpu/Makefile
+++ b/emulators/linux-pete-mesagpu/Makefile
@@ -16,8 +16,6 @@ DISTNAME= gpupetemesagl${MAJOR}${MINOR}
MAINTAINER= ports@FreeBSD.org
COMMENT= A PSEmu Pro GPU plugin using an OpenGL renderer (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
.ifdef WITH_NVIDIA_GL
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
.else
@@ -27,7 +25,7 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
ONLY_FOR_ARCHS= i386 amd64
diff --git a/emulators/linux-pete-xgl2gpu/Makefile b/emulators/linux-pete-xgl2gpu/Makefile
index 58bcdaf30a61..c25f328e8e46 100644
--- a/emulators/linux-pete-xgl2gpu/Makefile
+++ b/emulators/linux-pete-xgl2gpu/Makefile
@@ -14,8 +14,6 @@ DISTNAME= gpupetexgl${MAJOR}0${MINOR}
MAINTAINER= ports@FreeBSD.org
COMMENT= A PSEmu Pro GPU plugin using a modern OpenGL renderer (Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
.if defined(WITH_NVIDIA_GL)
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
.else
@@ -25,7 +23,7 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
ONLY_FOR_ARCHS= i386 amd64
diff --git a/emulators/linux-vmware-toolbox2/Makefile b/emulators/linux-vmware-toolbox2/Makefile
index 80720dcec2e4..b80a9903282e 100644
--- a/emulators/linux-vmware-toolbox2/Makefile
+++ b/emulators/linux-vmware-toolbox2/Makefile
@@ -19,7 +19,7 @@ COMMENT=VMware toolbox for guest OS (for VMware 2.x, Linux version)
ONLY_FOR_ARCHS= i386
PLIST_FILES= bin/linux-vmware-toolbox
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_BUILD= yes
.if !defined(BATCH)
IS_INTERACTIVE= yes
diff --git a/emulators/linux-vmware-toolbox4/Makefile b/emulators/linux-vmware-toolbox4/Makefile
index 8b45185e071b..d7b7c58cccb2 100644
--- a/emulators/linux-vmware-toolbox4/Makefile
+++ b/emulators/linux-vmware-toolbox4/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
.if !defined(BATCH)
IS_INTERACTIVE= yes
.endif
diff --git a/emulators/linux-vmware-toolbox5/Makefile b/emulators/linux-vmware-toolbox5/Makefile
index 71bf60afdf7e..bcf07412c8ff 100644
--- a/emulators/linux-vmware-toolbox5/Makefile
+++ b/emulators/linux-vmware-toolbox5/Makefile
@@ -15,8 +15,6 @@ DISTNAME= VMwareTools-${VMWARE_VER}-${BUILD_VER}
MAINTAINER= matusita@FreeBSD.org
COMMENT=VMware toolbox for guest OS (VMware Workstation 5.x, Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
DISTDIR= ${MOUNT_PT}
IGNOREFILES= ${DISTFILES}
PLIST_FILES= bin/linux-vmware-toolbox bin/linux-vmware-toolbox-gtk \
@@ -25,7 +23,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
NO_BUILD= yes
.if !defined(BATCH)
IS_INTERACTIVE= yes
diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile
index 7f4d89e19ec2..464f638984fb 100644
--- a/emulators/linux-vmware-toolbox6/Makefile
+++ b/emulators/linux-vmware-toolbox6/Makefile
@@ -15,8 +15,6 @@ DISTNAME= VMwareTools-${VMWARE_VER}-${BUILD_VER}
MAINTAINER= matusita@FreeBSD.org
COMMENT=VMware toolbox for guest OS (VMware Workstation 6.x, Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
DISTDIR= ${MOUNT_PT}
IGNOREFILES= ${DISTFILES}
PLIST_FILES= bin/linux-vmware-toolbox bin/linux-vmware-toolbox-gtk \
@@ -25,7 +23,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
NO_BUILD= yes
.if !defined(BATCH)
IS_INTERACTIVE= yes
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index ab08158c7a27..dd1a2aa0522a 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -45,7 +45,7 @@ SUB_LIST= BRIDGED="${VMNET_BRIDGED}" \
VMNET1_MINOR="${VMNET1_MINOR}"
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
WRKSRC= ${WRKDIR}/vmware-distrib
GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract
MAN1= vmware.1
diff --git a/french/gibi/Makefile b/french/gibi/Makefile
index 8d2b3fee7606..f62512fa3c09 100644
--- a/french/gibi/Makefile
+++ b/french/gibi/Makefile
@@ -25,7 +25,6 @@ COMMENT= GIBI est la partie mailleur et post de CASTEM
BUILD_DEPENDS+= ${LOCALBASE}/aster/${vaster}/asteru:${PORTSDIR}/french/aster
RUN_DEPENDS+= ${LOCALBASE}/aster/${vaster}/asteru:${PORTSDIR}/french/aster \
- ${LINUXBASE}/usr/lib/libg2c.so.0:${PORTSDIR}/lang/linux-libg2c \
${SHELL_RUN_GIBI}:${PORTSDIR}/shells/${SHRGDEP}
RESTRICTED= Toute personne chargeant le logiciel GIBI s'engage à ne\
@@ -35,6 +34,7 @@ RESTRICTED= Toute personne chargeant le logiciel GIBI s'engage à ne\
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= libg2c
REINPLACE_ARGS= -i ""
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
diff --git a/french/staroffice52/Makefile b/french/staroffice52/Makefile
index 4e57abe44f11..11ef9c65db26 100644
--- a/french/staroffice52/Makefile
+++ b/french/staroffice52/Makefile
@@ -36,7 +36,7 @@ FETCH_DEPENDS= ${LINUX_BASE_PORT}
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_CDROM= 'Doit être téléchargé depuis le site web de Sun'
CD_MOUNTPT= '/cdrom'
IS_INTERACTIVE= yes
diff --git a/games/HeroesOfMightAndMagic/Makefile b/games/HeroesOfMightAndMagic/Makefile
index 9e2cf11caf80..faf43d3e5aca 100644
--- a/games/HeroesOfMightAndMagic/Makefile
+++ b/games/HeroesOfMightAndMagic/Makefile
@@ -15,12 +15,11 @@ DISTFILES=
MAINTAINER= mva@FreeBSD.org
COMMENT= BSD Installation of the Linux game "Heroes of Might and Magic III"
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
PLIST= ${WRKDIR}/PLIST
IS_INTERACTIVE= yes
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= gtk
NO_BUILD= yes
NO_WRKSUBDIR= yes
NO_CDROM= Software is commercial
diff --git a/games/adom/Makefile b/games/adom/Makefile
index 3ffc9f133d60..50bc23fe361b 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -19,7 +19,7 @@ NO_CDROM= Copy of CD must be sent to author
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
WRKSRC= ${WRKDIR}/adom
NO_BUILD= yes
diff --git a/games/dsnake/Makefile b/games/dsnake/Makefile
index a971c01a5fd9..1d16849c3e64 100644
--- a/games/dsnake/Makefile
+++ b/games/dsnake/Makefile
@@ -15,13 +15,11 @@ DISTNAME= ${PORTNAME}-linux-${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= Deluxe Snake - snake clone with frogs and mushrooms
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/liballeg.so.4.0:${PORTSDIR}/devel/linux-allegro
-
RESTRICTED= Licence forbids any repacking and reselling
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= allegro xorglibs
WRKSRC= ${WRKDIR}/DeluxeSnake
SUB_FILES= pkg-install pkg-deinstall
diff --git a/games/gish-demo/Makefile b/games/gish-demo/Makefile
index e18a5118af53..b6a7cdbe5890 100644
--- a/games/gish-demo/Makefile
+++ b/games/gish-demo/Makefile
@@ -14,14 +14,11 @@ DISTNAME= gishdemo
MAINTAINER= mva@FreeBSD.org
COMMENT= A platform game with a gelatinous 12-pound ball of tar named Gish (Demo version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
- ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal \
- ${LINUXBASE}/usr/lib/libalut.so.0:${PORTSDIR}/audio/linux-freealut
-
RESTRICTED= (c) Copyright 2004 Chronic Logic All rights reserved
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= is an i386 Linux binary
USE_LINUX= yes
+USE_LINUX_APPS= freealut libvorbis openal
NO_BUILD= yes
DATADIR= ${PREFIX}/lib/${PORTNAME}
SUB_FILES= rungish.sh
diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile
index e7ead06f688c..9452168f65ff 100644
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/hoh-install-${PORTVERSION}/
USE_BZIP2= YES
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386
SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
diff --git a/games/linux-candycruncher-demo/Makefile b/games/linux-candycruncher-demo/Makefile
index ce903084477f..591d42b5c6fd 100644
--- a/games/linux-candycruncher-demo/Makefile
+++ b/games/linux-candycruncher-demo/Makefile
@@ -16,17 +16,9 @@ EXTRACT_SUFX= .run
MAINTAINER= mva@FreeBSD.org
COMMENT= Candy Cruncher Demo - a fast puzzle game with lots of candies
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
- ${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
- ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
- ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= alsalib jpeg libogg libvorbis mikmod sdl12 sdlmixer xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-coldwar-demo/Makefile b/games/linux-coldwar-demo/Makefile
index 30dab75dba0e..822449c4a63f 100644
--- a/games/linux-coldwar-demo/Makefile
+++ b/games/linux-coldwar-demo/Makefile
@@ -16,17 +16,9 @@ EXTRACT_SUFX= .run
MAINTAINER= mva@FreeBSD.org
COMMENT= Coldwar Demo - a third-person sneaker like Splinter Cell
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
- ${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
- ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
- ${LINUXBASE}/usr/lib/libtheora.so.0:${PORTSDIR}/multimedia/linux-libtheora
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 jpeg sdlmixer mikmod libogg libvorbis libtheora xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile
index f5f87aba9253..b67689897917 100644
--- a/games/linux-darwinia-demo/Makefile
+++ b/games/linux-darwinia-demo/Makefile
@@ -16,13 +16,9 @@ EXTRACT_SUFX= .sh
MAINTAINER= mva@FreeBSD.org
COMMENT= Real-time action strategy with programs
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
- ${LINUXBASE}/usr/lib/libvorbisfile.so.3:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 libogg libvorbis xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile
index db007abcb920..4e1ec563318b 100644
--- a/games/linux-defcon/Makefile
+++ b/games/linux-defcon/Makefile
@@ -15,13 +15,9 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
COMMENT= Defcon for Linux
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
- ${LINUXBASE}/usr/lib/libvorbisfile.so.3:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 libogg libvorbis xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-doom3-demo/Makefile b/games/linux-doom3-demo/Makefile
index 120966299f0d..dd7cf71f34a5 100644
--- a/games/linux-doom3-demo/Makefile
+++ b/games/linux-doom3-demo/Makefile
@@ -21,8 +21,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= DOOM III demo for Linux
ONLY_FOR_ARCHS= i386 amd64
-USE_XLIB= yes
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
NO_PACKAGE= Distfile size is 462MB, set FORCE_PACKAGE if you really want to build this package
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index e586e0bf3e17..8092a981ed64 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= alepulver@FreeBSD.org
COMMENT= Doom III for Linux
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/games/linux-gorky17-demo/Makefile b/games/linux-gorky17-demo/Makefile
index 2169f79198f0..266418c8628c 100644
--- a/games/linux-gorky17-demo/Makefile
+++ b/games/linux-gorky17-demo/Makefile
@@ -16,16 +16,9 @@ EXTRACT_SUFX= .run
MAINTAINER= mva@FreeBSD.org
COMMENT= Gorky17 Demo - a tactical shooter similiar to Jagged Alliance
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
- ${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
- ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 jpeg sdlmixer mikmod libogg libvorbis xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-hdb-demo/Makefile b/games/linux-hdb-demo/Makefile
index 49f71fcd9c9a..ed919003db4a 100644
--- a/games/linux-hdb-demo/Makefile
+++ b/games/linux-hdb-demo/Makefile
@@ -16,15 +16,9 @@ EXTRACT_SUFX= .run
MAINTAINER= mva@FreeBSD.org
COMMENT= Hyperspace Delivery Boy Demo - deliver mail and packages
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
- ${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
- ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 sdlmixer mikmod libogg libvorbis xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-majesty-demo/Makefile b/games/linux-majesty-demo/Makefile
index cc7e77551517..d92f6409a326 100644
--- a/games/linux-majesty-demo/Makefile
+++ b/games/linux-majesty-demo/Makefile
@@ -16,16 +16,9 @@ EXTRACT_SUFX= .run
MAINTAINER= mva@FreeBSD.org
COMMENT= Majesty Gold Demo
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
- ${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
- ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX= sdl12 jpeg sdlmixer mikmod libogg libvorbis xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-nerogame/Makefile b/games/linux-nerogame/Makefile
index 92a675a04845..aac80146a7ac 100644
--- a/games/linux-nerogame/Makefile
+++ b/games/linux-nerogame/Makefile
@@ -15,11 +15,8 @@ DISTNAME= nero2_linux_i386
MAINTAINER= acm@FreeBSD.org
COMMENT= Neuro envolving robotic operatives the game
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
- ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libtheora.so.0:${PORTSDIR}/multimedia/linux-libtheora
-
USE_LINUX= yes
+USE_LINUX_APPS= libvorbis sdl12 libtheora
NO_BUILD= yes
RESTRICTED= Nero is freeware, but i am not sure of its license
diff --git a/games/linux-ningpo-demo/Makefile b/games/linux-ningpo-demo/Makefile
index dd1b0abeb721..4748d30bace6 100644
--- a/games/linux-ningpo-demo/Makefile
+++ b/games/linux-ningpo-demo/Makefile
@@ -16,17 +16,9 @@ EXTRACT_SUFX= .run
MAINTAINER= mva@FreeBSD.org
COMMENT= NingPo Mahjong Demo - a feature rich Mahjong game
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
- ${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
- ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
- ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 jpeg sdlmixer mikmod libogg libvorbis alsalib xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile
index 05e961a39df8..bac03bbbce1d 100644
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -17,8 +17,7 @@ DISTFILES= nwclient129.tar.gz \
MAINTAINER= sean-freebsd@farley.org
COMMENT= Neverwinter Nights Linux (x86) Client
-RUN_DEPENDS= ${LOCALBASE}/share/nwndata/NWNv129.txt:${PORTSDIR}/games/nwndata \
- ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
+RUN_DEPENDS= ${LOCALBASE}/share/nwndata/NWNv129.txt:${PORTSDIR}/games/nwndata
.ifdef WITH_NVIDIA_GL
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
@@ -29,8 +28,8 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
NO_BUILD= yes
ONLY_FOR_ARCHS= i386
-USE_XLIB= yes
USE_LINUX= yes
+USE_LINUX_APPS= sdl12 xorglibs
NWNDATADIR= ${LOCALBASE}/share/nwndata
PLIST_SUB+= NWNVERSION="${PORTVERSION:S/.//}"
diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile
index 20f90a65c349..fbaeba26d672 100644
--- a/games/linux-quake4-demo/Makefile
+++ b/games/linux-quake4-demo/Makefile
@@ -18,9 +18,8 @@ EXTRACT_SUFX= .run
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Quake 4 for Linux Demo
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
USE_LINUX= yes
+USE_LINUX_APPS= sdl12
NO_WRKSUBDIR= yes
NO_CDROM= Redistribution is limited, see license
NO_PACKAGE= Package will be 337MB, set FORCE_PACKAGE if you really want it
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index a93102f5bd07..858d9f206c33 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -18,9 +18,8 @@ EXTRACT_SUFX= .run
MAINTAINER= acm@FreeBSD.org
COMMENT= Quake 4 for Linux
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
USE_LINUX= yes
+USE_LINUX_APPS= sdl12
NO_WRKSUBDIR= yes
NO_CDROM= Redistribution is limited, see license
NO_PACKAGE= Package will be 280MB, set FORCE_PACKAGE if you really want it
diff --git a/games/linux-savage-samuraiwars/Makefile b/games/linux-savage-samuraiwars/Makefile
index b803575c2414..c198db8bc34e 100644
--- a/games/linux-savage-samuraiwars/Makefile
+++ b/games/linux-savage-samuraiwars/Makefile
@@ -19,11 +19,9 @@ DIST_SUBDIR= savage
MAINTAINER= acm@FreeBSD.org
COMMENT= An official mod for Savage game (linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
- ${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff
-
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS= libvorbis tiff
NO_BUILD= yes
RESTRICTED= SamuraiWars is freeware, but i am not sure of its license
NO_PACKAGE= Package will be 350MB, set FORCE_PACKAGE if you really want it
diff --git a/games/linux-savage/Makefile b/games/linux-savage/Makefile
index ae294bd8390d..44e5c04f43d1 100644
--- a/games/linux-savage/Makefile
+++ b/games/linux-savage/Makefile
@@ -21,10 +21,8 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= acm@FreeBSD.org
COMMENT= The Savage game (linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
- ${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff
-
USE_LINUX= yes
+USE_LINUX_APPS= libvorbis tiff
NO_BUILD= yes
RESTRICTED= Savage is freeware, but i am not sure of its license
NO_PACKAGE= Package will be 150MB, set FORCE_PACKAGE if you really want it
diff --git a/games/linux-sof/Makefile b/games/linux-sof/Makefile
index 0e8abe3502e1..89adca403d5b 100644
--- a/games/linux-sof/Makefile
+++ b/games/linux-sof/Makefile
@@ -19,7 +19,7 @@ COMMENT= Soldier of Fortune for Linux
PATCH_DEPENDS= xdelta:${PORTSDIR}/misc/xdelta
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
USE_LDCONFIG= yes
NO_BUILD= yes
NO_PACKAGE= Distribution is 448MB; set FORCE_PACKAGE if you really want\
diff --git a/games/linux-spheresofchaos-demo/Makefile b/games/linux-spheresofchaos-demo/Makefile
index 7a7ce470044b..23a7705ccaba 100644
--- a/games/linux-spheresofchaos-demo/Makefile
+++ b/games/linux-spheresofchaos-demo/Makefile
@@ -19,10 +19,9 @@ DISTNAME= chaosl-${PORTVERSION}
MAINTAINER= roam@FreeBSD.org
COMMENT= An unusual and spectacular shoot-em-up for the PC
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
USE_ZIP= yes
USE_LINUX= yes
+USE_LINUX_APPS= sdl12
NO_BUILD= yes
diff --git a/games/linux-ssamtfe/Makefile b/games/linux-ssamtfe/Makefile
index 9ac4c7e3f381..b6d1a648445e 100644
--- a/games/linux-ssamtfe/Makefile
+++ b/games/linux-ssamtfe/Makefile
@@ -15,12 +15,10 @@ DISTFILES= ${PORTNAME:S|ssam|serious.sam.|}_${PORTVERSION:S|b|beta|}-english-2.r
MAINTAINER= ports@logvinov.com
COMMENT= Serious Sam: The First Encounter
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
OPTIONS= VORBIS "Ogg playing support" on
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 xorglibs
NO_BUILD= yes
NO_PACKAGE= Distribution is 279MB; set FORCE_PACKAGE if you really want\
to build this package
@@ -31,7 +29,7 @@ SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
.if defined(WITH_VORBIS)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
+USE_LINUX_APPS+=libvorbis
PLIST_SUB+= VORBIS=""
.else
PLIST_SUB+= VORBIS="@comment "
diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile
index edc2a7703e4f..ccb4815ffc10 100644
--- a/games/linux-ssamtse/Makefile
+++ b/games/linux-ssamtse/Makefile
@@ -15,12 +15,10 @@ DISTFILES= ${PORTNAME:S|ssam|serious.sam.|}_${PORTVERSION:S|b|beta|}-english-2.r
MAINTAINER= ports@logvinov.com
COMMENT= Serious Sam: The Second Encounter for Linux
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
OPTIONS= VORBIS "Ogg playing support" on
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 xorglibs
NO_BUILD= yes
NO_PACKAGE= Distribution is 352MB; set FORCE_PACKAGE if you really want to build this package
RESTRICTED= Redistribution is limited, see license
@@ -30,7 +28,7 @@ SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
.if defined(WITH_VORBIS)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
+USE_LINUX_APPS+=libvorbis
PLIST_SUB+= VORBIS=""
.else
PLIST_SUB+= VORBIS="@comment "
diff --git a/games/linux-steam/Makefile b/games/linux-steam/Makefile
index 225546718c3f..cab2fa2be859 100644
--- a/games/linux-steam/Makefile
+++ b/games/linux-steam/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LINUX_BASE_PORT}
IS_INTERACTIVE= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
PKGMESSAGE= ${WRKDIR}/pkg-message
INSTALLDIR?= steam
diff --git a/games/linux-unrealgold/Makefile b/games/linux-unrealgold/Makefile
index 883d50cf85fb..d43d85130800 100644
--- a/games/linux-unrealgold/Makefile
+++ b/games/linux-unrealgold/Makefile
@@ -18,11 +18,10 @@ MAINTAINER= ports@logvinov.com
COMMENT= Unreal Gold for Linux
BUILD_DEPENDS= ut:${PORTSDIR}/games/linux-ut
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ut:${PORTSDIR}/games/linux-ut
+RUN_DEPENDS= ut:${PORTSDIR}/games/linux-ut
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 xorglibs
NO_BUILD= yes
NO_PACKAGE= Distribution is 131MB; set FORCE_PACKAGE if you really want\
to build this package
diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile
index 11dc6230133b..a241bada1798 100644
--- a/games/linux-uplink-demo/Makefile
+++ b/games/linux-uplink-demo/Makefile
@@ -16,15 +16,9 @@ EXTRACT_SUFX= .sh
MAINTAINER= mva@FreeBSD.org
COMMENT= High tech computer crime and industrial espionage on the Internet
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
- ${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
- ${LINUXBASE}/usr/lib/libvorbisfile.so.3:${PORTSDIR}/audio/linux-libvorbis
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 jpeg sdlmixer mikmod libvorbis xorglibs
USE_LDCONFIG= yes
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-ut/Makefile b/games/linux-ut/Makefile
index 929414d9dab2..c2d6e33a42c5 100644
--- a/games/linux-ut/Makefile
+++ b/games/linux-ut/Makefile
@@ -18,11 +18,9 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= scf@FreeBSD.org
COMMENT= Unreal Tournament for Linux
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= sdl12 xorglibs
NO_BUILD= yes
NO_PACKAGE= Distribution is 340MB; set FORCE_PACKAGE if you really want\
to build this package
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index a56f85c91237..0fe569c2262d 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -17,8 +17,8 @@ EXTRACT_SUFX= .sh.bin
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Unreal Tournament 2003 demo
-USE_XLIB= yes
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
NO_PACKAGE= Distfile is 130MB, set FORCE_PACKAGE if you really want to build this package
RESTRICTED= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-ut2004-demo/Makefile b/games/linux-ut2004-demo/Makefile
index a6dcd4f68d85..9c220192c4d1 100644
--- a/games/linux-ut2004-demo/Makefile
+++ b/games/linux-ut2004-demo/Makefile
@@ -19,8 +19,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Unreal Tournament 2004 demo
ONLY_FOR_ARCHS= i386 amd64
-USE_XLIB= yes
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
NO_PACKAGE= Distfile size is 275MB, set FORCE_PACKAGE if you really want to build this package
RESTRICTED= Redistribution is limited, see license
NO_BUILD= yes
diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile
index dce2a140cd12..e3e02d7a91b9 100644
--- a/games/linux-virtual-jay-peak/Makefile
+++ b/games/linux-virtual-jay-peak/Makefile
@@ -17,8 +17,8 @@ COMMENT= A simulation of snowboarding at the Jay Peak resort in Vermont
WRKSRC= ${WRKDIR}/soulride
ONLY_FOR_ARCHS= i386
-USE_XLIB= yes
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
NO_BUILD= yes
SUB_FILES= virtual-jay-peak
diff --git a/games/linux-warsow/Makefile b/games/linux-warsow/Makefile
index 457c8902c0dc..79ec4a4ae1a7 100644
--- a/games/linux-warsow/Makefile
+++ b/games/linux-warsow/Makefile
@@ -27,10 +27,10 @@ COMMENT= Free multiplayer first person shooter with cartoon design
IGNORE= is outdated, does not match games/warsow-data port
-RUN_DEPENDS= ${LINUXBASE}/lib/libssl.so.5:${PORTSDIR}/security/linux-openssl \
- ${DATADIR}/data0.pk3:${PORTSDIR}/games/warsow-data
+RUN_DEPENDS= ${DATADIR}/data0.pk3:${PORTSDIR}/games/warsow-data
USE_LINUX= yes
+USE_LINUX_APPS= openssl
WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
@@ -79,10 +79,7 @@ PLIST_SUB+= ENGINESUFFIX=${ENGINESUFFIX} \
.endif
.if !defined(WITHOUT_CLIENT)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libcurl.so.3:${PORTSDIR}/ftp/linux-curl
+USE_LINUX_APPS+=sdl12 libvorbis jpeg curl
PLIST_SUB+= CLIENT=""
WARSOW_TARGET+= warsow
WARSOW_EXTRACT+=${PORTNAME}/warsow${ENGINESUFFIX} \
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 3a7161d18e5d..1cce010f3f33 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -19,8 +19,8 @@ COMMENT= Return to Castle Wolfenstein for Linux
USE_MAKESELF= yes
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
USE_GL= linux
-USE_XLIB= yes
NO_WRKSUBDIR= yes
SUB_FILES= pkg-message
diff --git a/games/stvef-paks/Makefile b/games/stvef-paks/Makefile
index 29cbc7c535e5..ba4bb8885290 100644
--- a/games/stvef-paks/Makefile
+++ b/games/stvef-paks/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
EXTRACT_ONLY= # Don't extract anything
GAMEDIR= ${PREFIX}/games/stvef/
diff --git a/games/stvef-server/Makefile b/games/stvef-server/Makefile
index 5ec35c1db14f..2eb06b0361b7 100644
--- a/games/stvef-server/Makefile
+++ b/games/stvef-server/Makefile
@@ -17,7 +17,7 @@ COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux
ONLY_FOR_ARCHS= i386
USE_ZIP= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
WRKSRC= ${WRKDIR}/Linux
INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
diff --git a/games/utserver/Makefile b/games/utserver/Makefile
index 5a3ab166d7a0..6530c393ba4e 100644
--- a/games/utserver/Makefile
+++ b/games/utserver/Makefile
@@ -20,11 +20,10 @@ EXTRACT_ONLY= ${MAINFILE}
MAINTAINER= ports@logvinov.com
COMMENT= Unreal Tournament Dedicated Server for Linux
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
OPTIONS= BONUSPACKS "install the official bonus packs collection" on
USE_LINUX= yes
+USE_LINUX_APPS= sdl12
NO_CDROM= Size; the data set is much too big
NO_BUILD= yes
WRKSRC= ${WRKDIR}/ut-server
diff --git a/german/citrix_ica/Makefile b/german/citrix_ica/Makefile
index 8b4d2fe90f58..78b7182d4dff 100644
--- a/german/citrix_ica/Makefile
+++ b/german/citrix_ica/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-linuxx86-de-${PORTVERSION}
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= Citrix(R) Presentation Server(TM) client
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= openmotif
RESTRICTED= License prohibits redistribution
IS_INTERACTIVE= "Noisy license agreement ignores stdin"
diff --git a/german/citrix_xenapp/Makefile b/german/citrix_xenapp/Makefile
index 8b4d2fe90f58..78b7182d4dff 100644
--- a/german/citrix_xenapp/Makefile
+++ b/german/citrix_xenapp/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-linuxx86-de-${PORTVERSION}
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= Citrix(R) Presentation Server(TM) client
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= openmotif
RESTRICTED= License prohibits redistribution
IS_INTERACTIVE= "Noisy license agreement ignores stdin"
diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile
index b2b9e88cb8ca..9a090d98797c 100644
--- a/german/staroffice5/Makefile
+++ b/german/staroffice5/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
NO_LATEST_LINK= yes
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_CDROM= 'Sie muessen StarOffice manuell via WWW-Interface herunterladen.'
IS_INTERACTIVE= yes
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index 7b6267965657..92fbde9b1018 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -34,7 +34,7 @@ FETCH_DEPENDS= ${LINUX_BASE_PORT}
NO_LATEST_LINK= yes
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_CDROM= 'Sie muessen StarOffice manuell via WWW-Interface herunterladen.'
CD_MOUNTPT= '/cdrom'
IS_INTERACTIVE= yes
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 40c7b7805174..2333776070a8 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -36,7 +36,7 @@ NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
IS_INTERACTIVE= yes
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
SOVERSION= ${PORTNAME}${PORTVERSION}
WRKSRC= ${WRKDIR}/${SOVERSION}
TMPDIR= ${WRKDIR}/tmp
diff --git a/graphics/linux-XnViewMP/Makefile b/graphics/linux-XnViewMP/Makefile
index a0368c9a4aea..579d984b6a49 100644
--- a/graphics/linux-XnViewMP/Makefile
+++ b/graphics/linux-XnViewMP/Makefile
@@ -23,7 +23,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/XnViewMP
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
PLIST_FILES= bin/xnview-mp lib/xnview-mp/libQtCore.so.4 \
lib/xnview-mp/libQtGui.so.4 lib/xnview-mp/xnview
diff --git a/graphics/linux-ac3d/Makefile b/graphics/linux-ac3d/Makefile
index 811cd987579a..b3149fbbee8c 100644
--- a/graphics/linux-ac3d/Makefile
+++ b/graphics/linux-ac3d/Makefile
@@ -17,10 +17,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= hernan.di.pietro@gmail.com
COMMENT= Easy to use and powerful 3D graphics modeller (trial version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png10 \
- ${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff
-
.ifdef(WITH_NVIDIA_GL)
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
@@ -32,7 +28,7 @@ RESTRICTED= no distribution permitted
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= jpeg png10 tiff xorglibs
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}lx
diff --git a/graphics/linux-adobesvg/Makefile b/graphics/linux-adobesvg/Makefile
index 1eecf80b8bef..585816d49bc2 100644
--- a/graphics/linux-adobesvg/Makefile
+++ b/graphics/linux-adobesvg/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The Adobe SVG browser plugin (Linux version)
ONLY_FOR_ARCHS= i386 amd64
-USE_XLIB= yes
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
RESTRICTED= "Redistribution prohibited"
NO_BUILD= yes
diff --git a/graphics/linux-cairo/Makefile b/graphics/linux-cairo/Makefile
index fd611ab28e61..580fc64bf927 100644
--- a/graphics/linux-cairo/Makefile
+++ b/graphics/linux-cairo/Makefile
@@ -16,14 +16,11 @@ MASTER_SITE_SRC_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.
MAINTAINER= ports@FreeBSD.org
COMMENT= Linux cairo binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libpng.so.3.1.2.8:${PORTSDIR}/graphics/linux-png
-
ONLY_FOR_ARCHS= i386 amd64
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-USE_XLIB= yes
+USE_LINUX_APPS= fontconfig png xorglibs
PLIST_SUB= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
diff --git a/graphics/linux-f10-cairo/Makefile b/graphics/linux-f10-cairo/Makefile
index fd611ab28e61..580fc64bf927 100644
--- a/graphics/linux-f10-cairo/Makefile
+++ b/graphics/linux-f10-cairo/Makefile
@@ -16,14 +16,11 @@ MASTER_SITE_SRC_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.
MAINTAINER= ports@FreeBSD.org
COMMENT= Linux cairo binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libpng.so.3.1.2.8:${PORTSDIR}/graphics/linux-png
-
ONLY_FOR_ARCHS= i386 amd64
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-USE_XLIB= yes
+USE_LINUX_APPS= fontconfig png xorglibs
PLIST_SUB= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
diff --git a/graphics/linux-f10-libmng/Makefile b/graphics/linux-f10-libmng/Makefile
index 6db7e51ba03c..74ccac75694b 100644
--- a/graphics/linux-f10-libmng/Makefile
+++ b/graphics/linux-f10-libmng/Makefile
@@ -13,9 +13,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= mranner@inode.at
COMMENT= RPM of libmng
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= jpeg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile
index b5c24c39df72..a80e82a4136f 100644
--- a/graphics/linux-f10-sdl_image/Makefile
+++ b/graphics/linux-f10-sdl_image/Makefile
@@ -15,9 +15,8 @@ DISTNAME= SDL_image-${PORTVERSION}-1
MAINTAINER= nivit@FreeBSD.org
COMMENT= A simple library to load images as SDL interfaces (linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= sdl12
INSTALL_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile
index 307cb831be2c..7c52ea33277f 100644
--- a/graphics/linux-f10-tiff/Makefile
+++ b/graphics/linux-f10-tiff/Makefile
@@ -13,10 +13,9 @@ DISTNAME= libtiff-${PORTVERSION}-6.fc4.2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
-
ONLY_FOR_ARCHS= amd64 i386
USE_LINUX_RPM= yes
+USE_LINUX_APPS= jpeg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/graphics/linux-f8-cairo/Makefile b/graphics/linux-f8-cairo/Makefile
index fd611ab28e61..580fc64bf927 100644
--- a/graphics/linux-f8-cairo/Makefile
+++ b/graphics/linux-f8-cairo/Makefile
@@ -16,14 +16,11 @@ MASTER_SITE_SRC_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.
MAINTAINER= ports@FreeBSD.org
COMMENT= Linux cairo binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libpng.so.3.1.2.8:${PORTSDIR}/graphics/linux-png
-
ONLY_FOR_ARCHS= i386 amd64
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-USE_XLIB= yes
+USE_LINUX_APPS= fontconfig png xorglibs
PLIST_SUB= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
diff --git a/graphics/linux-f8-libmng/Makefile b/graphics/linux-f8-libmng/Makefile
index 6db7e51ba03c..74ccac75694b 100644
--- a/graphics/linux-f8-libmng/Makefile
+++ b/graphics/linux-f8-libmng/Makefile
@@ -13,9 +13,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= mranner@inode.at
COMMENT= RPM of libmng
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= jpeg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/graphics/linux-f8-sdl_image/Makefile b/graphics/linux-f8-sdl_image/Makefile
index b5c24c39df72..a80e82a4136f 100644
--- a/graphics/linux-f8-sdl_image/Makefile
+++ b/graphics/linux-f8-sdl_image/Makefile
@@ -15,9 +15,8 @@ DISTNAME= SDL_image-${PORTVERSION}-1
MAINTAINER= nivit@FreeBSD.org
COMMENT= A simple library to load images as SDL interfaces (linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= sdl12
INSTALL_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index 307cb831be2c..7c52ea33277f 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -13,10 +13,9 @@ DISTNAME= libtiff-${PORTVERSION}-6.fc4.2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
-
ONLY_FOR_ARCHS= amd64 i386
USE_LINUX_RPM= yes
+USE_LINUX_APPS= jpeg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/graphics/linux-libmng/Makefile b/graphics/linux-libmng/Makefile
index 6db7e51ba03c..74ccac75694b 100644
--- a/graphics/linux-libmng/Makefile
+++ b/graphics/linux-libmng/Makefile
@@ -13,9 +13,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= mranner@inode.at
COMMENT= RPM of libmng
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= jpeg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/graphics/linux-panorama-tools/Makefile b/graphics/linux-panorama-tools/Makefile
index 8b50f35bed40..866fb252f378 100644
--- a/graphics/linux-panorama-tools/Makefile
+++ b/graphics/linux-panorama-tools/Makefile
@@ -21,16 +21,13 @@ DISTNAME= PanoTools
MAINTAINER= vd@FreeBSD.org
COMMENT= Software to View, Create, Edit and Remap Panoramic Images
-RUN_DEPENDS= ${LINUXBASE}/usr/bin/jpegtran:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff \
- ${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png10
-
NO_BUILD= yes
USE_LINUX_PREFIX=yes
USE_LDCONFIG= yes
# USE_LINUX is supposed to be defined automatically when USE_LINUX_PREFIX and
# USE_LDCONFIG are defined but it is not :-/
USE_LINUX= yes
+USE_LINUX_APPS= jpeg png10 tiff
WRKSRC= ${WRKDIR}/PTLinux
diff --git a/graphics/linux-sdl_image/Makefile b/graphics/linux-sdl_image/Makefile
index b5c24c39df72..a80e82a4136f 100644
--- a/graphics/linux-sdl_image/Makefile
+++ b/graphics/linux-sdl_image/Makefile
@@ -15,9 +15,8 @@ DISTNAME= SDL_image-${PORTVERSION}-1
MAINTAINER= nivit@FreeBSD.org
COMMENT= A simple library to load images as SDL interfaces (linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= sdl12
INSTALL_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
diff --git a/graphics/linux-sdl_ttf/Makefile b/graphics/linux-sdl_ttf/Makefile
index 67dc9008aa13..207df3ffcb85 100644
--- a/graphics/linux-sdl_ttf/Makefile
+++ b/graphics/linux-sdl_ttf/Makefile
@@ -14,9 +14,8 @@ DISTNAME= SDL_ttf-${PORTVERSION}-1
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A library to use TrueType fonts in SDL applications (linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= sdl12
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile
index 307cb831be2c..7c52ea33277f 100644
--- a/graphics/linux-tiff/Makefile
+++ b/graphics/linux-tiff/Makefile
@@ -13,10 +13,9 @@ DISTNAME= libtiff-${PORTVERSION}-6.fc4.2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
-
ONLY_FOR_ARCHS= amd64 i386
USE_LINUX_RPM= yes
+USE_LINUX_APPS= jpeg
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/graphics/linux_dri-devel/Makefile b/graphics/linux_dri-devel/Makefile
index bfc60c041823..4708dc365e43 100644
--- a/graphics/linux_dri-devel/Makefile
+++ b/graphics/linux_dri-devel/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_LINUX= yes
USE_LINUX_PREFIX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
# don't package this for amd64 until we come up with 32-bit ioctl wrappers for
# the drm.
diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile
index 84c2ac367aa8..45c525f7b219 100644
--- a/graphics/linux_dri/Makefile
+++ b/graphics/linux_dri/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_LINUX= yes
USE_LINUX_PREFIX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
# don't package this for amd64 until we come up with 32-bit ioctl wrappers for
# the drm.
diff --git a/japanese/citrix_ica/Makefile b/japanese/citrix_ica/Makefile
index bbb731bdbaae..96f2b7c7037d 100644
--- a/japanese/citrix_ica/Makefile
+++ b/japanese/citrix_ica/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-linuxx86-ja-${PORTVERSION}
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= Citrix(R) Presentation Server(TM) client
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= openmotif
RESTRICTED= License prohibits redistribution
IS_INTERACTIVE= "Noisy license agreement ignores stdin"
diff --git a/japanese/citrix_xenapp/Makefile b/japanese/citrix_xenapp/Makefile
index bbb731bdbaae..96f2b7c7037d 100644
--- a/japanese/citrix_xenapp/Makefile
+++ b/japanese/citrix_xenapp/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-linuxx86-ja-${PORTVERSION}
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= Citrix(R) Presentation Server(TM) client
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= openmotif
RESTRICTED= License prohibits redistribution
IS_INTERACTIVE= "Noisy license agreement ignores stdin"
diff --git a/japanese/slimeforest/Makefile b/japanese/slimeforest/Makefile
index 7f87421d370e..9ce5c4387460 100644
--- a/japanese/slimeforest/Makefile
+++ b/japanese/slimeforest/Makefile
@@ -17,10 +17,9 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= A NES RPG game for learning KANA and KANJI (linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0:${PORTSDIR}/graphics/linux-sdl_image
-
NO_BUILD= yes
USE_LINUX= yes
+USE_LINUX_APPS= sdlimage
WRKSRC= ${WRKDIR}/slimeforest
FIND_DIRS= -type d \! -empty
diff --git a/java/linux-blackdown-jdk14/Makefile b/java/linux-blackdown-jdk14/Makefile
index 5d484eccf55f..bfbcc4ee99b6 100644
--- a/java/linux-blackdown-jdk14/Makefile
+++ b/java/linux-blackdown-jdk14/Makefile
@@ -25,7 +25,7 @@ EXTRACT_BEFORE_ARGS= +592
EXTRACT_AFTER_ARGS= | ${BZIP2_CMD} -dc | ${TAR} xf -
USE_BZIP2= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
LATEST_LINK= linux-blackdown-jdk14
WRKSRC= ${WRKDIR}/j2sdk${PORTVERSION}
diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile
index 46a2603dd8b0..2318a18ac3cf 100644
--- a/java/linux-sun-jdk13/Makefile
+++ b/java/linux-sun-jdk13/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} \
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
JDK_VERSION= 1.3.1
JDK_REVISION= 18
ONLY_FOR_ARCHS= i386 amd64
diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile
index 01e1e0497384..b897409a18a7 100644
--- a/java/linux-sun-jdk14/Makefile
+++ b/java/linux-sun-jdk14/Makefile
@@ -29,7 +29,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
JDK_VERSION= 1.4.2
JDK_REVISION= 18
DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION}
diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile
index 2e828b00c9f7..2b5824d36553 100644
--- a/java/linux-sun-jdk15/Makefile
+++ b/java/linux-sun-jdk15/Makefile
@@ -30,7 +30,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
JDK_VERSION= 1.5.0
JDK_REVISION= 16
DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION}
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile
index e176a4a8fb49..cdec0845760e 100644
--- a/java/linux-sun-jdk16/Makefile
+++ b/java/linux-sun-jdk16/Makefile
@@ -29,7 +29,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
JDK_VERSION= 1.6.0
JDK_REVISION= 10
DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION}
diff --git a/java/linux-sun-jre15/Makefile b/java/linux-sun-jre15/Makefile
index f38a58842e4a..863a20916ef6 100644
--- a/java/linux-sun-jre15/Makefile
+++ b/java/linux-sun-jre15/Makefile
@@ -29,7 +29,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
JRE_VERSION= 1.5.0
JRE_REVISION= 13
DL_JRE_VERSION= ${JRE_VERSION}_${JRE_REVISION}
diff --git a/java/linux-sun-jre16/Makefile b/java/linux-sun-jre16/Makefile
index c063c83fecf8..7f02b5223347 100644
--- a/java/linux-sun-jre16/Makefile
+++ b/java/linux-sun-jre16/Makefile
@@ -29,7 +29,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
JRE_VERSION= 1.6.0
JRE_REVISION= 03
DL_JRE_VERSION= ${JRE_VERSION}_${JRE_REVISION}
diff --git a/lang/visualworks/Makefile b/lang/visualworks/Makefile
index 5dce1adb69a9..ca280da76be1 100644
--- a/lang/visualworks/Makefile
+++ b/lang/visualworks/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= chris@chrisburkert.de
COMMENT= A high performance Smalltalk environment
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
PLIST_FILES= bin/visual
diff --git a/mail/mulberry/Makefile b/mail/mulberry/Makefile
index 0438e941e54e..f77782390304 100644
--- a/mail/mulberry/Makefile
+++ b/mail/mulberry/Makefile
@@ -20,7 +20,7 @@ COMMENT= A scalable high-performance GUI internet Mail User Agent
NO_WRKSUBDIR= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386 amd64
.include <bsd.port.pre.mk>
diff --git a/math/linux-relview/Makefile b/math/linux-relview/Makefile
index d2f7985ab96e..e20965b7befe 100644
--- a/math/linux-relview/Makefile
+++ b/math/linux-relview/Makefile
@@ -16,11 +16,9 @@ EXTRACT_SUFX= .gz
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive tool for manipulation of relations
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
NO_WRKSUBDIR= yes
EXTRACT_AFTER_ARGS= > ${DISTNAME}
diff --git a/math/wingz/Makefile b/math/wingz/Makefile
index 87501eb9460b..6ba31bccee44 100644
--- a/math/wingz/Makefile
+++ b/math/wingz/Makefile
@@ -18,7 +18,7 @@ COMMENT= A Commercial Spreadsheet
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_WRKSUBDIR= yes
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index f0903da1ca8b..baf76b804a84 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -20,7 +20,7 @@ NO_PACKAGE= "nothing to build. commercial software"
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_BUILD= yes
diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile
index 8eca0f129d65..f7b423b172bf 100644
--- a/misc/opencyc/Makefile
+++ b/misc/opencyc/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= General knowledge base and commonsense reasoning engine
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_BUILD= yes
PLIST_SUB= PORTVERSION="${PORTVERSION}"
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index 6e868b251416..d6a222f28eef 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -18,12 +18,11 @@ MAINTAINER= multimedia@FreeBSD.org
COMMENT= Linux RealPlayer 10 from RealNetworks
EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
WRKSRC= ${WRKDIR}/usr/local/RealPlayer
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk2 xorglibs
RESTRICTED= Redistribution not allowed
NO_BUILD= yes
WANT_GNOME= yes
diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index c93f99c5bce7..8ccba8761c7e 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -21,7 +21,7 @@ EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
EXTRACT_CMD= rpm2cpio
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= | ${CPIO} -id --quiet
diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile
index e67602d8d688..dee7d7fe7872 100644
--- a/multimedia/netshow/Makefile
+++ b/multimedia/netshow/Makefile
@@ -21,7 +21,7 @@ RESTRICTED= "Commercial software"
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
PLIST_FILES= bin/netshow
pre-extract:
diff --git a/net-im/aim/Makefile b/net-im/aim/Makefile
index f8241aee817b..42cc44f8029b 100644
--- a/net-im/aim/Makefile
+++ b/net-im/aim/Makefile
@@ -16,11 +16,9 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= AOL's Instant Messenger (AIM) client
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_LDCONFIG= yes
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index d24c4ab5c756..916099b2eaa0 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -18,20 +18,16 @@ DISTNAME= skype_static-${DISTVERSION}-oss
MAINTAINER= beech@FreeBSD.org
COMMENT= P2P VoIP software
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
- ${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20 \
- ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
-
.ifdef WITH_NVIDIA_GL
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-USE_XLIB= yes
+USE_LINUX_APPS+=xorglibs
.else
USE_GL= linux
.endif
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS+=alsalib expat fontconfig libsigcpp20
RESTRICTED= Redistribution prohibited.
WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
diff --git a/net-im/skype12/Makefile b/net-im/skype12/Makefile
index 8418e16e905d..70ff3caea62b 100644
--- a/net-im/skype12/Makefile
+++ b/net-im/skype12/Makefile
@@ -14,11 +14,9 @@ DISTNAME= skype_staticQT-${PORTVERSION}
MAINTAINER= beech@FreeBSD.org
COMMENT= Legacy version P2P VoIP software
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
-
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS= expat fontconfig
PORTDOCS= LICENSE README
SUB_FILES= pkg-message
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index d24c4ab5c756..916099b2eaa0 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -18,20 +18,16 @@ DISTNAME= skype_static-${DISTVERSION}-oss
MAINTAINER= beech@FreeBSD.org
COMMENT= P2P VoIP software
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
- ${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20 \
- ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
-
.ifdef WITH_NVIDIA_GL
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-USE_XLIB= yes
+USE_LINUX_APPS+=xorglibs
.else
USE_GL= linux
.endif
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS+=alsalib expat fontconfig libsigcpp20
RESTRICTED= Redistribution prohibited.
WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
diff --git a/net-p2p/linux-agsatellite/Makefile b/net-p2p/linux-agsatellite/Makefile
index e07233114e47..b1f055045d14 100644
--- a/net-p2p/linux-agsatellite/Makefile
+++ b/net-p2p/linux-agsatellite/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*//}
NO_BUILD= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
RESTRICTED= no response from developer on licensing issues
DOCS= german_readme.txt license.txt readme.txt
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index e779085b6968..77a2d5fb3bae 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -15,10 +15,9 @@ DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION}
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= Citrix(R) Presentation Server(TM) client
-RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= openmotif
RESTRICTED= License prohibits redistribution
IS_INTERACTIVE= "Noisy license agreement ignores stdin"
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index e779085b6968..77a2d5fb3bae 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -15,10 +15,9 @@ DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION}
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= Citrix(R) Presentation Server(TM) client
-RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= openmotif
RESTRICTED= License prohibits redistribution
IS_INTERACTIVE= "Noisy license agreement ignores stdin"
diff --git a/net/linux-nx-client/Makefile b/net/linux-nx-client/Makefile
index 93ef70f9817c..ce30769b16a2 100644
--- a/net/linux-nx-client/Makefile
+++ b/net/linux-nx-client/Makefile
@@ -15,13 +15,10 @@ DISTNAME= nxclient-${PORTVERSION}-17.i386
MAINTAINER= ports@FreeBSD.org
COMMENT= The NoMachine NX client
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png
-
NO_WRKSUBDIR= yes
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= libaudiofile jpeg png
NO_BUILD= yes
INSTALL_ICONS= yes
diff --git a/net/skype/Makefile b/net/skype/Makefile
index d24c4ab5c756..916099b2eaa0 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -18,20 +18,16 @@ DISTNAME= skype_static-${DISTVERSION}-oss
MAINTAINER= beech@FreeBSD.org
COMMENT= P2P VoIP software
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
- ${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20 \
- ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
-
.ifdef WITH_NVIDIA_GL
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-USE_XLIB= yes
+USE_LINUX_APPS+=xorglibs
.else
USE_GL= linux
.endif
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS+=alsalib expat fontconfig libsigcpp20
RESTRICTED= Redistribution prohibited.
WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
diff --git a/net/skype12/Makefile b/net/skype12/Makefile
index 8418e16e905d..70ff3caea62b 100644
--- a/net/skype12/Makefile
+++ b/net/skype12/Makefile
@@ -14,11 +14,9 @@ DISTNAME= skype_staticQT-${PORTVERSION}
MAINTAINER= beech@FreeBSD.org
COMMENT= Legacy version P2P VoIP software
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
-
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS= expat fontconfig
PORTDOCS= LICENSE README
SUB_FILES= pkg-message
diff --git a/portuguese/staroffice52/Makefile b/portuguese/staroffice52/Makefile
index 516cb8602b77..f3af1cd88852 100644
--- a/portuguese/staroffice52/Makefile
+++ b/portuguese/staroffice52/Makefile
@@ -32,7 +32,7 @@ FETCH_DEPENDS= ${LINUX_BASE_PORT}
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
NO_CDROM= 'Deve ser obtido diretamente do site da Sun via interface www'
CD_MOUNTPT= '/cdrom'
IS_INTERACTIVE= yes
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index 97df327c5a7e..04fdce3a7bcd 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -17,15 +17,12 @@ DIST_SUBDIR= acroread
MAINTAINER= hrs@FreeBSD.org
COMMENT= Adobe Reader for view, print, and search PDF documents (${ADOBE_LANG})
-RUN_DEPENDS= acroreadwrapper>=0.0.20080906:${PORTSDIR}/print/acroreadwrapper \
- ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
- ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango \
- ${LOCALBASE}/lib/linux-nvu/libgtkembedmoz.so:${PORTSDIR}/www/linux-nvu \
- ${LINUXBASE}/usr/lib/gtk-2.0/immodules/im-scim.so:${PORTSDIR}/textproc/linux-scim-gtk
+RUN_DEPENDS= acroreadwrapper>=0.0.20080906:${PORTSDIR}/print/acroreadwrapper
RESTRICTED= Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html
ONLY_FOR_ARCHS= amd64 i386
USE_LINUX= yes
+USE_LINUX_APPS= gtk2 pango scimgtk webauth
USE_BZIP2= yes
USE_LDCONFIG= yes
#USE_GNOME= desktopfileutils
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index e4f90961767a..ebb25531ca4c 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -24,12 +24,7 @@ EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
RUN_DEPENDS= stsmon:${PORTSDIR}/print/bjfiltercom \
pstops:${PORTSDIR}/print/psutils-${PAPERSIZE}
.else
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libxml.so.1:${PORTSDIR}/textproc/linux-libxml \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff \
- ${LINUXBASE}/usr/lib/libglade.so.0:${PORTSDIR}/devel/linux-libglade \
- ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
+USE_LINUX_APPS= gtk jpeg libglade libxml tiff
BIN_FILES= bjcmd bjfilter bjprn lgmon printui stsmon
.endif
diff --git a/sysutils/linux-acu/Makefile b/sysutils/linux-acu/Makefile
index 54cd15c7f265..f56f5cb8b9a9 100644
--- a/sysutils/linux-acu/Makefile
+++ b/sysutils/linux-acu/Makefile
@@ -16,8 +16,6 @@ DISTNAME= Linux-ACU-Driver-v${PORTVERSION}
MAINTAINER= matt@peterson.org
COMMENT= Aironet Cisco Utilities for 802.11 wireless NIC's
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
.include <bsd.port.pre.mk>
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
@@ -31,7 +29,7 @@ IGNORE= may not be automatically fetched due to licensing\
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= gtk xorglibs
NO_WRKSUBDIR= yes
RESTRICTED= "Redistribution not allowed"
diff --git a/sysutils/linux-afaapps/Makefile b/sysutils/linux-afaapps/Makefile
index 5f1d81d4188c..6c81a5251ff9 100644
--- a/sysutils/linux-afaapps/Makefile
+++ b/sysutils/linux-afaapps/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR= rpm
MAINTAINER= ports@FreeBSD.org
COMMENT= DELL PowerEdge Raid Controller 2 (apps)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts
-
RESTRICTED= "binary redistribution license needs clarification"
USE_LINUX_RPM= yes
+USE_LINUX_APPS= arts
ONLY_FOR_ARCHS= i386 amd64
BRANDELF_FILES= usr/sbin/afacli
SRC_DISTFILES= # empty, no sources available
diff --git a/sysutils/linux-nero/Makefile b/sysutils/linux-nero/Makefile
index fed0666239e1..bb1b23d34640 100644
--- a/sysutils/linux-nero/Makefile
+++ b/sysutils/linux-nero/Makefile
@@ -17,12 +17,11 @@ DIST_SUBDIR= rpm
MAINTAINER= emulation@FreeBSD.org
COMMENT= CD/DVD disk burner
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
-
RESTRICTED= Get a serial number at http://www.nero.com/eng/NeroLINUX.html
ONLY_FOR_ARCH= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= gtk2
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
SRC_DISTFILES=
diff --git a/textproc/linux-f10-scim-gtk/Makefile b/textproc/linux-f10-scim-gtk/Makefile
index fbdc0bca65ff..bc097f2150e7 100644
--- a/textproc/linux-f10-scim-gtk/Makefile
+++ b/textproc/linux-f10-scim-gtk/Makefile
@@ -15,14 +15,12 @@ DISTNAME= # defined below
MAINTAINER= hrs@FreeBSD.org
COMMENT= Smart Common Input Method platform, gtk module, Linux binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
- ${LINUXBASE}/usr/lib/libscim-1.0.so.8:${PORTSDIR}/textproc/linux-scim-libs
-
MASTER_SITE_SRC_SUBDIR= # defined below
SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= gtk2 scimlibs
USE_LDCONFIG= yes
PLIST_SUB= LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
MD5_FILE= ${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-f10-scim-libs/Makefile b/textproc/linux-f10-scim-libs/Makefile
index f4159156d85d..d180ded8f0d2 100644
--- a/textproc/linux-f10-scim-libs/Makefile
+++ b/textproc/linux-f10-scim-libs/Makefile
@@ -16,13 +16,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Smart Common Input Method platform, library part, Linux binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
-
MASTER_SITE_SRC_SUBDIR= # defined below
SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= gtk2
USE_LDCONFIG= yes
PLIST_SUB= LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
PLIST= ${PKGDIR}/pkg-plist.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-f8-scim-gtk/Makefile b/textproc/linux-f8-scim-gtk/Makefile
index fbdc0bca65ff..bc097f2150e7 100644
--- a/textproc/linux-f8-scim-gtk/Makefile
+++ b/textproc/linux-f8-scim-gtk/Makefile
@@ -15,14 +15,12 @@ DISTNAME= # defined below
MAINTAINER= hrs@FreeBSD.org
COMMENT= Smart Common Input Method platform, gtk module, Linux binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
- ${LINUXBASE}/usr/lib/libscim-1.0.so.8:${PORTSDIR}/textproc/linux-scim-libs
-
MASTER_SITE_SRC_SUBDIR= # defined below
SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= gtk2 scimlibs
USE_LDCONFIG= yes
PLIST_SUB= LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
MD5_FILE= ${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-f8-scim-libs/Makefile b/textproc/linux-f8-scim-libs/Makefile
index f4159156d85d..d180ded8f0d2 100644
--- a/textproc/linux-f8-scim-libs/Makefile
+++ b/textproc/linux-f8-scim-libs/Makefile
@@ -16,13 +16,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Smart Common Input Method platform, library part, Linux binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
-
MASTER_SITE_SRC_SUBDIR= # defined below
SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= gtk2
USE_LDCONFIG= yes
PLIST_SUB= LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
PLIST= ${PKGDIR}/pkg-plist.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-scim-gtk/Makefile b/textproc/linux-scim-gtk/Makefile
index fbdc0bca65ff..bc097f2150e7 100644
--- a/textproc/linux-scim-gtk/Makefile
+++ b/textproc/linux-scim-gtk/Makefile
@@ -15,14 +15,12 @@ DISTNAME= # defined below
MAINTAINER= hrs@FreeBSD.org
COMMENT= Smart Common Input Method platform, gtk module, Linux binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
- ${LINUXBASE}/usr/lib/libscim-1.0.so.8:${PORTSDIR}/textproc/linux-scim-libs
-
MASTER_SITE_SRC_SUBDIR= # defined below
SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= gtk2 scimlibs
USE_LDCONFIG= yes
PLIST_SUB= LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
MD5_FILE= ${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-scim-libs/Makefile b/textproc/linux-scim-libs/Makefile
index f4159156d85d..d180ded8f0d2 100644
--- a/textproc/linux-scim-libs/Makefile
+++ b/textproc/linux-scim-libs/Makefile
@@ -16,13 +16,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Smart Common Input Method platform, library part, Linux binary
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
-
MASTER_SITE_SRC_SUBDIR= # defined below
SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= gtk2
USE_LDCONFIG= yes
PLIST_SUB= LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
PLIST= ${PKGDIR}/pkg-plist.fc${LINUX_DIST_VER}
diff --git a/www/linux-flashplugin9/Makefile b/www/linux-flashplugin9/Makefile
index 30d17b1ce288..d9359f7d4f29 100644
--- a/www/linux-flashplugin9/Makefile
+++ b/www/linux-flashplugin9/Makefile
@@ -19,10 +19,9 @@ EXTRACT_ONLY= install_flash_player_9.tar.gz
MAINTAINER= jamie@bishopston.net
COMMENT= Adobe Flash Player NPAPI Plugin
-RUN_DEPENDS= ${LINUXBASE}/lib/libssl.so.5:${PORTSDIR}/security/linux-openssl
-
ONLY_FOR_ARCHS= amd64 i386
USE_LINUX= yes
+USE_LINUX_APPS= openssl
RESTRICTED= Redistribution not allowed
RESTRICTED_FILES= ${DISTFILES:Nlibflashsupport*:C/:[^:]+$//}
diff --git a/www/linux-mplayer-plugin/Makefile b/www/linux-mplayer-plugin/Makefile
index 4434762eb6bd..3b41bef1c702 100644
--- a/www/linux-mplayer-plugin/Makefile
+++ b/www/linux-mplayer-plugin/Makefile
@@ -17,14 +17,11 @@ PKGNAMEPREFIX= linux-
MAINTAINER= ports@FreeBSD.org
COMMENT= Embed MPlayer into browser
-RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \
- ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
- ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
- ${LINUXBASE}/usr/lib/libpangoxft-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
+RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
NO_BUILD= yes
USE_LINUX_RPM= yes
-USE_XLIB= yes
+USE_LINUX_APPS= atk gtk2 pango xorglibs
LINUX_DIST= fedora
LINUX_DIST_VER= 4
PREFIX?= ${LOCALBASE}
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 9e0323f366cf..7490e33a5ea1 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -24,12 +24,10 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
MAINTAINER= mezz@FreeBSD.org
COMMENT= A blazingly fast, full-featured, standards-compliant browser
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
-
WRKSRC= ${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
-USE_XLIB= yes
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS= aspell xorglibs
ONLY_FOR_ARCHS= i386 amd64
NO_BUILD= yes
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 9e0323f366cf..7490e33a5ea1 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -24,12 +24,10 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
MAINTAINER= mezz@FreeBSD.org
COMMENT= A blazingly fast, full-featured, standards-compliant browser
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
-
WRKSRC= ${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
-USE_XLIB= yes
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS= aspell xorglibs
ONLY_FOR_ARCHS= i386 amd64
NO_BUILD= yes
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index dc6d260e4e88..36fa877cfedc 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -12,17 +12,12 @@ MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${DISTVERSION}
.endif
PKGNAMEPREFIX?= linux-
-RUN_DEPENDS?= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
- ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
- ${LINUXBASE}/usr/lib/libpangoxft-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango\
- ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/share/icons/hicolor/index.theme:${PORTSDIR}/x11-themes/linux-hicolor-icon-theme
-
NO_BUILD= yes
ONLY_FOR_ARCHS= i386 amd64
APP_NAME= ${PKGBASE}
BIN_NAME?= ${PORTNAME}
USE_LINUX= yes
+USE_LINUX_APPS= atk fontconfig gtk2 hicontheme pango
WRKSRC?= ${WRKDIR}/${BIN_NAME}
FDIR= ${PREFIX}/lib/${APP_NAME}
COMMON_DIR= ${.CURDIR}/../../www/linux-seamonkey
diff --git a/www/nspluginwrapper-devel/Makefile b/www/nspluginwrapper-devel/Makefile
index 77be439eb3f8..6cec5899052f 100644
--- a/www/nspluginwrapper-devel/Makefile
+++ b/www/nspluginwrapper-devel/Makefile
@@ -18,7 +18,6 @@ COMMENT= A compatibility plugin for Netscape 4 (NPAPI) plugins
EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
RPMFILE= ${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm
@@ -26,6 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS= gtk2
USE_XORG= x11 xext xt
USE_GNOME= glib20 gtk20 pkgconfig
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 77be439eb3f8..6cec5899052f 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -18,7 +18,6 @@ COMMENT= A compatibility plugin for Netscape 4 (NPAPI) plugins
EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
RPMFILE= ${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm
@@ -26,6 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
USE_LINUX= yes
+USE_LINUX_APPS= gtk2
USE_XORG= x11 xext xt
USE_GNOME= glib20 gtk20 pkgconfig
diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index 7fc79c11d085..b70d91f87393 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -39,7 +39,7 @@ OPERA_BUILD= 2456
USE_BZIP2= yes
USE_LINUX= yes
-USE_XLIB= yes
+USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386 amd64
WRKSRC= ${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.gcc3-shared-qt3.i386
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile
index 47e2a68603dd..3516be49859f 100644
--- a/x11-fonts/linux-f10-fontconfig/Makefile
+++ b/x11-fonts/linux-f10-fontconfig/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-13
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary of Fontconfig
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= expat
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile
index 47e2a68603dd..3516be49859f 100644
--- a/x11-fonts/linux-f8-fontconfig/Makefile
+++ b/x11-fonts/linux-f8-fontconfig/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-13
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary of Fontconfig
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= expat
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile
index 47e2a68603dd..3516be49859f 100644
--- a/x11-fonts/linux-fontconfig/Makefile
+++ b/x11-fonts/linux-fontconfig/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-13
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary of Fontconfig
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= expat
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index adb044dcbd61..715acd969687 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -19,9 +19,9 @@ COMMENT= RPM of the Gtk lib
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 1871b04d29b7..a183e803d042 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -15,17 +15,11 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X, Linux binary
-# these libraries are required by gtk-query-immodules-2.0 or
-# gdk-pixbuf-query-loaders
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png \
- ${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff \
- ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
-
ONLY_FOR_ARCHS= i386 amd64
-USE_XLIB= yes
USE_LINUX_RPM= yes
+# these libraries are required by gtk-query-immodules-2.0 or
+# gdk-pixbuf-query-loaders
+USE_LINUX_APPS= atk jpeg pango png tiff xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile
index e8b5aa38f70e..0284d92b4b44 100644
--- a/x11-toolkits/linux-f10-openmotif/Makefile
+++ b/x11-toolkits/linux-f10-openmotif/Makefile
@@ -23,8 +23,8 @@ BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
USE_LINUX_PREFIX= yes
-USE_XLIB= yes
NO_BUILD= yes
MD5_FILE= ${MASTERDIR}/distinfo.i386
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index 2f11cf41d4f3..11c9512817ba 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -17,14 +17,10 @@ MASTER_SITE_SRC_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
-# these libraries are required by pango-querymodules
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libcairo.so.2.2.3:${PORTSDIR}/graphics/linux-cairo \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
-
-USE_XLIB= yes
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+# these libraries are required by pango-querymodules
+USE_LINUX_APPS= cairo expat fontconfig xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/x11-toolkits/linux-f10-qt33/Makefile b/x11-toolkits/linux-f10-qt33/Makefile
index 753837c5d79b..64f5d884540b 100644
--- a/x11-toolkits/linux-f10-qt33/Makefile
+++ b/x11-toolkits/linux-f10-qt33/Makefile
@@ -13,11 +13,8 @@ DISTNAME= qt-${PORTVERSION}-${RPMVERSION}
MAINTAINER= bsam@FreeBSD.org
COMMENT= RPM of QT3
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libmng.so.1:${PORTSDIR}/graphics/linux-libmng \
- ${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= fontconfig libmng png
RPMVERSION= 15.5
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index adb044dcbd61..715acd969687 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -19,9 +19,9 @@ COMMENT= RPM of the Gtk lib
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index 1871b04d29b7..a183e803d042 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -15,17 +15,11 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X, Linux binary
-# these libraries are required by gtk-query-immodules-2.0 or
-# gdk-pixbuf-query-loaders
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png \
- ${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff \
- ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
-
ONLY_FOR_ARCHS= i386 amd64
-USE_XLIB= yes
USE_LINUX_RPM= yes
+# these libraries are required by gtk-query-immodules-2.0 or
+# gdk-pixbuf-query-loaders
+USE_LINUX_APPS= atk jpeg pango png tiff xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile
index e8b5aa38f70e..0284d92b4b44 100644
--- a/x11-toolkits/linux-f8-openmotif/Makefile
+++ b/x11-toolkits/linux-f8-openmotif/Makefile
@@ -23,8 +23,8 @@ BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
USE_LINUX_PREFIX= yes
-USE_XLIB= yes
NO_BUILD= yes
MD5_FILE= ${MASTERDIR}/distinfo.i386
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index 2f11cf41d4f3..11c9512817ba 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -17,14 +17,10 @@ MASTER_SITE_SRC_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
-# these libraries are required by pango-querymodules
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libcairo.so.2.2.3:${PORTSDIR}/graphics/linux-cairo \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
-
-USE_XLIB= yes
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+# these libraries are required by pango-querymodules
+USE_LINUX_APPS= cairo expat fontconfig xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/x11-toolkits/linux-f8-qt33/Makefile b/x11-toolkits/linux-f8-qt33/Makefile
index 753837c5d79b..64f5d884540b 100644
--- a/x11-toolkits/linux-f8-qt33/Makefile
+++ b/x11-toolkits/linux-f8-qt33/Makefile
@@ -13,11 +13,8 @@ DISTNAME= qt-${PORTVERSION}-${RPMVERSION}
MAINTAINER= bsam@FreeBSD.org
COMMENT= RPM of QT3
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libmng.so.1:${PORTSDIR}/graphics/linux-libmng \
- ${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= fontconfig libmng png
RPMVERSION= 15.5
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index adb044dcbd61..715acd969687 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -19,9 +19,9 @@ COMMENT= RPM of the Gtk lib
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+USE_LINUX_APPS= xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
-USE_XLIB= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index 1871b04d29b7..a183e803d042 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -15,17 +15,11 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X, Linux binary
-# these libraries are required by gtk-query-immodules-2.0 or
-# gdk-pixbuf-query-loaders
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
- ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
- ${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png \
- ${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff \
- ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
-
ONLY_FOR_ARCHS= i386 amd64
-USE_XLIB= yes
USE_LINUX_RPM= yes
+# these libraries are required by gtk-query-immodules-2.0 or
+# gdk-pixbuf-query-loaders
+USE_LINUX_APPS= atk jpeg pango png tiff xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/x11-toolkits/linux-openmotif/Makefile b/x11-toolkits/linux-openmotif/Makefile
index e8b5aa38f70e..0284d92b4b44 100644
--- a/x11-toolkits/linux-openmotif/Makefile
+++ b/x11-toolkits/linux-openmotif/Makefile
@@ -23,8 +23,8 @@ BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
+USE_LINUX_APPS= xorglibs
USE_LINUX_PREFIX= yes
-USE_XLIB= yes
NO_BUILD= yes
MD5_FILE= ${MASTERDIR}/distinfo.i386
diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index 2f11cf41d4f3..11c9512817ba 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -17,14 +17,10 @@ MASTER_SITE_SRC_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
-# these libraries are required by pango-querymodules
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libcairo.so.2.2.3:${PORTSDIR}/graphics/linux-cairo \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
-
-USE_XLIB= yes
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+# these libraries are required by pango-querymodules
+USE_LINUX_APPS= cairo expat fontconfig xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
diff --git a/x11-toolkits/linux-qt33/Makefile b/x11-toolkits/linux-qt33/Makefile
index 753837c5d79b..64f5d884540b 100644
--- a/x11-toolkits/linux-qt33/Makefile
+++ b/x11-toolkits/linux-qt33/Makefile
@@ -13,11 +13,8 @@ DISTNAME= qt-${PORTVERSION}-${RPMVERSION}
MAINTAINER= bsam@FreeBSD.org
COMMENT= RPM of QT3
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libmng.so.1:${PORTSDIR}/graphics/linux-libmng \
- ${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png
-
USE_LINUX_RPM= yes
+USE_LINUX_APPS= fontconfig libmng png
RPMVERSION= 15.5
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
diff --git a/x11/linux-f10-xorg-libs/Makefile b/x11/linux-f10-xorg-libs/Makefile
index 5b60f1b85ecb..d2b2f59d1a19 100644
--- a/x11/linux-f10-xorg-libs/Makefile
+++ b/x11/linux-f10-xorg-libs/Makefile
@@ -15,11 +15,10 @@ DISTFILES= xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.1.${LINUX_RPM_ARCH}.rpm \
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Xorg libraries, linux binaries
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
-
CONFLICTS= linux-XFree86-libs
USE_LINUX_RPM= yes
+USE_LINUX_APPS= fontconfig
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
diff --git a/x11/linux-f8-xorg-libs/Makefile b/x11/linux-f8-xorg-libs/Makefile
index 5b60f1b85ecb..d2b2f59d1a19 100644
--- a/x11/linux-f8-xorg-libs/Makefile
+++ b/x11/linux-f8-xorg-libs/Makefile
@@ -15,11 +15,10 @@ DISTFILES= xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.1.${LINUX_RPM_ARCH}.rpm \
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Xorg libraries, linux binaries
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
-
CONFLICTS= linux-XFree86-libs
USE_LINUX_RPM= yes
+USE_LINUX_APPS= fontconfig
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
diff --git a/x11/linux-xorg-libs/Makefile b/x11/linux-xorg-libs/Makefile
index 5b60f1b85ecb..d2b2f59d1a19 100644
--- a/x11/linux-xorg-libs/Makefile
+++ b/x11/linux-xorg-libs/Makefile
@@ -15,11 +15,10 @@ DISTFILES= xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.1.${LINUX_RPM_ARCH}.rpm \
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Xorg libraries, linux binaries
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
-
CONFLICTS= linux-XFree86-libs
USE_LINUX_RPM= yes
+USE_LINUX_APPS= fontconfig
LINUX_DIST_VER= 4
USE_LDCONFIG= yes