57,62c61,68
< _LINUX_APPS_ALL=	allegro alsalib arts aspell atk cairo cups-libs curl dri esound expat fontconfig \
< 					freealut gdkpixbuf gnutls gtk gtk2 hicontheme imlib jpeg libaudiofile \
< 					libg2c libgcrypt libglade libglade2 libglu libgpg-error libmng libogg \
< 					libsigcpp20 libtasn1 libtheora 	libvorbis libxml libxml2 mikmod naslibs \
< 					ncurses-base openal openmotif openssl pango png png10 scimgtk \
< 					scimlibs sdl12 sdlimage sdlmixer tiff xorglibs ucl ungif upx webauth
---
> _LINUX_APPS_ALL=	allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
> 					arts aspell atk avahi-libs cairo cups-libs curl dri devtools esound expat \
> 					flac fontconfig freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaudiofile \
> 					libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
> 					libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
> 					naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
> 					pulseaudio-libs scimgtk scimlibs sdl12 sdlimage sdlmixer sdlttf tiff \
> 					tcp_wrappers-libs xorglibs ucl ungif upx webauth
65,67c71,73
< _LINUX_26_APPS=		alsa-plugins-oss blt cyrus-sasl2 dbusglib dbuslibs \
< 			libasyncns libidn libssh2 libv4l nspr nss openal-soft \
< 			openldap pulseaudio-libs qt45 sqlite3 tcl84 tk84
---
> _LINUX_26_APPS=		 blt cyrus-sasl2 dbusglib dbuslibs \
> 			libidn libssh2 libv4l nspr nss openal-soft \
> 			openldap  qt45 sqlite3 tcl85 tk85 qt47 qt47-x11 qt47-webkit
81a88
> #FIXME: locate weird location for allegro c6 libs
86a94
> alsa-plugins-oss_c6_FILE=	${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so
90a99,103
> alsa-plugins-pulseaudio_c6_FILE=	${LINUXBASE}/usr/lib/alsa-lib/libasound_module_conf_pulse.so
> alsa-plugins-pulseaudio_DETECT=	${alsa-plugins-oss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> alsa-plugins-pulseaudio_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-plugins-pulseaudio
> alsa-plugins-pulseaudio_DEPENDS=	alsalib
> 
91a105
> alsalib_c6_FILE=	${LINUXBASE}/lib/libasound.so.2.0.0
95a110
> arts_c6_FILE=		${LINUXBASE}/usr/lib/libartsc.so.0
99a115
> aspell_c6_FILE=		${LINUXBASE}/usr/lib/libaspell.so.15.1.4
103a120
> atk_c6_FILE=		${LINUXBASE}/usr/lib/libatk-1.0.so.0.3009.1
107c124,128
< blt_f10_FILE=		${LINUXBASE}/usr/lib/libBLT24.so
---
> avahi-libs_c6_FILE=	${LINUXBASE}/usr/lib/libavahi-client.so.3.2.5
> avahi-libs_DETECT=	${avahi-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> avahi-libs_PORT=	${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-avahi-libs
> 
> blt_f10_FILE=		${LINUXBASE}/usr/lib/libBLT24.so # FIXME: deprecated, merged into tcl/tk85
110c131
< blt_DEPENDS=		tcl84 tk84 xorglibs
---
> blt_DEPENDS=		tcl85 tk85 xorglibs
112a134
> cairo_c6_FILE=		${LINUXBASE}/usr/lib/libcairo.so.2.10800.8
117a140
> cups-libs_c6_FILE=	${LINUXBASE}/usr/lib/libcups.so.2
122a146
> curl_c6_FILE=		${LINUXBASE}/usr/lib/libcurl.so.4.1.1
125d148
< .  if ${LINUX_DIST_SUFFIX} == "-f10"
127d149
< .  endif
129a152
> cyrus-sasl2_c6_FILE=	${LINUXBASE}/usr/lib/libsasl2.so.2.0.23
133a157
> dbusglib_c6_FILE=	${LINUXBASE}/usr/lib/libdbus-glib-1.so.2
138a163
> dbuslibs_c6_FILE=	${LINUXBASE}/lib/libdbus-1.so.3
143,144c168,170
< dri_DETECT=		${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
< dri_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri
---
> dri_c6_FILE=		${LINUXBASE}/usr/lib/libGL.so.1.2.0
> dri_DETECT=			${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> dri_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri
146a173,177
> devtools_f10_FILE=	${LINUXBASE}/usr/bin/i386-redhat-linux-gcc
> devtools_c6_FILE=	${LINUXBASE}/usr/bin/gcc
> devtools_DETECT=	${devtools${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> devtools_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-devtools
> 
147a179
> esound_c6_FILE=		${LINUXBASE}/usr/lib/libesd.so.0.2.39
152a185
> expat_c6_FILE=		${LINUXBASE}/lib/libexpat.so.1
156a190
> fontconfig_c6_FILE=	${LINUXBASE}/usr/lib/libfontconfig.so.1.4.4
160a195,198
> flac_c6_FILE=		${LINUXBASE}/usr/lib/libFLAC.so.8.2.0
> flac_DETECT=		${flac${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> flac_PORT=			${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-flac
> 
170,174d207
< gtk_f10_FILE=		${LINUXBASE}/usr/lib/libgtk-1.2.so.0.9.1
< gtk_DETECT=			${gtk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
< gtk_PORT=			${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk
< gtk_DEPENDS=		xorglibs
< 
175a209
> gnutls_c6_FILE=		${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
180a215
> gtk2_c6_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2000.1
185a221
> hicontheme_c6_FILE=	${LINUXBASE}/usr/share/icons/hicolor
193a230
> jpeg_c6_FILE=		${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
197a235
> libasyncns_c6_FILE=	${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
201a240
> libaudiofile_c6_FILE=	${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
209a249
> libgcrypt_c6_FILE=	${LINUXBASE}/lib/libgcrypt.so.11.5.3
213,216d252
< libglade_f10_FILE=	${LINUXBASE}/usr/lib/libglade.so.0.4.2
< libglade_DETECT=	${libglade${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
< libglade_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libglade
< 
217a254
> libglade2_c6_FILE=	${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
221a259
> libglu_c6_FILE=		${LINUXBASE}/usr/lib/libGLU.so.1
225a264
> libgpg-error_c6_FILE=	${LINUXBASE}/lib/libgpg-error.so.0.5.0
238a278
> libogg_c6_FILE=		${LINUXBASE}/usr/lib/libogg.so.0.6.0
241a282,285
> libpciaccess_c6_FILE=		${LINUXBASE}/usr/lib/libpciaccess.so.0.11.1
> libpciaccess_DETECT=		${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> libpciaccess_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libpciaccess
> 
245a290,293
> libsndfile_c6_FILE=	${LINUXBASE}/usr/lib/libsndfile.so.1.0.20
> libsndfile_DETECT=	${libsndfile${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> libsndfile_PORT=	${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libsndfile
> 
246a295
> libssh2_c6_FILE=	${LINUXBASE}/usr/lib/libssh2.so.1.0.1
251a301
> libv4l_c6_FILE=	${LINUXBASE}/usr/lib/libv4l1.so.0
255a306
> libtasn1_c6_FILE=	${LINUXBASE}/usr/lib/libtasn1.so.3.1.6
259a311
> libtheora_c6_FILE=	${LINUXBASE}/usr/lib/libtheora.so.0.3.9
263a316
> libvorbis_c6_FILE=	${LINUXBASE}/usr/lib/libvorbis.so.0.4.3
268,271d320
< libxml_f10_FILE=	${LINUXBASE}/usr/lib/libxml.so.1.8.17
< libxml_DETECT=		${libxml${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
< libxml_PORT=		${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-libxml
< 
272a322
> libxml2_c6_FILE=	${LINUXBASE}/usr/lib/libxml2.so.2.7.6
276a327
> mikmod_c6_FILE=	${LINUXBASE}/usr/lib/libmikmod.so.3.0.0
280a332
> naslibs_c6_FILE=	${LINUXBASE}/usr/lib/libaudio.so.2
285a338
> openldap_c6_FILE=	${LINUXBASE}/lib/libldap-2.4.so.2.5.6
289a343
> openmotif_c6_FILE=	${LINUXBASE}/usr/lib/libXm.so.4.0.3
294a349
> ncurses-base_c6_FILE=	${LINUXBASE}/lib/terminfo/a/ansi
298a354
> nspr_c6_FILE=		${LINUXBASE}/lib/libnspr4.so
302a359
> nss_c6_FILE=		${LINUXBASE}/usr/lib/libnss3.so
312a370
> openal-soft_c6_FILE=	${LINUXBASE}/usr/lib/libopenal.so.1.12.854
317a376
> openssl_c6_FILE=	${LINUXBASE}/usr/lib/libssl.so.10
320a380,383
> openssl-compat_c6_FILE=	${LINUXBASE}/usr/lib/libssl.so.0.9.8e
> openssl-compat_DETECT=		${openssl-compat${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> openssl-compat_PORT=		${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-openssl-compat
> 
321a385
> pango_c6_FILE=		${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.1
326a391
> png_c6_FILE=		${LINUXBASE}/usr/lib/libpng.so.3.49.0
330,333d394
< png10_f10_FILE=		${LINUXBASE}/usr/lib/libpng.so.2.1.0.43
< png10_DETECT=		${png10${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
< png10_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-png10
< 
334a396
> pulseaudio-libs_c6_FILE=	${LINUXBASE}/usr/lib/libpulse.so.0.12.2
342a405
> sdl12_c6_FILE=		${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.3
347a411
> sdlimage_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.8.2
352a417
> sdlmixer_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.10.1
356a422,427
> sdlttf_f10_FILE=	${LINUXBASE}/usr/lib/libSDL_ttf-2.0.so.0.6.2
> sdlttf_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_ttf-2.0.so.0.6.3
> sdlttf_DETECT=		${sdlttf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> sdlttf_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_ttf
> sdlttf_DEPENDS=	sdl12
> 
367a439
> sqlite3_c6_FILE=	${LINUXBASE}/usr/lib/libsqlite3.so.0
371,374c443,450
< # XXX: tcl85!!!
< tcl84_f10_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
< tcl84_DETECT=		${tcl84${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
< tcl84_PORT=		${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl85
---
> tcl85_f10_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
> tcl85_c6_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
> tcl85_DETECT=		${tcl85${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> tcl85_PORT=		${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl85
> 
> tcp_wrappers-libs_c6_FILE=	${LINUXBASE}/lib/libwrap.so.0
> tcp_wrappers-libs_DETECT=	${tcp_wrappers-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> tcp_wrappers-libs_PORT=	${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-tcp_wrappers-libs
376a453
> tiff_c6_FILE=		${LINUXBASE}/usr/lib/libtiff.so.3.9.4
381,385c458,462
< # XXX: tk85!!!
< tk84_f10_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
< tk84_DETECT=		${tk84${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
< tk84_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk85
< tk84_DEPENDS=		xorglibs
---
> tk85_f10_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
> tk85_c6_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
> tk85_DETECT=		${tk85${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> tk85_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk85
> tk85_DEPENDS=		xorglibs
387a465
> xorglibs_c6_FILE=	${LINUXBASE}/usr/lib/libXrandr.so.2.2.0
409a488,499
> qt47_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtCore.so.4.7.2
> qt47_DETECT=		${qt47${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> qt47_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-qt47
> 
> qt47-x11_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtGui.so.4.7.2
> qt47-x11_DETECT=		${qt47-x11${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> qt47-x11_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-qt47-x11
> 
> qt47-webkit_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtWebKit.so.4.7.2
> qt47-webkit_DETECT=		${qt47-webkit${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> qt47-webkit_PORT=		${PORTSDIR}/www/linux${LINUX_DIST_SUFFIX}-qt47-webkit
> 
