aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/rtc/Makefile3
-rw-r--r--emulators/vmware2/Makefile7
-rw-r--r--emulators/vmware2/files/vmware4
-rw-r--r--emulators/vmware2/files/vmware.sh2
-rw-r--r--emulators/vmware2/pkg-plist20
-rw-r--r--emulators/vmware2/scripts/pre-install2
-rw-r--r--emulators/vmware3/Makefile7
-rw-r--r--emulators/vmware3/files/vmware4
-rw-r--r--emulators/vmware3/files/vmware.sh2
-rw-r--r--emulators/vmware3/pkg-plist20
-rw-r--r--emulators/vmware3/scripts/pre-install2
-rw-r--r--palm/hdconv/Makefile4
12 files changed, 39 insertions, 38 deletions
diff --git a/emulators/rtc/Makefile b/emulators/rtc/Makefile
index ec92a8215c7a..018f24beb38e 100644
--- a/emulators/rtc/Makefile
+++ b/emulators/rtc/Makefile
@@ -15,11 +15,10 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
WRKSRC= ${WRKDIR}/files
-LINUX_DIR= /compat/linux
KMODDIR= ${PREFIX}/modules
CDEV_MAJOR= 202
-DEVDIR= ${LINUX_DIR}/dev
+DEVDIR= ${LINUXBASE}/dev
STARTUP= rtc.sh
MAKE_ARGS= KMODDIR="${KMODDIR}" CDEV_MAJOR="${CDEV_MAJOR}"
diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index 84bbe96a9771..4453cdcb5bff 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -60,10 +60,11 @@ BROKEN= "Kernel source files required"
.include "${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net"
.endif
-SCRIPTS_ENV+= LINUX_DIR="${LINUXBASE}" \
+SCRIPTS_ENV+= LINUXBASE="${LINUXBASE}" \
VMNET_HOST_IP="${VMNET_HOST_IP}" \
VMNET_NETMASK="${VMNET_NETMASK}"
MAKE_ARGS= KMODDIR="${VMDIR}/lib/modules"
+PLIST_SUB= LINUXBASE="${LINUXBASE}"
post-patch:
${CP} ${FILESDIR}/Makefile ${WRKSRC}
@@ -81,14 +82,14 @@ setoptions:
${FILESDIR}/config > ${WRKDIR}/config
${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@LINUX_DIR@@;${LINUXBASE};' \
+ -e 's;@@LINUXBASE@@;${LINUXBASE};' \
-e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
${FILESDIR}/vmware.sh > ${WRKDIR}/vmware.sh
${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@LINUX_DIR@@;${LINUXBASE};' \
+ -e 's;@@LINUXBASE@@;${LINUXBASE};' \
${FILESDIR}/vmware > ${WRKDIR}/vmware
pre-install: setoptions
diff --git a/emulators/vmware2/files/vmware b/emulators/vmware2/files/vmware
index bb98527690c2..6693fad91f09 100644
--- a/emulators/vmware2/files/vmware
+++ b/emulators/vmware2/files/vmware
@@ -4,9 +4,9 @@
#
# $FreeBSD$
-if [ ! -e @@LINUX_DIR@@/proc/cpuinfo ]; then
+if [ ! -e @@LINUXBASE@@/proc/cpuinfo ]; then
echo "************************************************************"
- echo "It seems Linux procfs is not mounted on @@LINUX_DIR@@/proc."
+ echo "It seems Linux procfs is not mounted on @@LINUXBASE@@/proc."
echo "VMware does not work without Linux procfs mounted."
echo
echo "For details, see linprocfs(5) manpage."
diff --git a/emulators/vmware2/files/vmware.sh b/emulators/vmware2/files/vmware.sh
index e375434044a4..93c8c4e33be8 100644
--- a/emulators/vmware2/files/vmware.sh
+++ b/emulators/vmware2/files/vmware.sh
@@ -25,7 +25,7 @@ start)
if [ $networking -eq 1 ]; then
sysctl net.link.ether.bridge_refresh && bridge="_bridge"
kldload if_tap.ko
- echo -n >@@LINUX_DIR@@/dev/vmnet1
+ echo -n >@@LINUXBASE@@/dev/vmnet1
ifconfig vmnet1 $host_ip netmask $netmask
if [ _$bridge != _ ]; then
sysctl -w net.link.ether.bridge_refresh=1
diff --git a/emulators/vmware2/pkg-plist b/emulators/vmware2/pkg-plist
index 20c1c47c410c..a96657129cf9 100644
--- a/emulators/vmware2/pkg-plist
+++ b/emulators/vmware2/pkg-plist
@@ -112,17 +112,17 @@ share/doc/vmware/INSTALL
share/doc/vmware/README
share/doc/vmware/README.FreeBSD
share/doc/vmware/SAMBA-LICENSE
-@exec mkdir -p /compat/linux/dev;for n in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/ttyv$n /compat/linux/dev/tty$n;done
-@exec ln -s /dev/ttyva /compat/linux/dev/tty10
-@exec ln -s /dev/ttyvb /compat/linux/dev/tty11
-@exec mknod /compat/linux/dev/null c 2 2
-@exec chmod 666 /compat/linux/dev/null
-@exec mknod /compat/linux/dev/hda b 0 0x00010002
-@exec mknod /compat/linux/dev/hdb b 0 0x0001000a
+@exec mkdir -p %%LINUXBASE%%/dev;for n in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/ttyv$n %%LINUXBASE%%/dev/tty$n;done
+@exec ln -s /dev/ttyva %%LINUXBASE%%/dev/tty10
+@exec ln -s /dev/ttyvb %%LINUXBASE%%/dev/tty11
+@exec mknod %%LINUXBASE%%/dev/null c 2 2
+@exec chmod 666 %%LINUXBASE%%/dev/null
+@exec mknod %%LINUXBASE%%/dev/hda b 0 0x00010002
+@exec mknod %%LINUXBASE%%/dev/hdb b 0 0x0001000a
@exec ln -s %D/etc/vmware /etc/vmware
-@exec mknod /compat/linux/dev/vmmon c 200 0
-@exec mknod /compat/linux/dev/vmnet1 c 149 65537
-@unexec rm -f /etc/vmware /compat/linux/dev/vmmon /compat/linux/dev/vmnet1 /compat/linux/bin/df /compat/linux/dev/tty[0-9]* /compat/linux/dev/hd? /compat/linux/dev/null
+@exec mknod %%LINUXBASE%%/dev/vmmon c 200 0
+@exec mknod %%LINUXBASE%%/dev/vmnet1 c 149 65537
+@unexec rm -f /etc/vmware %%LINUXBASE%%/dev/vmmon %%LINUXBASE%%/dev/vmnet1 %%LINUXBASE%%/bin/df %%LINUXBASE%%/dev/tty[0-9]* %%LINUXBASE%%/dev/hd? %%LINUXBASE%%/dev/null
@dirrm etc/vmware
@dirrm lib/vmware/bin
@dirrm lib/vmware/lib/floppies
diff --git a/emulators/vmware2/scripts/pre-install b/emulators/vmware2/scripts/pre-install
index ac9ecea947a5..3b6a1f8eb30c 100644
--- a/emulators/vmware2/scripts/pre-install
+++ b/emulators/vmware2/scripts/pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
echo Setup Linux compatible /dev directory
-linux_dev=${LINUX_DIR}/dev
+linux_dev=${LINUXBASE}/dev
if [ ! -d $linux_dev ]; then
echo Creating $linux_dev
mkdir $linux_dev
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 84bbe96a9771..4453cdcb5bff 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -60,10 +60,11 @@ BROKEN= "Kernel source files required"
.include "${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net"
.endif
-SCRIPTS_ENV+= LINUX_DIR="${LINUXBASE}" \
+SCRIPTS_ENV+= LINUXBASE="${LINUXBASE}" \
VMNET_HOST_IP="${VMNET_HOST_IP}" \
VMNET_NETMASK="${VMNET_NETMASK}"
MAKE_ARGS= KMODDIR="${VMDIR}/lib/modules"
+PLIST_SUB= LINUXBASE="${LINUXBASE}"
post-patch:
${CP} ${FILESDIR}/Makefile ${WRKSRC}
@@ -81,14 +82,14 @@ setoptions:
${FILESDIR}/config > ${WRKDIR}/config
${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@LINUX_DIR@@;${LINUXBASE};' \
+ -e 's;@@LINUXBASE@@;${LINUXBASE};' \
-e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
${FILESDIR}/vmware.sh > ${WRKDIR}/vmware.sh
${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@LINUX_DIR@@;${LINUXBASE};' \
+ -e 's;@@LINUXBASE@@;${LINUXBASE};' \
${FILESDIR}/vmware > ${WRKDIR}/vmware
pre-install: setoptions
diff --git a/emulators/vmware3/files/vmware b/emulators/vmware3/files/vmware
index bb98527690c2..6693fad91f09 100644
--- a/emulators/vmware3/files/vmware
+++ b/emulators/vmware3/files/vmware
@@ -4,9 +4,9 @@
#
# $FreeBSD$
-if [ ! -e @@LINUX_DIR@@/proc/cpuinfo ]; then
+if [ ! -e @@LINUXBASE@@/proc/cpuinfo ]; then
echo "************************************************************"
- echo "It seems Linux procfs is not mounted on @@LINUX_DIR@@/proc."
+ echo "It seems Linux procfs is not mounted on @@LINUXBASE@@/proc."
echo "VMware does not work without Linux procfs mounted."
echo
echo "For details, see linprocfs(5) manpage."
diff --git a/emulators/vmware3/files/vmware.sh b/emulators/vmware3/files/vmware.sh
index e375434044a4..93c8c4e33be8 100644
--- a/emulators/vmware3/files/vmware.sh
+++ b/emulators/vmware3/files/vmware.sh
@@ -25,7 +25,7 @@ start)
if [ $networking -eq 1 ]; then
sysctl net.link.ether.bridge_refresh && bridge="_bridge"
kldload if_tap.ko
- echo -n >@@LINUX_DIR@@/dev/vmnet1
+ echo -n >@@LINUXBASE@@/dev/vmnet1
ifconfig vmnet1 $host_ip netmask $netmask
if [ _$bridge != _ ]; then
sysctl -w net.link.ether.bridge_refresh=1
diff --git a/emulators/vmware3/pkg-plist b/emulators/vmware3/pkg-plist
index 20c1c47c410c..a96657129cf9 100644
--- a/emulators/vmware3/pkg-plist
+++ b/emulators/vmware3/pkg-plist
@@ -112,17 +112,17 @@ share/doc/vmware/INSTALL
share/doc/vmware/README
share/doc/vmware/README.FreeBSD
share/doc/vmware/SAMBA-LICENSE
-@exec mkdir -p /compat/linux/dev;for n in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/ttyv$n /compat/linux/dev/tty$n;done
-@exec ln -s /dev/ttyva /compat/linux/dev/tty10
-@exec ln -s /dev/ttyvb /compat/linux/dev/tty11
-@exec mknod /compat/linux/dev/null c 2 2
-@exec chmod 666 /compat/linux/dev/null
-@exec mknod /compat/linux/dev/hda b 0 0x00010002
-@exec mknod /compat/linux/dev/hdb b 0 0x0001000a
+@exec mkdir -p %%LINUXBASE%%/dev;for n in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/ttyv$n %%LINUXBASE%%/dev/tty$n;done
+@exec ln -s /dev/ttyva %%LINUXBASE%%/dev/tty10
+@exec ln -s /dev/ttyvb %%LINUXBASE%%/dev/tty11
+@exec mknod %%LINUXBASE%%/dev/null c 2 2
+@exec chmod 666 %%LINUXBASE%%/dev/null
+@exec mknod %%LINUXBASE%%/dev/hda b 0 0x00010002
+@exec mknod %%LINUXBASE%%/dev/hdb b 0 0x0001000a
@exec ln -s %D/etc/vmware /etc/vmware
-@exec mknod /compat/linux/dev/vmmon c 200 0
-@exec mknod /compat/linux/dev/vmnet1 c 149 65537
-@unexec rm -f /etc/vmware /compat/linux/dev/vmmon /compat/linux/dev/vmnet1 /compat/linux/bin/df /compat/linux/dev/tty[0-9]* /compat/linux/dev/hd? /compat/linux/dev/null
+@exec mknod %%LINUXBASE%%/dev/vmmon c 200 0
+@exec mknod %%LINUXBASE%%/dev/vmnet1 c 149 65537
+@unexec rm -f /etc/vmware %%LINUXBASE%%/dev/vmmon %%LINUXBASE%%/dev/vmnet1 %%LINUXBASE%%/bin/df %%LINUXBASE%%/dev/tty[0-9]* %%LINUXBASE%%/dev/hd? %%LINUXBASE%%/dev/null
@dirrm etc/vmware
@dirrm lib/vmware/bin
@dirrm lib/vmware/lib/floppies
diff --git a/emulators/vmware3/scripts/pre-install b/emulators/vmware3/scripts/pre-install
index ac9ecea947a5..3b6a1f8eb30c 100644
--- a/emulators/vmware3/scripts/pre-install
+++ b/emulators/vmware3/scripts/pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
echo Setup Linux compatible /dev directory
-linux_dev=${LINUX_DIR}/dev
+linux_dev=${LINUXBASE}/dev
if [ ! -d $linux_dev ]; then
echo Creating $linux_dev
mkdir $linux_dev
diff --git a/palm/hdconv/Makefile b/palm/hdconv/Makefile
index 5d3933e7fd88..97499e52a160 100644
--- a/palm/hdconv/Makefile
+++ b/palm/hdconv/Makefile
@@ -13,7 +13,7 @@ DISTNAME= handbase_desktop_${PORTVERSION:S/./_/}.i386-any-linux2.0
MAINTAINER= knu@FreeBSD.org
-BUILD_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+USE_LINUX= yes
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/handbase-${PORTVERSION}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/hd ${PREFIX}/bin/hdconv
- /compat/linux/usr/bin/strip ${PREFIX}/bin/hdconv
+ ${LINUXBASE}/usr/bin/strip ${PREFIX}/bin/hdconv
brandelf -t Linux ${PREFIX}/bin/hdconv
${MKDIR} ${PREFIX}/share/doc/hdconv/
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/hdconv/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:23:24 +0000