Page MenuHomeFreeBSD
Files F157037876

D1145.id2678.diff
No OneTemporary
Actions

D1145.id2678.diff
View Options

Index: Mk/bsd.linux-apps.mk
===================================================================
--- Mk/bsd.linux-apps.mk
+++ Mk/bsd.linux-apps.mk
@@ -51,8 +51,8 @@
LINUX_DIST_SUFFIX= -${USE_LINUX}
. endif
. else
-# default
-LINUX_DIST_SUFFIX= -f10 # temporary default, set to -c6 soon
+# default to CentOS
+LINUX_DIST_SUFFIX= -c6
. endif
WEB_AUTH= nvu
@@ -208,9 +208,9 @@
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_DETECT= ${gdkpixbuf2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-.if ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" # temporary default, remove or clause soon
+.if ${USE_LINUX} == "f10"
gdkpixbuf2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
-.else
+.else # default to CentOS 6.
gdkpixbuf2_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf2
.endif
Index: Mk/bsd.linux-rpm.mk
===================================================================
--- Mk/bsd.linux-rpm.mk
+++ Mk/bsd.linux-rpm.mk
@@ -43,13 +43,13 @@
NO_BUILD= yes
. if ${ARCH} == "amd64" || ${ARCH} == "i386"
-. if ${USE_LINUX} == "c6"
-# Do not build CentOS 6.6 ports if overridden by f10
+. 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" || ${USE_LINUX} == "yes" # temporary default, move or clause to line 46
+. 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.
@@ -68,11 +68,11 @@
Linux_RPM_Post_Include= bsd.linux-rpm.mk
-.if ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" # temporary default, remove or clause soon
+.if ${USE_LINUX} == "f10"
USE_LINUX?= "f10"
LINUX_DIST= fedora
LINUX_DIST_VER= 10
-.else
+.else # default to CentOS
LINUX_DIST= centos
LINUX_DIST_VER= 6.6
.endif
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1402,7 +1402,7 @@
PKGDIR?= ${MASTERDIR}
.if defined(USE_LINUX_PREFIX)
-PREFIX?= ${LINUXBASE}
+PREFIX:= ${LINUXBASE}
NO_MTREE= yes
.else
PREFIX?= ${LOCALBASE}
@@ -1779,9 +1779,8 @@
LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
. else
. if ${USE_LINUX:tl} == "yes"
-USE_LINUX= f10 # temporary default, set to c6 soon
-LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10
-#LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
+USE_LINUX= c6
+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
Index: emulators/linux_base-c6/pkg-message
===================================================================
--- emulators/linux_base-c6/pkg-message
+++ emulators/linux_base-c6/pkg-message
@@ -9,7 +9,6 @@
----------------------
You should enable Linux mode with the linux_enable variable of rc.conf(5)
and use compat.linux.osrelease=2.6.18 in sysctl.conf(5).
-This is highly experimental!
----------------------
If you want to use shared memory in Linux applications, you need to set up

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 2:02 AM (16 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33285277
Default Alt Text
D1145.id2678.diff (3 KB)

Event Timeline