aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2015-07-26 21:06:24 +0800
committernetchild <netchild@FreeBSD.org>2015-07-26 21:06:24 +0800
commitb7b235441550eaabe144bf86b077ae4088e9d5d8 (patch)
treee209e06ced549984f72de2e41fc9452f6156d081 /Mk
parent28502bf8a1cb54b055aa9b4d9e4aff0dc43ba62f (diff)
downloadfreebsd-ports-gnome-b7b235441550eaabe144bf86b077ae4088e9d5d8.tar.gz
freebsd-ports-gnome-b7b235441550eaabe144bf86b077ae4088e9d5d8.tar.zst
freebsd-ports-gnome-b7b235441550eaabe144bf86b077ae4088e9d5d8.zip
64 bit linuxulator support (not activated by default):
- most of the work was done by Alan Jude - all errors are mine - 64bit (may) have rough edges - I validated * that the 32bit part doesn't has deinstall regressions * 29 of 72 64bit ports ports don't have deinstall leftovers (more validation later, when I dare to activate the 64bit linuxulator in the kernel) - the infrastructure part looks mature enough to let more test-bunnies get some experience with it - to use it you shall have no linux ports installed and have to specify (on your own risk) the following in make.conf before installing the ports: OVERRIDE_LINUX_BASE_PORT=c6_64 OVERRIDE_LINUX_NONBASE_PORTS=c6_64 This is on top of the exiting c6 linux ports. Given that CentOS 7 is 64bits only, we decided to have it as an "overlay" instead of new ports. The 64bit part only installs 64bit executables, the 32bit ports can not be installed at the same time (if needed we can think of letting the 64bit overlay install the 32bit parts too, but given the CentOS 7 comment above...). Differential Revision: https://reviews.freebsd.org/D174 Submitted by: alanjude Sponsored by: Essen FreeBSD Hackathon 2015 Reviewed by: xmj, eadler (earlier versions) Approved by: portmgr (implicit, I remember blanked approval for linux parts loooong ago, punish me if you don't agree anymore)
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.linux-apps.mk240
-rw-r--r--Mk/bsd.linux-rpm.mk91
-rw-r--r--Mk/bsd.port.mk17
-rw-r--r--Mk/bsd.sites.mk14
4 files changed, 211 insertions, 151 deletions
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk
index 410a083340f7..0b8f97acd909 100644
--- a/Mk/bsd.linux-apps.mk
+++ b/Mk/bsd.linux-apps.mk
@@ -41,18 +41,19 @@ Linux_APPS_Post_Include= bsd.linux-apps.mk
#new
. if defined(OVERRIDE_LINUX_NONBASE_PORTS)
-. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6"
+. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"
LINUX_DIST_SUFFIX= -${OVERRIDE_LINUX_NONBASE_PORTS}
+LINUX_BASEPORT_NAME= -${OVERRIDE_LINUX_NONBASE_PORTS:S/_64//}
. else
-IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\" and \"c6\"
+IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\", \"c6\", and \"c6_64\"
. endif
. elif defined(USE_LINUX)
-. if ${USE_LINUX} == "f10" || ${USE_LINUX} == "c6"
LINUX_DIST_SUFFIX= -${USE_LINUX}
-. endif
+LINUX_BASEPORT_NAME= -${USE_LINUX:S/_64//}
. else
# default to CentOS
LINUX_DIST_SUFFIX= -c6
+LINUX_BASEPORT_NAME= -c6
. endif
WEB_AUTH= nvu
@@ -70,7 +71,7 @@ _LINUX_APPS_ALL= allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
# 2.6.16 components
_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
+ openldap qt45 sqlite3 tcl85 tk85 qt47 qt47-x11 qt47-webkit
_LINUX_APPS_ALL+= ${_LINUX_26_APPS}
@@ -87,325 +88,377 @@ _LINUX_APPS_ALL+= ${_LINUX_26_APPS}
allegro_f10_FILE= ${LINUXBASE}/usr/lib/liballeg-4.2.2.so
#FIXME: locate weird location for allegro c6 libs
allegro_DETECT= ${allegro${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-allegro_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-allegro
+allegro_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-allegro
allegro_DEPENDS= xorglibs
alsa-plugins-oss_f10_FILE= ${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so
alsa-plugins-oss_c6_FILE= ${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so
+alsa-plugins-oss_c6_64_FILE= ${LINUXBASE}/usr/lib64/alsa-lib/libasound_module_pcm_oss.so
alsa-plugins-oss_DETECT= ${alsa-plugins-oss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-alsa-plugins-oss_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-plugins-oss
+alsa-plugins-oss_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-alsa-plugins-oss
alsa-plugins-oss_DEPENDS= alsalib
alsa-plugins-pulseaudio_c6_FILE= ${LINUXBASE}/usr/lib/alsa-lib/libasound_module_conf_pulse.so
+alsa-plugins-pulseaudio_c6_64_FILE= ${LINUXBASE}/usr/lib64/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_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-alsa-plugins-pulseaudio
alsa-plugins-pulseaudio_DEPENDS= alsalib
alsalib_f10_FILE= ${LINUXBASE}/lib/libasound.so.2.0.0
alsalib_c6_FILE= ${LINUXBASE}/lib/libasound.so.2.0.0
+alsalib_c6_64_FILE= ${LINUXBASE}/lib64/libasound.so.2.0.0
alsalib_DETECT= ${alsalib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-alsalib_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-lib
+alsalib_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-alsa-lib
arts_f10_FILE= ${LINUXBASE}/usr/lib/libartsc.so.0
arts_c6_FILE= ${LINUXBASE}/usr/lib/libartsc.so.0
+arts_c6_64_FILE= ${LINUXBASE}/usr/lib64/libartsc.so.0
arts_DETECT= ${arts${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-arts_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-arts
+arts_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-arts
aspell_f10_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.1.4
aspell_c6_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.1.4
+aspell_c6_64_FILE= ${LINUXBASE}/usr/lib64/libaspell.so.15.1.4
aspell_DETECT= ${aspell${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-aspell_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-aspell
+aspell_PORT= ${PORTSDIR}/textproc/linux${LINUX_BASEPORT_NAME}-aspell
atk_f10_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.2409.1
atk_c6_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.3009.1
+atk_c6_64_FILE= ${LINUXBASE}/usr/lib64/libatk-1.0.so.0.3009.1
atk_DETECT= ${atk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-atk_PORT= ${PORTSDIR}/accessibility/linux${LINUX_DIST_SUFFIX}-atk
+atk_PORT= ${PORTSDIR}/accessibility/linux${LINUX_BASEPORT_NAME}-atk
avahi-libs_c6_FILE= ${LINUXBASE}/usr/lib/libavahi-client.so.3.2.5
+avahi-libs_c6_64_FILE= ${LINUXBASE}/usr/lib64/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
+avahi-libs_PORT= ${PORTSDIR}/net/linux${LINUX_BASEPORT_NAME}-avahi-libs
blt_f10_FILE= ${LINUXBASE}/usr/lib/libBLT24.so # FIXME: deprecated, merged into tcl/tk85
blt_DETECT= ${blt${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-blt_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-blt
+blt_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_BASEPORT_NAME}-blt
blt_DEPENDS= tcl85 tk85 xorglibs
cairo_f10_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.10800.0
cairo_c6_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.10800.8
+cairo_c6_64_FILE= ${LINUXBASE}/usr/lib64/libcairo.so.2.10800.8
cairo_DETECT= ${cairo${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-cairo_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-cairo
+cairo_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-cairo
cairo_DEPENDS= fontconfig png xorglibs
cups-libs_f10_FILE= ${LINUXBASE}/usr/lib/libcups.so.2
cups-libs_c6_FILE= ${LINUXBASE}/usr/lib/libcups.so.2
+cups-libs_c6_64_FILE= ${LINUXBASE}/usr/lib64/libcups.so.2
cups-libs_DETECT= ${cups-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-cups-libs_PORT= ${PORTSDIR}/print/linux${LINUX_DIST_SUFFIX}-cups-libs
+cups-libs_PORT= ${PORTSDIR}/print/linux${LINUX_BASEPORT_NAME}-cups-libs
cups-libs_DEPENDS= gnutls
curl_f10_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1
curl_c6_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1
+curl_c6_64_FILE= ${LINUXBASE}/usr/lib64/libcurl.so.4.1.1
curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
+curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_BASEPORT_NAME}-curl
curl_DEPENDS= cyrus-sasl2 openldap
cyrus-sasl2_f10_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.22
cyrus-sasl2_c6_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.23
+cyrus-sasl2_c6_64_FILE= ${LINUXBASE}/usr/lib64/libsasl2.so.2.0.23
cyrus-sasl2_DETECT= ${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2
+cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-cyrus-sasl2
dbusglib_f10_FILE= ${LINUXBASE}/usr/lib/libdbus-glib-1.so.2
dbusglib_c6_FILE= ${LINUXBASE}/usr/lib/libdbus-glib-1.so.2
+dbusglib_c6_64_FILE= ${LINUXBASE}/usr/lib64/libdbus-glib-1.so.2
dbusglib_DETECT= ${dbusglib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dbusglib_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-dbus-glib
+dbusglib_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-dbus-glib
dbusglib_DEPENDS= dbuslibs expat
dbuslibs_f10_FILE= ${LINUXBASE}/lib/libdbus-1.so.3
dbuslibs_c6_FILE= ${LINUXBASE}/lib/libdbus-1.so.3
+dbuslibs_c6_64_FILE= ${LINUXBASE}/lib64/libdbus-1.so.3
dbuslibs_DETECT= ${dbuslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dbuslibs_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-dbus-libs
+dbuslibs_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-dbus-libs
dri_f10_FILE= ${LINUXBASE}/usr/lib/libGL.so.1.2
dri_c6_FILE= ${LINUXBASE}/usr/lib/libGL.so.1.2.0
+dri_c6_64_FILE= ${LINUXBASE}/usr/lib64/libGL.so.1.2.0
dri_DETECT= ${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dri_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri
+dri_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-dri
dri_DEPENDS= xorglibs
devtools_f10_FILE= ${LINUXBASE}/usr/bin/i386-redhat-linux-gcc
devtools_c6_FILE= ${LINUXBASE}/usr/bin/gcc
+devtools_c6_64_FILE= ${LINUXBASE}/usr/bin/gcc
devtools_DETECT= ${devtools${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-devtools_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-devtools
+devtools_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-devtools
esound_f10_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.39
esound_c6_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.39
+esound_c6_64_FILE= ${LINUXBASE}/usr/lib64/libesd.so.0.2.39
esound_DETECT= ${esound${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-esound_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-esound
+esound_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-esound
esound_DEPENDS= libaudiofile
expat_f10_FILE= ${LINUXBASE}/lib/libexpat.so.1
expat_c6_FILE= ${LINUXBASE}/lib/libexpat.so.1
+expat_c6_64_FILE= ${LINUXBASE}/lib64/libexpat.so.1
expat_DETECT= ${expat${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-expat_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-expat
+expat_PORT= ${PORTSDIR}/textproc/linux${LINUX_BASEPORT_NAME}-expat
fontconfig_f10_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1.3.0
fontconfig_c6_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1.4.4
+fontconfig_c6_64_FILE= ${LINUXBASE}/usr/lib64/libfontconfig.so.1.4.4
fontconfig_DETECT= ${fontconfig${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-fontconfig_PORT= ${PORTSDIR}/x11-fonts/linux${LINUX_DIST_SUFFIX}-fontconfig
+fontconfig_PORT= ${PORTSDIR}/x11-fonts/linux${LINUX_BASEPORT_NAME}-fontconfig
fontconfig_DEPENDS= expat
flac_c6_FILE= ${LINUXBASE}/usr/lib/libFLAC.so.8.2.0
+flac_c6_64_FILE= ${LINUXBASE}/usr/lib64/libFLAC.so.8.2.0
flac_DETECT= ${flac${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-flac_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-flac
+flac_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-flac
freealut_f10_FILE= ${LINUXBASE}/usr/lib/libalut.so.0.1.0
freealut_DETECT= ${freealut${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-freealut_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-freealut
+freealut_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-freealut
freealut_DEPENDS= openal
gdkpixbuf_f10_FILE= ${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
gdkpixbuf_DETECT= ${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-gdkpixbuf_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
+gdkpixbuf_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-gdk-pixbuf
-gdkpixbuf2_f10_FILE=${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
+gdkpixbuf2_f10_FILE= ${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
gdkpixbuf2_c6_FILE= ${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
+gdkpixbuf2_c6_64_FILE= ${LINUXBASE}/usr/lib64/libgdk_pixbuf-2.0.so.0
gdkpixbuf2_DETECT= ${gdkpixbuf2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
.if ${USE_LINUX} == "f10"
-gdkpixbuf2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
+gdkpixbuf2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_BASEPORT_NAME}-gtk2
.else # default to CentOS 6.
-gdkpixbuf2_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf2
+gdkpixbuf2_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-gdk-pixbuf2
.endif
gnutls_f10_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
gnutls_c6_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
+gnutls_c6_64_FILE= ${LINUXBASE}/usr/lib64/libgnutls.so.26.14.12
gnutls_DETECT= ${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-gnutls_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-gnutls
+gnutls_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-gnutls
gnutls_DEPENDS= libtasn1 libgcrypt libgpg-error
gtk2_f10_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.1400.7
gtk2_c6_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2400.23
+gtk2_c6_64_FILE= ${LINUXBASE}/usr/lib64/libgtk-x11-2.0.so.0.2400.23
gtk2_DETECT= ${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-gtk2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
+gtk2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_BASEPORT_NAME}-gtk2
gtk2_DEPENDS= atk gdkpixbuf2 jpeg png pango tiff xorglibs
hicontheme_f10_FILE= ${LINUXBASE}/usr/share/icons/hicolor
hicontheme_c6_FILE= ${LINUXBASE}/usr/share/icons/hicolor
+hicontheme_c6_64_FILE= ${LINUXBASE}/usr/share/icons/hicolor
hicontheme_DETECT= ${hicontheme${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-hicontheme_PORT= ${PORTSDIR}/x11-themes/linux${LINUX_DIST_SUFFIX}-hicolor-icon-theme
+hicontheme_PORT= ${PORTSDIR}/x11-themes/linux${LINUX_BASEPORT_NAME}-hicolor-icon-theme
imlib_f10_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
+imlib_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-imlib
jpeg_f10_FILE= ${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
jpeg_c6_FILE= ${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
+jpeg_c6_64_FILE= ${LINUXBASE}/usr/lib64/libjpeg.so.62.0.0
jpeg_DETECT= ${jpeg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-jpeg_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-jpeg
+jpeg_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-jpeg
libasyncns_f10_FILE= ${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
libasyncns_c6_FILE= ${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
+libasyncns_c6_64_FILE= ${LINUXBASE}/usr/lib64/libasyncns.so.0.3.1
libasyncns_DETECT= ${libasyncns${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libasyncns_PORT= ${PORTSDIR}/dns/linux${LINUX_DIST_SUFFIX}-libasyncns
+libasyncns_PORT= ${PORTSDIR}/dns/linux${LINUX_BASEPORT_NAME}-libasyncns
libaudiofile_f10_FILE= ${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
libaudiofile_c6_FILE= ${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
+libaudiofile_c6_64_FILE=${LINUXBASE}/usr/lib64/libaudiofile.so.0.0.2
libaudiofile_DETECT= ${libaudiofile${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libaudiofile_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libaudiofile
+libaudiofile_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-libaudiofile
libg2c_f10_FILE= ${LINUXBASE}/usr/lib/libg2c.so.0.0.0
libg2c_DETECT= ${libg2c${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libg2c_PORT= ${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-libg2c
+libg2c_PORT= ${PORTSDIR}/lang/linux${LINUX_BASEPORT_NAME}-libg2c
libgcrypt_f10_FILE= ${LINUXBASE}/lib/libgcrypt.so.11.5.2
libgcrypt_c6_FILE= ${LINUXBASE}/lib/libgcrypt.so.11.5.3
+libgcrypt_c6_64_FILE= ${LINUXBASE}/lib64/libgcrypt.so.11.5.3
libgcrypt_DETECT= ${libgcrypt${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libgcrypt_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libgcrypt
+libgcrypt_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-libgcrypt
libglade2_f10_FILE= ${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
libglade2_c6_FILE= ${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
+libglade2_c6_64_FILE= ${LINUXBASE}/usr/lib64/libglade-2.0.so.0.0.7
libglade2_DETECT= ${libglade2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libglade2_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libglade2
+libglade2_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-libglade2
libglu_f10_FILE= ${LINUXBASE}/usr/lib/libGLU.so.1
libglu_c6_FILE= ${LINUXBASE}/usr/lib/libGLU.so.1
+libglu_c6_64_FILE= ${LINUXBASE}/usr/lib64/libGLU.so.1
libglu_DETECT= ${libglu${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libglu_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libGLU
+libglu_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-libGLU
libgpg-error_f10_FILE= ${LINUXBASE}/lib/libgpg-error.so.0.4.0
libgpg-error_c6_FILE= ${LINUXBASE}/lib/libgpg-error.so.0.5.0
+libgpg-error_c6_64_FILE=${LINUXBASE}/lib64/libgpg-error.so.0.5.0
libgpg-error_DETECT= ${libgpg-error${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libgpg-error_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libgpg-error
+libgpg-error_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-libgpg-error
# no libidn_f10_FILE (libidn is integrated into linux_base-f10 port)
libidn_DETECT= ${libidn${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libidn_PORT= ${PORTSDIR}/dns/linux${LINUX_DIST_SUFFIX}-libidn
+libidn_PORT= ${PORTSDIR}/dns/linux${LINUX_BASEPORT_NAME}-libidn
libmng_f10_FILE= ${LINUXBASE}/usr/lib/libmng.so.1.0.0
libmng_DETECT= ${libmng${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libmng_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libmng
+libmng_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-libmng
libmng_DEPENDS= jpeg
libogg_f10_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.5.3
libogg_c6_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.6.0
+libogg_c6_64_FILE= ${LINUXBASE}/usr/lib64/libogg.so.0.6.0
libogg_DETECT= ${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libogg_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libogg
+libogg_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-libogg
libpciaccess_c6_FILE= ${LINUXBASE}/usr/lib/libpciaccess.so.0.11.1
libpciaccess_DETECT= ${libpciaccess${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libpciaccess_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libpciaccess
+libpciaccess_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-libpciaccess
libsigcpp20_f10_FILE= ${LINUXBASE}/usr/lib/libsigc-2.0.so.0
libsigcpp20_c6_FILE= ${LINUXBASE}/usr/lib/libsigc-2.0.so.0
+libsigcpp20_c6_64_FILE= ${LINUXBASE}/usr/lib64/libsigc-2.0.so.0
libsigcpp20_DETECT= ${libsigcpp20${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libsigcpp20_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libsigc++20
+libsigcpp20_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-libsigc++20
libsndfile_c6_FILE= ${LINUXBASE}/usr/lib/libsndfile.so.1.0.20
+libsndfile_c6_64_FILE= ${LINUXBASE}/usr/lib64/libsndfile.so.1.0.20
libsndfile_DETECT= ${libsndfile${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libsndfile_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libsndfile
+libsndfile_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-libsndfile
libssh2_f10_FILE= ${LINUXBASE}/usr/lib/libssh2.so.1
libssh2_c6_FILE= ${LINUXBASE}/usr/lib/libssh2.so.1.0.1
+libssh2_c6_64_FILE= ${LINUXBASE}/usr/lib64/libssh2.so.1.0.1
libssh2_DETECT= ${libssh2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libssh2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libssh2
+libssh2_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-libssh2
libssh2_DEPENDS= openssl
libv4l_f10_FILE= ${LINUXBASE}/usr/lib/libv4l1.so.0
libv4l_c6_FILE= ${LINUXBASE}/usr/lib/libv4l1.so.0
+libv4l_c6_64_FILE= ${LINUXBASE}/usr/lib64/libv4l1.so.0
libv4l_DETECT= ${libv4l${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libv4l_PORT= ${PORTSDIR}/multimedia/linux${LINUX_DIST_SUFFIX}-libv4l
+libv4l_PORT= ${PORTSDIR}/multimedia/linux${LINUX_BASEPORT_NAME}-libv4l
libtasn1_f10_FILE= ${LINUXBASE}/usr/lib/libtasn1.so.3.0.16
libtasn1_c6_FILE= ${LINUXBASE}/usr/lib/libtasn1.so.3.1.6
+libtasn1_c6_64_FILE= ${LINUXBASE}/usr/lib64/libtasn1.so.3.1.6
libtasn1_DETECT= ${libtasn1${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libtasn1_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libtasn1
+libtasn1_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-libtasn1
libtheora_f10_FILE= ${LINUXBASE}/usr/lib/libtheora.so.0.3.3
libtheora_c6_FILE= ${LINUXBASE}/usr/lib/libtheora.so.0.3.9
+libtheora_c6_64_FILE= ${LINUXBASE}/usr/lib64/libtheora.so.0.3.9
libtheora_DETECT= ${libtheora${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libtheora_PORT= ${PORTSDIR}/multimedia/linux${LINUX_DIST_SUFFIX}-libtheora
+libtheora_PORT= ${PORTSDIR}/multimedia/linux${LINUX_BASEPORT_NAME}-libtheora
libvorbis_f10_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.4.0
libvorbis_c6_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.4.3
+libvorbis_c6_64_FILE= ${LINUXBASE}/usr/lib64/libvorbis.so.0.4.3
libvorbis_DETECT= ${libvorbis${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libvorbis_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libvorbis
+libvorbis_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-libvorbis
libvorbis_DEPENDS= libogg
libxml2_f10_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.7.3
libxml2_c6_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.7.6
+libxml2_c6_64_FILE= ${LINUXBASE}/usr/lib64/libxml2.so.2.7.6
libxml2_DETECT= ${libxml2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libxml2_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-libxml2
+libxml2_PORT= ${PORTSDIR}/textproc/linux${LINUX_BASEPORT_NAME}-libxml2
mikmod_f10_FILE= ${LINUXBASE}/usr/lib/libmikmod.so.3.0.0
mikmod_c6_FILE= ${LINUXBASE}/usr/lib/libmikmod.so.3.0.0
+mikmod_c6_64_FILE= ${LINUXBASE}/usr/lib64/libmikmod.so.3.0.0
mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
+mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-mikmod
naslibs_f10_FILE= ${LINUXBASE}/usr/lib/libaudio.so.2
naslibs_c6_FILE= ${LINUXBASE}/usr/lib/libaudio.so.2
+naslibs_c6_64_FILE= ${LINUXBASE}/usr/lib64/libaudio.so.2
naslibs_DETECT= ${naslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-naslibs_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-nas-libs
+naslibs_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-nas-libs
naslibs_DEPENDS= xorglibs
openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
openldap_c6_FILE= ${LINUXBASE}/lib/libldap-2.4.so.2.10.2
+openldap_c6_64_FILE= ${LINUXBASE}/lib64/libldap-2.4.so.2.10.2
openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openldap_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap
+openldap_PORT= ${PORTSDIR}/net/linux${LINUX_BASEPORT_NAME}-openldap
openmotif_f10_FILE= ${LINUXBASE}/usr/lib/libXm.so.4
openmotif_c6_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.3
+openmotif_c6_64_FILE= ${LINUXBASE}/usr/lib64/libXm.so.4.0.3
openmotif_DETECT= ${openmotif${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openmotif_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-openmotif
+openmotif_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_BASEPORT_NAME}-openmotif
openmotif_DEPENDS= xorglibs
ncurses-base_f10_FILE= ${LINUXBASE}/lib/terminfo/a/ansi
ncurses-base_c6_FILE= ${LINUXBASE}/lib/terminfo/a/ansi
+ncurses-base_c6_64_FILE=${LINUXBASE}/lib64/terminfo/a/ansi
ncurses-base_DETECT= ${ncurses-base${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-ncurses-base_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-ncurses-base
+ncurses-base_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-ncurses-base
nspr_f10_FILE= ${LINUXBASE}/lib/libnspr4.so
nspr_c6_FILE= ${LINUXBASE}/lib/libnspr4.so
+nspr_c6_64_FILE= ${LINUXBASE}/lib64/libnspr4.so
nspr_DETECT= ${nspr${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-nspr_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-nspr
+nspr_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-nspr
nss_f10_FILE= ${LINUXBASE}/lib/libnss3.so
nss_c6_FILE= ${LINUXBASE}/usr/lib/libnss3.so
+nss_c6_64_FILE= ${LINUXBASE}/usr/lib64/libnss3.so
nss_DETECT= ${nss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-nss_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-nss
+nss_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-nss
nss_DEPENDS= nspr sqlite3
openal_f10_FILE= ${LINUXBASE}/usr/lib/libopenal.so.0.0.0
openal_DETECT= ${openal${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openal_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-openal
+openal_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-openal
openal_DEPENDS= alsalib arts esound libaudiofile libvorbis sdl12
openal-soft_f10_FILE= ${LINUXBASE}/usr/lib/libopenal.so.1.8.466
openal-soft_c6_FILE= ${LINUXBASE}/usr/lib/libopenal.so.1.12.854
+openal-soft_c6_64_FILE= ${LINUXBASE}/usr/lib64/libopenal.so.1.12.854
openal-soft_DETECT= ${openal-soft${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openal-soft_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-openal-soft
+openal-soft_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-openal-soft
openal-soft_DEPENDS= alsalib arts esound
openssl_f10_FILE= ${LINUXBASE}/lib/libssl.so.0.9.8g
openssl_c6_FILE= ${LINUXBASE}/usr/lib/libssl.so.10
+openssl_c6_64_FILE= ${LINUXBASE}/usr/lib64/libssl.so.10
openssl_DETECT= ${openssl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openssl_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-openssl
+openssl_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-openssl
openssl-compat_c6_FILE= ${LINUXBASE}/usr/lib/libssl.so.0.9.8e
+openssl-compat_c6_64_FILE= ${LINUXBASE}/usr/lib64/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
+openssl-compat_PORT= ${PORTSDIR}/security/linux${LINUX_BASEPORT_NAME}-openssl-compat
pango_f10_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.3
pango_c6_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.1
+pango_c6_64_FILE= ${LINUXBASE}/usr/lib64/libpango-1.0.so.0.2800.1
pango_DETECT= ${pango${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-pango_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-pango
+pango_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_BASEPORT_NAME}-pango
pango_DEPENDS= cairo expat fontconfig xorglibs
png_f10_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.37.0
png_c6_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.49.0
+png_c6_64_FILE= ${LINUXBASE}/usr/lib64/libpng.so.3.49.0
png_DETECT= ${png${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-png_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-png
+png_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-png
pulseaudio-libs_f10_FILE= ${LINUXBASE}/usr/lib/libpulse.so.0
pulseaudio-libs_c6_FILE= ${LINUXBASE}/usr/lib/libpulse.so.0.12.2
+pulseaudio-libs_c6_64_FILE= ${LINUXBASE}/usr/lib64/libpulse.so.0.12.2
pulseaudio-libs_DETECT= ${pulseaudio-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-pulseaudio-libs_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-pulseaudio-libs
+pulseaudio-libs_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-pulseaudio-libs
qt45_f10_FILE= ${LINUXBASE}/usr/lib/libQtCore.so.4.5.3
qt45_DETECT= ${qt45${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
@@ -413,81 +466,91 @@ qt45_DEPENDS= fontconfig libmng png
sdl12_f10_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.2
sdl12_c6_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.3
+sdl12_c6_64_FILE= ${LINUXBASE}/usr/lib64/libSDL-1.2.so.0.11.3
sdl12_DETECT= ${sdl12${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sdl12_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-sdl12
+sdl12_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-sdl12
sdl12_DEPENDS= xorglibs
sdlimage_f10_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5
sdlimage_c6_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.8.4
+sdlimage_c6_64_FILE= ${LINUXBASE}/usr/lib64/libSDL_image-1.2.so.0.8.4
sdlimage_DETECT= ${sdlimage${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sdlimage_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_image
+sdlimage_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-sdl_image
sdlimage_DEPENDS= jpeg png sdl12 tiff
sdlmixer_f10_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.6
sdlmixer_c6_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.12.0
+sdlmixer_c6_64_FILE= ${LINUXBASE}/usr/lib64/libSDL_mixer-1.2.so.0.12.0
sdlmixer_DETECT= ${sdlmixer${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sdlmixer_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-sdl_mixer
+sdlmixer_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-sdl_mixer
sdlmixer_DEPENDS= sdl12
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_c6_64_FILE= ${LINUXBASE}/usr/lib64/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_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-sdl_ttf
sdlttf_DEPENDS= sdl12
scimgtk_f10_FILE= ${LINUXBASE}/usr/lib/gtk-2.0/immodules/im-scim.so
scimgtk_DETECT= ${scimgtk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-scimgtk_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-gtk
+scimgtk_PORT= ${PORTSDIR}/textproc/linux${LINUX_BASEPORT_NAME}-scim-gtk
scimgtk_DEPENDS= gtk2 scimlibs
scimlibs_f10_FILE= ${LINUXBASE}/usr/lib/libscim-1.0.so.8
scimlibs_DETECT= ${scimlibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-scimlibs_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-libs
+scimlibs_PORT= ${PORTSDIR}/textproc/linux${LINUX_BASEPORT_NAME}-scim-libs
scimlibs_DEPENDS= gtk2
sqlite3_f10_FILE= ${LINUXBASE}/usr/lib/libsqlite3.so.0
sqlite3_c6_FILE= ${LINUXBASE}/usr/lib/libsqlite3.so.0
+sqlite3_c6_64_FILE= ${LINUXBASE}/usr/lib64/libsqlite3.so.0
sqlite3_DETECT= ${sqlite3${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sqlite3_PORT= ${PORTSDIR}/databases/linux${LINUX_DIST_SUFFIX}-sqlite3
+sqlite3_PORT= ${PORTSDIR}/databases/linux${LINUX_BASEPORT_NAME}-sqlite3
tcl85_f10_FILE= ${LINUXBASE}/usr/lib/libtcl8.5.so
tcl85_c6_FILE= ${LINUXBASE}/usr/lib/libtcl8.5.so
+tcl85_c6_64_FILE= ${LINUXBASE}/usr/lib64/libtcl8.5.so
tcl85_DETECT= ${tcl85${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tcl85_PORT= ${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl85
+tcl85_PORT= ${PORTSDIR}/lang/linux${LINUX_BASEPORT_NAME}-tcl85
tcp_wrappers-libs_c6_FILE= ${LINUXBASE}/lib/libwrap.so.0
+tcp_wrappers-libs_c6_64_FILE= ${LINUXBASE}/lib64/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
+tcp_wrappers-libs_PORT= ${PORTSDIR}/net/linux${LINUX_BASEPORT_NAME}-tcp_wrappers-libs
tiff_f10_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.8.2
tiff_c6_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.9.4
+tiff_c6_64_FILE= ${LINUXBASE}/usr/lib64/libtiff.so.3.9.4
tiff_DETECT= ${tiff${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tiff_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-tiff
+tiff_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-tiff
tiff_DEPENDS= jpeg
tk85_f10_FILE= ${LINUXBASE}/usr/lib/libtk8.5.so
tk85_c6_FILE= ${LINUXBASE}/usr/lib/libtk8.5.so
+tk85_c6_64_FILE= ${LINUXBASE}/usr/lib64/libtk8.5.so
tk85_DETECT= ${tk85${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tk85_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk85
+tk85_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_BASEPORT_NAME}-tk85
tk85_DEPENDS= xorglibs
xorglibs_f10_FILE= ${LINUXBASE}/usr/lib/libXrandr.so.2.1.0
xorglibs_c6_FILE= ${LINUXBASE}/usr/lib/libXrandr.so.2.2.0
+xorglibs_c6_64_FILE= ${LINUXBASE}/usr/lib64/libXrandr.so.2.2.0
xorglibs_DETECT= ${xorglibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-xorglibs_PORT= ${PORTSDIR}/x11/linux${LINUX_DIST_SUFFIX}-xorg-libs
+xorglibs_PORT= ${PORTSDIR}/x11/linux${LINUX_BASEPORT_NAME}-xorg-libs
xorglibs_DEPENDS= fontconfig
ucl_f10_FILE= ${LINUXBASE}/usr/lib/libucl.so.1
ucl_DETECT= ${ucl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-ucl_PORT= ${PORTSDIR}/archivers/linux${LINUX_DIST_SUFFIX}-ucl
+ucl_PORT= ${PORTSDIR}/archivers/linux${LINUX_BASEPORT_NAME}-ucl
ungif_f10_FILE= ${LINUXBASE}/usr/lib/libgif.so.4.1.3
ungif_DETECT= ${ungif${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-ungif_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-ungif
+ungif_PORT= ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-ungif
upx_f10_FILE= ${LINUXBASE}/usr/bin/upx
upx_DETECT= ${upx${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-upx_PORT= ${PORTSDIR}/archivers/linux${LINUX_DIST_SUFFIX}-upx
+upx_PORT= ${PORTSDIR}/archivers/linux${LINUX_BASEPORT_NAME}-upx
upx_DEPENDS= ucl
webauth_f10_FILE= ${LOCALBASE}/bin/linux-nvu
@@ -496,16 +559,19 @@ webauth_PORT= ${PORTSDIR}/www/linux-${WEB_AUTH}
webauth_DEPENDS= gtk2 atk pango fontconfig
qt47_c6_FILE= ${LINUXBASE}/usr/lib/qt47/libQtCore.so.4.7.2
+qt47_c6_64_FILE= ${LINUXBASE}/usr/lib64/qt47/libQtCore.so.4.7.2
qt47_DETECT= ${qt47${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-qt47_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-qt47
+qt47_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-qt47
qt47-x11_c6_FILE= ${LINUXBASE}/usr/lib/qt47/libQtGui.so.4.7.2
+qt47-x11_c6_64_FILE= ${LINUXBASE}/usr/lib64/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-x11_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_BASEPORT_NAME}-qt47-x11
qt47-webkit_c6_FILE= ${LINUXBASE}/usr/lib/qt47/libQtWebKit.so.4.7.2
+qt47-webkit_c6_64_FILE= ${LINUXBASE}/usr/lib64/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
+qt47-webkit_PORT= ${PORTSDIR}/www/linux${LINUX_BASEPORT_NAME}-qt47-webkit
# End component definition section
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk
index 1d69d1a1a511..edd143ee9702 100644
--- a/Mk/bsd.linux-rpm.mk
+++ b/Mk/bsd.linux-rpm.mk
@@ -10,6 +10,8 @@
# LINUX_DIST_VER - Use depends upon the dist-specific presets.
# Valid values for "fedora": all version numbers
# e.g. 10 for fedora 10
+# Valid values for "centos": all version numbers
+# e.g. 6.6 for centos 6.6
# This is used to set MASTER_SITE_{,SRC_}SUBDIR
# if it isn't already set.
# MASTER_SITE_SRC_SUBDIR
@@ -42,26 +44,13 @@ USE_LINUX_PREFIX= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
-. if ${ARCH} == "amd64" || ${ARCH} == "i386"
-. if ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes" # default to CentOS
+. if ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes" # default to CentOS
# Do not build CentOS 6 ports if overridden by f10
-. if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
-IGNORE= This port requires CentOS ${LINUX_DIST_VER}. Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
-. endif
-LINUX_RPM_ARCH?= i686 # ?= because of nasty c5 qt ports
-. elif ${USE_LINUX} == "f10"
-# Do not build Fedora 10 ports unless specifically overridden.
-#. if ! defined(OVERRIDE_LINUX_NONBASE_PORTS) || ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
-#IGNORE= This port requires Fedora 10, yet Fedora 10 is heavily outdated and contains many vulnerable ports. If you really need it, add OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
-#. endif
-LINUX_RPM_ARCH?= i386 # the linuxulator does not yet support amd64 code
-. else
-LINUX_RPM_ARCH?= ${ARCH}
-. endif
-
-. elif ${ARCH} == "powerpc"
-LINUX_RPM_ARCH?= ppc
+. if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
+IGNORE= This port requires CentOS ${LINUX_DIST_VER}. Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
+. endif
. endif
+
.endif
.if defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Post_Include)
@@ -77,56 +66,41 @@ LINUX_DIST= centos
LINUX_DIST_VER= 6.6
.endif
-. if defined(LINUX_DIST)
+.if defined(LINUX_DIST)
DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER}
-. if ${LINUX_DIST} == "fedora"
+. 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}
-. if ${LINUX_DIST_VER} == 10
+. ifndef MASTER_SITES
+MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
+. if ${LINUX_DIST_VER} == 10
MASTER_SITE_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages \
../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
MASTER_SITE_SRC_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \
../updates/${LINUX_DIST_VER}/SRPMS
-. else
+. 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
-. elif ${LINUX_DIST} == "centos"
-MASTER_SITES_SUBDIR= /centos/6/os/i386/Packages/
-. if ${LINUX_DIST_VER} == "5" #needed for Qt...
-LINUX_RPM_ARCH= i386
-MASTER_SITES_SUBDIR= /centos/5/os/i386/Packages/
. endif
-
-. ifndef MASTER_SITES
-MASTER_SITES= ${MASTER_SITE_CENTOS_LINUX}
-. if ${LINUX_DIST_VER} == "6.6"
-. if ! defined(PACKAGE_BUILDING)
-MASTER_SITES= http://mirror.centos.org/centos/6/os/i386/Packages/
-MASTER_SITES_SUBDIR= /centos/6/os/i386/Packages/
-. else
-MASTER_SITES?= http://vault.centos.org/%SUBDIR%/
-MASTER_SITES_SUBDIR= /${LINUX_DIST_VER}/os/Source/SPackages/
-. endif
-
-. else
-MASTER_SITES= http://vault.centos.org/${LINUX_DIST_VER}/os/i386/Packages/
-. endif
-. endif
-
+. endif
+. elif ${LINUX_DIST} == "centos"
+MASTER_SITES?= ${MASTER_SITE_CENTOS_LINUX} ${MASTER_SITE_CENTOS_LINUX_UPDATES}
+MASTER_SITE_SUBDIR?= centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \
+ centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/
+. if ${LINUX_DIST_VER} == "5" #needed for Qt...
+LINUX_RPM_ARCH= i386
+MASTER_SITE_SUBDIR= centos/5/os/i386/Packages/
+. endif
+. if defined(PACKAGE_BUILDING)
+MASTER_SITES+= http://vault.centos.org/%SUBDIR%/:SOURCE
+MASTER_SITE_SUBDIR+= ${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE
. endif
. endif
+.endif
-
-#.if ${USE_LINUX:L} == "yes" #redundant with bsd.port.mk fu
-#USE_LINUX= c6
-#.endif
PKGNAMEPREFIX?= linux-${USE_LINUX}-
# DISTFILES and SRC_DISTFILES assume that there is only one bindist
@@ -138,7 +112,7 @@ DISTVERSION= ${PORTVERSION}-${RPMVERSION}
DISTNAME?= ${PORTNAME}-${DISTVERSION}
DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
BIN_DISTFILES:= ${DISTFILES}
-SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX}
+SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX}:SOURCE
EXTRACT_ONLY?= ${BIN_DISTFILES:C/:[^:]+$//}
. if defined(PACKAGE_BUILDING)
@@ -177,16 +151,19 @@ linux-rpm-clean-portdocs:
. endif
. endif
+PLIST= ${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH}
+
. if defined(AUTOMATIC_PLIST)
-. if ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes"
+. if ${USE_LINUX} == "f10"
_LINUX_BASE_SUFFIX= f10
-. elif ${USE_LINUX} == "c6"
-USE_LINUX= c6
+. elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes"
+_LINUX_BASE_SUFFIX= c6
+. elif ${USE_LINUX} == "c6_64
_LINUX_BASE_SUFFIX= c6
. else
# other linux_base ports do not provide a pkg-plist file
-IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"f10\" and \"c6\"
+IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"f10\", \"c6\", and \"c6_64\"
. endif
PLIST?= ${WRKDIR}/.PLIST.linux-rpm
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 7bdf1875a546..ec85e1a6ea2b 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1718,6 +1718,8 @@ STRIP_CMD= ${TRUE}
. if defined(OVERRIDE_LINUX_BASE_PORT)
. if ${USE_LINUX:tl} == yes
USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT}
+. elif ${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64"
+USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT}
. endif
. endif
@@ -1730,11 +1732,26 @@ LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINU
. if ${USE_LINUX:tl} == "yes"
USE_LINUX= c6
LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
+. elif ${USE_LINUX} == "c6_64"
+LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
. else
IGNORE= cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT
. endif
. endif
+. if ${USE_LINUX} == "c6_64" || (defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64")
+. if ${ARCH} != "amd64"
+IGNORE= Cannot install 64 bit Linux on non-64bit platforms
+. endif
+LINUX_RPM_ARCH?= x86_64
+LINUX_REPO_ARCH?= x86_64
+. elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes" # default to CentOS
+LINUX_RPM_ARCH?= i686
+LINUX_REPO_ARCH?= i386
+. elif ${USE_LINUX} == "f10"
+LINUX_RPM_ARCH?= i386
+LINUX_REPO_ARCH?= i386
+. endif
RUN_DEPENDS+= ${LINUX_BASE_PORT}
.endif
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 0e8ff052af83..b5cc4a19c471 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -232,23 +232,23 @@ MASTER_SITE_EXIM+= \
.if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
MASTER_SITE_CENTOS_LINUX+= \
- http://mirror.centos.org/centos/6/os/i386/Packages/ \
- http://vault.centos.org/6.6/os/Source/SPackages/ \
http://mirror.centos.org/%SUBDIR%/ \
- http://vault.centos.org/%SUBDIR%/
-
+ http://vault.centos.org/%SUBDIR%/ \
+ http://mirror.centos.org/centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \
+ http://vault.centos.org/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \
+ http://vault.centos.org/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE
.endif
.if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
MASTER_SITE_CENTOS_LINUX_UPDATES+= \
- http://mirror.centos.org/centos/6/updates/i386/Packages/ \
- http://vault.centos.org/${LINUX_DIST_VER}/updates/Source/SPackages/
+ http://mirror.centos.org/centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/ \
+ http://vault.centos.org/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
.endif
.if !defined(IGNORE_MASTER_SITE_EPEL)
MASTER_SITE_EPEL+= \
http://dl.fedoraproject.org/pub/epel/6/i386/ \
- http://dl.fedoraproject.org/pub/epel/6/SRPMS/
+ http://dl.fedoraproject.org/pub/epel/6/SRPMS/:DEFAULT,SOURCE
.endif
.if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX)