diff options
Diffstat (limited to 'emulators')
78 files changed, 0 insertions, 6646 deletions
diff --git a/emulators/dynamips-devel/Makefile b/emulators/dynamips-devel/Makefile deleted file mode 100644 index a06d8e811052..000000000000 --- a/emulators/dynamips-devel/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# New ports collection makefile for: dynamips -# Date created: 31 Jan 2006 -# Whom: Max Khon <fjoe@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= dynamips -PORTVERSION= 0.2.4 -CATEGORIES= emulators -MASTER_SITES= http://www.ipflow.utc.fr/dynamips/ - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= Cisco 7200 Simulator - -LIB_DEPENDS= elf.0:${PORTSDIR}/devel/libelf - -USE_GMAKE= yes -USE_GCC= 3.2+ -ALL_TARGET= ${PORTNAME} -MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\ - PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\ - PTHREAD_LIBS=${PTHREAD_LIBS} - -PLIST_FILES= bin/${PORTNAME} -.if !defined(NOPORTDOCS) -PORTDOCS= README -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" -DYNAMIPS_ARCH= "x86" -.elif ${ARCH} == "amd64" -DYNAMIPS_ARCH= "nojit" # JIT does not work on amd64 for some reason -.else -DYNAMIPS_ARCH= "nojit" -.endif - -.if ${OSVERSION} < 600029 -# -# Requires libpcap 0.9+ -MAKE_ENV+= HAS_PCAP=0 -.endif - -.if ${OSVERSION} >= 700013 -MAKE_ENV+= HAS_POSIX_MEMALIGN=1 -.endif - -.include <bsd.port.post.mk> diff --git a/emulators/dynamips-devel/distinfo b/emulators/dynamips-devel/distinfo deleted file mode 100644 index 4a69aaf7c8e1..000000000000 --- a/emulators/dynamips-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (dynamips-0.2.4.tar.gz) = 7b5ba42bbb466cb057bba1bc855476a9 -SHA256 (dynamips-0.2.4.tar.gz) = c29154224d87bd5e73cb89a0c4ab96e64a67328fdbd15bfa36afafe0240e6c1d -SIZE (dynamips-0.2.4.tar.gz) = 193988 diff --git a/emulators/dynamips-devel/files/patch-Makefile b/emulators/dynamips-devel/files/patch-Makefile deleted file mode 100644 index 42cbc60faef4..000000000000 --- a/emulators/dynamips-devel/files/patch-Makefile +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig Tue Feb 14 23:54:17 2006 -+++ Makefile Wed Mar 8 22:54:11 2006 -@@ -12,6 +12,9 @@ - # (WinPcap is used for Cygwin) - HAS_PCAP?=1 - -+# Change this to 1 if your system has posix_memalign -+HAS_POSIX_MEMALIGN?=0 -+ - # Current dynamips release - VERSION=0.2.4 - -@@ -25,14 +28,15 @@ - CFLAGS+=-g -Wall -O3 -fomit-frame-pointer -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ - -DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ -- -DHAS_RFC2553=$(HAS_RFC2553) -+ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) - - PCAP_LIB=-lpcap - - ifeq ($(shell uname), FreeBSD) - PTHREAD_LIBS?=-pthread -- CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) -- LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) -+ LOCALBASE?=/usr/local -+ CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf $(PTHREAD_CFLAGS) -+ LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) - else - ifeq ($(shell uname -s), Darwin) - CFLAGS+=-I/usr/local/include diff --git a/emulators/dynamips-devel/files/patch-utils.c b/emulators/dynamips-devel/files/patch-utils.c deleted file mode 100644 index 970f89eb2e78..000000000000 --- a/emulators/dynamips-devel/files/patch-utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- utils.c.orig Wed Mar 8 22:53:21 2006 -+++ utils.c Wed Mar 8 22:53:37 2006 -@@ -187,7 +187,7 @@ - { - void *p; - --#ifdef __linux__ -+#if defined(__linux__) || HAS_POSIX_MEMALIGN - if (posix_memalign((void *)&p,boundary,size)) - #else - #ifdef __CYGWIN__ diff --git a/emulators/dynamips-devel/files/patch-utils.h b/emulators/dynamips-devel/files/patch-utils.h deleted file mode 100644 index a8edbe606abf..000000000000 --- a/emulators/dynamips-devel/files/patch-utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- utils.h.orig Fri Feb 24 06:59:58 2006 -+++ utils.h Fri Feb 24 07:00:14 2006 -@@ -34,6 +34,8 @@ - #define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN - #elif defined(__x86_64__) - #define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN -+#elif defined(__ia64__) -+#define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN - #endif - - #ifndef ARCH_BYTE_ORDER diff --git a/emulators/dynamips-devel/pkg-descr b/emulators/dynamips-devel/pkg-descr deleted file mode 100644 index f4f8a8d23601..000000000000 --- a/emulators/dynamips-devel/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Cisco 7200 simulator. - -WWW: http://www.ipflow.utc.fr/index.php/Cisco_7200_Simulator diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile deleted file mode 100644 index 28d63c9034b1..000000000000 --- a/emulators/fceux/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# New ports collection makefile for: fceu -# Date Created: 10 Mov 2002 -# Whom: HIYAMA Takeshi <gibbon@cocoa.freemail.ne.jp> -# -# $FreeBSD$ -# - -PORTNAME= fceu -PORTVERSION= 0.98.13 -CATEGORIES= emulators -MASTER_SITES= http://bsd-unix.org/downloads/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src - -MAINTAINER= xcas@cox.net -COMMENT= A portable NES/Famicom emulator based on Bero's original FCE - -USE_BZIP2= yes -USE_GCC= 3.4 -USE_GMAKE= yes -USE_REINPLACE= yes -USE_SDL= sdl -USE_X_PREFIX= yes - -WRKSRC= ${WRKDIR}/fceu - -GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} - -MAN6= fceu.6 - -PLIST_FILES= bin/fceu %%DOCSDIR%%/cheat.html %%DOCSDIR%%/faq.html \ - %%DOCSDIR%%/fceultra.html %%DOCSDIR%%/fcm.txt \ - %%DOCSDIR%%/fcs.txt %%DOCSDIR%%/protocol.txt -PLIST_DIRS= %%DOCSDIR%% - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "sparc64" -BROKEN= "Does not compile on sparc64" -.endif - -post-extract: - ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/src/drivers/common/vidblit.c - -pre-build: - @${CP} ${WRKSRC}/Documentation/fceu-sdl.6 ${WRKSRC}/Documentation/fceu.6 - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/fceu ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/Documentation/fceu.6 ${PREFIX}/man/man6 - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Documentation/cheat.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Documentation/faq.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Documentation/fceultra.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Documentation/fcm.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Documentation/fcs.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Documentation/protocol.txt ${DOCSDIR} - -.include <bsd.port.post.mk> diff --git a/emulators/fceux/distinfo b/emulators/fceux/distinfo deleted file mode 100644 index e8d78187e9f1..000000000000 --- a/emulators/fceux/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (fceu-0.98.13-pre.src.tar.bz2) = 1977214a15a341a4fd8bad14eda76866 -SHA256 (fceu-0.98.13-pre.src.tar.bz2) = a227f2d8a3b79462a895435be26c1622f03c5978d2e3e5456d6284592e88a6c2 -SIZE (fceu-0.98.13-pre.src.tar.bz2) = 570842 diff --git a/emulators/fceux/files/patch-configure b/emulators/fceux/files/patch-configure deleted file mode 100644 index 16d3c59c5218..000000000000 --- a/emulators/fceux/files/patch-configure +++ /dev/null @@ -1,57 +0,0 @@ ---- configure.orig Wed Sep 15 20:31:55 2004 -+++ configure Mon Feb 28 08:45:42 2005 -@@ -308,7 +308,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP WIN32_TRUE WIN32_FALSE UNIX_TRUE UNIX_FALSE USE_SEXYAL_TRUE USE_SEXYAL_FALSE NATIVEWIN32_TRUE NATIVEWIN32_FALSE OPENGL_TRUE OPENGL_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS C80x86_TRUE C80x86_FALSE LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP WIN32_TRUE WIN32_FALSE UNIX_TRUE UNIX_FALSE USE_SEXYAL_TRUE USE_SEXYAL_FALSE NATIVEWIN32_TRUE NATIVEWIN32_FALSE OPENGL_TRUE OPENGL_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -5130,21 +5130,11 @@ - fi - - --if expr match "$target_cpu" 'i.86' > /dev/null; then -+if echo ${target_cpu} | grep -q 'i.86' > /dev/null; then - cat >>confdefs.h <<\_ACEOF - #define C80x86 1 - _ACEOF - -- -- --if true; then -- C80x86_TRUE= -- C80x86_FALSE='#' --else -- C80x86_TRUE='#' -- C80x86_FALSE= --fi -- - fi - - echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -@@ -5589,13 +5579,6 @@ - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi --if test -z "${C80x86_TRUE}" && test -z "${C80x86_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"C80x86\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"C80x86\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi - - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files -@@ -6188,8 +6171,6 @@ - s,@SDL_CONFIG@,$SDL_CONFIG,;t t - s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t - s,@SDL_LIBS@,$SDL_LIBS,;t t --s,@C80x86_TRUE@,$C80x86_TRUE,;t t --s,@C80x86_FALSE@,$C80x86_FALSE,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF diff --git a/emulators/fceux/files/patch-configure.ac b/emulators/fceux/files/patch-configure.ac deleted file mode 100644 index d75bfb586ecd..000000000000 --- a/emulators/fceux/files/patch-configure.ac +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.ac.orig Sat Sep 11 14:32:25 2004 -+++ configure.ac Mon Feb 28 08:46:24 2005 -@@ -114,9 +114,8 @@ - fi - - --if expr match "$target_cpu" 'i.86' > /dev/null; then -+if echo ${target_cpu} | grep -q 'i.86' > /dev/null; then - AC_DEFINE([C80x86]) -- AM_CONDITIONAL(C80x86, true) - fi - - AC_C_BIGENDIAN([], [AC_DEFINE([LSB_FIRST])]) diff --git a/emulators/fceux/files/patch-src-drivers-common-vidblit.c b/emulators/fceux/files/patch-src-drivers-common-vidblit.c deleted file mode 100644 index dd42323ab40f..000000000000 --- a/emulators/fceux/files/patch-src-drivers-common-vidblit.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/drivers/common/vidblit.c.orig Tue Dec 21 15:43:20 2004 -+++ src/drivers/common/vidblit.c Tue Dec 21 15:43:44 2004 -@@ -79,7 +79,7 @@ - { - if(specfilt == 2 || specfilt == 4) // scale2x and scale3x - { -- int multi; -+ int multi = 0; - - if(specfilt == 2) multi = 2 * 2; - else if(specfilt == 4) multi = 3 * 3; diff --git a/emulators/fceux/files/patch-src-mappers-simple.c b/emulators/fceux/files/patch-src-mappers-simple.c deleted file mode 100644 index acd066cb5e96..000000000000 --- a/emulators/fceux/files/patch-src-mappers-simple.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mappers/simple.c.orig Tue Dec 21 13:34:28 2004 -+++ src/mappers/simple.c Tue Dec 21 13:35:20 2004 -@@ -283,7 +283,7 @@ - - static void M185Sync(int version) - { -- int x; -+ //int x; - - //printf("%02x\n",mapbyte1[0]); - //if((mapbyte1[0]&3)==3) diff --git a/emulators/fceux/pkg-descr b/emulators/fceux/pkg-descr deleted file mode 100644 index e83ddac8d7f5..000000000000 --- a/emulators/fceux/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -FCE Ultra is an NTSC and PAL Famicom/NES emulator for various -platforms. It is based upon Bero's original FCE source code. Current -features include good PPU, CPU, pAPU, expansion chip, and joystick -emulation. Also a feature unique to this emulator(at the current -time) is authentic Game Genie emulation. Save states and snapshot -features also have been implemented. The VS Unisystem is emulated -as well. FCE Ultra supports iNES format ROM images, UNIF format ROM -images, headerless and FWNES style FDS disk images, and NSF files. - -FCE Ultra currently supports the following iNES mappers(many partially): - -WWW: http://fceultra.sourceforge.net/ diff --git a/emulators/kqemu-kmod-devel/Makefile b/emulators/kqemu-kmod-devel/Makefile deleted file mode 100644 index 03f84aa01af2..000000000000 --- a/emulators/kqemu-kmod-devel/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: kqemu-kmod -# Date created: 2005/10/25 -# Whom: nork@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= kqemu -PORTVERSION= 0.7.2 -PORTREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= http://fabrice.bellard.free.fr/qemu/ -PKGNAMESUFFIX= -kmod -DIST_SUBDIR= kqemu - -MAINTAINER= nork@FreeBSD.org -COMMENT= Kernel Acceralator for QEMU CPU Emulator - -ONLY_FOR_ARCHS= i386 amd64 -NO_PACKAGE= "Depends on kernel, and module not redistributable" - -PLIST_FILES= "include/kqemu/kqemu.h" -PLIST_FILES+= "@dirrm include/kqemu" -PLIST_FILES+= "@cwd /" -PLIST_FILES+= ${KMODDIR:C,^/,,}/kqemu.ko - -WRKSRC= ${WRKDIR}/${PORTNAME} -MAKEFILE= Makefile.freebsd - -.include <bsd.port.pre.mk> -MAKE_ENV+= KMODDIR="${KMODDIR}" - -.if !exists(${SRC_BASE}/sys/Makefile) -IGNORE= kqemu requires kernel source to be installed -.endif - -post-install: - @${MKDIR} ${PREFIX}/include/kqemu - @${INSTALL_DATA} ${WRKSRC}/kqemu.h ${PREFIX}/include/kqemu - if mount |${GREP} ^devfs >/dev/null ; then \ - : ; \ - else \ - if [ ! -e /dev/kqemu ]; then\ - mknod /dev/kqemu c 250 0 ; \ - fi ; \ - ${CHMOD} 666 /dev/kqemu ; \ - fi - -.include <bsd.port.post.mk> diff --git a/emulators/kqemu-kmod-devel/distinfo b/emulators/kqemu-kmod-devel/distinfo deleted file mode 100644 index eedd5e21bf58..000000000000 --- a/emulators/kqemu-kmod-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (kqemu/kqemu-0.7.2.tar.gz) = 02cfdecda90458d6393781496ec6b48b -SHA256 (kqemu/kqemu-0.7.2.tar.gz) = 4158b2c67603f5256a78d0065d715bde068a457aa58bbfef12dda20fe7f7ad8b -SIZE (kqemu/kqemu-0.7.2.tar.gz) = 79314 diff --git a/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd b/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd deleted file mode 100644 index b75420fa0cc7..000000000000 --- a/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.freebsd.orig Fri Jul 29 06:37:06 2005 -+++ Makefile.freebsd Tue Oct 25 21:08:43 2005 -@@ -5,6 +5,7 @@ - .elif ${MACHINE_ARCH} == "amd64" - OBJS= kqemu-mod-x86_64.o - .endif -+CC= cc - WERROR= - - .include <bsd.kmod.mk> diff --git a/emulators/kqemu-kmod-devel/files/patch-kqemu-freebsd.c b/emulators/kqemu-kmod-devel/files/patch-kqemu-freebsd.c deleted file mode 100644 index ac413bb54912..000000000000 --- a/emulators/kqemu-kmod-devel/files/patch-kqemu-freebsd.c +++ /dev/null @@ -1,506 +0,0 @@ ---- kqemu-freebsd.c.orig Sun Aug 14 18:34:06 2005 -+++ kqemu-freebsd.c Thu Nov 3 17:15:47 2005 -@@ -3,32 +3,55 @@ - #include <sys/param.h> - #include <sys/systm.h> - #include <sys/conf.h> -+#include <sys/ctype.h> -+#include <sys/fcntl.h> - #include <sys/ioccom.h> - #include <sys/malloc.h> - #include <sys/module.h> -+#if __FreeBSD_version >= 500000 - #include <sys/mutex.h> -+#endif - #include <sys/proc.h> -+#include <sys/resourcevar.h> -+#if __FreeBSD_version >= 500000 - #include <sys/sched.h> -+#endif - #include <sys/signalvar.h> - #include <sys/kernel.h> -+#include <sys/sysctl.h> -+#include <sys/uio.h> -+#if __FreeBSD_version < 500000 -+#include <sys/buf.h> -+#endif -+ - #include <vm/vm.h> - #include <vm/vm_param.h> - #include <vm/vm_extern.h> - #include <vm/pmap.h> - #include <vm/vm_map.h> - #include <vm/vm_kern.h> -+#include <vm/vm_page.h> -+ - #include <machine/vmparam.h> - #include <machine/stdarg.h> - - #include "kqemu-kernel.h" - -+#ifndef KQEMU_MAJOR -+#define KQEMU_MAJOR 250 -+#endif -+ - MALLOC_DECLARE(M_KQEMU); - MALLOC_DEFINE(M_KQEMU, "kqemu", "kqemu buffers"); - -+int kqemu_debug; -+SYSCTL_INT(_debug, OID_AUTO, kqemu_debug, CTLFLAG_RW, &kqemu_debug, 0, -+ "kqemu debug flag"); -+ - #define USER_BASE 0x1000 - - /* lock the page at virtual address 'user_addr' and return its -- physical page index. Return -1 if error */ -+ physical page index. Return NULL if error */ - struct kqemu_user_page *CDECL kqemu_lock_user_page(unsigned long *ppage_index, - unsigned long user_addr) - { -@@ -37,14 +60,18 @@ - vm_paddr_t pa = 0; - int ret; - pmap_t pmap; -+#if __FreeBSD_version >= 500000 - ret = vm_map_wire(&vm->vm_map, va, va+PAGE_SIZE, VM_MAP_WIRE_USER); -+#else -+ ret = vm_map_user_pageable(&vm->vm_map, va, va+PAGE_SIZE, FALSE); -+#endif - if (ret != KERN_SUCCESS) { -- printf("kqemu_lock_user_page(%08lx) failed, ret=%d\n", user_addr, ret); -+ kqemu_log("kqemu_lock_user_page(%08lx) failed, ret=%d\n", user_addr, ret); - return NULL; - } - pmap = vm_map_pmap(&vm->vm_map); - pa = pmap_extract(pmap, va); -- // printf("kqemu_lock_user_page(%08lx) va=%08x pa=%08x\n", user_addr, va, pa); -+ /* kqemu_log("kqemu_lock_user_page(%08lx) va=%08x pa=%08x\n", user_addr, va, pa); */ - *ppage_index = pa >> PAGE_SHIFT; - return (struct kqemu_user_page *)va; - } -@@ -54,12 +81,16 @@ - struct vmspace *vm = curproc->p_vmspace; - vm_offset_t va; - int ret; -- // printf("kqemu_unlock_user_page(%08lx)\n", page_index); -+ /* kqemu_log("kqemu_unlock_user_page(%08lx)\n", page_index); */ - va = (vm_offset_t)page; -+#if __FreeBSD_version >= 500000 - ret = vm_map_unwire(&vm->vm_map, va, va+PAGE_SIZE, VM_MAP_WIRE_USER); -+#else -+ ret = vm_map_user_pageable(&vm->vm_map, va, va+PAGE_SIZE, TRUE); -+#endif - #if 0 - if (ret != KERN_SUCCESS) { -- printf("kqemu_unlock_user_page(%08lx) failed, ret=%d\n", page_index, ret); -+ kqemu_log("kqemu_unlock_user_page(%08lx) failed, ret=%d\n", page_index, ret); - } - #endif - } -@@ -76,20 +107,21 @@ - - va = kmem_alloc(kernel_map, PAGE_SIZE); - if (va == 0) { -- printf("kqemu_alloc_zeroed_page: NULL\n"); -- return -1; -+ kqemu_log("kqemu_alloc_zeroed_page: NULL\n"); -+ return NULL; - } - pmap = vm_map_pmap(kernel_map); - pa = pmap_extract(pmap, va); -- // printf("kqemu_alloc_zeroed_page: %08x\n", pa); -+ /* kqemu_log("kqemu_alloc_zeroed_page: %08x\n", pa); */ - *ppage_index = pa >> PAGE_SHIFT; - return (struct kqemu_page *)va; - } - - void CDECL kqemu_free_page(struct kqemu_page *page) - { -- // printf("kqemu_free_page(%08lx)\n", page_index); -- /* XXX: do it */ -+ if (kqemu_debug > 0) -+ kqemu_log("kqemu_free_page(%p)\n", page); -+ kmem_free(kernel_map, (vm_offset_t) page, PAGE_SIZE); - } - - /* return kernel address of the physical page page_index */ -@@ -103,42 +135,29 @@ - GB of physical memory */ - void * CDECL kqemu_vmalloc(unsigned int size) - { -- struct vmspace *vm = curproc->p_vmspace; -- vm_offset_t va = USER_BASE; -- int rv; -- if (size % PAGE_SIZE != 0) { -- printf("kqemu_vmalloc(%d) not a multiple of page size\n", size); -- return NULL; -- } -- rv = vm_map_find(&vm->vm_map, NULL, 0, &va, size, 1, -- VM_PROT_ALL, VM_PROT_ALL, 0); -- if (rv != KERN_SUCCESS) { -- printf("kqemu_vmalloc(%d) failed rv=%d\n", size, rv); -- return NULL; -- } -- printf("kqemu_vmalloc(%d): %08x\n", size, va); -- return (void *)va; -+ void *ptr = malloc(size, M_KQEMU, M_WAITOK); -+ if (kqemu_debug > 0) -+ kqemu_log("kqemu_vmalloc(%d): %p\n", size, ptr); -+ return ptr; - } - - void CDECL kqemu_vfree(void *ptr) - { -- printf("kqemu_vfree(%p)\n", ptr); -+ if (kqemu_debug > 0) -+ kqemu_log("kqemu_vfree(%p)\n", ptr); -+ free(ptr, M_KQEMU); - } - - /* return the physical page index for a given virtual page */ - unsigned long CDECL kqemu_vmalloc_to_phys(const void *vaddr) - { -- struct vmspace *vm = curproc->p_vmspace; -- vm_paddr_t pa; -- pmap_t pmap; -- -- pmap = vm_map_pmap(&vm->vm_map); -- pa = pmap_extract(pmap, (vm_offset_t)vaddr); -+ vm_paddr_t pa = vtophys(vaddr); - if (pa == 0) { -- printf("kqemu_vmalloc_to_phys(%p)->error\n", vaddr); -+ kqemu_log("kqemu_vmalloc_to_phys(%p)->error\n", vaddr); - return -1; - } -- printf("kqemu_vmalloc_to_phys(%p)->%08x\n", vaddr, pa); -+ if (kqemu_debug > 0) -+ kqemu_log("kqemu_vmalloc_to_phys(%p)->%08x\n", vaddr, pa); - return pa >> PAGE_SHIFT; - } - -@@ -154,16 +173,48 @@ - { - } - -+#if __FreeBSD_version < 500000 -+static int -+curpriority_cmp(struct proc *p) -+{ -+ int c_class, p_class; -+ -+ c_class = RTP_PRIO_BASE(curproc->p_rtprio.type); -+ p_class = RTP_PRIO_BASE(p->p_rtprio.type); -+ if (p_class != c_class) -+ return (p_class - c_class); -+ if (p_class == RTP_PRIO_NORMAL) -+ return (((int)p->p_priority - (int)curpriority) / PPQ); -+ return ((int)p->p_rtprio.prio - (int)curproc->p_rtprio.prio); -+} -+ -+/* return TRUE if a signal is pending (i.e. the guest must stop -+ execution) */ -+int CDECL kqemu_schedule(void) -+{ -+ struct proc *p = curproc; -+ if (curpriority_cmp(p) > 0) { -+ int s = splhigh(); -+ p->p_priority = MAXPRI; -+ setrunqueue(p); -+ p->p_stats->p_ru.ru_nvcsw++; -+ mi_switch(); -+ splx(s); -+ } -+ return issignal(curproc) != 0; -+} -+#else - /* return TRUE if a signal is pending (i.e. the guest must stop - execution) */ - int CDECL kqemu_schedule(void) - { -- // printf("kqemu_schedule\n"); -+ /* kqemu_log("kqemu_schedule\n"); */ - mtx_lock_spin(&sched_lock); - mi_switch(SW_VOL, NULL); - mtx_unlock_spin(&sched_lock); - return SIGPENDING(curthread); - } -+#endif - - static char log_buf[4096]; - -@@ -176,47 +227,160 @@ - va_end(ap); - } - -+#define KQEMU_MAX_INSTANCES 4 -+ - struct kqemu_instance { -- // struct semaphore sem; -+#if __FreeBSD_version >= 500000 -+ TAILQ_ENTRY(kqemu_instance) kqemu_ent; -+ struct cdev *kqemu_dev; -+#endif -+ /* struct semaphore sem; */ - struct kqemu_state *state; - }; - -+static int kqemu_ref_count = 0; -+static int max_locked_pages; -+ -+#if __FreeBSD_version < 500000 -+static dev_t kqemu_dev; -+#else -+static struct clonedevs *kqemuclones; -+static TAILQ_HEAD(,kqemu_instance) kqemuhead = TAILQ_HEAD_INITIALIZER(kqemuhead); -+static eventhandler_tag clonetag; -+#endif -+ - static d_close_t kqemu_close; - static d_open_t kqemu_open; - static d_ioctl_t kqemu_ioctl; - - static struct cdevsw kqemu_cdevsw = { -+#if __FreeBSD_version < 500000 -+ /* open */ kqemu_open, -+ /* close */ kqemu_close, -+ /* read */ noread, -+ /* write */ nowrite, -+ /* ioctl */ kqemu_ioctl, -+ /* poll */ nopoll, -+ /* mmap */ nommap, -+ /* strategy */ nostrategy, -+ /* name */ "kqemu", -+ /* maj */ KQEMU_MAJOR, -+ /* dump */ nodump, -+ /* psize */ nopsize, -+ /* flags */ 0, -+ /* bmaj */ -1 -+#else - .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, - .d_open = kqemu_open, - .d_ioctl = kqemu_ioctl, - .d_close = kqemu_close, - .d_name = "kqemu" -+#endif - }; - --/* For use with make_dev(9)/destroy_dev(9). */ --static struct cdev *kqemu_dev; -+#if __FreeBSD_version >= 500000 -+static void -+#if __FreeBSD_version >= 600034 -+kqemu_clone(void *arg, struct ucred *cred, char *name, int namelen, -+struct cdev **dev) -+#else -+kqemu_clone(void *arg, char *name, int namelen, struct cdev **dev) -+#endif -+{ -+ int unit, r; -+ if (*dev != NULL) -+ return; -+ -+ if (strcmp(name, "kqemu") == 0) -+ unit = -1; -+ else if (dev_stdclone(name, NULL, "kqemu", &unit) != 1) -+ return; /* Bad name */ -+ if (unit != -1 && unit > KQEMU_MAX_INSTANCES) -+ return; -+ -+ r = clone_create(&kqemuclones, &kqemu_cdevsw, &unit, dev, 0); -+ if (r) { -+ *dev = make_dev(&kqemu_cdevsw, unit2minor(unit), -+ UID_ROOT, GID_WHEEL, 0660, "kqemu%d", unit); -+ if (*dev != NULL) { -+ dev_ref(*dev); -+ (*dev)->si_flags |= SI_CHEAPCLONE; -+ } -+ } -+} -+#endif -+ -+static void kqemu_destroy(struct kqemu_instance *ks) -+{ -+#if __FreeBSD_version >= 500000 -+ struct cdev *dev = ks->kqemu_dev; -+#endif -+ -+ if (ks->state) { -+ kqemu_delete(ks->state); -+ ks->state = NULL; -+ } -+ -+#if __FreeBSD_version >= 500000 -+ dev->si_drv1 = NULL; -+ TAILQ_REMOVE(&kqemuhead, ks, kqemu_ent); -+ destroy_dev(dev); -+#endif -+ free(ks, M_KQEMU); -+ --kqemu_ref_count; -+} - - /* ARGSUSED */ - static int -+#if __FreeBSD_version < 500000 -+kqemu_open(dev_t dev, int flags, int fmt __unused, struct proc *p) -+{ -+#else - kqemu_open(struct cdev *dev, int flags, int fmt __unused, - struct thread *td) - { -+ struct proc *p = td->td_proc; -+#endif - struct kqemu_instance *ks; -+ -+#if __FreeBSD_version >= 500000 -+ if (kqemu_ref_count >= KQEMU_MAX_INSTANCES) -+#else -+ if (dev->si_drv1 || kqemu_ref_count >= KQEMU_MAX_INSTANCES) -+#endif -+ return(EBUSY); -+ -+ if ((flags & (FREAD|FWRITE)) == FREAD) -+ return(EPERM); -+ - ks = malloc(sizeof(struct kqemu_instance), M_KQEMU, M_WAITOK); - if (ks == NULL) { -- printf("malloc failed\n"); -+ kqemu_log("malloc failed\n"); - return ENOMEM; - } -- ks->state = NULL; -+ memset(ks, 0, sizeof *ks); -+#if __FreeBSD_version >= 500000 -+ ks->kqemu_dev = dev; -+ TAILQ_INSERT_TAIL(&kqemuhead, ks, kqemu_ent); -+#endif -+ kqemu_ref_count++; -+ - dev->si_drv1 = ks; -+ if (kqemu_debug > 0) -+ kqemu_log("opened by pid=%d\n", p->p_pid); - return 0; - } - - /* ARGSUSED */ - static int -+#if __FreeBSD_version < 500000 -+kqemu_ioctl(dev_t dev, u_long cmd, caddr_t addr, -+ int flags __unused, struct proc *p) -+#else - kqemu_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, - int flags __unused, struct thread *td) -+#endif - { - int error = 0; - int ret; -@@ -231,8 +395,9 @@ - break; - } - d1 = *(struct kqemu_init *)addr; -- printf("ram_base=%p ram_size=%ld\n", d1.ram_base, d1.ram_size); -- s = kqemu_init(d, 16000); -+ if (kqemu_debug > 0) -+ kqemu_log("ram_base=%p ram_size=%ld\n", d1.ram_base, d1.ram_size); -+ s = kqemu_init(d, max_locked_pages); - if (s == NULL) { - error = ENOMEM; - break; -@@ -248,9 +413,16 @@ - } - ctx = kqemu_get_cpu_state(s); - *ctx = *(struct kqemu_cpu_state *)addr; -+#if __FreeBSD_version >= 500000 - DROP_GIANT(); -+#endif - ret = kqemu_exec(s); -+#if __FreeBSD_version >= 500000 - PICKUP_GIANT(); -+ td->td_retval[0] = ret; -+#else -+ p->p_retval[0] = ret; -+#endif - *(struct kqemu_cpu_state *)addr = *ctx; - break; - } -@@ -265,10 +437,22 @@ - - /* ARGSUSED */ - static int -+#if __FreeBSD_version < 500000 -+kqemu_close(dev_t dev, int flags, int fmt __unused, struct proc *p) -+{ -+#else - kqemu_close(struct cdev *dev __unused, int flags, int fmt __unused, - struct thread *td) - { -- return 0; -+ struct proc *p = td->td_proc; -+#endif -+ struct kqemu_instance *ks = (struct kqemu_instance *) dev->si_drv1; -+ -+ kqemu_destroy(ks); -+ -+ if (kqemu_debug > 0) -+ kqemu_log("closed by pid=%d\n", p->p_pid); -+ return 0; - } - - /* ARGSUSED */ -@@ -276,15 +460,55 @@ - kqemu_modevent(module_t mod __unused, int type, void *data __unused) - { - int error = 0; -+#if __FreeBSD_version < 500000 -+ int rc; -+#else -+ struct kqemu_instance *ks; -+#endif - - switch (type) { - case MOD_LOAD: - printf("kqemu version 0x%08x\n", KQEMU_VERSION); -+ max_locked_pages = physmem / (2 * KQEMU_MAX_INSTANCES); -+ if (max_locked_pages > 32768) -+ max_locked_pages = 32768; -+#if __FreeBSD_version < 500000 -+ if ((rc = cdevsw_add(&kqemu_cdevsw))) { -+ kqemu_log("error registering cdevsw, rc=%d\n", rc); -+ error = ENOENT; -+ break; -+ } - kqemu_dev = make_dev(&kqemu_cdevsw, 0, -- UID_ROOT, GID_WHEEL, 0666, "kqemu"); -+ UID_ROOT, GID_WHEEL, 0660, "kqemu"); -+#else -+ clone_setup(&kqemuclones); -+ clonetag = EVENTHANDLER_REGISTER(dev_clone, kqemu_clone, 0, 1000); -+ if (!clonetag) { -+ error = ENOMEM; -+ break; -+ } -+#endif -+ kqemu_log("KQEMU installed, max_instances=%d max_locked_mem=%dkB.\n", -+ KQEMU_MAX_INSTANCES, max_locked_pages * 4); -+ -+ kqemu_ref_count = 0; - break; - case MOD_UNLOAD: -+ if (kqemu_ref_count > 0) { -+ error = EBUSY; -+ break; -+ } -+#if __FreeBSD_version < 500000 - destroy_dev(kqemu_dev); -+ if ((rc = cdevsw_remove(&kqemu_cdevsw))) -+ kqemu_log("error unregistering, rc=%d\n", rc); -+#else -+ EVENTHANDLER_DEREGISTER(dev_clone, clonetag); -+ while ((ks = TAILQ_FIRST(&kqemuhead)) != NULL) { -+ kqemu_destroy(ks); -+ } -+ clone_cleanup(&kqemuclones); -+#endif - break; - case MOD_SHUTDOWN: - break; diff --git a/emulators/kqemu-kmod-devel/pkg-descr b/emulators/kqemu-kmod-devel/pkg-descr deleted file mode 100644 index d340d3bb1f4b..000000000000 --- a/emulators/kqemu-kmod-devel/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -KQEMU is a qemu accelerator kernel module on x86/amd64. - -WWW: http://fabrice.bellard.free.fr/qemu/qemu-accel.html diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile deleted file mode 100644 index 77d0cb092888..000000000000 --- a/emulators/linux-vmware-toolbox6/Makefile +++ /dev/null @@ -1,104 +0,0 @@ -# New ports collection makefile for: VMware toolbox for Linux -# Date created: 10 Aug 2000 -# Whom: matusita@jp.FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= vmware-toolbox -PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -CATEGORIES= emulators linux -MASTER_SITES= # bundled with VMware Workstation -PKGNAMEPREFIX= linux- -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 \ - bin/linux-vmware-user -WRKSRC= ${WRKDIR}/vmware-tools-distrib - -ONLY_FOR_ARCHS= i386 -USE_LINUX= yes -USE_X_PREFIX= yes -NO_BUILD= yes -.if !defined(BATCH) -IS_INTERACTIVE= yes -.endif - -RESTRICTED= "Not sure if we can redistribute this." -NO_PACKAGE= ${RESTRICTED} - -VMWARE_VER= 5.5.1 -BUILD_VER= 19175 - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -MOUNT_DEV?= /dev/acd0c -.else -MOUNT_DEV?= /dev/acd0 -.endif -MOUNT_PT?= /mnt -MOUNT= /sbin/mount -UMOUNT= /sbin/umount - -.if ${ARCH} == i386 -BITS?= 32 -.else # ${ARCH} == amd64 -BITS?= 64 -.endif - -do-fetch: - @${DO_NADA} -fetch-list: - @${DO_NADA} - -pre-extract: - @${ECHO} "========================================================================" - @${ECHO} "" - @${ECHO} "Before installing this port, please follow this instructions:" - @${ECHO} "" - @${ECHO} " *) Be sure that your VM has an IDE CD-ROM drive." - @${ECHO} " *) Select \"VM -> Removable Devices -> CD-ROM -> Edit\" on VMware menu," - @${ECHO} " *) Check \"Connected\" box." - @${ECHO} " *) Check \"Use ISO image\" radio button." - @${ECHO} " *) Choose the file \"linux.iso\" for the ISO image. You will find" - @${ECHO} " it under the directory VMware Workstation installed." - @${ECHO} " *) Press \"OK\" button." - @${ECHO} "" - @${ECHO} "Don't forget to restore the configuration after installing this port." - @${ECHO} "" - @${ECHO} "========================================================================" - @${ECHO} "" -.if !defined(BATCH) - @${ECHO} -n "Ready to install this ports? [Y/n]: " - @(read line; \ - case "$${line}" in \ - [Nn]*) \ - ${FALSE} ;; \ - *) \ - ${TRUE} ;; \ - esac) -.endif - ${MKDIR} ${MOUNT_PT} - -${UMOUNT} ${MOUNT_PT} 2>&1 >/dev/null - -${UMOUNT} ${MOUNT_DEV} 2>&1 >/dev/null - ${MOUNT} -t cd9660 -r ${MOUNT_DEV} ${MOUNT_PT} - -post-extract: - ${UMOUNT} ${MOUNT_DEV} - -do-install: -.for file in vmware-toolbox-gtk vmware-user - ${BRANDELF} -t Linux ${WRKSRC}/lib/bin${BITS}/${file} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/${file} ${PREFIX}/bin/linux-${file} -.endfor - ${LN} -sfh linux-vmware-toolbox-gtk ${PREFIX}/bin/linux-vmware-toolbox - -.include <bsd.port.post.mk> diff --git a/emulators/linux-vmware-toolbox6/distinfo b/emulators/linux-vmware-toolbox6/distinfo deleted file mode 100644 index 028035e3b0c6..000000000000 --- a/emulators/linux-vmware-toolbox6/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (VMwareTools-5.5.1-19175.tar.gz) = IGNORE -SHA256 (VMwareTools-5.5.1-19175.tar.gz) = IGNORE diff --git a/emulators/linux-vmware-toolbox6/pkg-descr b/emulators/linux-vmware-toolbox6/pkg-descr deleted file mode 100644 index 19e4af351d3b..000000000000 --- a/emulators/linux-vmware-toolbox6/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -This is the full-featured Linux version VMware toolbox for FreeBSD -_Guest_ OS. Beware, this port is _not_ for FreeBSD _Host_ OS. - -As VMware toolbox included in VMware tools for FreeBSD is not as good -as that for Linux, it lacks some useful features such as time -synchronization between the virtual machine and the Host OS. That is -why this port is provided. - - -Before installing this port, make sure you have a `linux.iso' file -that comes with VMware: - - Windows: C:\Program Files\VMware\VMware Workstation\linux.iso - Linux: /usr/lib/vmware/lib/isoimages/linux.iso diff --git a/emulators/linux_dist-gentoo-stage1/Makefile b/emulators/linux_dist-gentoo-stage1/Makefile deleted file mode 100644 index 66b7796a03e4..000000000000 --- a/emulators/linux_dist-gentoo-stage1/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# New ports collection makefile for: linux_base-gentoo-stage1 -# Date created: 2003-10-12 -# Whom: trevor -# -# $FreeBSD$ -# - -PORTNAME= linux_base-gentoo-stage1 -PORTVERSION= 2005.0 -CATEGORIES= emulators linux -MASTER_SITES= ${MASTER_SITE_GENTOO} -EXTRACT_ONLY= - -MAINTAINER= ports@FreeBSD.org -COMMENT= Files from Gentoo distribution, for Linux compatibility - -RESTRICTED= "binaries licensed under GNU GPL without accompanying source" - -BROKEN= Incorrect pkg-plist - -CONFLICTS= linux_base-7* linux_base-8* linux_base-debian* \ - linux_base-rh* linux_base-suse* - -DIST_SUBDIR= gentoo-linux -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} -NO_BUILD= y -NO_FILTER_SHLIBS=y -NO_MTREE= y -ONLY_FOR_ARCHS= alpha amd64 ia64 i386 -PLIST= ${WRKDIR}/pkg-plist -PREFIX= ${LINUXBASE} -USE_BZIP2= y - -.include <bsd.port.pre.mk> - -.if (${ARCH} == "amd64") -LATEST_LINK= ${PORTNAME:C/linux_base/linux32_base/} -.endif - -.if (${ARCH} == "alpha") -MASTER_SITE_SUBDIR= releases/alpha/${PORTVERSION}/stages -DISTNAME= stage1-alpha-${PORTVERSION} -.elif (${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "ia64") -MASTER_SITE_SUBDIR= releases/x86/${PORTVERSION}/stages/x86 -DISTNAME= stage1-x86-${PORTVERSION} -.endif - -do-extract: - @${MKDIR} ${WRKSRC} - @${TAR} --exclude=./dev -xpy -C ${WRKSRC} \ - -f ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} - @${ECHO_CMD} etc/resolv.conf > ${PLIST} - @cd ${WRKSRC} && ${FIND} * -type f -o -type l >> ${PLIST} \ - && ${FIND} * -type d | ${SORT} -r | ${SED} -e 's:^:@dirrm :' \ - >> ${PLIST} - @${RM} -fr ${WRKSRC} - -do-install: - - ${MKDIR} ${PREFIX} - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - @${TAR} --exclude=./dev -xpy -C ${PREFIX} \ - -f ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} - @${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \; - @${CP} -p /etc/resolv.conf ${PREFIX}/etc/ - @${BRANDELF} -t Linux ${PREFIX}/sbin/ldconfig ${PREFIX}/sbin/sln - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/emulators/linux_dist-gentoo-stage1/distinfo.alpha b/emulators/linux_dist-gentoo-stage1/distinfo.alpha deleted file mode 100644 index a55aeba97b94..000000000000 --- a/emulators/linux_dist-gentoo-stage1/distinfo.alpha +++ /dev/null @@ -1,3 +0,0 @@ -$FreeBSD$ -MD5 (gentoo-linux/stage1-alpha-2005.0.tar.bz2) = 086efbd8c7dba22aaf5666281c7cc46a -SIZE (gentoo-linux/stage1-alpha-2005.0.tar.bz2) = 19179206 diff --git a/emulators/linux_dist-gentoo-stage1/distinfo.i386 b/emulators/linux_dist-gentoo-stage1/distinfo.i386 deleted file mode 100644 index 84f457f592ee..000000000000 --- a/emulators/linux_dist-gentoo-stage1/distinfo.i386 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (gentoo-linux/stage1-x86-2005.0.tar.bz2) = 778c067fbbbf578031abfb9e04e34acd -SIZE (gentoo-linux/stage1-x86-2005.0.tar.bz2) = 16795318 diff --git a/emulators/linux_dist-gentoo-stage1/pkg-descr b/emulators/linux_dist-gentoo-stage1/pkg-descr deleted file mode 100644 index 06f2c5310b01..000000000000 --- a/emulators/linux_dist-gentoo-stage1/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -from Daniel Robbins of Gentoo Technologies, Inc.: - - The "stage1" tarball is what we used to call a "build - tarball". It is a chrootable image that you can use to - build Gentoo Linux completely from scratch. It requires a - bootstrap and an "emerge system" to convert it to a bootable - Gentoo Linux system, and it will run on any PC (i486 or - greater). - -WWW: http://www.gentoo.org/ diff --git a/emulators/linux_dist-gentoo-stage1/pkg-install b/emulators/linux_dist-gentoo-stage1/pkg-install deleted file mode 100644 index 2d569a739289..000000000000 --- a/emulators/linux_dist-gentoo-stage1/pkg-install +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# an installation script for linux_base - -case "$2" in -PRE-INSTALL) - if [ -z "`kldstat -v | grep -E 'linux(aout|elf)'`" ]; then - echo 'Linux mode is not enabled.' - echo 'Loading linux kernel module now...' - if ! kldload linux; then - echo 'The linux kernel module could not be loaded.' - echo 'Please enable linux mode manually and retry.' - exit 1 - fi - fi - if [ -n "`mount | grep -w ^linprocfs`" ]; then - echo 'Un-mounting linprocfs...' - umount linprocfs - fi - ;; -POST-INSTALL) - if [ -n "`grep -w ^linprocfs /etc/fstab`" ]; then - echo 'Re-mounting linprocfs...' - mount linprocfs - fi - ;; -DEINSTALL) - if [ -n "`mount | grep -w ^linprocfs`" ]; then - echo 'Un-mounting linprocfs...' - umount linprocfs - fi - ;; -esac - -exit 0 diff --git a/emulators/linux_dist-gentoo-stage1/pkg-message b/emulators/linux_dist-gentoo-stage1/pkg-message deleted file mode 100644 index b38ae7cd42df..000000000000 --- a/emulators/linux_dist-gentoo-stage1/pkg-message +++ /dev/null @@ -1,18 +0,0 @@ -* The port/package has attempted to enable Linux compatibility mode by loading -* the linux.ko kernel module. You can load the module manually as root with the -* command "kldload linux" or have it load automatically at boot time by adding -* to /etc/rc.conf the line: -* -* linux_enable="YES" -* -* You may wish to enable emulation of the Linux proc filesystem. See the -* linprocfs(5) man page. -* -* To download Portage, do "chroot /compat/linux emerge sync" as root. Then you -* may want to do "chroot /compat/linux /usr/portage/scripts/bootstrap.sh" to -* rebuild binutils, gcc, gettext, and glibc. See -* <URL:http://www.gentoo.org/doc/en/gentoo-alpha-install.xml> or -* <URL:http://www.gentoo.org/doc/en/gentoo-x86-install.xml> for more complete -* instructions. -* -* Do not do "emerge portage" in stage 1. diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile deleted file mode 100644 index 61087cfb7139..000000000000 --- a/emulators/qemu-devel/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# New ports collection makefile for: qemu -# Date created: 2004/05/31 -# Whom: Juergen Lock <nox@jelal.kn-bremen.de> -# -# $FreeBSD$ -# - -PORTNAME= qemu -PORTVERSION= 0.8.0 -PORTREVISION= 3 -CATEGORIES= emulators -MASTER_SITES= http://www.qemu.org/:release \ - http://people.fruitsalad.org/nox/qemu/:snapshot \ - http://www.volny.cz/xnavara/qemu/:snapshot \ - http://qemu.dad-answers.com/download/qemu/:snapshot \ - http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \ - http://people.freebsd.org/~maho/qemu/:misc -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release -.if defined (WITH_HACKS) -DISTFILES+= qemu_dma_patch.tar.gz:idedma patch3_cirrus:misc -.endif -DIST_SUBDIR= qemu -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= nox@jelal.kn-bremen.de -COMMENT= QEMU CPU Emulator - -BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html -.if defined(WITH_SAMBA) -RUN_DEPENDS+= ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba -.endif -.if defined(WITH_KQEMU) -BUILD_DEPENDS+= ${LOCALBASE}/include/kqemu/kqemu.h:${PORTSDIR}/emulators/kqemu-kmod -.endif - -HAS_CONFIGURE= yes -USE_GMAKE= yes -USE_GETOPT_LONG= yes -USE_SDL= sdl -USE_PERL5= yes -PATCH_STRIP= -p1 -CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} -MAKE_ENV+= BSD_MAKE=${MAKE} -MAN1= qemu.1 qemu-img.1 -ONLY_FOR_ARCHS= amd64 i386 -.if defined(WITH_KQEMU) -CONFIGURE_ARGS+= --enable-kqemu -.else -CONFIGURE_ARGS+= --disable-kqemu -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" -MAKE_ARGS+= ARCH=x86_64 -.endif -USE_GCC= 3.4 - -pre-everything:: -.if !defined(WITH_KQEMU) - @${ECHO_MSG} "Notice: you can build qemu with the (alpha!) kqemu accelerator kernel module" - @${ECHO_MSG} "by defining WITH_KQEMU." -.endif -.if !defined(WITH_HACKS) - @${ECHO_MSG} "You can build qemu with some hacks (esp. for speedup)" - @${ECHO_MSG} "by defining WITH_HACKS." - @${ECHO_MSG} "1. IDE Bus-master DMA Support by John Coiner" - @${ECHO_MSG} "http://people.brandeis.edu/~jcoiner/qemu_idedma/qemu_dma_patch.html" - @${ECHO_MSG} "2. higher speed on large display (cirrus_vga) by Juergen Pfennig" - @${ECHO_MSG} "http://lists.gnu.org/archive/html/qemu-devel/2006-01/msg00208.html" -.endif -.if !defined(WITH_SAMBA) && !exists(${LOCALBASE}/sbin/smbd) - @${ECHO_MSG} "Notice: if you need qemu's -smb option (smb-export local dir to guest)" - @${ECHO_MSG} "then you also need samba, you can have this port install it by defining" - @${ECHO_MSG} "WITH_SAMBA." -.endif - -post-extract: - @${MKDIR} ${WRKSRC}/kqemu - @${TOUCH} ${WRKSRC}/kqemu/Makefile - @${ECHO} all: > ${WRKSRC}/kqemu/Makefile.freebsd - -pre-patch: - @for A in ${ONLY_FOR_ARCHS}; do \ - ${MKDIR} ${WRKSRC}/bsd/$$A; \ - done - -post-patch: -.if defined(WITH_HACKS) - @cd ${WRKDIR} ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/qemu_dma_patch.tar.gz ; ${CP} new_qemu_dma_patch/bios.bin ${WRKSRC}/pc-bios; cd ${WRKSRC}; ${PATCH} --quiet -p1 < ../new_qemu_dma_patch/qemu-piix4-udma.patch - @cd ${WRKSRC} ; ${PATCH} --quiet < ${DISTDIR}/${DIST_SUBDIR}/patch3_cirrus -.endif - -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo deleted file mode 100644 index 2875a220fc36..000000000000 --- a/emulators/qemu-devel/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (qemu/qemu-0.8.0.tar.gz) = eb175b26583280706fe7e4d8910d320d -SHA256 (qemu/qemu-0.8.0.tar.gz) = de388539ce86971a2cbe8474fca8b6160898c95772e3e6e08a7794d48db32a61 -SIZE (qemu/qemu-0.8.0.tar.gz) = 1497965 -MD5 (qemu/qemu_dma_patch.tar.gz) = 5e339dc201d411af56bad684d3f89338 -SHA256 (qemu/qemu_dma_patch.tar.gz) = cdf74bf5e079d835e100f116d940686b13ec2b7ed6aee5a6a97a4441ea5f2b8f -SIZE (qemu/qemu_dma_patch.tar.gz) = 25837 -MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810 -SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11 -SIZE (qemu/patch3_cirrus) = 8817 diff --git a/emulators/qemu-devel/files/patch-Makefile.target b/emulators/qemu-devel/files/patch-Makefile.target deleted file mode 100644 index fe251c021ced..000000000000 --- a/emulators/qemu-devel/files/patch-Makefile.target +++ /dev/null @@ -1,9 +0,0 @@ -Index: qemu/Makefile.target -@@ -18,6 +18,7 @@ - DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) - endif - CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS+=-I${LOCALBASE}/include - #CFLAGS+=-Werror - LDFLAGS=-g - LIBS= diff --git a/emulators/qemu-devel/files/patch-aa b/emulators/qemu-devel/files/patch-aa deleted file mode 100644 index 25eaa72ab235..000000000000 --- a/emulators/qemu-devel/files/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -diff -urd --exclude=CVS ../cvs/qemu/Makefile qemu-0.5.5/Makefile ---- ../cvs/qemu/Makefile Mon May 17 21:06:42 2004 -+++ qemu-0.5.5/Makefile Sun May 30 05:26:19 2004 -@@ -70,7 +70,7 @@ - - # documentation - %.html: %.texi -- texi2html -monolithic -number $< -+ -texi2html -monolithic -number $< - - qemu.1: qemu-doc.texi - ./texi2pod.pl $< qemu.pod diff --git a/emulators/qemu-devel/files/patch-ac b/emulators/qemu-devel/files/patch-ac deleted file mode 100644 index 8adf3dbd9637..000000000000 --- a/emulators/qemu-devel/files/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ -Index: qemu/configure -@@ -204,7 +204,7 @@ - - if test -z "$sdl" ; then - --sdl_config="sdl-config" -+sdl_config="${SDL_CONFIG}" - sdl=no - sdl_static=no - diff --git a/emulators/qemu-devel/files/patch-audio-4 b/emulators/qemu-devel/files/patch-audio-4 deleted file mode 100644 index bb71885a2992..000000000000 --- a/emulators/qemu-devel/files/patch-audio-4 +++ /dev/null @@ -1,24 +0,0 @@ -Index: qemu/audio/audio_template.h -@@ -32,6 +32,10 @@ - #define SW glue (SWVoice, In) - #endif - -+#ifndef UINT64_MAX -+#define UINT64_MAX ((uint64_t)(18446744073709551615ULL)) -+#endif -+ - static void glue (audio_pcm_sw_fini_, TYPE) (SW *sw) - { - glue (audio_pcm_sw_free_resources_, TYPE) (sw); -Index: qemu/audio/audio.c -@@ -36,6 +36,10 @@ - /* #define DEBUG_LIVE */ - /* #define DEBUG_OUT */ - -+#ifndef INT16_MAX -+#define INT16_MAX (32767) -+#endif -+ - static struct audio_driver *drvtab[] = { - #ifdef CONFIG_OSS - &oss_audio_driver, diff --git a/emulators/qemu-devel/files/patch-audio::ossaudio.c b/emulators/qemu-devel/files/patch-audio::ossaudio.c deleted file mode 100644 index 8fc9e99b9153..000000000000 --- a/emulators/qemu-devel/files/patch-audio::ossaudio.c +++ /dev/null @@ -1,11 +0,0 @@ -Index: qemu/audio/ossaudio.c -@@ -21,8 +21,8 @@ - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ --#include <sys/mman.h> - #include <sys/types.h> -+#include <sys/mman.h> - #include <sys/ioctl.h> - #include <sys/soundcard.h> - #include <assert.h> diff --git a/emulators/qemu-devel/files/patch-bc b/emulators/qemu-devel/files/patch-bc deleted file mode 100644 index 7ad83440d48b..000000000000 --- a/emulators/qemu-devel/files/patch-bc +++ /dev/null @@ -1,12 +0,0 @@ -Index: qemu/i386-dis.c -@@ -2896,6 +2896,10 @@ - OP_E (bytemode, sizeflag); - } - -+#ifndef PRIx64 -+#define PRIx64 "llx" -+#endif -+ - static void - print_operand_value (buf, hex, disp) - char *buf; diff --git a/emulators/qemu-devel/files/patch-bd b/emulators/qemu-devel/files/patch-bd deleted file mode 100644 index 3f85d63c03a1..000000000000 --- a/emulators/qemu-devel/files/patch-bd +++ /dev/null @@ -1,10 +0,0 @@ -Index: qemu/configure -@@ -286,7 +286,7 @@ - if test -z "$prefix" ; then - prefix="/usr/local" - fi --mandir="$prefix/share/man" -+mandir="$prefix/man" - datadir="$prefix/share/qemu" - docdir="$prefix/share/doc/qemu" - bindir="$prefix/bin" diff --git a/emulators/qemu-devel/files/patch-be b/emulators/qemu-devel/files/patch-be deleted file mode 100644 index 6de47db9eaf9..000000000000 --- a/emulators/qemu-devel/files/patch-be +++ /dev/null @@ -1,16 +0,0 @@ -Index: qemu/vl.c -@@ -662,6 +662,14 @@ - case QEMU_TIMER_REALTIME: - #ifdef _WIN32 - return GetTickCount(); -+#elif defined(_BSD) -+ { -+ struct timeval r; -+ if (!gettimeofday(&r, NULL)) { -+ return ((timer_freq * 1000LL) * (int64_t)r.tv_sec -+ + ((int64_t)r.tv_usec * timer_freq) / 1000) / timer_freq; -+ } -+ } - #else - { - struct tms tp; diff --git a/emulators/qemu-devel/files/patch-bf b/emulators/qemu-devel/files/patch-bf deleted file mode 100644 index 57cc889e3119..000000000000 --- a/emulators/qemu-devel/files/patch-bf +++ /dev/null @@ -1,37 +0,0 @@ -Index: qemu/slirp/slirp_config.h -@@ -86,7 +86,7 @@ - #undef BAD_SPRINTF - - /* Define if you have readv */ --#undef HAVE_READV -+#define HAVE_READV - - /* Define if iovec needs to be declared */ - #undef DECLARE_IOVEC -@@ -95,7 +95,7 @@ - #undef DECLARE_SPRINTF - - /* Define if you have a POSIX.1 sys/wait.h */ --#undef HAVE_SYS_WAIT_H -+#define HAVE_SYS_WAIT_H - - /* Define if you have sys/select.h */ - #define HAVE_SYS_SELECT_H -@@ -107,7 +107,7 @@ - #define HAVE_ARPA_INET_H - - /* Define if you have sys/signal.h */ --#undef HAVE_SYS_SIGNAL_H -+#define HAVE_SYS_SIGNAL_H - - /* Define if you have sys/stropts.h */ - #undef HAVE_SYS_STROPTS_H -@@ -180,7 +180,7 @@ - #undef HAVE_GRANTPT - - /* Define if you have fchmod */ --#undef HAVE_FCHMOD -+#define HAVE_FCHMOD - - /* Define if you have <sys/type32.h> */ - #undef HAVE_SYS_TYPES32_H diff --git a/emulators/qemu-devel/files/patch-bg b/emulators/qemu-devel/files/patch-bg deleted file mode 100644 index 57a9ef32df97..000000000000 --- a/emulators/qemu-devel/files/patch-bg +++ /dev/null @@ -1,25 +0,0 @@ -Index: qemu/Makefile.target -@@ -179,7 +179,7 @@ - - ######################################################### - --DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -+DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DSMBD=\"${LOCALBASE}/sbin/smbd\" - LIBS+=-lm - ifndef CONFIG_USER_ONLY - LIBS+=-lz -Index: qemu/vl.c -@@ -1560,8 +1560,13 @@ - fclose(f); - atexit(smb_exit); - -+#ifdef __FreeBSD__ -+ snprintf(smb_cmdline, sizeof(smb_cmdline), SMBD " -s %s", -+ smb_conf); -+#else - snprintf(smb_cmdline, sizeof(smb_cmdline), "/usr/sbin/smbd -s %s", - smb_conf); -+#endif - - slirp_add_exec(0, smb_cmdline, 4, 139); - } diff --git a/emulators/qemu-devel/files/patch-bh b/emulators/qemu-devel/files/patch-bh deleted file mode 100644 index 1218bb4656c5..000000000000 --- a/emulators/qemu-devel/files/patch-bh +++ /dev/null @@ -1,26 +0,0 @@ -Index: qemu/dyngen-exec.h -=================================================================== -RCS file: /cvsroot/qemu/qemu/dyngen-exec.h,v -retrieving revision 1.12 -diff -w -u -d -r1.12 dyngen-exec.h ---- dyngen-exec.h 12 May 2004 19:32:15 -0000 1.12 -+++ dyngen-exec.h 21 May 2004 15:00:41 -0000 -@@ -21,6 +21,8 @@ - #define __DYNGEN_EXEC_H__ - - #include <stddef.h> -+#include <stdio.h> -+#include "config.h" - - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; -@@ -54,9 +56,6 @@ - #define UINT32_MAX (4294967295U) - #define UINT64_MAX ((uint64_t)(18446744073709551615)) - --typedef struct FILE FILE; --extern int fprintf(FILE *, const char *, ...); --extern int printf(const char *, ...); - #undef NULL - #define NULL 0 - #ifdef _BSD diff --git a/emulators/qemu-devel/files/patch-bk b/emulators/qemu-devel/files/patch-bk deleted file mode 100644 index 09281f31aef2..000000000000 --- a/emulators/qemu-devel/files/patch-bk +++ /dev/null @@ -1,190 +0,0 @@ -Index: qemu/slirp/bootp.c -@@ -29,11 +29,12 @@ - - #define START_ADDR 15 - --#define LEASE_TIME (24 * 3600) -+#define LEASE_TIME (120) - - typedef struct { - uint8_t allocated; - uint8_t macaddr[6]; -+ int time; - } BOOTPClient; - - BOOTPClient bootp_clients[NB_ADDR]; -@@ -68,26 +69,54 @@ - { - BOOTPClient *bc; - int i; -+ int now=time(NULL); - - for(i = 0; i < NB_ADDR; i++) { - if (!memcmp(macaddr, bootp_clients[i].macaddr, 6)) - goto found; - } -+ for(i = 0; i < NB_ADDR; i++) { -+ if (now-bootp_clients[i].time > 3*LEASE_TIME) -+ goto found; -+ } - return NULL; - found: - bc = &bootp_clients[i]; -- bc->allocated = 1; - paddr->s_addr = htonl(ntohl(special_addr.s_addr) | (i + START_ADDR)); - return bc; - } - -+static BOOTPClient *find_reqaddr(struct in_addr *paddr, struct in_addr *reqaddr, const uint8_t *macaddr) -+{ -+ BOOTPClient *bc=NULL; -+ int i; -+ /*check the net prefix*/ -+ if ((ntohl(reqaddr->s_addr) & 0xffffff00) == -+ (ntohl(special_addr.s_addr) & 0xffffff00)) { -+ i=(ntohl(reqaddr->s_addr) & 0xff) - START_ADDR; -+ if (i>=0 && i< NB_ADDR) { -+ bc = &bootp_clients[i]; -+ if (bc->allocated && -+ (memcmp(macaddr, bootp_clients[i].macaddr, 6)==0)) { -+ paddr->s_addr = reqaddr->s_addr; -+ return bc; -+ } -+ else -+ bc=NULL; -+ } -+ } -+ return bc; -+} -+ -+ - static void dhcp_decode(const uint8_t *buf, int size, -- int *pmsg_type) -+ int *pmsg_type, struct sockaddr_in *preqaddr) - { - const uint8_t *p, *p_end; - int len, tag; - - *pmsg_type = 0; -+ preqaddr->sin_addr.s_addr=htonl(0L); - - p = buf; - p_end = buf + size; -@@ -114,6 +143,10 @@ - if (len >= 1) - *pmsg_type = p[0]; - break; -+ case RFC2132_REQ_ADDR: -+ if (len == 4) { -+ memcpy(&(preqaddr->sin_addr),p,4); -+ } - default: - break; - } -@@ -127,14 +160,14 @@ - BOOTPClient *bc; - struct mbuf *m; - struct bootp_t *rbp; -- struct sockaddr_in saddr, daddr; -+ struct sockaddr_in saddr, daddr, reqaddr; - struct in_addr dns_addr; - int dhcp_msg_type, val; -- uint8_t *q; -+ uint8_t *q,replytype; - - /* extract exact DHCP msg type */ -- dhcp_decode(bp->bp_vend, DHCP_OPT_LEN, &dhcp_msg_type); -- dprintf("bootp packet op=%d msgtype=%d\n", bp->bp_op, dhcp_msg_type); -+ dhcp_decode(bp->bp_vend, DHCP_OPT_LEN, &dhcp_msg_type,&reqaddr); -+ dprintf("bootp packet op=%d msgtype=%d reqaddr=%x\n", bp->bp_op, dhcp_msg_type,ntohl(reqaddr.sin_addr.s_addr)); - - if (dhcp_msg_type == 0) - dhcp_msg_type = DHCPREQUEST; /* Force reply for old BOOTP clients */ -@@ -152,21 +185,18 @@ - m->m_data += sizeof(struct udpiphdr); - memset(rbp, 0, sizeof(struct bootp_t)); - -- if (dhcp_msg_type == DHCPDISCOVER) { -- new_addr: -- bc = get_new_addr(&daddr.sin_addr); -- if (!bc) { -- dprintf("no address left\n"); -- return; -- } -- memcpy(bc->macaddr, client_ethaddr, 6); -- } else { -- bc = find_addr(&daddr.sin_addr, bp->bp_hwaddr); -- if (!bc) { -- /* if never assigned, behaves as if it was already -- assigned (windows fix because it remembers its address) */ -- goto new_addr; -- } -+ bc=NULL; -+ daddr.sin_addr.s_addr=htonl(0L); -+ if (dhcp_msg_type == DHCPREQUEST) { -+ if (reqaddr.sin_addr.s_addr != htonl(0L)) -+ bc = find_reqaddr(&daddr.sin_addr, &reqaddr.sin_addr, bp->bp_hwaddr); -+ else -+ bc = find_addr(&daddr.sin_addr, bp->bp_hwaddr); -+ } -+ else if (dhcp_msg_type == DHCPDISCOVER) { -+ bc = find_addr(&daddr.sin_addr, bp->bp_hwaddr); -+ if (!bc) -+ bc = get_new_addr(&daddr.sin_addr); - } - dprintf("offered addr=%08x\n", ntohl(daddr.sin_addr.s_addr)); - -@@ -181,25 +211,27 @@ - rbp->bp_hlen = 6; - memcpy(rbp->bp_hwaddr, bp->bp_hwaddr, 6); - -- rbp->bp_yiaddr = daddr.sin_addr; /* Client IP address */ -- rbp->bp_siaddr = saddr.sin_addr; /* Server IP address */ -+ rbp->bp_yiaddr = daddr.sin_addr; /* IP address */ - - q = rbp->bp_vend; - memcpy(q, rfc1533_cookie, 4); - q += 4; - -- if (dhcp_msg_type == DHCPDISCOVER) { -- *q++ = RFC2132_MSG_TYPE; -- *q++ = 1; -- *q++ = DHCPOFFER; -- } else if (dhcp_msg_type == DHCPREQUEST) { -+ if (bc != NULL) { -+ memcpy(bc->macaddr, client_ethaddr, 6); -+ bc->allocated = 1; -+ bc->time = time(NULL); -+ replytype=(dhcp_msg_type == DHCPDISCOVER)?DHCPOFFER:DHCPACK; -+ } -+ else -+ replytype=DHCPNACK; -+ - *q++ = RFC2132_MSG_TYPE; - *q++ = 1; -- *q++ = DHCPACK; -- } -+ *q++ = replytype; - -- if (dhcp_msg_type == DHCPDISCOVER || -- dhcp_msg_type == DHCPREQUEST) { -+ if ((dhcp_msg_type == DHCPDISCOVER || -+ dhcp_msg_type == DHCPREQUEST) && replytype!=DHCPNACK) { - *q++ = RFC2132_SRV_ID; - *q++ = 4; - memcpy(q, &saddr.sin_addr, 4); -Index: qemu/slirp/bootp.h -=================================================================== -RCS file: /cvsroot/qemu/qemu/slirp/bootp.h,v -retrieving revision 1.1 -diff -u -r1.1 bootp.h ---- slirp/bootp.h 22 Apr 2004 00:10:47 -0000 1.1 -+++ slirp/bootp.h 5 Jun 2004 19:34:22 -0000 -@@ -71,6 +71,7 @@ - #define DHCPOFFER 2 - #define DHCPREQUEST 3 - #define DHCPACK 5 -+#define DHCPNACK 6 - - #define RFC1533_VENDOR_MAJOR 0 - #define RFC1533_VENDOR_MINOR 0 diff --git a/emulators/qemu-devel/files/patch-bt b/emulators/qemu-devel/files/patch-bt deleted file mode 100644 index 62e8924722b3..000000000000 --- a/emulators/qemu-devel/files/patch-bt +++ /dev/null @@ -1,103 +0,0 @@ -Index: qemu/vl.c -@@ -43,6 +43,9 @@ - #ifndef __APPLE__ - #include <libutil.h> - #endif -+#ifdef __FreeBSD__ -+#include <sys/module.h> -+#endif - #else - #include <linux/if.h> - #include <linux/if_tun.h> -@@ -1059,6 +1062,34 @@ - - #endif /* CONFIG_SLIRP */ - -+#ifdef __FreeBSD__ -+#define LOAD_QUIETLY 1 -+#define LOAD_VERBOSLY 2 -+ -+int -+loadmodules(int how, const char *module, ...) -+{ -+ int loaded = 0; -+ va_list ap; -+ -+ va_start(ap, module); -+#ifndef NO_MODULES -+ while (module != NULL) { -+ if (modfind(module) == -1) { -+ if (kldload(module) == -1) { -+ if (how == LOAD_VERBOSLY) -+ fprintf(stderr, "%s: Cannot load module\n", module); -+ } else -+ loaded++; -+ } -+ module = va_arg(ap, const char *); -+ } -+ va_end(ap); -+#endif -+ return loaded; -+} -+#endif -+ - #if !defined(_WIN32) - #ifdef _BSD - static int tun_open(char *ifname, int ifname_size) -@@ -1067,11 +1098,55 @@ - char *dev; - struct stat s; - -+#ifdef __FreeBSD__ -+ int i, kldtried = 0, enoentcount = 0, err = 0; -+ char dname[100]; -+#ifdef USE_DEVTAP -+ /* -+ * 5.x has /dev/tap, but that seems to just blindly increase its -+ * couter on every open() for some people(??), i.e. on every qemu run. -+ */ -+ i = -1; -+#else -+ i = 0; -+#endif -+ for (; i < 10; i++) { -+ if (i == -1) -+ strcpy(dname, "/dev/tap"); -+ else -+ snprintf(dname, sizeof dname, "%s%d", -+ "/dev/tap", i); -+ fd = open(dname, O_RDWR); -+ if (fd >= 0) -+ break; -+ else if (errno == ENXIO || errno == ENOENT) { -+ if (i == 0 && !kldtried++) { -+ /* -+ * Attempt to load the tunnel interface KLD if it isn't loaded -+ * already. -+ */ -+ if (loadmodules(LOAD_VERBOSLY, "if_tap", NULL)) -+ i = -1; -+ continue; -+ } -+ if (errno != ENOENT || ++enoentcount > 3) { -+ err = errno; -+ break; -+ } -+ } else -+ err = errno; -+ } -+ if (fd < 0) { -+ fprintf(stderr, "warning: could not open %s (%s): no virtual network emulation\n", dname, strerror(err)); -+ return -1; -+ } -+#else - fd = open("/dev/tap", O_RDWR); - if (fd < 0) { -- fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n"); -+ fprintf(stderr, "warning: could not open /dev/tap (%s): no virtual network emulation\n", strerror(errno)); - return -1; - } -+#endif - - fstat(fd, &s); - dev = devname(s.st_rdev, S_IFCHR); diff --git a/emulators/qemu-devel/files/patch-fbsd b/emulators/qemu-devel/files/patch-fbsd deleted file mode 100644 index abb69f4ecdc5..000000000000 --- a/emulators/qemu-devel/files/patch-fbsd +++ /dev/null @@ -1,165 +0,0 @@ -Index: qemu/Makefile -@@ -13,7 +13,7 @@ - endif - DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 - --all: dyngen$(EXESUF) $(TOOLS) $(DOCS) -+all: bsd/libmath.a dyngen$(EXESUF) $(TOOLS) $(DOCS) - for d in $(TARGET_DIRS); do \ - $(MAKE) -C $$d $@ || exit 1 ; \ - done -@@ -21,10 +21,13 @@ - ifdef CONFIG_WIN32 - $(MAKE) -C kqemu -f Makefile.winnt - else -- $(MAKE) -C kqemu -+ ( cd kqemu && $(BSD_MAKE) -f Makefile.freebsd ) - endif - endif - -+bsd/libmath.a: -+ ( cd bsd ; $(BSD_MAKE) CC=$(CC) ) -+ - qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c - $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS) - -@@ -33,6 +36,7 @@ - - clean: - # avoid old build problems by removing potentially incorrect old files -+ ( cd bsd ; $(BSD_MAKE) clean ) - rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h - rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~ - $(MAKE) -C tests clean -@@ -40,7 +44,7 @@ - $(MAKE) -C $$d $@ || exit 1 ; \ - done - ifdef CONFIG_KQEMU -- $(MAKE) -C kqemu clean -+ cd kqemu && $(BSD_MAKE) -f Makefile.freebsd clean - endif - - distclean: clean -@@ -73,9 +77,6 @@ - for d in $(TARGET_DIRS); do \ - $(MAKE) -C $$d $@ || exit 1 ; \ - done --ifdef CONFIG_KQEMU -- cd kqemu ; ./install.sh --endif - - # various test targets - test speed test2: all -Index: qemu/Makefile.target -@@ -391,8 +391,8 @@ - VL_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld - endif - --$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a -- $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) -+$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a ../bsd/libmath.a -+ $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) ../bsd/libmath.a - - cocoa.o: cocoa.m - $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< -Index: qemu/fpu/softfloat-native.c -@@ -2,11 +2,15 @@ - context is supported */ - #include "softfloat.h" - #include <math.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500000 -+#include <ieeefp.h> -+#endif - - void set_float_rounding_mode(int val STATUS_PARAM) - { - STATUS(float_rounding_mode) = val; --#if defined(_BSD) && !defined(__APPLE__) -+#if defined(_BSD) && !defined(__APPLE__) && \ -+ (defined(__FreeBSD__) && __FreeBSD_version < 500000) - fpsetround(val); - #elif defined(__arm__) - /* nothing to do */ -@@ -22,7 +26,7 @@ - } - #endif - --#if defined(_BSD) -+#if defined(_BSD) && !defined(__FreeBSD__) - #define lrint(d) ((int32_t)rint(d)) - #define llrint(d) ((int64_t)rint(d)) - #endif -Index: qemu/fpu/softfloat-native.h -@@ -1,7 +1,17 @@ - /* Native implementation of soft float functions */ - #include <math.h> --#if defined(_BSD) && !defined(__APPLE__) -+#if defined(_BSD) && !defined(__APPLE__) && \ -+ (!defined(__FreeBSD__) || __FreeBSD_version < 500000) - #include <ieeefp.h> -+#if defined(__FreeBSD__) -+#define isgreater(x, y) __builtin_isgreater((x), (y)) -+#define isgreaterequal(x, y) __builtin_isgreaterequal((x), (y)) -+#define isless(x, y) __builtin_isless((x), (y)) -+#define islessequal(x, y) __builtin_islessequal((x), (y)) -+#define islessgreater(x, y) __builtin_islessgreater((x), (y)) -+#define isunordered(x, y) __builtin_isunordered((x), (y)) -+long double fabsl(long double x); -+#endif - #else - #include <fenv.h> - #endif -@@ -33,12 +43,13 @@ - /*---------------------------------------------------------------------------- - | Software IEC/IEEE floating-point rounding mode. - *----------------------------------------------------------------------------*/ --#if defined(_BSD) && !defined(__APPLE__) -+#if defined(_BSD) && !defined(__APPLE__) && \ -+ (!defined(__FreeBSD__) || __FreeBSD_version < 500000) - enum { - float_round_nearest_even = FP_RN, -- float_round_down = FE_RM, -- float_round_up = FE_RP, -- float_round_to_zero = FE_RZ -+ float_round_down = FP_RM, -+ float_round_up = FP_RP, -+ float_round_to_zero = FP_RZ - }; - #elif defined(__arm__) - enum { -Index: qemu/fpu/softfloat.h -@@ -84,7 +84,8 @@ - #define FLOAT128 - #else - /* native float support */ --#if (defined(__i386__) || defined(__x86_64__)) && !defined(_BSD) -+#if (defined(__i386__) || defined(__x86_64__)) && \ -+ (!defined(_BSD) || defined(__FreeBSD__)) - #define FLOATX80 - #endif - #endif /* !CONFIG_SOFTFLOAT */ -Index: qemu/target-ppc/op_helper.c -@@ -303,6 +303,13 @@ - FT0 = sqrt(FT0); - } - -+#ifndef isnormal -+#define isnormal(x) \ -+ ((sizeof (x) == sizeof (float)) ? __isnormalf(x) \ -+ : (sizeof (x) == sizeof (double)) ? __isnormal(x) \ -+ : __isnormall(x)) -+#endif -+ - void do_fres (void) - { - union { -Index: qemu/x86_64.ld -@@ -2,7 +2,7 @@ - OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") - OUTPUT_ARCH(i386:x86-64) - ENTRY(_start) --SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/local/lib64"); -+SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); SEARCH_DIR("/usr/local/lib"); - SECTIONS - { - /* Read-only sections, merged into text segment: */ diff --git a/emulators/qemu-devel/files/patch-libmath b/emulators/qemu-devel/files/patch-libmath deleted file mode 100644 index d0c4cbaa363c..000000000000 --- a/emulators/qemu-devel/files/patch-libmath +++ /dev/null @@ -1,2524 +0,0 @@ -diff -Nru qemu-0.7.0/bsd.orig/Makefile qemu-0.7.0/bsd/Makefile ---- qemu-0.7.0/bsd.orig/Makefile Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/Makefile Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,32 @@ -+SRCS= ${MACHINE_ARCH}/e_atan2l.c \ -+ ${MACHINE_ARCH}/e_logl.S \ -+ ${MACHINE_ARCH}/e_powl.S \ -+ ${MACHINE_ARCH}/e_remainderl.S \ -+ ${MACHINE_ARCH}/e_sqrtl.c \ -+ ${MACHINE_ARCH}/s_ceill.S \ -+ ${MACHINE_ARCH}/s_cosl.S \ -+ ${MACHINE_ARCH}/s_floorl.S \ -+ ${MACHINE_ARCH}/s_isnormal.c \ -+ ${MACHINE_ARCH}/s_llrint.S \ -+ ${MACHINE_ARCH}/s_llrintf.S \ -+ ${MACHINE_ARCH}/s_llrintl.S \ -+ ${MACHINE_ARCH}/s_lrint.S \ -+ ${MACHINE_ARCH}/s_lrintf.S \ -+ ${MACHINE_ARCH}/s_lrintl.S \ -+ ${MACHINE_ARCH}/s_rintl.c \ -+ ${MACHINE_ARCH}/s_round.c \ -+ ${MACHINE_ARCH}/s_sinl.S \ -+ ${MACHINE_ARCH}/s_tanl.S -+ -+OBJS= ${SRCS:R:S/$/.o/} -+ -+CFLAGS= -O2 -Wall -I. -+ -+all: libmath.a -+ -+libmath.a: ${OBJS} -+ rm -f $@ -+ ${AR} rcs $@ ${OBJS:T} -+ -+clean: -+ rm -f ${OBJS:T} libmath.a -diff -Nru qemu-0.7.0/bsd.orig/amd64/e_atan2l.c qemu-0.7.0/bsd/amd64/e_atan2l.c ---- qemu-0.7.0/bsd.orig/amd64/e_atan2l.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/e_atan2l.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,20 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <sysdep.h> -+ -+long double -+__ieee754_atan2l (long double y, long double x) -+{ -+ long double res; -+ -+ asm ("fpatan" : "=t" (res) : "u" (y), "0" (x) : "st(1)"); -+ -+ return res; -+} -+ -+weak_alias(__ieee754_atan2l, atan2l) -diff -Nru qemu-0.7.0/bsd.orig/amd64/e_logl.S qemu-0.7.0/bsd/amd64/e_logl.S ---- qemu-0.7.0/bsd.orig/amd64/e_logl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/e_logl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,59 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ * Adapted for x86-64 by Andreas Jaeger <aj@suse.de>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+RCSID("$NetBSD: $") -+ -+ -+#ifdef __ELF__ -+ .section .rodata -+#else -+ .text -+#endif -+ .align ALIGNARG(4) -+ ASM_TYPE_DIRECTIVE(one,@object) -+one: .double 1.0 -+ ASM_SIZE_DIRECTIVE(one) -+ /* It is not important that this constant is precise. It is only -+ a value which is known to be on the safe side for using the -+ fyl2xp1 instruction. */ -+ ASM_TYPE_DIRECTIVE(limit,@object) -+limit: .double 0.29 -+ ASM_SIZE_DIRECTIVE(limit) -+ -+ -+#ifdef PIC -+#define MO(op) op##(%rip) -+#else -+#define MO(op) op -+#endif -+ -+ .text -+ENTRY(__ieee754_logl) -+ fldln2 // log(2) -+ fldt 8(%rsp) // x : log(2) -+ fld %st // x : x : log(2) -+ fsubl MO(one) // x-1 : x : log(2) -+ fld %st // x-1 : x-1 : x : log(2) -+ fabs // |x-1| : x-1 : x : log(2) -+ fcompl MO(limit) // x-1 : x : log(2) -+ fnstsw // x-1 : x : log(2) -+ andb $0x45, %ah -+ jz 2f -+ fstp %st(1) // x-1 : log(2) -+ fyl2xp1 // log(x) -+ ret -+ -+2: fstp %st(0) // x : log(2) -+ fyl2x // log(x) -+ ret -+END (__ieee754_logl) -+ -+weak_alias(__ieee754_logl,logl) -diff -Nru qemu-0.7.0/bsd.orig/amd64/e_powl.S qemu-0.7.0/bsd/amd64/e_powl.S ---- qemu-0.7.0/bsd.orig/amd64/e_powl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/e_powl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,341 @@ -+/* ix87 specific implementation of pow function. -+ Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+#ifdef __ELF__ -+ .section .rodata -+#else -+ .text -+#endif -+ -+ .align ALIGNARG(4) -+ ASM_TYPE_DIRECTIVE(infinity,@object) -+inf_zero: -+infinity: -+ .byte 0, 0, 0, 0, 0, 0, 0xf0, 0x7f -+ ASM_SIZE_DIRECTIVE(infinity) -+ ASM_TYPE_DIRECTIVE(zero,@object) -+zero: .double 0.0 -+ ASM_SIZE_DIRECTIVE(zero) -+ ASM_TYPE_DIRECTIVE(minf_mzero,@object) -+minf_mzero: -+minfinity: -+ .byte 0, 0, 0, 0, 0, 0, 0xf0, 0xff -+mzero: -+ .byte 0, 0, 0, 0, 0, 0, 0, 0x80 -+ ASM_SIZE_DIRECTIVE(minf_mzero) -+ ASM_TYPE_DIRECTIVE(one,@object) -+one: .double 1.0 -+ ASM_SIZE_DIRECTIVE(one) -+ ASM_TYPE_DIRECTIVE(limit,@object) -+limit: .double 0.29 -+ ASM_SIZE_DIRECTIVE(limit) -+ ASM_TYPE_DIRECTIVE(p63,@object) -+p63: -+ .byte 0, 0, 0, 0, 0, 0, 0xe0, 0x43 -+ ASM_SIZE_DIRECTIVE(p63) -+ -+#ifdef PIC -+#define MO(op) op##(%rip) -+#else -+#define MO(op) op -+#endif -+ -+ .text -+ENTRY(__ieee754_powl) -+ fldt 24(%rsp) // y -+ fxam -+ -+ -+ fnstsw -+ movb %ah, %dl -+ andb $0x45, %ah -+ cmpb $0x40, %ah // is y == 0 ? -+ je 11f -+ -+ cmpb $0x05, %ah // is y == ±inf ? -+ je 12f -+ -+ cmpb $0x01, %ah // is y == NaN ? -+ je 30f -+ -+ fldt 8(%rsp) // x : y -+ -+ fxam -+ fnstsw -+ movb %ah, %dh -+ andb $0x45, %ah -+ cmpb $0x40, %ah -+ je 20f // x is ±0 -+ -+ cmpb $0x05, %ah -+ je 15f // x is ±inf -+ -+ fxch // y : x -+ -+ /* fistpll raises invalid exception for |y| >= 1L<<63. */ -+ fldl MO(p63) // 1L<<63 : y : x -+ fld %st(1) // y : 1L<<63 : y : x -+ fabs // |y| : 1L<<63 : y : x -+ fcomip %st(1), %st // 1L<<63 : y : x -+ fstp %st(0) // y : x -+ jnc 2f -+ -+ /* First see whether `y' is a natural number. In this case we -+ can use a more precise algorithm. */ -+ fld %st // y : y : x -+ fistpll -8(%rsp) // y : x -+ fildll -8(%rsp) // int(y) : y : x -+ fucomip %st(1),%st // y : x -+ jne 2f -+ -+ /* OK, we have an integer value for y. */ -+ mov -8(%rsp),%eax -+ mov -4(%rsp),%edx -+ orl $0, %edx -+ fstp %st(0) // x -+ jns 4f // y >= 0, jump -+ fdivrl MO(one) // 1/x (now referred to as x) -+ negl %eax -+ adcl $0, %edx -+ negl %edx -+4: fldl MO(one) // 1 : x -+ fxch -+ -+6: shrdl $1, %edx, %eax -+ jnc 5f -+ fxch -+ fmul %st(1) // x : ST*x -+ fxch -+5: fmul %st(0), %st // x*x : ST*x -+ shrl $1, %edx -+ movl %eax, %ecx -+ orl %edx, %ecx -+ jnz 6b -+ fstp %st(0) // ST*x -+ ret -+ -+ /* y is ±NAN */ -+30: fldt 8(%rsp) // x : y -+ fldl MO(one) // 1.0 : x : y -+ fucomip %st(1),%st // x : y -+ je 31f -+ fxch // y : x -+31: fstp %st(1) -+ ret -+ -+ .align ALIGNARG(4) -+2: /* y is a real number. */ -+ fxch // x : y -+ fldl MO(one) // 1.0 : x : y -+ fld %st(1) // x : 1.0 : x : y -+ fsub %st(1) // x-1 : 1.0 : x : y -+ fabs // |x-1| : 1.0 : x : y -+ fcompl MO(limit) // 1.0 : x : y -+ fnstsw -+ fxch // x : 1.0 : y -+ test $4500,%eax -+ jz 7f -+ fsub %st(1) // x-1 : 1.0 : y -+ fyl2xp1 // log2(x) : y -+ jmp 8f -+ -+7: fyl2x // log2(x) : y -+8: fmul %st(1) // y*log2(x) : y -+ fxam -+ fnstsw -+ andb $0x45, %ah -+ cmpb $0x05, %ah // is y*log2(x) == ±inf ? -+ je 28f -+ fst %st(1) // y*log2(x) : y*log2(x) -+ frndint // int(y*log2(x)) : y*log2(x) -+ fsubr %st, %st(1) // int(y*log2(x)) : fract(y*log2(x)) -+ fxch // fract(y*log2(x)) : int(y*log2(x)) -+ f2xm1 // 2^fract(y*log2(x))-1 : int(y*log2(x)) -+ faddl MO(one) // 2^fract(y*log2(x)) : int(y*log2(x)) -+ fscale // 2^fract(y*log2(x))*2^int(y*log2(x)) : int(y*log2(x)) -+ fstp %st(1) // 2^fract(y*log2(x))*2^int(y*log2(x)) -+ ret -+ -+28: fstp %st(1) // y*log2(x) -+ fldl MO(one) // 1 : y*log2(x) -+ fscale // 2^(y*log2(x)) : y*log2(x) -+ fstp %st(1) // 2^(y*log2(x)) -+ ret -+ -+ // pow(x,±0) = 1 -+ .align ALIGNARG(4) -+11: fstp %st(0) // pop y -+ fldl MO(one) -+ ret -+ -+ // y == ±inf -+ .align ALIGNARG(4) -+12: fstp %st(0) // pop y -+ fldt 8(%rsp) // x -+ fabs -+ fcompl MO(one) // < 1, == 1, or > 1 -+ fnstsw -+ andb $0x45, %ah -+ cmpb $0x45, %ah -+ je 13f // jump if x is NaN -+ -+ cmpb $0x40, %ah -+ je 14f // jump if |x| == 1 -+ -+ shlb $1, %ah -+ xorb %ah, %dl -+ andl $2, %edx -+#ifdef PIC -+ lea inf_zero(%rip),%rcx -+ fldl (%rcx, %rdx, 4) -+#else -+ fldl inf_zero(,%rdx, 4) -+#endif -+ ret -+ -+ .align ALIGNARG(4) -+14: fldl MO(one) -+ ret -+ -+ .align ALIGNARG(4) -+13: fldt 8(%rsp) // load x == NaN -+ ret -+ -+ .align ALIGNARG(4) -+ // x is ±inf -+15: fstp %st(0) // y -+ testb $2, %dh -+ jz 16f // jump if x == +inf -+ -+ // We must find out whether y is an odd integer. -+ fld %st // y : y -+ fistpll -8(%rsp) // y -+ fildll -8(%rsp) // int(y) : y -+ fucomip %st(1),%st -+ ffreep %st // <empty> -+ jne 17f -+ -+ // OK, the value is an integer, but is it odd? -+ mov -8(%rsp), %eax -+ mov -4(%rsp), %edx -+ andb $1, %al -+ jz 18f // jump if not odd -+ // It's an odd integer. -+ shrl $31, %edx -+#ifdef PIC -+ lea minf_mzero(%rip),%rcx -+ fldl (%rcx, %rdx, 8) -+#else -+ fldl minf_mzero(,%rdx, 8) -+#endif -+ ret -+ -+ .align ALIGNARG(4) -+16: fcompl MO(zero) -+ fnstsw -+ shrl $5, %eax -+ andl $8, %eax -+#ifdef PIC -+ lea inf_zero(%rip),%rcx -+ fldl (%rcx, %rax, 1) -+#else -+ fldl inf_zero(,%rax, 1) -+#endif -+ ret -+ -+ .align ALIGNARG(4) -+17: shll $30, %edx // sign bit for y in right position -+18: shrl $31, %edx -+#ifdef PIC -+ lea inf_zero(%rip),%rcx -+ fldl (%rcx, %rdx, 8) -+#else -+ fldl inf_zero(,%rdx, 8) -+#endif -+ ret -+ -+ .align ALIGNARG(4) -+ // x is ±0 -+20: fstp %st(0) // y -+ testb $2, %dl -+ jz 21f // y > 0 -+ -+ // x is ±0 and y is < 0. We must find out whether y is an odd integer. -+ testb $2, %dh -+ jz 25f -+ -+ fld %st // y : y -+ fistpll -8(%rsp) // y -+ fildll -8(%rsp) // int(y) : y -+ fucomip %st(1),%st -+ ffreep %st // <empty> -+ jne 26f -+ -+ // OK, the value is an integer, but is it odd? -+ mov -8(%rsp),%eax -+ mov -4(%rsp),%edx -+ andb $1, %al -+ jz 27f // jump if not odd -+ // It's an odd integer. -+ // Raise divide-by-zero exception and get minus infinity value. -+ fldl MO(one) -+ fdivl MO(zero) -+ fchs -+ ret -+ -+25: fstp %st(0) -+26: -+27: // Raise divide-by-zero exception and get infinity value. -+ fldl MO(one) -+ fdivl MO(zero) -+ ret -+ -+ .align ALIGNARG(4) -+ // x is ±0 and y is > 0. We must find out whether y is an odd integer. -+21: testb $2, %dh -+ jz 22f -+ -+ fld %st // y : y -+ fistpll -8(%rsp) // y -+ fildll -8(%rsp) // int(y) : y -+ fucomip %st(1),%st -+ ffreep %st // <empty> -+ jne 23f -+ -+ // OK, the value is an integer, but is it odd? -+ mov -8(%rsp),%eax -+ mov -4(%rsp),%edx -+ andb $1, %al -+ jz 24f // jump if not odd -+ // It's an odd integer. -+ fldl MO(mzero) -+ ret -+ -+22: fstp %st(0) -+23: -+24: fldl MO(zero) -+ ret -+ -+END(__ieee754_powl) -+ -+weak_alias(__ieee754_powl,powl) -diff -Nru qemu-0.7.0/bsd.orig/amd64/e_remainderl.S qemu-0.7.0/bsd/amd64/e_remainderl.S ---- qemu-0.7.0/bsd.orig/amd64/e_remainderl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/e_remainderl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,23 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ * Adapted for x86-64 by Andreas Jaeger <aj@suse.de>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+ENTRY(__ieee754_remainderl) -+ fldt 24(%rsp) -+ fldt 8(%rsp) -+1: fprem1 -+ fstsw %ax -+ testl $0x400,%eax -+ jnz 1b -+ fstp %st(1) -+ ret -+END (__ieee754_remainderl) -+ -+weak_alias(__ieee754_remainderl,remainderl) -diff -Nru qemu-0.7.0/bsd.orig/amd64/e_sqrtl.c qemu-0.7.0/bsd/amd64/e_sqrtl.c ---- qemu-0.7.0/bsd.orig/amd64/e_sqrtl.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/e_sqrtl.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,20 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <sysdep.h> -+ -+long double -+__ieee754_sqrtl (long double x) -+{ -+ long double res; -+ -+ asm ("fsqrt" : "=t" (res) : "0" (x)); -+ -+ return res; -+} -+ -+weak_alias(__ieee754_sqrtl,sqrtl) -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_ceill.S qemu-0.7.0/bsd/amd64/s_ceill.S ---- qemu-0.7.0/bsd.orig/amd64/s_ceill.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_ceill.S Fri Apr 29 02:22:18 2005 -@@ -0,0 +1,246 @@ -+/* -+ * ==================================================== -+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. -+ * -+ * Developed at SunPro, a Sun Microsystems, Inc. business. -+ * Permission to use, copy, modify, and distribute this -+ * software is freely granted, provided that this notice -+ * is preserved. -+ * ==================================================== -+ * -+ * From: @(#)s_ceil.c 5.1 93/09/24 -+ */ -+/* XXX: generated from src/lib/msun/src/s_ceill.c */ -+ -+#include <machine/asm.h> -+ -+__FBSDID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+ -+ .file "s_ceill.c" -+ .section .rodata.cst8,"aM",@progbits,8 -+ .p2align 3 -+.LC0: -+ .long 2281731484 -+ .long 2117592124 -+ .text -+ .p2align 4,,15 -+.globl ceill -+ .type ceill, @function -+ceill: -+.LFB17: -+ pushq %rbp -+.LCFI0: -+ pushq %rbx -+.LCFI1: -+ fldt 24(%rsp) -+ movq $0, -16(%rsp) -+ fld %st(0) -+ fstpt -40(%rsp) -+ movl -32(%rsp), %edi -+ movq -40(%rsp), %rsi -+ movl %edi, -16(%rsp) -+ movl -16(%rsp), %r11d -+ movq %rsi, -24(%rsp) -+ movl %r11d, %r10d -+ andl $32767, %r10d -+ leal -16383(%r10), %r8d -+ cmpl $30, %r8d -+ jg .L2 -+ testl %r8d, %r8d -+ js .L38 -+ movl -20(%rsp), %r9d -+ leal 1(%r8), %ecx -+ mov -24(%rsp), %eax -+ movl $4294967295, %ebp -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ shrq %cl, %rbp -+ mov %r9d, %ebx -+ movq %rbx, %rdx -+ andq %rbp, %rdx -+ orq %rax, %rdx -+ fldt -40(%rsp) -+ je .L42 -+ ffreep %st(0) -+ testb $-128, -15(%rsp) -+ jne .L12 -+ movl $31, %ecx -+ movl $1, %eax -+ subl %r8d, %ecx -+ salq %cl, %rax -+ addl %eax, %r9d -+ mov %r9d, %eax -+ cmpq %rbx, %rax -+ jae .L32 -+ leal 1(%r10), %edx -+ movl %r11d, %eax -+ orl $-2147483648, %r9d -+ andw $-32768, %ax -+ andw $32767, %dx -+ orl %edx, %eax -+ movw %ax, -16(%rsp) -+.L32: -+ movl %r9d, -20(%rsp) -+.L12: -+ faddl .LC0(%rip) -+ fldz -+ fxch %st(1) -+ fucomip %st(1), %st -+ fstp %st(0) -+ jbe .L31 -+ movl %ebp, %eax -+ movl $0, -24(%rsp) -+ notl %eax -+ andl %eax, %r9d -+ movl %r9d, -20(%rsp) -+ .p2align 4,,7 -+.L31: -+ movq -24(%rsp), %rsi -+ movl -16(%rsp), %edi -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ fldt -40(%rsp) -+ popq %rbx -+ popq %rbp -+ ret -+ .p2align 4,,7 -+.L2: -+ cmpl $62, %r8d -+ jle .L45 -+.L44: -+ ffreep %st(0) -+.L17: -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ fldt -40(%rsp) -+ popq %rbx -+ popq %rbp -+ ret -+ .p2align 4,,7 -+.L45: -+ movl -24(%rsp), %edx -+ leal 1(%r8), %ecx -+ movq $-1, %rbx -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ shrq %cl, %rbx -+ mov %edx, %r9d -+ testq %rbx, %r9 -+ fldt -40(%rsp) -+ je .L42 -+ ffreep %st(0) -+ testb $-128, -15(%rsp) -+ jne .L20 -+ cmpl $31, %r8d -+ je .L36 -+ movl $63, %ecx -+ movl $1, %eax -+ subl %r8d, %ecx -+ salq %cl, %rax -+ leal (%rdx,%rax), %eax -+ movl %eax, -24(%rsp) -+ mov %eax, %eax -+ cmpq %r9, %rax -+ jae .L20 -+.L36: -+ movl -20(%rsp), %eax -+ leal 1(%rax), %ecx -+ cmpl %eax, %ecx -+ jae .L34 -+ leal 1(%r10), %edx -+ movl %r11d, %eax -+ orl $-2147483648, %ecx -+ andw $-32768, %ax -+ andw $32767, %dx -+ orl %edx, %eax -+ movw %ax, -16(%rsp) -+.L34: -+ movl %ecx, -20(%rsp) -+ .p2align 4,,7 -+.L20: -+ faddl .LC0(%rip) -+ fldz -+ fxch %st(1) -+ fucomip %st(1), %st -+ fstp %st(0) -+ jbe .L31 -+ movl %ebx, %eax -+ notl %eax -+ andl %eax, -24(%rsp) -+ jmp .L31 -+ .p2align 4,,7 -+.L42: -+ fstp %st(1) -+ popq %rbx -+ popq %rbp -+ ret -+ .p2align 4,,7 -+.L38: -+ fldl .LC0(%rip) -+ faddp %st, %st(1) -+ fldz -+ fxch %st(1) -+ fucomip %st(1), %st -+ jbe .L44 -+ testl %r10d, %r10d -+ jle .L39 -+.L7: -+ movabsq $-9223372036854775808, %rsi -+ movl $16383, %edi -+ testb $-128, -15(%rsp) -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ fldt -40(%rsp) -+ fcmovne %st(1), %st -+ fstp %st(1) -+ fstpt -40(%rsp) -+ movq -40(%rsp), %rsi -+ movl -32(%rsp), %edi -+ movq %rsi, -24(%rsp) -+ movl %edi, -16(%rsp) -+ jmp .L17 -+.L39: -+ movl -24(%rsp), %eax -+ orl -20(%rsp), %eax -+ je .L44 -+ jmp .L7 -+.LFE17: -+ .size ceill, .-ceill -+ .section .eh_frame,"a",@progbits -+.Lframe1: -+ .long .LECIE1-.LSCIE1 -+.LSCIE1: -+ .long 0x0 -+ .byte 0x1 -+ .string "" -+ .uleb128 0x1 -+ .sleb128 -8 -+ .byte 0x10 -+ .byte 0xc -+ .uleb128 0x7 -+ .uleb128 0x8 -+ .byte 0x90 -+ .uleb128 0x1 -+ .p2align 3 -+.LECIE1: -+.LSFDE1: -+ .long .LEFDE1-.LASFDE1 -+.LASFDE1: -+ .long .LASFDE1-.Lframe1 -+ .quad .LFB17 -+ .quad .LFE17-.LFB17 -+ .byte 0x4 -+ .long .LCFI0-.LFB17 -+ .byte 0xe -+ .uleb128 0x10 -+ .byte 0x4 -+ .long .LCFI1-.LCFI0 -+ .byte 0xe -+ .uleb128 0x18 -+ .byte 0x83 -+ .uleb128 0x3 -+ .byte 0x86 -+ .uleb128 0x2 -+ .p2align 3 -+.LEFDE1: -+ .ident "GCC: (GNU) 3.4.4 [FreeBSD] 20050421" -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_cosl.S qemu-0.7.0/bsd/amd64/s_cosl.S ---- qemu-0.7.0/bsd.orig/amd64/s_cosl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_cosl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,33 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ * Adapted for x86-64 by Andreas Jaeger <aj@suse.de>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+RCSID("$NetBSD: $") -+ -+ENTRY(__cosl) -+ fldt 8(%rsp) -+ fcos -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 1f -+ ret -+ .align ALIGNARG(4) -+1: fldpi -+ fadd %st(0) -+ fxch %st(1) -+2: fprem1 -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 2b -+ fstp %st(1) -+ fcos -+ ret -+END (__cosl) -+weak_alias (__cosl, cosl) -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_floorl.S qemu-0.7.0/bsd/amd64/s_floorl.S ---- qemu-0.7.0/bsd.orig/amd64/s_floorl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_floorl.S Fri Apr 29 02:24:32 2005 -@@ -0,0 +1,247 @@ -+/* -+ * ==================================================== -+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. -+ * -+ * Developed at SunPro, a Sun Microsystems, Inc. business. -+ * Permission to use, copy, modify, and distribute this -+ * software is freely granted, provided that this notice -+ * is preserved. -+ * ==================================================== -+ * -+ * From: @(#)s_floor.c 5.1 93/09/24 -+ */ -+/* XXX: generated from src/lib/msun/src/s_floorl.c */ -+ -+#include <machine/asm.h> -+ -+__FBSDID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+ -+ .file "s_floorl.c" -+ .section .rodata.cst8,"aM",@progbits,8 -+ .p2align 3 -+.LC0: -+ .long 2281731484 -+ .long 2117592124 -+ .section .rodata.cst4,"aM",@progbits,4 -+ .p2align 2 -+.LC2: -+ .long 3212836864 -+ .text -+ .p2align 4,,15 -+.globl floorl -+ .type floorl, @function -+floorl: -+.LFB17: -+ pushq %rbp -+.LCFI0: -+ pushq %rbx -+.LCFI1: -+ fldt 24(%rsp) -+ movq $0, -16(%rsp) -+ fld %st(0) -+ fstpt -40(%rsp) -+ movl -32(%rsp), %edi -+ movq -40(%rsp), %rsi -+ movl %edi, -16(%rsp) -+ movl -16(%rsp), %r11d -+ movq %rsi, -24(%rsp) -+ movl %r11d, %r10d -+ andl $32767, %r10d -+ leal -16383(%r10), %r8d -+ cmpl $30, %r8d -+ jg .L2 -+ testl %r8d, %r8d -+ js .L38 -+ movl -20(%rsp), %r9d -+ leal 1(%r8), %ecx -+ mov -24(%rsp), %eax -+ movl $4294967295, %ebp -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ shrq %cl, %rbp -+ mov %r9d, %ebx -+ movq %rbx, %rdx -+ andq %rbp, %rdx -+ orq %rax, %rdx -+ fldt -40(%rsp) -+ je .L42 -+ ffreep %st(0) -+ testb $-128, -15(%rsp) -+ je .L12 -+ movl $31, %ecx -+ movl $1, %eax -+ subl %r8d, %ecx -+ salq %cl, %rax -+ addl %eax, %r9d -+ mov %r9d, %eax -+ cmpq %rbx, %rax -+ jae .L32 -+ leal 1(%r10), %edx -+ movl %r11d, %eax -+ orl $-2147483648, %r9d -+ andw $-32768, %ax -+ andw $32767, %dx -+ orl %edx, %eax -+ movw %ax, -16(%rsp) -+.L32: -+ movl %r9d, -20(%rsp) -+.L12: -+ faddl .LC0(%rip) -+ fldz -+ fxch %st(1) -+ fucomip %st(1), %st -+ fstp %st(0) -+ jbe .L31 -+ movl %ebp, %eax -+ movl $0, -24(%rsp) -+ notl %eax -+ andl %eax, %r9d -+ movl %r9d, -20(%rsp) -+ .p2align 4,,7 -+.L31: -+ movq -24(%rsp), %rsi -+ movl -16(%rsp), %edi -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ fldt -40(%rsp) -+ popq %rbx -+ popq %rbp -+ ret -+ .p2align 4,,7 -+.L2: -+ cmpl $62, %r8d -+ jle .L45 -+.L44: -+ ffreep %st(0) -+.L17: -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ fldt -40(%rsp) -+ popq %rbx -+ popq %rbp -+ ret -+ .p2align 4,,7 -+.L45: -+ movl -24(%rsp), %edx -+ leal 1(%r8), %ecx -+ movq $-1, %rbx -+ movq %rsi, -40(%rsp) -+ movl %edi, -32(%rsp) -+ shrq %cl, %rbx -+ mov %edx, %r9d -+ testq %rbx, %r9 -+ fldt -40(%rsp) -+ je .L42 -+ ffreep %st(0) -+ testb $-128, -15(%rsp) -+ je .L20 -+ cmpl $31, %r8d -+ je .L36 -+ movl $63, %ecx -+ movl $1, %eax -+ subl %r8d, %ecx -+ salq %cl, %rax -+ leal (%rdx,%rax), %eax -+ movl %eax, -24(%rsp) -+ mov %eax, %eax -+ cmpq %r9, %rax -+ jae .L20 -+.L36: -+ movl -20(%rsp), %eax -+ leal 1(%rax), %ecx -+ cmpl %eax, %ecx -+ jae .L34 -+ leal 1(%r10), %edx -+ movl %r11d, %eax -+ orl $-2147483648, %ecx -+ andw $-32768, %ax -+ andw $32767, %dx -+ orl %edx, %eax -+ movw %ax, -16(%rsp) -+.L34: -+ movl %ecx, -20(%rsp) -+ .p2align 4,,7 -+.L20: -+ faddl .LC0(%rip) -+ fldz -+ fxch %st(1) -+ fucomip %st(1), %st -+ fstp %st(0) -+ jbe .L31 -+ movl %ebx, %eax -+ notl %eax -+ andl %eax, -24(%rsp) -+ jmp .L31 -+ .p2align 4,,7 -+.L42: -+ fstp %st(1) -+ popq %rbx -+ popq %rbp -+ ret -+ .p2align 4,,7 -+.L38: -+ fldl .LC0(%rip) -+ faddp %st, %st(1) -+ fldz -+ fxch %st(1) -+ fucomip %st(1), %st -+ jbe .L44 -+ testl %r10d, %r10d -+ jle .L39 -+.L7: -+ testb $-128, -15(%rsp) -+ je .L9 -+ ffreep %st(0) -+ flds .LC2(%rip) -+.L9: -+ fstpt -40(%rsp) -+ movq -40(%rsp), %rsi -+ movl -32(%rsp), %edi -+ movq %rsi, -24(%rsp) -+ movl %edi, -16(%rsp) -+ jmp .L17 -+.L39: -+ movl -24(%rsp), %eax -+ orl -20(%rsp), %eax -+ je .L44 -+ jmp .L7 -+.LFE17: -+ .size floorl, .-floorl -+ .section .eh_frame,"a",@progbits -+.Lframe1: -+ .long .LECIE1-.LSCIE1 -+.LSCIE1: -+ .long 0x0 -+ .byte 0x1 -+ .string "" -+ .uleb128 0x1 -+ .sleb128 -8 -+ .byte 0x10 -+ .byte 0xc -+ .uleb128 0x7 -+ .uleb128 0x8 -+ .byte 0x90 -+ .uleb128 0x1 -+ .p2align 3 -+.LECIE1: -+.LSFDE1: -+ .long .LEFDE1-.LASFDE1 -+.LASFDE1: -+ .long .LASFDE1-.Lframe1 -+ .quad .LFB17 -+ .quad .LFE17-.LFB17 -+ .byte 0x4 -+ .long .LCFI0-.LFB17 -+ .byte 0xe -+ .uleb128 0x10 -+ .byte 0x4 -+ .long .LCFI1-.LCFI0 -+ .byte 0xe -+ .uleb128 0x18 -+ .byte 0x83 -+ .uleb128 0x3 -+ .byte 0x86 -+ .uleb128 0x2 -+ .p2align 3 -+.LEFDE1: -+ .ident "GCC: (GNU) 3.4.4 [FreeBSD] 20050421" -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_isnormal.c qemu-0.7.0/bsd/amd64/s_isnormal.c ---- qemu-0.7.0/bsd.orig/amd64/s_isnormal.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_isnormal.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,85 @@ -+/*- -+ * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org> -+ * Copyright (c) 2002-2004 David Schultz <das@FreeBSD.ORG> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * $FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $ -+ */ -+ -+union IEEEf2bits { -+ float f; -+ struct { -+ unsigned int man :23; -+ unsigned int exp :8; -+ unsigned int sign :1; -+ } bits; -+}; -+ -+union IEEEd2bits { -+ double d; -+ struct { -+ unsigned int manl :32; -+ unsigned int manh :20; -+ unsigned int exp :11; -+ unsigned int sign :1; -+ } bits; -+}; -+ -+union IEEEl2bits { -+ long double e; -+ struct { -+ unsigned int manl :32; -+ unsigned int manh :32; -+ unsigned int exp :15; -+ unsigned int sign :1; -+ unsigned int junk :16; -+ } bits; -+}; -+ -+int -+__isnormal(double d) -+{ -+ union IEEEd2bits u; -+ -+ u.d = d; -+ return (u.bits.exp != 0 && u.bits.exp != 2047); -+} -+ -+int -+__isnormalf(float f) -+{ -+ union IEEEf2bits u; -+ -+ u.f = f; -+ return (u.bits.exp != 0 && u.bits.exp != 255); -+} -+ -+int -+__isnormall(long double e) -+{ -+ union IEEEl2bits u; -+ -+ u.e = e; -+ return (u.bits.exp != 0 && u.bits.exp != 32767); -+} -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_llrint.S qemu-0.7.0/bsd/amd64/s_llrint.S ---- qemu-0.7.0/bsd.orig/amd64/s_llrint.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_llrint.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,6 @@ -+#include <machine/asm.h> -+__FBSDID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+ -+/* sizeof(long) == sizeof(long long) */ -+#define fn llrint -+#include "s_lrint.S" -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_llrintf.S qemu-0.7.0/bsd/amd64/s_llrintf.S ---- qemu-0.7.0/bsd.orig/amd64/s_llrintf.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_llrintf.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,6 @@ -+#include <machine/asm.h> -+__FBSDID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+ -+/* sizeof(long) == sizeof(long long) */ -+#define fn llrintf -+#include "s_lrintf.S" -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_llrintl.S qemu-0.7.0/bsd/amd64/s_llrintl.S ---- qemu-0.7.0/bsd.orig/amd64/s_llrintl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_llrintl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,35 @@ -+/* Round argument to nearest integral value according to current rounding -+ direction. -+ Copyright (C) 1997, 2002 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+ .text -+ENTRY(__llrintl) -+ fldt 8(%rsp) -+ fistpll -8(%rsp) -+ fwait -+ movq -8(%rsp),%rax -+ ret -+END(__llrintl) -+weak_alias (__llrintl, llrintl) -+strong_alias (__llrintl, __lrintl) -+weak_alias (__llrintl, lrintl) -+ -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_lrint.S qemu-0.7.0/bsd/amd64/s_lrint.S ---- qemu-0.7.0/bsd.orig/amd64/s_lrint.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_lrint.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,36 @@ -+/*- -+ * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include <machine/asm.h> -+ -+#ifndef fn -+__FBSDID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+#define fn lrint -+#endif -+ -+ENTRY(fn) -+ cvtsd2si %xmm0, %rax -+ ret -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_lrintf.S qemu-0.7.0/bsd/amd64/s_lrintf.S ---- qemu-0.7.0/bsd.orig/amd64/s_lrintf.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_lrintf.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,36 @@ -+/*- -+ * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include <machine/asm.h> -+ -+#ifndef fn -+__FBSDID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+#define fn lrintf -+#endif -+ -+ENTRY(fn) -+ cvtss2si %xmm0, %rax -+ ret -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_lrintl.S qemu-0.7.0/bsd/amd64/s_lrintl.S ---- qemu-0.7.0/bsd.orig/amd64/s_lrintl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_lrintl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1 @@ -+/* Not needed, see s_llrintl.S. */ -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_rintl.c qemu-0.7.0/bsd/amd64/s_rintl.c ---- qemu-0.7.0/bsd.orig/amd64/s_rintl.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_rintl.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,18 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Changes for long double by Ulrich Drepper <drepper@cygnus.com> -+ * Public domain. -+ */ -+ -+#include <sysdep.h> -+ -+long double -+__rintl (long double x) -+{ -+ long double res; -+ -+ asm ("frndint" : "=t" (res) : "0" (x)); -+ return res; -+} -+ -+weak_alias (__rintl, rintl) -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_round.c qemu-0.7.0/bsd/amd64/s_round.c ---- qemu-0.7.0/bsd.orig/amd64/s_round.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_round.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,51 @@ -+/*- -+ * Copyright (c) 2003, Steven G. Kargl -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice unmodified, this list of conditions, and the following -+ * disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include <sys/cdefs.h> -+__FBSDID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $"); -+ -+#include <math.h> -+ -+double -+round(double x) -+{ -+ double t; -+ -+ if (!isfinite(x)) -+ return (x); -+ -+ if (x >= 0.0) { -+ t = ceil(x); -+ if (t - x > 0.5) -+ t -= 1.0; -+ return (t); -+ } else { -+ t = ceil(-x); -+ if (t + x > 0.5) -+ t -= 1.0; -+ return (-t); -+ } -+} -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_sinl.S qemu-0.7.0/bsd/amd64/s_sinl.S ---- qemu-0.7.0/bsd.orig/amd64/s_sinl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_sinl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,31 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ * Adapted for x86-64 by Andreas Jaeger <aj@suse.de>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+ENTRY(__sinl) -+ fldt 8(%rsp) -+ fsin -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 1f -+ ret -+ .align ALIGNARG(4) -+1: fldpi -+ fadd %st(0) -+ fxch %st(1) -+2: fprem1 -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 2b -+ fstp %st(1) -+ fsin -+ ret -+END (__sinl) -+weak_alias (__sinl, sinl) -diff -Nru qemu-0.7.0/bsd.orig/amd64/s_tanl.S qemu-0.7.0/bsd/amd64/s_tanl.S ---- qemu-0.7.0/bsd.orig/amd64/s_tanl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/amd64/s_tanl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,34 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ * Adapted for x86-64 by Andreas Jaeger <aj@suse.de>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+RCSID("$NetBSD: $") -+ -+ENTRY(__tanl) -+ fldt 8(%rsp) -+ fptan -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 1f -+ fstp %st(0) -+ ret -+1: fldpi -+ fadd %st(0) -+ fxch %st(1) -+2: fprem1 -+ fstsw %ax -+ testl $0x400,%eax -+ jnz 2b -+ fstp %st(1) -+ fptan -+ fstp %st(0) -+ ret -+END (__tanl) -+weak_alias (__tanl, tanl) -diff -Nru qemu-0.7.0/bsd.orig/i386/e_atan2l.c qemu-0.7.0/bsd/i386/e_atan2l.c ---- qemu-0.7.0/bsd.orig/i386/e_atan2l.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/e_atan2l.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,20 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <sysdep.h> -+ -+long double -+__ieee754_atan2l (long double y, long double x) -+{ -+ long double res; -+ -+ asm ("fpatan" : "=t" (res) : "u" (y), "0" (x) : "st(1)"); -+ -+ return res; -+} -+ -+weak_alias(__ieee754_atan2l, atan2l) -diff -Nru qemu-0.7.0/bsd.orig/i386/e_logl.S qemu-0.7.0/bsd/i386/e_logl.S ---- qemu-0.7.0/bsd.orig/i386/e_logl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/e_logl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,63 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+RCSID("$NetBSD: $") -+ -+ -+#ifdef __ELF__ -+ .section .rodata -+#else -+ .text -+#endif -+ .align ALIGNARG(4) -+ ASM_TYPE_DIRECTIVE(one,@object) -+one: .double 1.0 -+ ASM_SIZE_DIRECTIVE(one) -+ /* It is not important that this constant is precise. It is only -+ a value which is known to be on the safe side for using the -+ fyl2xp1 instruction. */ -+ ASM_TYPE_DIRECTIVE(limit,@object) -+limit: .double 0.29 -+ ASM_SIZE_DIRECTIVE(limit) -+ -+ -+#ifdef PIC -+#define MO(op) op##@GOTOFF(%edx) -+#else -+#define MO(op) op -+#endif -+ -+ .text -+ENTRY(__ieee754_logl) -+ fldln2 // log(2) -+ fldt 4(%esp) // x : log(2) -+#ifdef PIC -+ call 1f -+1: popl %edx -+ addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %edx -+#endif -+ fld %st // x : x : log(2) -+ fsubl MO(one) // x-1 : x : log(2) -+ fld %st // x-1 : x-1 : x : log(2) -+ fabs // |x-1| : x-1 : x : log(2) -+ fcompl MO(limit) // x-1 : x : log(2) -+ fnstsw // x-1 : x : log(2) -+ andb $0x45, %ah -+ jz 2f -+ fstp %st(1) // x-1 : log(2) -+ fyl2xp1 // log(x) -+ ret -+ -+2: fstp %st(0) // x : log(2) -+ fyl2x // log(x) -+ ret -+END (__ieee754_logl) -+ -+weak_alias(__ieee754_logl,logl) -diff -Nru qemu-0.7.0/bsd.orig/i386/e_powl.S qemu-0.7.0/bsd/i386/e_powl.S ---- qemu-0.7.0/bsd.orig/i386/e_powl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/e_powl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,341 @@ -+/* ix87 specific implementation of pow function. -+ Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004 -+ Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+#ifdef __ELF__ -+ .section .rodata -+#else -+ .text -+#endif -+ -+ .align ALIGNARG(4) -+ ASM_TYPE_DIRECTIVE(infinity,@object) -+inf_zero: -+infinity: -+ .byte 0, 0, 0, 0, 0, 0, 0xf0, 0x7f -+ ASM_SIZE_DIRECTIVE(infinity) -+ ASM_TYPE_DIRECTIVE(zero,@object) -+zero: .double 0.0 -+ ASM_SIZE_DIRECTIVE(zero) -+ ASM_TYPE_DIRECTIVE(minf_mzero,@object) -+minf_mzero: -+minfinity: -+ .byte 0, 0, 0, 0, 0, 0, 0xf0, 0xff -+mzero: -+ .byte 0, 0, 0, 0, 0, 0, 0, 0x80 -+ ASM_SIZE_DIRECTIVE(minf_mzero) -+ ASM_TYPE_DIRECTIVE(one,@object) -+one: .double 1.0 -+ ASM_SIZE_DIRECTIVE(one) -+ ASM_TYPE_DIRECTIVE(limit,@object) -+limit: .double 0.29 -+ ASM_SIZE_DIRECTIVE(limit) -+ ASM_TYPE_DIRECTIVE(p63,@object) -+p63: .byte 0, 0, 0, 0, 0, 0, 0xe0, 0x43 -+ ASM_SIZE_DIRECTIVE(p63) -+ -+#ifdef PIC -+#define MO(op) op##@GOTOFF(%ecx) -+#define MOX(op,x,f) op##@GOTOFF(%ecx,x,f) -+#else -+#define MO(op) op -+#define MOX(op,x,f) op(,x,f) -+#endif -+ -+ .text -+ENTRY(__ieee754_powl) -+ fldt 16(%esp) // y -+ fxam -+ -+#ifdef PIC -+ call 1f -+1: popl %ecx -+ addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx -+#endif -+ -+ fnstsw -+ movb %ah, %dl -+ andb $0x45, %ah -+ cmpb $0x40, %ah // is y == 0 ? -+ je 11f -+ -+ cmpb $0x05, %ah // is y == ±inf ? -+ je 12f -+ -+ cmpb $0x01, %ah // is y == NaN ? -+ je 30f -+ -+ fldt 4(%esp) // x : y -+ -+ subl $8,%esp -+ -+ fxam -+ fnstsw -+ movb %ah, %dh -+ andb $0x45, %ah -+ cmpb $0x40, %ah -+ je 20f // x is ±0 -+ -+ cmpb $0x05, %ah -+ je 15f // x is ±inf -+ -+ fxch // y : x -+ -+ /* fistpll raises invalid exception for |y| >= 1L<<63. */ -+ fld %st // y : y : x -+ fabs // |y| : y : x -+ fcompl MO(p63) // y : x -+ fnstsw -+ sahf -+ jnc 2f -+ -+ /* First see whether `y' is a natural number. In this case we -+ can use a more precise algorithm. */ -+ fld %st // y : y : x -+ fistpll (%esp) // y : x -+ fildll (%esp) // int(y) : y : x -+ fucomp %st(1) // y : x -+ fnstsw -+ sahf -+ jne 2f -+ -+ /* OK, we have an integer value for y. */ -+ popl %eax -+ popl %edx -+ orl $0, %edx -+ fstp %st(0) // x -+ jns 4f // y >= 0, jump -+ fdivrl MO(one) // 1/x (now referred to as x) -+ negl %eax -+ adcl $0, %edx -+ negl %edx -+4: fldl MO(one) // 1 : x -+ fxch -+ -+6: shrdl $1, %edx, %eax -+ jnc 5f -+ fxch -+ fmul %st(1) // x : ST*x -+ fxch -+5: fmul %st(0), %st // x*x : ST*x -+ shrl $1, %edx -+ movl %eax, %ecx -+ orl %edx, %ecx -+ jnz 6b -+ fstp %st(0) // ST*x -+ ret -+ -+ /* y is ±NAN */ -+30: fldt 4(%esp) // x : y -+ fldl MO(one) // 1.0 : x : y -+ fucomp %st(1) // x : y -+ fnstsw -+ sahf -+ je 31f -+ fxch // y : x -+31: fstp %st(1) -+ ret -+ -+ .align ALIGNARG(4) -+2: /* y is a real number. */ -+ fxch // x : y -+ fldl MO(one) // 1.0 : x : y -+ fld %st(1) // x : 1.0 : x : y -+ fsub %st(1) // x-1 : 1.0 : x : y -+ fabs // |x-1| : 1.0 : x : y -+ fcompl MO(limit) // 1.0 : x : y -+ fnstsw -+ fxch // x : 1.0 : y -+ sahf -+ ja 7f -+ fsub %st(1) // x-1 : 1.0 : y -+ fyl2xp1 // log2(x) : y -+ jmp 8f -+ -+7: fyl2x // log2(x) : y -+8: fmul %st(1) // y*log2(x) : y -+ fxam -+ fnstsw -+ andb $0x45, %ah -+ cmpb $0x05, %ah // is y*log2(x) == ±inf ? -+ je 28f -+ fst %st(1) // y*log2(x) : y*log2(x) -+ frndint // int(y*log2(x)) : y*log2(x) -+ fsubr %st, %st(1) // int(y*log2(x)) : fract(y*log2(x)) -+ fxch // fract(y*log2(x)) : int(y*log2(x)) -+ f2xm1 // 2^fract(y*log2(x))-1 : int(y*log2(x)) -+ faddl MO(one) // 2^fract(y*log2(x)) : int(y*log2(x)) -+ fscale // 2^fract(y*log2(x))*2^int(y*log2(x)) : int(y*log2(x)) -+ addl $8, %esp -+ fstp %st(1) // 2^fract(y*log2(x))*2^int(y*log2(x)) -+ ret -+ -+28: fstp %st(1) // y*log2(x) -+ fldl MO(one) // 1 : y*log2(x) -+ fscale // 2^(y*log2(x)) : y*log2(x) -+ addl $8, %esp -+ fstp %st(1) // 2^(y*log2(x)) -+ ret -+ -+ // pow(x,±0) = 1 -+ .align ALIGNARG(4) -+11: fstp %st(0) // pop y -+ fldl MO(one) -+ ret -+ -+ // y == ±inf -+ .align ALIGNARG(4) -+12: fstp %st(0) // pop y -+ fldt 4(%esp) // x -+ fabs -+ fcompl MO(one) // < 1, == 1, or > 1 -+ fnstsw -+ andb $0x45, %ah -+ cmpb $0x45, %ah -+ je 13f // jump if x is NaN -+ -+ cmpb $0x40, %ah -+ je 14f // jump if |x| == 1 -+ -+ shlb $1, %ah -+ xorb %ah, %dl -+ andl $2, %edx -+ fldl MOX(inf_zero, %edx, 4) -+ ret -+ -+ .align ALIGNARG(4) -+14: fldl MO(one) -+ ret -+ -+ .align ALIGNARG(4) -+13: fldt 4(%esp) // load x == NaN -+ ret -+ -+ .align ALIGNARG(4) -+ // x is ±inf -+15: fstp %st(0) // y -+ testb $2, %dh -+ jz 16f // jump if x == +inf -+ -+ // We must find out whether y is an odd integer. -+ fld %st // y : y -+ fistpll (%esp) // y -+ fildll (%esp) // int(y) : y -+ fucompp // <empty> -+ fnstsw -+ sahf -+ jne 17f -+ -+ // OK, the value is an integer, but is it odd? -+ popl %eax -+ popl %edx -+ andb $1, %al -+ jz 18f // jump if not odd -+ // It's an odd integer. -+ shrl $31, %edx -+ fldl MOX(minf_mzero, %edx, 8) -+ ret -+ -+ .align ALIGNARG(4) -+16: fcompl MO(zero) -+ addl $8, %esp -+ fnstsw -+ shrl $5, %eax -+ andl $8, %eax -+ fldl MOX(inf_zero, %eax, 1) -+ ret -+ -+ .align ALIGNARG(4) -+17: shll $30, %edx // sign bit for y in right position -+ addl $8, %esp -+18: shrl $31, %edx -+ fldl MOX(inf_zero, %edx, 8) -+ ret -+ -+ .align ALIGNARG(4) -+ // x is ±0 -+20: fstp %st(0) // y -+ testb $2, %dl -+ jz 21f // y > 0 -+ -+ // x is ±0 and y is < 0. We must find out whether y is an odd integer. -+ testb $2, %dh -+ jz 25f -+ -+ fld %st // y : y -+ fistpll (%esp) // y -+ fildll (%esp) // int(y) : y -+ fucompp // <empty> -+ fnstsw -+ sahf -+ jne 26f -+ -+ // OK, the value is an integer, but is it odd? -+ popl %eax -+ popl %edx -+ andb $1, %al -+ jz 27f // jump if not odd -+ // It's an odd integer. -+ // Raise divide-by-zero exception and get minus infinity value. -+ fldl MO(one) -+ fdivl MO(zero) -+ fchs -+ ret -+ -+25: fstp %st(0) -+26: addl $8, %esp -+27: // Raise divide-by-zero exception and get infinity value. -+ fldl MO(one) -+ fdivl MO(zero) -+ ret -+ -+ .align ALIGNARG(4) -+ // x is ±0 and y is > 0. We must find out whether y is an odd integer. -+21: testb $2, %dh -+ jz 22f -+ -+ fld %st // y : y -+ fistpll (%esp) // y -+ fildll (%esp) // int(y) : y -+ fucompp // <empty> -+ fnstsw -+ sahf -+ jne 23f -+ -+ // OK, the value is an integer, but is it odd? -+ popl %eax -+ popl %edx -+ andb $1, %al -+ jz 24f // jump if not odd -+ // It's an odd integer. -+ fldl MO(mzero) -+ ret -+ -+22: fstp %st(0) -+23: addl $8, %esp // Don't use 2 x pop -+24: fldl MO(zero) -+ ret -+ -+END(__ieee754_powl) -+ -+weak_alias(__ieee754_powl,powl) -diff -Nru qemu-0.7.0/bsd.orig/i386/e_remainderl.S qemu-0.7.0/bsd/i386/e_remainderl.S ---- qemu-0.7.0/bsd.orig/i386/e_remainderl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/e_remainderl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,24 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+RCSID("$NetBSD: $") -+ -+ENTRY(__ieee754_remainderl) -+ fldt 16(%esp) -+ fldt 4(%esp) -+1: fprem1 -+ fstsw %ax -+ sahf -+ jp 1b -+ fstp %st(1) -+ ret -+END (__ieee754_remainderl) -+ -+weak_alias(__ieee754_remainderl,remainderl) -diff -Nru qemu-0.7.0/bsd.orig/i386/e_sqrtl.c qemu-0.7.0/bsd/i386/e_sqrtl.c ---- qemu-0.7.0/bsd.orig/i386/e_sqrtl.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/e_sqrtl.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,20 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <sysdep.h> -+ -+long double -+__ieee754_sqrtl (long double x) -+{ -+ long double res; -+ -+ asm ("fsqrt" : "=t" (res) : "0" (x)); -+ -+ return res; -+} -+ -+weak_alias(__ieee754_sqrtl,sqrtl) -diff -Nru qemu-0.7.0/bsd.orig/i386/s_ceill.S qemu-0.7.0/bsd/i386/s_ceill.S ---- qemu-0.7.0/bsd.orig/i386/s_ceill.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_ceill.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,27 @@ -+/* -+ * Based on code written by J.T. Conklin <jtc@NetBSD.org>. -+ * Public domain. -+ */ -+ -+#include <machine/asm.h> -+RCSID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+ -+ENTRY(ceill) -+ pushl %ebp -+ movl %esp,%ebp -+ subl $8,%esp -+ -+ fstcw -4(%ebp) /* store fpu control word */ -+ movw -4(%ebp),%dx -+ orw $0x0800,%dx /* round towards +oo */ -+ andw $0xfbff,%dx -+ movw %dx,-8(%ebp) -+ fldcw -8(%ebp) /* load modfied control word */ -+ -+ fldt 8(%ebp) /* round */ -+ frndint -+ -+ fldcw -4(%ebp) /* restore original control word */ -+ -+ leave -+ ret -diff -Nru qemu-0.7.0/bsd.orig/i386/s_cosl.S qemu-0.7.0/bsd/i386/s_cosl.S ---- qemu-0.7.0/bsd.orig/i386/s_cosl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_cosl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,32 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+RCSID("$NetBSD: $") -+ -+ENTRY(__cosl) -+ fldt 4(%esp) -+ fcos -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 1f -+ ret -+ .align ALIGNARG(4) -+1: fldpi -+ fadd %st(0) -+ fxch %st(1) -+2: fprem1 -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 2b -+ fstp %st(1) -+ fcos -+ ret -+END (__cosl) -+weak_alias (__cosl, cosl) -diff -Nru qemu-0.7.0/bsd.orig/i386/s_floorl.S qemu-0.7.0/bsd/i386/s_floorl.S ---- qemu-0.7.0/bsd.orig/i386/s_floorl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_floorl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,27 @@ -+/* -+ * Based on code written by J.T. Conklin <jtc@NetBSD.org>. -+ * Public domain. -+ */ -+ -+#include <machine/asm.h> -+RCSID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+ -+ENTRY(floorl) -+ pushl %ebp -+ movl %esp,%ebp -+ subl $8,%esp -+ -+ fstcw -4(%ebp) /* store fpu control word */ -+ movw -4(%ebp),%dx -+ orw $0x0400,%dx /* round towards -oo */ -+ andw $0xf7ff,%dx -+ movw %dx,-8(%ebp) -+ fldcw -8(%ebp) /* load modfied control word */ -+ -+ fldt 8(%ebp) /* round */ -+ frndint -+ -+ fldcw -4(%ebp) /* restore original control word */ -+ -+ leave -+ ret -diff -Nru qemu-0.7.0/bsd.orig/i386/s_isnormal.c qemu-0.7.0/bsd/i386/s_isnormal.c ---- qemu-0.7.0/bsd.orig/i386/s_isnormal.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_isnormal.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,85 @@ -+/*- -+ * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org> -+ * Copyright (c) 2002-2004 David Schultz <das@FreeBSD.ORG> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * $FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $ -+ */ -+ -+union IEEEf2bits { -+ float f; -+ struct { -+ unsigned int man :23; -+ unsigned int exp :8; -+ unsigned int sign :1; -+ } bits; -+}; -+ -+union IEEEd2bits { -+ double d; -+ struct { -+ unsigned int manl :32; -+ unsigned int manh :20; -+ unsigned int exp :11; -+ unsigned int sign :1; -+ } bits; -+}; -+ -+union IEEEl2bits { -+ long double e; -+ struct { -+ unsigned int manl :32; -+ unsigned int manh :32; -+ unsigned int exp :15; -+ unsigned int sign :1; -+ unsigned int junk :16; -+ } bits; -+}; -+ -+int -+__isnormal(double d) -+{ -+ union IEEEd2bits u; -+ -+ u.d = d; -+ return (u.bits.exp != 0 && u.bits.exp != 2047); -+} -+ -+int -+__isnormalf(float f) -+{ -+ union IEEEf2bits u; -+ -+ u.f = f; -+ return (u.bits.exp != 0 && u.bits.exp != 255); -+} -+ -+int -+__isnormall(long double e) -+{ -+ union IEEEl2bits u; -+ -+ u.e = e; -+ return (u.bits.exp != 0 && u.bits.exp != 32767); -+} -diff -Nru qemu-0.7.0/bsd.orig/i386/s_llrint.S qemu-0.7.0/bsd/i386/s_llrint.S ---- qemu-0.7.0/bsd.orig/i386/s_llrint.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_llrint.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,36 @@ -+/*- -+ * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include <machine/asm.h> -+RCSID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $"); -+ -+ENTRY(llrint) -+ fldl 4(%esp) -+ subl $8,%esp -+ fistpll (%esp) -+ popl %eax -+ popl %edx -+ ret -diff -Nru qemu-0.7.0/bsd.orig/i386/s_llrintf.S qemu-0.7.0/bsd/i386/s_llrintf.S ---- qemu-0.7.0/bsd.orig/i386/s_llrintf.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_llrintf.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,36 @@ -+/*- -+ * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include <machine/asm.h> -+RCSID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+ -+ENTRY(llrintf) -+ flds 4(%esp) -+ subl $8,%esp -+ fistpll (%esp) -+ popl %eax -+ popl %edx -+ ret -diff -Nru qemu-0.7.0/bsd.orig/i386/s_llrintl.S qemu-0.7.0/bsd/i386/s_llrintl.S ---- qemu-0.7.0/bsd.orig/i386/s_llrintl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_llrintl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,35 @@ -+/* Round argument to nearest integral value according to current rounding -+ direction. -+ Copyright (C) 1997 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+ .text -+ENTRY(__llrintl) -+ fldt 4(%esp) -+ subl $8, %esp -+ fistpll (%esp) -+ fwait -+ popl %eax -+ popl %edx -+ ret -+END(__llrintl) -+weak_alias (__llrintl, llrintl) -diff -Nru qemu-0.7.0/bsd.orig/i386/s_lrint.S qemu-0.7.0/bsd/i386/s_lrint.S ---- qemu-0.7.0/bsd.orig/i386/s_lrint.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_lrint.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,35 @@ -+/*- -+ * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include <machine/asm.h> -+RCSID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $"); -+ -+ENTRY(lrint) -+ fldl 4(%esp) -+ subl $4,%esp -+ fistpl (%esp) -+ popl %eax -+ ret -diff -Nru qemu-0.7.0/bsd.orig/i386/s_lrintf.S qemu-0.7.0/bsd/i386/s_lrintf.S ---- qemu-0.7.0/bsd.orig/i386/s_lrintf.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_lrintf.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,35 @@ -+/*- -+ * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include <machine/asm.h> -+RCSID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $") -+ -+ENTRY(lrintf) -+ flds 4(%esp) -+ subl $4,%esp -+ fistpl (%esp) -+ popl %eax -+ ret -diff -Nru qemu-0.7.0/bsd.orig/i386/s_lrintl.S qemu-0.7.0/bsd/i386/s_lrintl.S ---- qemu-0.7.0/bsd.orig/i386/s_lrintl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_lrintl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,34 @@ -+/* Round argument to nearest integral value according to current rounding -+ direction. -+ Copyright (C) 1997 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+ .text -+ENTRY(__lrintl) -+ fldt 4(%esp) -+ subl $4, %esp -+ fistpl (%esp) -+ fwait -+ popl %eax -+ ret -+END(__lrintl) -+weak_alias (__lrintl, lrintl) -diff -Nru qemu-0.7.0/bsd.orig/i386/s_rintl.c qemu-0.7.0/bsd/i386/s_rintl.c ---- qemu-0.7.0/bsd.orig/i386/s_rintl.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_rintl.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,18 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Changes for long double by Ulrich Drepper <drepper@cygnus.com> -+ * Public domain. -+ */ -+ -+#include <sysdep.h> -+ -+long double -+__rintl (long double x) -+{ -+ long double res; -+ -+ asm ("frndint" : "=t" (res) : "0" (x)); -+ return res; -+} -+ -+weak_alias (__rintl, rintl) -diff -Nru qemu-0.7.0/bsd.orig/i386/s_round.c qemu-0.7.0/bsd/i386/s_round.c ---- qemu-0.7.0/bsd.orig/i386/s_round.c Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_round.c Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,51 @@ -+/*- -+ * Copyright (c) 2003, Steven G. Kargl -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice unmodified, this list of conditions, and the following -+ * disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include <sys/cdefs.h> -+__FBSDID("$FreeBSD: /tmp/pcvs/ports/emulators/qemu-devel/files/Attic/patch-libmath,v 1.1 2005-05-03 04:02:46 nork Exp $"); -+ -+#include <math.h> -+ -+double -+round(double x) -+{ -+ double t; -+ -+ if (!isfinite(x)) -+ return (x); -+ -+ if (x >= 0.0) { -+ t = ceil(x); -+ if (t - x > 0.5) -+ t -= 1.0; -+ return (t); -+ } else { -+ t = ceil(-x); -+ if (t + x > 0.5) -+ t -= 1.0; -+ return (-t); -+ } -+} -diff -Nru qemu-0.7.0/bsd.orig/i386/s_sinl.S qemu-0.7.0/bsd/i386/s_sinl.S ---- qemu-0.7.0/bsd.orig/i386/s_sinl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_sinl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,32 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+RCSID("$NetBSD: $") -+ -+ENTRY(__sinl) -+ fldt 4(%esp) -+ fsin -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 1f -+ ret -+ .align ALIGNARG(4) -+1: fldpi -+ fadd %st(0) -+ fxch %st(1) -+2: fprem1 -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 2b -+ fstp %st(1) -+ fsin -+ ret -+END (__sinl) -+weak_alias (__sinl, sinl) -diff -Nru qemu-0.7.0/bsd.orig/i386/s_tanl.S qemu-0.7.0/bsd/i386/s_tanl.S ---- qemu-0.7.0/bsd.orig/i386/s_tanl.S Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/i386/s_tanl.S Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,33 @@ -+/* -+ * Written by J.T. Conklin <jtc@netbsd.org>. -+ * Public domain. -+ * -+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>. -+ */ -+ -+#include <machine/asm.h> -+#include <sysdep.h> -+ -+RCSID("$NetBSD: $") -+ -+ENTRY(__tanl) -+ fldt 4(%esp) -+ fptan -+ fnstsw %ax -+ testl $0x400,%eax -+ jnz 1f -+ fstp %st(0) -+ ret -+1: fldpi -+ fadd %st(0) -+ fxch %st(1) -+2: fprem1 -+ fstsw %ax -+ testl $0x400,%eax -+ jnz 2b -+ fstp %st(1) -+ fptan -+ fstp %st(0) -+ ret -+END (__tanl) -+weak_alias (__tanl, tanl) -diff -Nru qemu-0.7.0/bsd.orig/sysdep.h qemu-0.7.0/bsd/sysdep.h ---- qemu-0.7.0/bsd.orig/sysdep.h Wed Dec 31 19:00:00 1969 -+++ qemu-0.7.0/bsd/sysdep.h Fri Apr 29 02:11:27 2005 -@@ -0,0 +1,20 @@ -+#ifndef _QEMU_BSD_SYSDEP_H_ -+#define _QEMU_BSD_SYSDEP_H_ -+ -+#include <sys/cdefs.h> -+ -+#define HAVE_ELF -+ -+#ifdef __ASSEMBLER__ -+#define ALIGNARG(log2) 1<<log2 -+#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; -+#define ASM_SIZE_DIRECTIVE(name) .size name,.-name; -+#define END(x) -+#define strong_alias(sym,alias) .set alias,sym; -+#define weak_alias(sym,alias) .weak alias; .equ alias,sym; -+#else -+#define strong_alias(sym,alias) __strong_reference(sym,alias); -+#define weak_alias(sym,alias) __weak_reference(sym,alias); -+#endif -+ -+#endif diff --git a/emulators/qemu-devel/files/patch-libmath2 b/emulators/qemu-devel/files/patch-libmath2 deleted file mode 100644 index a6f6475ee8b4..000000000000 --- a/emulators/qemu-devel/files/patch-libmath2 +++ /dev/null @@ -1,67 +0,0 @@ -Index: qemu/bsd/Makefile -@@ -16,7 +16,8 @@ - ${MACHINE_ARCH}/s_rintl.c \ - ${MACHINE_ARCH}/s_round.c \ - ${MACHINE_ARCH}/s_sinl.S \ -- ${MACHINE_ARCH}/s_tanl.S -+ ${MACHINE_ARCH}/s_tanl.S \ -+ ${MACHINE_ARCH}/s_ldexpl.c - - OBJS= ${SRCS:R:S/$/.o/} - -Index: qemu/bsd/i386/s_ldexpl.c -@@ -0,0 +1,21 @@ -+#include <math.h> -+#include <errno.h> -+#include <sysdep.h> -+ -+long double __ldexpl(long double x, int expn) -+{ -+ long double res; -+ if (!isfinite (x) || x == 0.0L) -+ return x; -+ -+ __asm__ ("fscale" -+ : "=t" (res) -+ : "0" (x), "u" ((long double) expn)); -+ -+ if (!isfinite (res) || res == 0.0L) -+ errno = ERANGE; -+ -+ return res; -+} -+ -+weak_alias(__ldexpl,ldexpl) -Index: qemu/bsd/amd64/s_ldexpl.c -@@ -0,0 +1,21 @@ -+#include <math.h> -+#include <errno.h> -+#include <sysdep.h> -+ -+long double __ldexpl(long double x, int expn) -+{ -+ long double res; -+ if (!isfinite (x) || x == 0.0L) -+ return x; -+ -+ __asm__ ("fscale" -+ : "=t" (res) -+ : "0" (x), "u" ((long double) expn)); -+ -+ if (!isfinite (res) || res == 0.0L) -+ errno = ERANGE; -+ -+ return res; -+} -+ -+weak_alias(__ldexpl,ldexpl) -Index: qemu/target-i386/helper.c -@@ -2886,6 +2886,8 @@ - ST0 = floatx_round_to_int(ST0, &env->fp_status); - } - -+long double ldexpl(long double, int); -+ - void helper_fscale(void) - { - ST0 = ldexp (ST0, (int)(ST1)); diff --git a/emulators/qemu-devel/files/patch-libmath4 b/emulators/qemu-devel/files/patch-libmath4 deleted file mode 100644 index 0c482370b8ba..000000000000 --- a/emulators/qemu-devel/files/patch-libmath4 +++ /dev/null @@ -1,45 +0,0 @@ -Index: qemu/bsd/i386/s_ldexpl.c -@@ -2,6 +2,30 @@ - #include <errno.h> - #include <sysdep.h> - -+/* 4.x doesnt have isfinite */ -+#ifndef isfinite -+#define isfinite __isfinitel -+ -+union IEEEl2bits { -+ long double e; -+ struct { -+ unsigned int manl :32; -+ unsigned int manh :32; -+ unsigned int exp :15; -+ unsigned int sign :1; -+ unsigned int junk :16; -+ } bits; -+}; -+ -+static int __isfinitel(long double x) -+{ -+ union IEEEl2bits u; -+ -+ u.e = x; -+ return (u.bits.exp != 32767); -+} -+#endif -+ - long double __ldexpl(long double x, int expn) - { - long double res; -Index: qemu/bsd/i386/s_round.c -@@ -29,6 +29,11 @@ - - #include <math.h> - -+/* 4.x doesnt have isfinite */ -+#ifndef isfinite -+#define isfinite(x) (!isnan(x) && !isinf(x)) -+#endif -+ - double - round(double x) - { diff --git a/emulators/qemu-devel/files/patch-osdep.c b/emulators/qemu-devel/files/patch-osdep.c deleted file mode 100644 index 3d5382b50c51..000000000000 --- a/emulators/qemu-devel/files/patch-osdep.c +++ /dev/null @@ -1,40 +0,0 @@ -Index: qemu/osdep.c -@@ -323,7 +323,9 @@ - - #elif defined(USE_KQEMU) - -+#ifndef __FreeBSD__ - #include <sys/vfs.h> -+#endif - #include <sys/mman.h> - #include <fcntl.h> - -@@ -334,6 +336,7 @@ - const char *tmpdir; - char phys_ram_file[1024]; - void *ptr; -+#ifndef __FreeBSD__ - struct statfs stfs; - - if (phys_ram_fd < 0) { -@@ -389,12 +392,20 @@ - } - unlink(phys_ram_file); - } -+#endif - size = (size + 4095) & ~4095; -+#ifndef __FreeBSD__ - ftruncate(phys_ram_fd, phys_ram_size + size); - ptr = mmap(NULL, - size, - PROT_WRITE | PROT_READ, MAP_SHARED, - phys_ram_fd, phys_ram_size); -+#else -+ ptr = mmap(NULL, -+ size, -+ PROT_WRITE | PROT_READ, MAP_PRIVATE|MAP_ANON, -+ -1, 0); -+#endif - if (ptr == MAP_FAILED) { - fprintf(stderr, "Could not map physical memory\n"); - exit(1); diff --git a/emulators/qemu-devel/files/patch-qemu-img.c b/emulators/qemu-devel/files/patch-qemu-img.c deleted file mode 100644 index b525b50a3bcb..000000000000 --- a/emulators/qemu-devel/files/patch-qemu-img.c +++ /dev/null @@ -1,10 +0,0 @@ -Index: qemu/qemu-img.c -@@ -134,7 +134,7 @@ - "Command syntax:\n" - " create [-e] [-b base_image] [-f fmt] filename [size]\n" - " commit [-f fmt] filename\n" -- " convert [-c] [-e] [-f fmt] filename [-O output_fmt] output_filename\n" -+ " convert [-c] [-e] [-f fmt] [-O output_fmt] filename output_filename\n" - " info [-f fmt] filename\n" - "\n" - "Command parameters:\n" diff --git a/emulators/qemu-devel/files/patch-qemu-img.texi b/emulators/qemu-devel/files/patch-qemu-img.texi deleted file mode 100644 index 79693026dd2d..000000000000 --- a/emulators/qemu-devel/files/patch-qemu-img.texi +++ /dev/null @@ -1,19 +0,0 @@ -Index: qemu/qemu-img.texi -@@ -10,7 +10,7 @@ - @table @option - @item create [-e] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}] - @item commit [-f @var{fmt}] @var{filename} --@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename} -+@item convert [-c] [-e] [-f @var{fmt}] [-O @var{output_fmt}] @var{filename} @var{output_filename} - @item info [-f @var{fmt}] @var{filename} - @end table - -@@ -83,7 +83,7 @@ - - Commit the changes recorded in @var{filename} in its base image. - --@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename} -+@item convert [-c] [-e] [-f @var{fmt}] [-O @var{output_fmt}] @var{filename} @var{output_filename} - - Convert the disk image @var{filename} to disk image @var{output_filename} - using format @var{output_fmt}. It can be optionnaly encrypted diff --git a/emulators/qemu-devel/files/patch-slirp-mbuf.c b/emulators/qemu-devel/files/patch-slirp-mbuf.c deleted file mode 100644 index 1bd32d6ad7dc..000000000000 --- a/emulators/qemu-devel/files/patch-slirp-mbuf.c +++ /dev/null @@ -1,26 +0,0 @@ -# http://lists.gnu.org/archive/html/qemu-devel/2005-05/msg00228.html - -Index: qemu/slirp/mbuf.c -@@ -146,18 +146,19 @@ - struct mbuf *m; - int size; - { -+ int datasize; -+ - /* some compiles throw up on gotos. This one we can fake. */ - if(m->m_size>size) return; - - if (m->m_flags & M_EXT) { -- /* datasize = m->m_data - m->m_ext; */ -+ datasize = m->m_data - m->m_ext; - m->m_ext = (char *)realloc(m->m_ext,size); - /* if (m->m_ext == NULL) - * return (struct mbuf *)NULL; - */ -- /* m->m_data = m->m_ext + datasize; */ -+ m->m_data = m->m_ext + datasize; - } else { -- int datasize; - char *dat; - datasize = m->m_data - m->m_dat; - dat = (char *)malloc(size); diff --git a/emulators/qemu-devel/files/patch-slirp-nat b/emulators/qemu-devel/files/patch-slirp-nat deleted file mode 100644 index 9c1accaeaf83..000000000000 --- a/emulators/qemu-devel/files/patch-slirp-nat +++ /dev/null @@ -1,56 +0,0 @@ -# http://lists.gnu.org/archive/html/qemu-devel/2005-12/msg00277.html - -diff -wurb qemu/slirp/misc.c qemu-patched/slirp/misc.c ---- qemu/slirp/misc.c Sun Dec 12 12:45:10 2004 -+++ qemu-patched/slirp/misc.c Mon Mar 21 13:22:05 2005 -@@ -90,13 +90,12 @@ - char buff[256]; - struct hostent *he; - -- if (gethostname(buff,256) < 0) -- return; -- -- if ((he = gethostbyname(buff)) == NULL) -- return; -- -+ if (gethostname(buff,256) == 0) -+ if ((he = gethostbyname(buff)) != NULL) - our_addr = *(struct in_addr *)he->h_addr; -+ -+ if (our_addr.s_addr == 0 || our_addr.s_addr == loopback_addr.s_addr) -+ our_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); - } - - #if SIZEOF_CHAR_P == 8 -diff -wurb qemu/slirp/slirp.c qemu-patched/slirp/slirp.c ---- qemu/slirp/slirp.c Fri Oct 8 01:27:35 2004 -+++ qemu-patched/slirp/slirp.c Mon Mar 21 13:22:05 2005 -@@ -144,7 +144,6 @@ - m_init(); - - /* set default addresses */ -- getouraddr(); - inet_aton("127.0.0.1", &loopback_addr); - - if (get_dns_addr(&dns_addr) < 0) { -@@ -153,6 +152,7 @@ - } - - inet_aton(CTL_SPECIAL, &special_addr); -+ getouraddr(); - } - - #define CONN_CANFSEND(so) (((so)->so_state & (SS_FCANTSENDMORE|SS_ISFCONNECTED)) == SS_ISFCONNECTED) -diff -wurb qemu/slirp/udp.c qemu-patched/slirp/udp.c ---- qemu/slirp/udp.c Fri Oct 8 01:27:35 2004 -+++ qemu-patched/slirp/udp.c Mon Mar 21 13:22:05 2005 -@@ -314,6 +314,8 @@ - saddr = *addr; - if ((so->so_faddr.s_addr & htonl(0xffffff00)) == special_addr.s_addr) - saddr.sin_addr.s_addr = so->so_faddr.s_addr; -+ if ((so->so_faddr.s_addr & htonl(0x000000ff)) == htonl(0xff)) -+ saddr.sin_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); - daddr.sin_addr = so->so_laddr; - daddr.sin_port = so->so_lport; - - diff --git a/emulators/qemu-devel/files/patch-slirp_throttle b/emulators/qemu-devel/files/patch-slirp_throttle deleted file mode 100644 index 50d8c0fcc39d..000000000000 --- a/emulators/qemu-devel/files/patch-slirp_throttle +++ /dev/null @@ -1,257 +0,0 @@ -Index: qemu/vl.c -=================================================================== -RCS file: /sources/qemu/qemu/vl.c,v -retrieving revision 1.157 -diff -u -p -r1.157 vl.c ---- vl.c 18 Dec 2005 20:34:32 -0000 1.157 -+++ vl.c 20 Dec 2005 21:11:37 -0000 -@@ -1768,13 +1768,16 @@ VLANState *qemu_find_vlan(int id) - } - - VLANClientState *qemu_new_vlan_client(VLANState *vlan, -- IOReadHandler *fd_read, void *opaque) -+ IOReadHandler *fd_read, -+ IOCanRWHandler *fd_can_read, -+ void *opaque) - { - VLANClientState *vc, **pvc; - vc = qemu_mallocz(sizeof(VLANClientState)); - if (!vc) - return NULL; - vc->fd_read = fd_read; -+ vc->fd_can_read = fd_can_read; - vc->opaque = opaque; - vc->vlan = vlan; - -@@ -1786,6 +1789,20 @@ VLANClientState *qemu_new_vlan_client(VL - return vc; - } - -+int qemu_can_send_packet(VLANClientState *vc1) -+{ -+ VLANState *vlan = vc1->vlan; -+ VLANClientState *vc; -+ -+ for(vc = vlan->first_client; vc != NULL; vc = vc->next) { -+ if (vc != vc1) { -+ if (vc->fd_can_read && !vc->fd_can_read(vc->opaque)) -+ return 0; -+ } -+ } -+ return 1; -+} -+ - void qemu_send_packet(VLANClientState *vc1, const uint8_t *buf, int size) - { - VLANState *vlan = vc1->vlan; -@@ -1811,7 +1828,7 @@ static VLANClientState *slirp_vc; - - int slirp_can_output(void) - { -- return 1; -+ return qemu_can_send_packet(slirp_vc); - } - - void slirp_output(const uint8_t *pkt, int pkt_len) -@@ -1839,7 +1856,7 @@ static int net_slirp_init(VLANState *vla - slirp_init(); - } - slirp_vc = qemu_new_vlan_client(vlan, -- slirp_receive, NULL); -+ slirp_receive, NULL, NULL); - snprintf(slirp_vc->info_str, sizeof(slirp_vc->info_str), "user redirector"); - return 0; - } -@@ -2024,7 +2041,7 @@ static TAPState *net_tap_fd_init(VLANSta - if (!s) - return NULL; - s->fd = fd; -- s->vc = qemu_new_vlan_client(vlan, tap_receive, s); -+ s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s); - qemu_set_fd_handler(s->fd, tap_send, NULL, s); - snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd); - return s; -@@ -2327,7 +2344,7 @@ static NetSocketState *net_socket_fd_ini - return NULL; - s->fd = fd; - -- s->vc = qemu_new_vlan_client(vlan, net_socket_receive_dgram, s); -+ s->vc = qemu_new_vlan_client(vlan, net_socket_receive_dgram, NULL, s); - qemu_set_fd_handler(s->fd, net_socket_send_dgram, NULL, s); - - /* mcast: save bound address as dst */ -@@ -2355,7 +2372,7 @@ static NetSocketState *net_socket_fd_ini - return NULL; - s->fd = fd; - s->vc = qemu_new_vlan_client(vlan, -- net_socket_receive, s); -+ net_socket_receive, NULL, s); - snprintf(s->vc->info_str, sizeof(s->vc->info_str), - "socket: fd=%d", fd); - if (is_connected) { -Index: qemu/vl.h -=================================================================== -RCS file: /sources/qemu/qemu/vl.h,v -retrieving revision 1.99 -diff -u -p -r1.99 vl.h ---- vl.h 18 Dec 2005 20:34:32 -0000 1.99 -+++ vl.h 20 Dec 2005 21:11:38 -0000 -@@ -279,6 +279,9 @@ typedef struct VLANClientState VLANClien - - struct VLANClientState { - IOReadHandler *fd_read; -+ /* Packets may still be sent if this returns zero. It's used to -+ rate-limit the slirp code. */ -+ IOCanRWHandler *fd_can_read; - void *opaque; - struct VLANClientState *next; - struct VLANState *vlan; -@@ -293,8 +296,12 @@ typedef struct VLANState { - - VLANState *qemu_find_vlan(int id); - VLANClientState *qemu_new_vlan_client(VLANState *vlan, -- IOReadHandler *fd_read, void *opaque); -+ IOReadHandler *fd_read, -+ IOCanRWHandler *fd_can_read, -+ void *opaque); -+int qemu_can_send_packet(VLANClientState *vc); - void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size); -+void qemu_handler_true(void *opaque); - - void do_info_network(void); - -Index: qemu/hw/lance.c -=================================================================== -RCS file: /sources/qemu/qemu/hw/lance.c,v -retrieving revision 1.5 -diff -u -p -r1.5 lance.c ---- hw/lance.c 15 Nov 2005 22:16:05 -0000 1.5 -+++ hw/lance.c 20 Dec 2005 21:11:38 -0000 -@@ -283,6 +283,11 @@ static CPUWriteMemoryFunc *lance_mem_wri - - #define MIN_BUF_SIZE 60 - -+static void lance_can_receive(void *opaque) -+{ -+ return 1; -+} -+ - static void lance_receive(void *opaque, const uint8_t *buf, int size) - { - LANCEState *s = opaque; -@@ -440,7 +445,7 @@ void lance_init(NICInfo *nd, int irq, ui - - lance_reset(s); - -- s->vc = qemu_new_vlan_client(nd->vlan, lance_receive, s); -+ s->vc = qemu_new_vlan_client(nd->vlan, lance_receive, lance_can_receive, s); - - snprintf(s->vc->info_str, sizeof(s->vc->info_str), - "lance macaddr=%02x:%02x:%02x:%02x:%02x:%02x", -Index: qemu/hw/ne2000.c -=================================================================== -RCS file: /sources/qemu/qemu/hw/ne2000.c,v -retrieving revision 1.17 -diff -u -p -r1.17 ne2000.c ---- hw/ne2000.c 22 Nov 2005 20:16:13 -0000 1.17 -+++ hw/ne2000.c 20 Dec 2005 21:11:38 -0000 -@@ -200,14 +200,10 @@ static int compute_mcast_idx(const uint8 - return (crc >> 26); - } - --/* return the max buffer size if the NE2000 can receive more data */ --static int ne2000_can_receive(void *opaque) -+static int ne2000_buffer_full(NE2000State *s) - { -- NE2000State *s = opaque; - int avail, index, boundary; -- -- if (s->cmd & E8390_STOP) -- return 0; -+ - index = s->curpag << 8; - boundary = s->boundary << 8; - if (index < boundary) -@@ -215,8 +211,17 @@ static int ne2000_can_receive(void *opaq - else - avail = (s->stop - s->start) - (index - boundary); - if (avail < (MAX_ETH_FRAME_SIZE + 4)) -- return 0; -- return MAX_ETH_FRAME_SIZE; -+ return 1; -+ return 0; -+} -+ -+static int ne2000_can_receive(void *opaque) -+{ -+ NE2000State *s = opaque; -+ -+ if (s->cmd & E8390_STOP) -+ return 1; -+ return !ne2000_buffer_full(s); - } - - #define MIN_BUF_SIZE 60 -@@ -234,7 +239,7 @@ static void ne2000_receive(void *opaque, - printf("NE2000: received len=%d\n", size); - #endif - -- if (!ne2000_can_receive(s)) -+ if (s->cmd & E8390_STOP || ne2000_buffer_full(s)) - return; - - /* XXX: check this */ -@@ -715,7 +720,8 @@ void isa_ne2000_init(int base, int irq, - - ne2000_reset(s); - -- s->vc = qemu_new_vlan_client(nd->vlan, ne2000_receive, s); -+ s->vc = qemu_new_vlan_client(nd->vlan, ne2000_receive, -+ ne2000_can_receive, s); - - snprintf(s->vc->info_str, sizeof(s->vc->info_str), - "ne2000 macaddr=%02x:%02x:%02x:%02x:%02x:%02x", -@@ -784,7 +790,8 @@ void pci_ne2000_init(PCIBus *bus, NICInf - s->pci_dev = (PCIDevice *)d; - memcpy(s->macaddr, nd->macaddr, 6); - ne2000_reset(s); -- s->vc = qemu_new_vlan_client(nd->vlan, ne2000_receive, s); -+ s->vc = qemu_new_vlan_client(nd->vlan, ne2000_receive, -+ ne2000_can_receive, s); - - snprintf(s->vc->info_str, sizeof(s->vc->info_str), - "ne2000 pci macaddr=%02x:%02x:%02x:%02x:%02x:%02x", -Index: qemu/hw/smc91c111.c -=================================================================== -RCS file: /sources/qemu/qemu/hw/smc91c111.c,v -retrieving revision 1.2 -diff -u -p -r1.2 smc91c111.c ---- hw/smc91c111.c 18 Dec 2005 17:39:52 -0000 1.2 -+++ hw/smc91c111.c 20 Dec 2005 21:11:38 -0000 -@@ -593,6 +593,17 @@ static uint32_t smc91c111_readl(void *op - return val; - } - -+static int smc91c111_can_receive(void *opaque) -+{ -+ smc91c111_state *s = (smc91c111_state *)opaque; -+ -+ if ((s->rcr & RCR_RXEN) == 0 || (s->rcr & RCR_SOFT_RST)) -+ return 1; -+ if (s->allocated == (1 << NUM_PACKETS) - 1) -+ return 0; -+ return 1; -+} -+ - static void smc91c111_receive(void *opaque, const uint8_t *buf, int size) - { - smc91c111_state *s = (smc91c111_state *)opaque; -@@ -697,6 +708,7 @@ void smc91c111_init(NICInfo *nd, uint32_ - - smc91c111_reset(s); - -- s->vc = qemu_new_vlan_client(nd->vlan, smc91c111_receive, s); -+ s->vc = qemu_new_vlan_client(nd->vlan, smc91c111_receive, -+ smc91c111_can_receive, s); - /* ??? Save/restore. */ - } diff --git a/emulators/qemu-devel/files/patch-vl.c b/emulators/qemu-devel/files/patch-vl.c deleted file mode 100644 index adf052460e28..000000000000 --- a/emulators/qemu-devel/files/patch-vl.c +++ /dev/null @@ -1,27 +0,0 @@ ---- vl.c.orig Mon Nov 14 15:55:56 2005 -+++ vl.c Mon Nov 14 15:57:25 2005 -@@ -1363,7 +1367,7 @@ - return chr; - } - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - CharDriverState *qemu_chr_open_pty(void) - { - char slave_name[1024]; -@@ -1509,6 +1513,7 @@ - return chr; - } - -+#if defined(__linux__) - static int pp_ioctl(CharDriverState *chr, int cmd, void *arg) - { - int fd = (int)chr->opaque; -@@ -1571,6 +1576,7 @@ - chr->chr_ioctl = pp_ioctl; - return chr; - } -+#endif - - #else - CharDriverState *qemu_chr_open_pty(void) diff --git a/emulators/qemu-devel/pkg-descr b/emulators/qemu-devel/pkg-descr deleted file mode 100644 index 5dbc48de3ce5..000000000000 --- a/emulators/qemu-devel/pkg-descr +++ /dev/null @@ -1,20 +0,0 @@ -QEMU is a FAST! processor emulator using dynamic translation to achieve -good emulation speed. -QEMU has two operating modes: - - * Full system emulation. In this mode, QEMU emulates a full system -(for example a PC), including a processor and various peripherials. -It can be used to launch different Operating Systems without rebooting -the PC or to debug system code. - * User mode emulation (Linux host only). In this mode, QEMU can launch -Linux processes compiled for one CPU on another CPU. It can be used to -launch the Wine Windows API emulator or to ease cross-compilation and -cross-debugging. - -As QEMU requires no host kernel patches to run, it is very safe and easy to use. -(but kqemu is now also supported for the i386 on i386 case) - -See also the preconfigured system images on http://oszoo.org/ -Many live cd isos also work. - -WWW: http://fabrice.bellard.free.fr/qemu/ diff --git a/emulators/qemu-devel/pkg-message b/emulators/qemu-devel/pkg-message deleted file mode 100644 index 4728b9171ccb..000000000000 --- a/emulators/qemu-devel/pkg-message +++ /dev/null @@ -1,36 +0,0 @@ -==== -FreeBSD host notes: -- needs to run as root in order to use /dev/tap* networking (why?) -(actually RELENG_6 and above now has a sysctl net.link.tap.user_open -to allow users to use it too. don't forget to adjust device node -permissions in /etc/devfs.rules.) -- slirp (usermode networking) is fixed now in cvs, on FreeSBIE 1.0 guests -you still have to manually do: - echo nameserver 10.0.2.3 >/etc/resolv.conf -but i've been told that that's normal. (fixed on FreeSBIE 1.1.) -and you have to wait a bit for dhclient to do its thing; traffic to -address 10.0.2.2 is routed to 127.1 on the host. -- expect timer problems when guest kernel HZ is > hosts, -for example time sleep 1 takes 49 seconds and booting sleeps for -minutes at the acd0 probe with a FreeSBIE 1.0 guest, thats because -its kernel is built with HZ=5000, and FreeBSD's default is 100... -(no longer a problem with FreeSBIE 1.1.) The linux 2.6 kernel uses -1000 by default btw. Enabling /dev/rtc doesn't seem to help either -(not included since it needs a patch to emulators/rtc.) -- using physical media doesn't work on 4.x hosts (missing DIOCGMEDIASIZE -ioctl.) -- the -smb option (smb-export local dir to guest) needs the net/samba -port/package installed in addition to qemu. -- RELENG_6 and up guests often crash while accessing the emulated cdrom -(see kern/84102, http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/84102), -using a kernel without PREEMPTION has been reported to fix this problem. -(or do an ftp install instead of installing from the emulated cdrom, and -then make a new kernel.) [fixed since 6.0-R.] -- 6.0-RC1 was released with an ed driver that doesn't like qemu's emulated -RTL8029 nic, this has been fixed in the meantime but if for some reason -you need to use that version as a guest you can temporarily add the patch -in this message: http://docs.freebsd.org/cgi/mid.cgi?200510131428.21211.jkim -(not included in the port since the used VIA VT86C926 PCI ID does not -really match the emulated nic exactly, it just `happens' to work with -6.0-RC1's driver.) -==== diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist deleted file mode 100644 index 8a97a757277b..000000000000 --- a/emulators/qemu-devel/pkg-plist +++ /dev/null @@ -1,54 +0,0 @@ -bin/qemu -bin/qemu-img -bin/qemu-system-arm -bin/qemu-system-mips -bin/qemu-system-ppc -bin/qemu-system-sparc -bin/qemu-system-x86_64 -%%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html -%%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html -%%DATADIR%%/bios.bin -%%DATADIR%%/linux_boot.bin -%%DATADIR%%/vgabios.bin -%%DATADIR%%/vgabios-cirrus.bin -%%DATADIR%%/ppc_rom.bin -%%DATADIR%%/proll.elf -%%DATADIR%%/video.x -%%DATADIR%%/keymaps/ar -%%DATADIR%%/keymaps/common -%%DATADIR%%/keymaps/da -%%DATADIR%%/keymaps/de -%%DATADIR%%/keymaps/de-ch -%%DATADIR%%/keymaps/en-gb -%%DATADIR%%/keymaps/en-us -%%DATADIR%%/keymaps/es -%%DATADIR%%/keymaps/et -%%DATADIR%%/keymaps/fi -%%DATADIR%%/keymaps/fo -%%DATADIR%%/keymaps/fr -%%DATADIR%%/keymaps/fr-be -%%DATADIR%%/keymaps/fr-ca -%%DATADIR%%/keymaps/fr-ch -%%DATADIR%%/keymaps/hr -%%DATADIR%%/keymaps/hu -%%DATADIR%%/keymaps/is -%%DATADIR%%/keymaps/it -%%DATADIR%%/keymaps/ja -%%DATADIR%%/keymaps/lt -%%DATADIR%%/keymaps/lv -%%DATADIR%%/keymaps/mk -%%DATADIR%%/keymaps/modifiers -%%DATADIR%%/keymaps/nl -%%DATADIR%%/keymaps/nl-be -%%DATADIR%%/keymaps/no -%%DATADIR%%/keymaps/pl -%%DATADIR%%/keymaps/pt -%%DATADIR%%/keymaps/pt-br -%%DATADIR%%/keymaps/ru -%%DATADIR%%/keymaps/sl -%%DATADIR%%/keymaps/sv -%%DATADIR%%/keymaps/th -%%DATADIR%%/keymaps/tr -@dirrm %%DATADIR%%/keymaps -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile deleted file mode 100644 index d9c0bb256e57..000000000000 --- a/emulators/simh/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# New ports collection makefile for: sim -# Date created: 7 November 1997 -# Whom: jraynard -# -# $FreeBSD$ -# - -PORTNAME= sim -PORTVERSION= 3.5.2 -PORTREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= http://simh.trailing-edge.com/sources/ -DISTNAME= ${PORTNAME}hv35-2 - -MAINTAINER= mmendez@energyhq.be -COMMENT= Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others - -USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -qoa -USE_GMAKE= yes -RESTRICTED= Non-commercial use only -MAKEFILE= makefile -NO_WRKSUBDIR= yes - -SHELL=${SH} - -OPTIONS= NETWORK "Enable Sim_Ether module (and ports libpcap)" on - -BIN_FILES= altair h316 ibm1130 nova pdp15 pdp9 vax780 \ - altairz80 hp2100 id16 pdp1 pdp4 s3 \ - eclipse i1401 id32 pdp10 pdp7 sds \ - gri i1620 lgp pdp11 pdp8 vax - -PORTDOCS= 0readme_35.txt simh_doc.txt simh_swre.txt \ - 0readme_ethernet.txt simh_faq.txt - -PLIST_FILES= ${BIN_FILES:S/^/bin\//g} %%DATADIR%%/ka655x.bin -PLIST_DIRS= %%DATADIR%% - -.include <bsd.port.pre.mk> - -# XXX How do we know that libpcap.a is really the correct >0.9.x version?! -.if defined (WITH_NETWORK) -RUN_DEPENDS= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap -BUILD_DEPENDS= ${RUN_DEPENDS} -MAKE_ENV= USE_NETWORK=1 -.endif - -pre-patch: - @${MKDIR} ${WRKSRC}/BIN - -do-install: -.for file in ${BIN_FILES} - ${INSTALL_PROGRAM} ${WRKDIR}/BIN/${file} ${PREFIX}/bin -.endfor - - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${DATADIR} - -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @for i in ${PORTDOCS}; do\ - ${INSTALL_DATA} ${WRKDIR}/$$i ${DOCSDIR}; \ - done -.endif - -post-install: - @${CAT} pkg-message - -.include <bsd.port.post.mk> diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo deleted file mode 100644 index a022b298d967..000000000000 --- a/emulators/simh/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (simhv35-2.zip) = e3d2a168f2da62e10e0013f1f9111d82 -SHA256 (simhv35-2.zip) = 12c6e6290b599b7f131027a533ee12add8d68735128805e012309db46f2ab9fb -SIZE (simhv35-2.zip) = 2259795 diff --git a/emulators/simh/files/patch-makefile b/emulators/simh/files/patch-makefile deleted file mode 100644 index 6d771593e784..000000000000 --- a/emulators/simh/files/patch-makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- makefile.orig Mon Aug 22 18:36:56 2005 -+++ makefile Mon Aug 22 18:37:56 2005 -@@ -10,7 +10,7 @@ - else - OS_CCDEFS = -D_GNU_SOURCE - endif --CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I . -+CC += ${CFLAGS} -lm $(OS_CCDEFS) -I . - ifeq ($(USE_NETWORK),) - else - NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a diff --git a/emulators/simh/pkg-descr b/emulators/simh/pkg-descr deleted file mode 100644 index 039169280298..000000000000 --- a/emulators/simh/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -SIMH is a higly portable, multi-system simulator. - -SIMH implements simulators for: - - Data General Nova, Eclipse - - Digital Equipment Corporation PDP-1, PDP-4, PDP-7, PDP-8, PDP-9, - PDP-10, PDP-11, PDP-15, VAX - - GRI Corporation GRI-909 - - IBM 1401, 1620, 1130, System 3 - - Interdata (Perkin-Elmer) 16b and 32b systems - - Hewlett-Packard 2116, 2100, 21MX - - Honeywell H316/H516 - - MITS Altair 8800, with both 8080 and Z80 - - Royal-Mcbee LGP-30, LGP-21 - - Scientific Data Systems SDS 940 - -These simulators are capable of running the Unix V5, V6 and V7 binaries -licenced for non-commercial use by SCO. See ${WRKDIR}/simh_doc.txt for -further details. diff --git a/emulators/simh/pkg-message b/emulators/simh/pkg-message deleted file mode 100644 index a7a5bbf096a7..000000000000 --- a/emulators/simh/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -********************************************************************* - -The file needed by the VAX emulator is located in ${PREFIX}/share/sim - -********************************************************************* diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh.in b/emulators/vmware-guestd4/files/vmware-guestd.sh.in deleted file mode 100644 index 4f5072ce1f41..000000000000 --- a/emulators/vmware-guestd4/files/vmware-guestd.sh.in +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: vmware-guestd -# REQUIRE: DAEMON -# BEFORE: LOGIN - -PREFIX=%%PREFIX%% -. %%RC_SUBR%% - -# Global -checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null" - -# Functions -vmware_guest_kmod_start() -{ - echo 'Loading vmmemctl kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/vmmemctl.ko >/dev/null 2>&1 -} - -# VMware kernel modules -name="vmware_guest_kmod" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_kmod_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_kmod_enable" ] && vmware_guest_kmod_enable="NO" -run_rc_command "$1" - -# VMware guest daemon -name="vmware_guestd" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -unset start_cmd -stop_precmd="${checkvm_cmd}" -unset stop_cmd -command="${PREFIX}/sbin/vmware-guestd" -command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1" -pidfile="/var/run/${name}.pid" - -load_rc_config $name -[ -z "$vmware_guestd_enable" ] && vmware_guestd_enable="YES" -[ -z "$vmware_guestd_flags" ] && vmware_guestd_flags="--background ${pidfile}" -run_rc_command "$1" diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh.in b/emulators/vmware-guestd5/files/vmware-guestd.sh.in deleted file mode 100644 index 158e88bf56bd..000000000000 --- a/emulators/vmware-guestd5/files/vmware-guestd.sh.in +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: vmware-guestd -# REQUIRE: DAEMON -# BEFORE: LOGIN - -PREFIX=%%PREFIX%% -. %%RC_SUBR%% - -# Global -checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null" - -# Functions -vmware_guest_vmmemctl_start() -{ - echo 'Loading vmmemctl kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/vmmemctl.ko >/dev/null 2>&1 -} -vmware_guest_vmxnet_start() -{ - echo 'Loading vmxnet kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/vmxnet.ko >/dev/null 2>&1 -} - -# VMware kernel module: vmmemctl -name="vmware_guest_vmmemctl" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_vmmemctl_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_vmmemctl_enable" ] && vmware_guest_vmmemctl_enable="NO" -[ -n "$vmware_guest_kmod_enable" ] && vmware_guest_vmmemctl_enable="$vmware_guest_kmod_enable" -run_rc_command "$1" - -# VMware kernel module: vmxnet -name="vmware_guest_vmxnet" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_vmxnet_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO" -run_rc_command "$1" - -# VMware guest daemon -name="vmware_guestd" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -unset start_cmd -stop_precmd="${checkvm_cmd}" -unset stop_cmd -command="${PREFIX}/sbin/vmware-guestd" -command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1" -pidfile="/var/run/${name}.pid" - -load_rc_config $name -[ -z "$vmware_guestd_enable" ] && vmware_guestd_enable="YES" -[ -z "$vmware_guestd_flags" ] && vmware_guestd_flags="--background ${pidfile}" -run_rc_command "$1" diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile deleted file mode 100644 index 24c9b2c09463..000000000000 --- a/emulators/vmware-guestd6/Makefile +++ /dev/null @@ -1,253 +0,0 @@ -# New ports collection makefile for: VMware tools for FreeBSD -# Date created: 10 Aug 2000 -# Whom: matusita@jp.FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= vmware -PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -PORTREVISION?= 2 -CATEGORIES= emulators -MASTER_SITES= # bundled with VMware Workstation -PKGNAMESUFFIX?= -guestd -DISTNAME= vmware-freebsd-tools - -MAINTAINER= matusita@FreeBSD.org -COMMENT?=VMware guest OS supporting daemon (VMware Workstation 5.x, FreeBSD version) - -.if defined(VMWARE_X_PORTS) -RUN_DEPENDS= ${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd5 -.endif - -DISTDIR= ${MOUNT_PT} -IGNOREFILES= ${DISTFILES} -WRKSRC= ${WRKDIR}/vmware-tools-distrib - -ONLY_FOR_ARCHS= i386 amd64 -USE_REINPLACE= yes -USE_RC_SUBR= yes -RC_SCRIPT= ${PREFIX}/etc/rc.d/vmware-guestd.sh -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -.if !defined(BATCH) -IS_INTERACTIVE= yes -.endif -.if defined(VMWARE_X_PORTS) -USE_X_PREFIX= yes -NO_BUILD= yes -.if defined(WITH_VMWARE_GTK) -PLIST_SUB+= INSTALLXGTKTOOL:="" -USE_ICONV= yes -USE_GETTEXT= yes -USE_XLIB= yes -USE_GNOME= glib12 gtk12 -LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.else -PLIST_SUB+= INSTALLXGTKTOOL:="@comment " -.endif -.endif - -RESTRICTED= "Not sure if we can redistribute this." -NO_PACKAGE= ${RESTRICTED} - -VMWARE_VER= 5.5.1 -BUILD_VER= 19175 - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -MOUNT_DEV?= /dev/acd0c -.else -MOUNT_DEV?= /dev/acd0 -.endif -MOUNT_PT?= /mnt -MOUNT= /sbin/mount -UMOUNT= /sbin/umount - -.if ${ARCH} == i386 -BITS?= 32 -.else # ${ARCH} == amd64 -BITS?= 64 -.endif - -.if defined(VMWARE_X_PORTS) - -.if ${X_WINDOW_SYSTEM:L} == xfree86-3 -.if ${BITS} == 32 -PLIST_SUB+= INSTALLXSERVER3:="" -.else -PLIST_SUB+= INSTALLXSERVER3:="@comment " -.endif -PLIST_SUB+= INSTALLXSERVER4:="@comment " -PLIST_SUB+= INSTALLXVMMOUSE:="@comment " -.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 -PLIST_SUB+= INSTALLXSERVER3:="@comment " -PLIST_SUB+= INSTALLXSERVER4:="" -PLIST_SUB+= INSTALLXVMMOUSE:="" -.else -PLIST_SUB+= INSTALLXSERVER3:="@comment " -PLIST_SUB+= INSTALLXSERVER4:="@comment " -PLIST_SUB+= INSTALLXVMMOUSE:="" -.endif - -.else - -VMWARE_KMODDIR= ${PREFIX}/lib/vmware-tools/modules - -.if !defined(WITHOUT_VMWARE_VMMEMCTL) && exists(/usr/src/sys/Makefile) -WITH_VMWARE_VMMEMCTL=YES -.endif -.if !defined(WITHOUT_VMWARE_VMXNET) && (${BITS} == 32) -WITH_VMWARE_VMXNET=YES -.endif - -.if defined(WITH_VMWARE_VMMEMCTL) -PLIST_SUB+= VMWARE_VMMEMCTL:="" -.else -PLIST_SUB+= VMWARE_VMMEMCTL:="@comment " -.endif - -.if defined(WITH_VMWARE_VMXNET) -.if (${OSVERSION} >= 480000) && (${OSVERSION} < 500000) && (${BITS} == 32) -PLIST_SUB+= VMWARE_VMXNET:="" -VMWARE_VMXNET_PATH= 4.9/vmxnet.ko -.elif (${OSVERSION} >= 500000) && (${OSVERSION} < 600000) -PLIST_SUB+= VMWARE_VMXNET:="" -.if ${BITS} == 32 -VMWARE_VMXNET_PATH= 5.3-i386/vmxnet.ko -.else -VMWARE_VMXNET_PATH= 5.3-amd64/vmxnet.ko -.endif -.else -# VMware doesn't provide vmxnet.ko for other versions -.undef WITH_VMWARE_VMXNET -PLIST_SUB+= VMWARE_VMXNET:="@comment " -.endif -.else -PLIST_SUB+= VMWARE_VMXNET:="@comment " -.endif - -.if defined(WITH_VMWARE_VMMEMCTL) || defined(WITH_VMWARE_VMXNET) -PLIST_SUB+= VMWARE_KMODDIR:="" -.else -PLIST_SUB+= VMWARE_KMODDIR:="@comment " -.endif - -.endif - -fetch-list: - @${DO_NADA} - -do-fetch: - @${ECHO} "" - @${ECHO} "========================================================================" - @${ECHO} "Choose \"VM\" -> \"Install VMware Tools...\" from VMware Workstation" - @${ECHO} "menu to connect VM's CD-ROM drive and installation CD image temporary." - @${ECHO} "Press \"Install\" button when a dialog pops up." - @${ECHO} "========================================================================" - @${ECHO} "" -.if !defined(BATCH) - @${ECHO} "This port mounts ${MOUNT_DEV} to ${MOUNT_PT}." - @${ECHO} "" - @${ECHO} -n "Are you ready? [Y/n]: " - @(read line; \ - case "$${line}" in \ - [Nn]*) \ - ${FALSE} ;; \ - *) \ - ${TRUE} ;; \ - esac) -.endif - ${MKDIR} ${MOUNT_PT} - -${UMOUNT} ${MOUNT_PT} 2>&1 >/dev/null - -${UMOUNT} ${MOUNT_DEV} 2>&1 >/dev/null - ${MOUNT} -t cd9660 ${MOUNT_DEV} ${MOUNT_PT} - -post-extract: - ${UMOUNT} ${MOUNT_PT} -.if defined(WITH_VMWARE_VMMEMCTL) - (cd ${WRKDIR}; ${TAR} xf ${WRKSRC}/lib/modules/source/vmmemctl.tar) -.endif - -.if defined(VMWARE_X_PORTS) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-tcl ${X11BASE}/bin - ${LN} -sfh vmware-toolbox-tcl ${X11BASE}/bin/vmware-toolbox -.if defined(WITH_VMWARE_GTK) - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin -.endif -.if ${X_WINDOW_SYSTEM:L} != xfree86-3 - if [ ! -d ${X11BASE}/lib/modules/input ] ; then \ - ${MKDIR} ${X11BASE}/lib/modules/input ; \ - fi -.endif -.if ${X_WINDOW_SYSTEM:L} == xfree86-3 -.if ${BITS} == 32 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware - @${ECHO} "" - @${ECHO} "You have installed XFree86 3.x X Server for VMware." - @${ECHO} "${X11BASE}/etc/XF86Config_VMware is a sample XF86Config file." - @${ECHO} "Copy this file to /etc/XF86Config before starting X." -.else - @${ECHO} "There is no XFree86 3.x X server for your system." - @${ECHO} "Consider upgrading your X to XFree86 4.x or switch to X.Org." -.endif -.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware - if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \ - ${MKDIR} ${X11BASE}/lib/modules/drivers ; \ - fi -.if ${BITS} == 32 - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware -.else - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware -.endif -.else -.if ${BITS} == 32 - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware -.else - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware -.endif -.endif - -${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end - -.else - -post-patch: - ${REINPLACE_CMD} "`${PRINTF} 's|\0152\013\0350|\0152\\\n\0350|g'`" \ - ${WRKSRC}/lib/sbin${BITS}/vmware-checkvm - -do-build: -.if defined(WITH_VMWARE_VMMEMCTL) - (cd ${WRKDIR}/vmmemctl-only; make) -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}/vmware-guestd ${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}/vmware-checkvm ${PREFIX}/sbin -.if defined(WITH_VMWARE_VMMEMCTL) - ${MKDIR} ${VMWARE_KMODDIR} - ${INSTALL_PROGRAM} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR} -.endif -.if defined(WITH_VMWARE_VMXNET) - ${MKDIR} ${VMWARE_KMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/modules/binary/FreeBSD${VMWARE_VMXNET_PATH} ${VMWARE_KMODDIR} -.endif - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/vmware-guestd.sh > ${WRKDIR}/vmware-guestd.sh - @${INSTALL_SCRIPT} ${WRKDIR}/vmware-guestd.sh ${RC_SCRIPT} - -${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end - ${MKDIR} ${PREFIX}/share/vmware-tools - ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweroff-vm-default - ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweron-vm-default - ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/resume-vm-default - ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/suspend-vm-default - ${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools - -.endif - -.include <bsd.port.post.mk> diff --git a/emulators/vmware-guestd6/distinfo b/emulators/vmware-guestd6/distinfo deleted file mode 100644 index 33ac5d7c570a..000000000000 --- a/emulators/vmware-guestd6/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (vmware-freebsd-tools.tar.gz) = IGNORE -SHA256 (vmware-freebsd-tools.tar.gz) = IGNORE diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh b/emulators/vmware-guestd6/files/vmware-guestd.sh deleted file mode 100644 index 158e88bf56bd..000000000000 --- a/emulators/vmware-guestd6/files/vmware-guestd.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: vmware-guestd -# REQUIRE: DAEMON -# BEFORE: LOGIN - -PREFIX=%%PREFIX%% -. %%RC_SUBR%% - -# Global -checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null" - -# Functions -vmware_guest_vmmemctl_start() -{ - echo 'Loading vmmemctl kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/vmmemctl.ko >/dev/null 2>&1 -} -vmware_guest_vmxnet_start() -{ - echo 'Loading vmxnet kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/vmxnet.ko >/dev/null 2>&1 -} - -# VMware kernel module: vmmemctl -name="vmware_guest_vmmemctl" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_vmmemctl_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_vmmemctl_enable" ] && vmware_guest_vmmemctl_enable="NO" -[ -n "$vmware_guest_kmod_enable" ] && vmware_guest_vmmemctl_enable="$vmware_guest_kmod_enable" -run_rc_command "$1" - -# VMware kernel module: vmxnet -name="vmware_guest_vmxnet" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_vmxnet_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO" -run_rc_command "$1" - -# VMware guest daemon -name="vmware_guestd" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -unset start_cmd -stop_precmd="${checkvm_cmd}" -unset stop_cmd -command="${PREFIX}/sbin/vmware-guestd" -command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1" -pidfile="/var/run/${name}.pid" - -load_rc_config $name -[ -z "$vmware_guestd_enable" ] && vmware_guestd_enable="YES" -[ -z "$vmware_guestd_flags" ] && vmware_guestd_flags="--background ${pidfile}" -run_rc_command "$1" diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh.in b/emulators/vmware-guestd6/files/vmware-guestd.sh.in deleted file mode 100644 index 158e88bf56bd..000000000000 --- a/emulators/vmware-guestd6/files/vmware-guestd.sh.in +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: vmware-guestd -# REQUIRE: DAEMON -# BEFORE: LOGIN - -PREFIX=%%PREFIX%% -. %%RC_SUBR%% - -# Global -checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null" - -# Functions -vmware_guest_vmmemctl_start() -{ - echo 'Loading vmmemctl kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/vmmemctl.ko >/dev/null 2>&1 -} -vmware_guest_vmxnet_start() -{ - echo 'Loading vmxnet kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/vmxnet.ko >/dev/null 2>&1 -} - -# VMware kernel module: vmmemctl -name="vmware_guest_vmmemctl" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_vmmemctl_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_vmmemctl_enable" ] && vmware_guest_vmmemctl_enable="NO" -[ -n "$vmware_guest_kmod_enable" ] && vmware_guest_vmmemctl_enable="$vmware_guest_kmod_enable" -run_rc_command "$1" - -# VMware kernel module: vmxnet -name="vmware_guest_vmxnet" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_vmxnet_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO" -run_rc_command "$1" - -# VMware guest daemon -name="vmware_guestd" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -unset start_cmd -stop_precmd="${checkvm_cmd}" -unset stop_cmd -command="${PREFIX}/sbin/vmware-guestd" -command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1" -pidfile="/var/run/${name}.pid" - -load_rc_config $name -[ -z "$vmware_guestd_enable" ] && vmware_guestd_enable="YES" -[ -z "$vmware_guestd_flags" ] && vmware_guestd_flags="--background ${pidfile}" -run_rc_command "$1" diff --git a/emulators/vmware-guestd6/pkg-descr b/emulators/vmware-guestd6/pkg-descr deleted file mode 100644 index b16e51735850..000000000000 --- a/emulators/vmware-guestd6/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -vmware-guestd daemon is for time synchronization with host OS and others. -Beware, this port is for FreeBSD _guest_ OS. You don't need to install -this ports to FreeBSD _host_ OS. This ports also installs a kernel modules -for FreeBSD guest. - -If you want to run FreeBSD as a VMware guest OS, install this port -would help you. If you want to run X, install vmware-tools too. - -This port assumes that a) users want only "must-have" binaries and -b) guest OS runs on a certain architecture and never be changed. For -those want full-feature of VMware Tools, use the installer bundled with -VMware Tools instead. - -WWW: http://www.vmware.com/products/ws/ diff --git a/emulators/vmware-guestd6/pkg-descr.tools b/emulators/vmware-guestd6/pkg-descr.tools deleted file mode 100644 index 2027da8571ce..000000000000 --- a/emulators/vmware-guestd6/pkg-descr.tools +++ /dev/null @@ -1,21 +0,0 @@ -VMware tools support FreeBSD _guest_ OS running on VMware Workstation. -Beware, this port is _not_ for FreeBSD _host_ OS. - -VMware tools for FreeBSD consist of vmware-toolbox which supports -seamless operation between the Host and the Guest OS, dual-boot -configulation files, and special XFree86 3.x server for Guest OS. -However, we cannot install dual-boot configuration since it requires -to modify /etc files. - -This ports will install vmware-toolbox to your computer, and -XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, -If you already use XFree86 4.1.0 or later, you may use 'vmware' -driver for X server. Vmware-guestd is installed as a separate port, -ports/emulators/vmware-guestd4, but this port install guestd automatically. - -This port assumes that a) users want only "must-have" binaries and -b) guest OS runs on a certain architecture and never be changed. For -those want full-feature of VMware Tools, use the installer bundled with -VMware Tools instead. - -WWW: http://www.vmware.com/products/ws/ diff --git a/emulators/vmware-guestd6/pkg-plist b/emulators/vmware-guestd6/pkg-plist deleted file mode 100644 index 4f377fe95b86..000000000000 --- a/emulators/vmware-guestd6/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -@unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true -etc/rc.d/vmware-guestd.sh -sbin/vmware-checkvm -sbin/vmware-guestd -%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko -%%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko -%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules -%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools -share/vmware-tools/poweroff-vm-default -share/vmware-tools/poweron-vm-default -share/vmware-tools/resume-vm-default -share/vmware-tools/suspend-vm-default -@dirrm share/vmware-tools -@cwd / -etc/vmware-tools diff --git a/emulators/vmware-guestd6/pkg-plist.tools b/emulators/vmware-guestd6/pkg-plist.tools deleted file mode 100644 index 01dff9975c77..000000000000 --- a/emulators/vmware-guestd6/pkg-plist.tools +++ /dev/null @@ -1,10 +0,0 @@ -bin/vmware-toolbox -bin/vmware-toolbox-tcl -%%INSTALLXGTKTOOL:%%bin/vmware-toolbox-gtk -%%INSTALLXSERVER3:%%bin/XF86_VMware -%%INSTALLXSERVER3:%%etc/XF86Config_VMware -%%INSTALLXSERVER4:%%etc/XF86Config-4_VMware -%%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware -%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware -%%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers -%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input diff --git a/emulators/vmware-tools6/Makefile b/emulators/vmware-tools6/Makefile deleted file mode 100644 index c2d5ba4d1517..000000000000 --- a/emulators/vmware-tools6/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# New ports collection makefile for: VMware tools for FreeBSD -# Date created: 10 Aug 2000 -# Whom: matusita@jp.FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= vmware -PORTREVISION?= 1 -MASTER_SITES= # bundled with VMware Workstation -PKGNAMESUFFIX?= -tools - -COMMENT=VMware Tools for guest OS (VMware Workstation 5.x, FreeBSD version) - -MASTERDIR= ${.CURDIR}/../vmware-guestd5 -DESCR= ${PKGDIR}/pkg-descr.tools -PLIST= ${PKGDIR}/pkg-plist.tools - -VMWARE_X_PORTS= YES - -.include "${MASTERDIR}/Makefile" diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile deleted file mode 100644 index a741dba5bc62..000000000000 --- a/emulators/wine-devel/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# ex:ts=8 -# New ports collection makefile for: wine -# Date created: Sa 9 Nov 1996 00:52:22 MET -# Whom: se -# -# $FreeBSD$ -# - -PORTNAME= wine -PORTVERSION= 0.9.8 -PORTEPOCH= 1 -CATEGORIES= emulators -MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ - ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= gerald@FreeBSD.org -COMMENT= Microsoft Windows compatibility layer for Unix-like systems - -# wine/dlls/glut32/ depends on the presence of libglut. -LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms \ - glut.4:${PORTSDIR}/graphics/libglut - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib LIBS=-Wl,-rpath,${PREFIX}/lib/wine -INSTALLS_SHLIB= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/wine -MAN1= widl.1 wine.1 winebuild.1 winedbg.1 winedump.1 winegcc.1 \ - winemaker.1 wineserver.1 wmc.1 wrc.1 -ONLY_FOR_ARCHS= i386 -USE_BISON= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GL= yes -USE_XPM= yes - -SUB_FILES= pkg-message wine.sh -PKGMESSAGE= ${WRKDIR}/pkg-message - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 503000 -IGNORE= fails to work on versions of FreeBSD before 5.3 (due to problems with threading support) -.endif - -pre-build: - cd ${WRKSRC} && make depend - -post-install: - -@${MKDIR} ${PREFIX}/etc/rc.d - ${RM} ${PREFIX}/man/man1/wineg++.1 -.if !defined(NOPORTDOCS) - -@${MKDIR} ${DOCSDIR} -.for i in README ANNOUNCE AUTHORS LICENSE - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor -.for i in progman uninstaller wcmd winedbg winemine - ${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i} -.endfor - ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump -.endif - @${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine - @${INSTALL_SCRIPT} ${WRKDIR}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh - @${ECHO} - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo deleted file mode 100644 index 6251259aed3f..000000000000 --- a/emulators/wine-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (wine-0.9.8.tar.bz2) = a3b3914c9e34df910045384d64baee87 -SHA256 (wine-0.9.8.tar.bz2) = 6e6442aec2a889f04897ad739b863abec05c320a6f43c12198914cf7f830ee48 -SIZE (wine-0.9.8.tar.bz2) = 10563571 diff --git a/emulators/wine-devel/files/pkg-message.in b/emulators/wine-devel/files/pkg-message.in deleted file mode 100644 index 5a29eb19315e..000000000000 --- a/emulators/wine-devel/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ -Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before -FreeBSD 5.3 will generally not work properly. - -The port also installs some of Wine's doc files which describe additional -things that are not in the manual pages, see: - %%PREFIX%%/share/doc/wine -There are more in the source tree but the others are only useful in -conjunction with the rest of the source tree, and then you can as well -look at them there. (If you just installed this as a package and do not -know how to use the ports system to have it fetch and extract the source, -have a look at <http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports.html>.) diff --git a/emulators/wine-devel/files/wine.sh.in b/emulators/wine-devel/files/wine.sh.in deleted file mode 100644 index fe67ceb5d4e2..000000000000 --- a/emulators/wine-devel/files/wine.sh.in +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - /sbin/ldconfig -m %%PREFIX%%/lib/wine - ;; - stop) - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac diff --git a/emulators/wine-devel/pkg-descr b/emulators/wine-devel/pkg-descr deleted file mode 100644 index 55ca19427ccb..000000000000 --- a/emulators/wine-devel/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Wine is a Microsoft Windows compatibility layer running under Unix-like -systems on i386 (and compatible) CPUs. - -It is still beta quality, but is definitely making progress. Most -applications already work, more or less, including several games. - -WWW: http://www.winehq.com/ - -- Gerald Pfeifer -gerald@FreeBSD.org diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist deleted file mode 100644 index ad181cf1ed44..000000000000 --- a/emulators/wine-devel/pkg-plist +++ /dev/null @@ -1,801 +0,0 @@ -bin/function_grep.pl -bin/msiexec -bin/notepad -bin/progman -bin/regedit -bin/regsvr32 -bin/uninstaller -bin/wcmd -bin/widl -bin/wine -bin/wineboot -bin/winebrowser -bin/winebuild -bin/winecfg -bin/wineconsole -bin/winecpp -bin/winedbg -bin/winedump -bin/winefile -bin/wineg++ -bin/winegcc -bin/winelauncher -bin/winemaker -bin/winemine -bin/winepath -bin/wineprefixcreate -bin/wineserver -bin/wineshelllink -bin/winhelp -bin/wmc -bin/wrc -etc/rc.d/000.wine.sh -include/wine/debug.h -include/wine/exception.h -include/wine/itss.h -include/wine/itss.idl -include/wine/library.h -include/wine/unicode.h -include/wine/msvcrt/conio.h -include/wine/msvcrt/crtdbg.h -include/wine/msvcrt/ctype.h -include/wine/msvcrt/direct.h -include/wine/msvcrt/dirent.h -include/wine/msvcrt/dos.h -include/wine/msvcrt/eh.h -include/wine/msvcrt/errno.h -include/wine/msvcrt/fcntl.h -include/wine/msvcrt/float.h -include/wine/msvcrt/io.h -include/wine/msvcrt/limits.h -include/wine/msvcrt/locale.h -include/wine/msvcrt/malloc.h -include/wine/msvcrt/math.h -include/wine/msvcrt/mbctype.h -include/wine/msvcrt/mbstring.h -include/wine/msvcrt/process.h -include/wine/msvcrt/search.h -include/wine/msvcrt/setjmp.h -include/wine/msvcrt/share.h -include/wine/msvcrt/signal.h -include/wine/msvcrt/stddef.h -include/wine/msvcrt/stdio.h -include/wine/msvcrt/stdlib.h -include/wine/msvcrt/string.h -include/wine/msvcrt/sys/locking.h -include/wine/msvcrt/sys/stat.h -include/wine/msvcrt/sys/timeb.h -include/wine/msvcrt/sys/types.h -include/wine/msvcrt/sys/unistd.h -include/wine/msvcrt/sys/utime.h -include/wine/msvcrt/time.h -include/wine/msvcrt/unistd.h -include/wine/msvcrt/wchar.h -include/wine/msvcrt/wctype.h -include/wine/windows/accctrl.h -include/wine/windows/aclapi.h -include/wine/windows/activscp.h -include/wine/windows/activscp.idl -include/wine/windows/advpub.h -include/wine/windows/amstream.h -include/wine/windows/amstream.idl -include/wine/windows/amvideo.h -include/wine/windows/amvideo.idl -include/wine/windows/appmgmt.h -include/wine/windows/audevcod.h -include/wine/windows/austream.h -include/wine/windows/austream.idl -include/wine/windows/aviriff.h -include/wine/windows/axcore.idl -include/wine/windows/axextend.idl -include/wine/windows/basetsd.h -include/wine/windows/basetyps.h -include/wine/windows/cderr.h -include/wine/windows/cguid.h -include/wine/windows/comcat.h -include/wine/windows/comcat.idl -include/wine/windows/commctrl.h -include/wine/windows/commdlg.h -include/wine/windows/compobj.h -include/wine/windows/control.h -include/wine/windows/control.idl -include/wine/windows/cpl.h -include/wine/windows/custcntl.h -include/wine/windows/cvconst.h -include/wine/windows/d3d.h -include/wine/windows/d3d8.h -include/wine/windows/d3d8caps.h -include/wine/windows/d3d8types.h -include/wine/windows/d3d9.h -include/wine/windows/d3d9caps.h -include/wine/windows/d3d9types.h -include/wine/windows/d3dcaps.h -include/wine/windows/d3dhal.h -include/wine/windows/d3drm.h -include/wine/windows/d3dtypes.h -include/wine/windows/d3dvec.inl -include/wine/windows/d3dx8core.h -include/wine/windows/dbghelp.h -include/wine/windows/dbt.h -include/wine/windows/dciddi.h -include/wine/windows/dciman.h -include/wine/windows/dde.h -include/wine/windows/ddeml.h -include/wine/windows/ddraw.h -include/wine/windows/ddrawi.h -include/wine/windows/ddstream.h -include/wine/windows/ddstream.idl -include/wine/windows/devenum.idl -include/wine/windows/devguid.h -include/wine/windows/digitalv.h -include/wine/windows/dinput.h -include/wine/windows/dispdib.h -include/wine/windows/dispex.h -include/wine/windows/dispex.idl -include/wine/windows/dlgs.h -include/wine/windows/dls1.h -include/wine/windows/dls2.h -include/wine/windows/dmdls.h -include/wine/windows/dmerror.h -include/wine/windows/dmo.h -include/wine/windows/dmoreg.h -include/wine/windows/dmort.h -include/wine/windows/dmplugin.h -include/wine/windows/dmusbuff.h -include/wine/windows/dmusicc.h -include/wine/windows/dmusicf.h -include/wine/windows/dmusici.h -include/wine/windows/dmusics.h -include/wine/windows/docobj.h -include/wine/windows/docobj.idl -include/wine/windows/downloadmgr.h -include/wine/windows/downloadmgr.idl -include/wine/windows/dpaddr.h -include/wine/windows/dplay.h -include/wine/windows/dplay8.h -include/wine/windows/dplobby.h -include/wine/windows/dplobby8.h -include/wine/windows/dpnathlp.h -include/wine/windows/dsconf.h -include/wine/windows/dshow.h -include/wine/windows/dsdriver.h -include/wine/windows/dsound.h -include/wine/windows/dsrole.h -include/wine/windows/dxdiag.h -include/wine/windows/dxerr8.h -include/wine/windows/dxerr9.h -include/wine/windows/dxfile.h -include/wine/windows/dyngraph.idl -include/wine/windows/evcode.h -include/wine/windows/evntrace.h -include/wine/windows/excpt.h -include/wine/windows/exdisp.h -include/wine/windows/exdisp.idl -include/wine/windows/exdispid.h -include/wine/windows/fci.h -include/wine/windows/fdi.h -include/wine/windows/guiddef.h -include/wine/windows/hlink.h -include/wine/windows/hlink.idl -include/wine/windows/htmlhelp.h -include/wine/windows/iads.h -include/wine/windows/iads.idl -include/wine/windows/icm.h -include/wine/windows/icmpapi.h -include/wine/windows/idispids.h -include/wine/windows/imagehlp.h -include/wine/windows/imm.h -include/wine/windows/initguid.h -include/wine/windows/ipexport.h -include/wine/windows/iphlpapi.h -include/wine/windows/ipifcons.h -include/wine/windows/iprtrmib.h -include/wine/windows/iptypes.h -include/wine/windows/ks.h -include/wine/windows/ksguid.h -include/wine/windows/ksmedia.h -include/wine/windows/lm.h -include/wine/windows/lmaccess.h -include/wine/windows/lmapibuf.h -include/wine/windows/lmbrowsr.h -include/wine/windows/lmcons.h -include/wine/windows/lmerr.h -include/wine/windows/lmjoin.h -include/wine/windows/lmserver.h -include/wine/windows/lmshare.h -include/wine/windows/lmstats.h -include/wine/windows/lmwksta.h -include/wine/windows/lzexpand.h -include/wine/windows/mapi.h -include/wine/windows/mapicode.h -include/wine/windows/mapidefs.h -include/wine/windows/mapiguid.h -include/wine/windows/mapitags.h -include/wine/windows/mapiutil.h -include/wine/windows/mapival.h -include/wine/windows/mapix.h -include/wine/windows/mciavi.h -include/wine/windows/mcx.h -include/wine/windows/mediaerr.h -include/wine/windows/mediaobj.h -include/wine/windows/mediaobj.idl -include/wine/windows/mimeinfo.h -include/wine/windows/mimeinfo.idl -include/wine/windows/minmax.h -include/wine/windows/mlang.h -include/wine/windows/mlang.idl -include/wine/windows/mmddk.h -include/wine/windows/mmreg.h -include/wine/windows/mmstream.h -include/wine/windows/mmstream.idl -include/wine/windows/mmsystem.h -include/wine/windows/msacm.h -include/wine/windows/msacmdlg.h -include/wine/windows/msacmdrv.h -include/wine/windows/mscat.h -include/wine/windows/mshtmcid.h -include/wine/windows/mshtmdid.h -include/wine/windows/mshtmhst.h -include/wine/windows/mshtmhst.idl -include/wine/windows/mshtml.h -include/wine/windows/mshtml.idl -include/wine/windows/msi.h -include/wine/windows/msidefs.h -include/wine/windows/msiquery.h -include/wine/windows/mssip.h -include/wine/windows/mswsock.h -include/wine/windows/msxml.h -include/wine/windows/msxml.idl -include/wine/windows/msxml2.h -include/wine/windows/msxml2.idl -include/wine/windows/msxml2did.h -include/wine/windows/msxmldid.h -include/wine/windows/nb30.h -include/wine/windows/npapi.h -include/wine/windows/nspapi.h -include/wine/windows/ntddcdrm.h -include/wine/windows/ntddscsi.h -include/wine/windows/ntddstor.h -include/wine/windows/ntsecapi.h -include/wine/windows/ntstatus.h -include/wine/windows/oaidl.h -include/wine/windows/oaidl.idl -include/wine/windows/objbase.h -include/wine/windows/objidl.h -include/wine/windows/objidl.idl -include/wine/windows/objsafe.h -include/wine/windows/objsafe.idl -include/wine/windows/objsel.h -include/wine/windows/ocidl.h -include/wine/windows/ocidl.idl -include/wine/windows/odbcinst.h -include/wine/windows/ole2.h -include/wine/windows/ole2ver.h -include/wine/windows/oleauto.h -include/wine/windows/olectl.h -include/wine/windows/oledlg.h -include/wine/windows/oleidl.h -include/wine/windows/oleidl.idl -include/wine/windows/pktdef.h -include/wine/windows/poppack.h -include/wine/windows/powrprof.h -include/wine/windows/propidl.h -include/wine/windows/propidl.idl -include/wine/windows/prsht.h -include/wine/windows/psapi.h -include/wine/windows/pshpack1.h -include/wine/windows/pshpack2.h -include/wine/windows/pshpack4.h -include/wine/windows/pshpack8.h -include/wine/windows/pstore.h -include/wine/windows/pstore.idl -include/wine/windows/ras.h -include/wine/windows/reason.h -include/wine/windows/regstr.h -include/wine/windows/richedit.h -include/wine/windows/richole.h -include/wine/windows/richole.idl -include/wine/windows/rpc.h -include/wine/windows/rpcdce.h -include/wine/windows/rpcdcep.h -include/wine/windows/rpcndr.h -include/wine/windows/rpcnterr.h -include/wine/windows/rpcproxy.h -include/wine/windows/schannel.h -include/wine/windows/schnlsp.h -include/wine/windows/schemadef.h -include/wine/windows/sddl.h -include/wine/windows/secext.h -include/wine/windows/security.h -include/wine/windows/sensapi.h -include/wine/windows/sensevts.h -include/wine/windows/sensevts.idl -include/wine/windows/servprov.h -include/wine/windows/servprov.idl -include/wine/windows/setupapi.h -include/wine/windows/sfc.h -include/wine/windows/shellapi.h -include/wine/windows/shldisp.h -include/wine/windows/shldisp.idl -include/wine/windows/shlguid.h -include/wine/windows/shlobj.h -include/wine/windows/shlwapi.h -include/wine/windows/shobjidl.h -include/wine/windows/shobjidl.idl -include/wine/windows/shtypes.h -include/wine/windows/shtypes.idl -include/wine/windows/sipbase.h -include/wine/windows/snmp.h -include/wine/windows/sql.h -include/wine/windows/sqlext.h -include/wine/windows/sqltypes.h -include/wine/windows/sspi.h -include/wine/windows/storage.h -include/wine/windows/strmif.h -include/wine/windows/strmif.idl -include/wine/windows/tapi.h -include/wine/windows/tchar.h -include/wine/windows/textserv.h -include/wine/windows/tlhelp32.h -include/wine/windows/tmschema.h -include/wine/windows/unknwn.h -include/wine/windows/unknwn.idl -include/wine/windows/urlmon.h -include/wine/windows/urlmon.idl -include/wine/windows/usp10.h -include/wine/windows/uuids.h -include/wine/windows/uxtheme.h -include/wine/windows/ver.h -include/wine/windows/vfw.h -include/wine/windows/vfwmsgs.h -include/wine/windows/winbase.h -include/wine/windows/wincon.h -include/wine/windows/wincrypt.h -include/wine/windows/windef.h -include/wine/windows/windows.h -include/wine/windows/windowsx.h -include/wine/windows/winerror.h -include/wine/windows/wingdi.h -include/wine/windows/wininet.h -include/wine/windows/winioctl.h -include/wine/windows/winldap.h -include/wine/windows/winnetwk.h -include/wine/windows/winnls.h -include/wine/windows/winnls32.h -include/wine/windows/winnt.h -include/wine/windows/winreg.h -include/wine/windows/winres.h -include/wine/windows/winresrc.h -include/wine/windows/winsock.h -include/wine/windows/winsock2.h -include/wine/windows/winspool.h -include/wine/windows/winsvc.h -include/wine/windows/wintab.h -include/wine/windows/wintabx.h -include/wine/windows/winternl.h -include/wine/windows/wintrust.h -include/wine/windows/winuser.h -include/wine/windows/winver.h -include/wine/windows/wmistr.h -include/wine/windows/wnaspi32.h -include/wine/windows/wownt32.h -include/wine/windows/ws2spi.h -include/wine/windows/ws2tcpip.h -include/wine/windows/wshisotp.h -include/wine/windows/wsipx.h -include/wine/windows/wsnwlink.h -include/wine/windows/wtsapi32.h -include/wine/windows/wtypes.h -include/wine/windows/wtypes.idl -include/wine/windows/xcmc.h -include/wine/windows/xmldom.h -include/wine/windows/xmldom.idl -include/wine/windows/xmldomdid.h -include/wine/windows/xmldso.h -include/wine/windows/xmldso.idl -include/wine/windows/xmldsodid.h -include/wine/windows/zmouse.h -include/wine/windows/ddk/cfgmgr32.h -include/wine/windows/ddk/ntddcdvd.h -include/wine/windows/ddk/ntddser.h -include/wine/windows/ddk/ntddtape.h -include/wine/windows/ddk/wdm.h -include/wine/windows/ddk/winsplp.h -lib/libwine.so -lib/libwine.so.1 -lib/libwine_unicode.so -lib/libwine_unicode.so.1 -lib/wine/activeds.dll.so -lib/wine/advapi32.dll.so -lib/wine/advpack.dll.so -lib/wine/amstream.dll.so -lib/wine/atl.dll.so -lib/wine/avicap32.dll.so -lib/wine/avifil32.dll.so -lib/wine/avifile.dll.so -lib/wine/aviinfo.exe.so -lib/wine/aviplay.exe.so -lib/wine/bug_report.pl -lib/wine/cabinet.dll.so -lib/wine/capi2032.dll.so -lib/wine/cards.dll.so -lib/wine/cfgmgr32.dll.so -lib/wine/clock.exe.so -lib/wine/comcat.dll.so -lib/wine/comctl32.dll.so -lib/wine/comdlg32.dll.so -lib/wine/comm.drv.so -lib/wine/commdlg.dll.so -lib/wine/compobj.dll.so -lib/wine/control.exe.so -lib/wine/crtdll.dll.so -lib/wine/crypt32.dll.so -lib/wine/cryptdll.dll.so -lib/wine/ctl3d.dll.so -lib/wine/ctl3d32.dll.so -lib/wine/ctl3dv2.dll.so -lib/wine/d3d8.dll.so -lib/wine/d3d9.dll.so -lib/wine/d3dim.dll.so -lib/wine/d3drm.dll.so -lib/wine/d3dx8.dll.so -lib/wine/d3dxof.dll.so -lib/wine/dbghelp.dll.so -lib/wine/dciman32.dll.so -lib/wine/ddeml.dll.so -lib/wine/ddraw.dll.so -lib/wine/devenum.dll.so -lib/wine/dinput.dll.so -lib/wine/dinput8.dll.so -lib/wine/dispdib.dll.so -lib/wine/display.drv.so -lib/wine/dmband.dll.so -lib/wine/dmcompos.dll.so -lib/wine/dmime.dll.so -lib/wine/dmloader.dll.so -lib/wine/dmscript.dll.so -lib/wine/dmstyle.dll.so -lib/wine/dmsynth.dll.so -lib/wine/dmusic.dll.so -lib/wine/dmusic32.dll.so -lib/wine/dpnhpast.dll.so -lib/wine/dplay.dll.so -lib/wine/dplayx.dll.so -lib/wine/dpnet.dll.so -lib/wine/dsound.dll.so -lib/wine/dswave.dll.so -lib/wine/dxdiagn.dll.so -lib/wine/eject.exe.so -lib/wine/expand.exe.so -lib/wine/explorer.exe.so -lib/wine/gdi.exe.so -lib/wine/gdi32.dll.so -lib/wine/glu32.dll.so -lib/wine/glut32.dll.so -lib/wine/hh.exe.so -lib/wine/hhctrl.ocx.so -lib/wine/iccvid.dll.so -lib/wine/icinfo.exe.so -lib/wine/icmp.dll.so -lib/wine/ifsmgr.vxd.so -lib/wine/imaadp32.acm.so -lib/wine/imagehlp.dll.so -lib/wine/imm.dll.so -lib/wine/imm32.dll.so -lib/wine/iphlpapi.dll.so -lib/wine/itss.dll.so -lib/wine/joystick.drv.so -lib/wine/kernel32.dll.so -lib/wine/keyboard.drv.so -lib/wine/krnl386.exe.so -lib/wine/libactiveds.def -lib/wine/libadvapi32.def -lib/wine/libadvpack.def -lib/wine/libatl.def -lib/wine/libavicap32.def -lib/wine/libavifil32.def -lib/wine/libcabinet.def -lib/wine/libcapi2032.def -lib/wine/libcards.def -lib/wine/libcfgmgr32.def -lib/wine/libcomctl32.def -lib/wine/libcomdlg32.def -lib/wine/libcrtdll.def -lib/wine/libcrypt32.def -lib/wine/libcryptdll.def -lib/wine/libctl3d32.def -lib/wine/libd3d8.def -lib/wine/libd3d9.def -lib/wine/libd3dim.def -lib/wine/libd3drm.def -lib/wine/libd3dx8.def -lib/wine/libd3dxof.def -lib/wine/libdbghelp.def -lib/wine/libdciman32.def -lib/wine/libddraw.def -lib/wine/libdinput.def -lib/wine/libdinput.def.a -lib/wine/libdinput8.def -lib/wine/libdmusic32.def -lib/wine/libdpnet.def -lib/wine/libglut32.def -lib/wine/libdplay.def -lib/wine/libdplayx.def -lib/wine/libdsound.def -lib/wine/libdxerr8.a -lib/wine/libdxerr9.a -lib/wine/libdxguid.a -lib/wine/libgdi32.def -lib/wine/libglu32.def -lib/wine/libicmp.def -lib/wine/libimagehlp.def -lib/wine/libimm32.def -lib/wine/libiphlpapi.def -lib/wine/libkernel32.def -lib/wine/liblz32.def -lib/wine/libmapi32.def -lib/wine/libmlang.def -lib/wine/libmpr.def -lib/wine/libmsacm32.def -lib/wine/libmscms.def -lib/wine/libmsdmo.def -lib/wine/libmshtml.def -lib/wine/libmsi.def -lib/wine/libmsimg32.def -lib/wine/libmsvcrt.def -lib/wine/libmsvcrt20.def -lib/wine/libmsvcrt40.def -lib/wine/libmsvcrtd.def -lib/wine/libmsvfw32.def -lib/wine/libmswsock.def -lib/wine/libnetapi32.def -lib/wine/libnewdev.def -lib/wine/libntdll.def -lib/wine/libodbc32.def -lib/wine/libodbccp32.def -lib/wine/libole32.def -lib/wine/liboleacc.def -lib/wine/liboleaut32.def -lib/wine/libolecli32.def -lib/wine/liboledlg.def -lib/wine/libolepro32.def -lib/wine/libolesvr32.def -lib/wine/libopengl32.def -lib/wine/libpowrprof.def -lib/wine/libpsapi.def -lib/wine/libquartz.def -lib/wine/librasapi32.def -lib/wine/librsaenh.def -lib/wine/libriched20.def -lib/wine/librpcrt4.def -lib/wine/libsecur32.def -lib/wine/libsensapi.def -lib/wine/libserialui.def -lib/wine/libsetupapi.def -lib/wine/libsfc.def -lib/wine/libshdocvw.def -lib/wine/libshell32.def -lib/wine/libshfolder.def -lib/wine/libshlwapi.def -lib/wine/libsnmpapi.def -lib/wine/libsti.def -lib/wine/libstrmiids.a -lib/wine/libtapi32.def -lib/wine/libunicows.def -lib/wine/liburl.def -lib/wine/liburlmon.def -lib/wine/libuser32.def -lib/wine/libusp10.def -lib/wine/libuuid.a -lib/wine/libuxtheme.def -lib/wine/libvdmdbg.def -lib/wine/libversion.def -lib/wine/libwldap32.def -lib/wine/libwinecrt0.a -lib/wine/libwined3d.def -lib/wine/libwinedos.def -lib/wine/libwininet.def -lib/wine/libwinmm.def -lib/wine/libwinnls32.def -lib/wine/libwinspool.def -lib/wine/libwintab32.def -lib/wine/libwintrust.def -lib/wine/libwnaspi32.def -lib/wine/libwow32.def -lib/wine/libws2_32.def -lib/wine/libwsock32.def -lib/wine/libwtsapi32.def -lib/wine/lz32.dll.so -lib/wine/lzexpand.dll.so -lib/wine/mapi32.dll.so -lib/wine/mciavi32.dll.so -lib/wine/mcicda.dll.so -lib/wine/mciseq.dll.so -lib/wine/mciwave.drv.so -lib/wine/midimap.dll.so -lib/wine/mlang.dll.so -lib/wine/mmdevldr.vxd.so -lib/wine/mmsystem.dll.so -lib/wine/monodebg.vxd.so -lib/wine/mouse.drv.so -lib/wine/mpr.dll.so -lib/wine/msacm.drv.so -lib/wine/msacm.dll.so -lib/wine/msacm32.dll.so -lib/wine/msadp32.acm.so -lib/wine/mscms.dll.so -lib/wine/msdmo.dll.so -lib/wine/msg711.acm.so -lib/wine/mshtml.dll.so -lib/wine/msi.dll.so -lib/wine/msiexec.exe.so -lib/wine/msimg32.dll.so -lib/wine/msisys.ocx.so -lib/wine/msnet32.dll.so -lib/wine/msrle32.dll.so -lib/wine/msvcrt.dll.so -lib/wine/msvcrt20.dll.so -lib/wine/msvcrt40.dll.so -lib/wine/msvcrtd.dll.so -lib/wine/msvfw32.dll.so -lib/wine/msvidc32.dll.so -lib/wine/msvideo.dll.so -lib/wine/mswsock.dll.so -lib/wine/msxml3.dll.so -lib/wine/netapi32.dll.so -lib/wine/newdev.dll.so -lib/wine/notepad.exe.so -lib/wine/ntdll.dll.so -lib/wine/objsel.dll.so -lib/wine/odbc32.dll.so -lib/wine/odbccp32.dll.so -lib/wine/ole2.dll.so -lib/wine/ole2conv.dll.so -lib/wine/ole2disp.dll.so -lib/wine/ole2nls.dll.so -lib/wine/ole2prox.dll.so -lib/wine/ole2thk.dll.so -lib/wine/ole32.dll.so -lib/wine/oleacc.dll.so -lib/wine/oleaut32.dll.so -lib/wine/olecli.dll.so -lib/wine/olecli32.dll.so -lib/wine/oledlg.dll.so -lib/wine/olepro32.dll.so -lib/wine/olesvr.dll.so -lib/wine/olesvr32.dll.so -lib/wine/opengl32.dll.so -lib/wine/powrprof.dll.so -lib/wine/progman.exe.so -lib/wine/psapi.dll.so -lib/wine/qcap.dll.so -lib/wine/quartz.dll.so -lib/wine/rasapi16.dll.so -lib/wine/rasapi32.dll.so -lib/wine/regedit.exe.so -lib/wine/regsvr32.exe.so -lib/wine/riched20.dll.so -lib/wine/riched32.dll.so -lib/wine/rpcrt4.dll.so -lib/wine/rpcss.exe.so -lib/wine/rsabase.dll.so -lib/wine/rsaenh.dll.so -lib/wine/rundll32.exe.so -lib/wine/secur32.dll.so -lib/wine/security.dll.so -lib/wine/sensapi.dll.so -lib/wine/serialui.dll.so -lib/wine/setupapi.dll.so -lib/wine/setupx.dll.so -lib/wine/sfc.dll.so -lib/wine/shdocvw.dll.so -lib/wine/shell.dll.so -lib/wine/shell32.dll.so -lib/wine/shfolder.dll.so -lib/wine/shlwapi.dll.so -lib/wine/snmpapi.dll.so -lib/wine/sound.drv.so -lib/wine/start.exe.so -lib/wine/stdole2.tlb.so -lib/wine/stdole32.tlb.so -lib/wine/sti.dll.so -lib/wine/storage.dll.so -lib/wine/stress.dll.so -lib/wine/system.drv.so -lib/wine/tapi32.dll.so -lib/wine/taskmgr.exe.so -lib/wine/toolhelp.dll.so -lib/wine/twain.dll.so -lib/wine/twain_32.dll.so -lib/wine/typelib.dll.so -lib/wine/unicows.dll.so -lib/wine/uninstaller.exe.so -lib/wine/url.dll.so -lib/wine/urlmon.dll.so -lib/wine/user.exe.so -lib/wine/user32.dll.so -lib/wine/usp10.dll.so -lib/wine/uxtheme.dll.so -lib/wine/vdhcp.vxd.so -lib/wine/vdmdbg.dll.so -lib/wine/ver.dll.so -lib/wine/version.dll.so -lib/wine/vmm.vxd.so -lib/wine/vnbt.vxd.so -lib/wine/vnetbios.vxd.so -lib/wine/vtdapi.vxd.so -lib/wine/vwin32.vxd.so -lib/wine/w32skrnl.dll.so -lib/wine/w32sys.dll.so -lib/wine/wcmd.exe.so -lib/wine/win32s16.dll.so -lib/wine/win87em.dll.so -lib/wine/winaspi.dll.so -lib/wine/windebug.dll.so -lib/wine/winealsa.drv.so -lib/wine/winearts.drv.so -lib/wine/wineaudioio.drv.so -lib/wine/wineboot.exe.so -lib/wine/winebrowser.exe.so -lib/wine/winecfg.exe.so -lib/wine/wineconsole.exe.so -lib/wine/wined3d.dll.so -lib/wine/winedbg.exe.so -lib/wine/winedos.dll.so -lib/wine/wineesd.drv.so -lib/wine/winefile.exe.so -lib/wine/winejack.drv.so -lib/wine/winemine.exe.so -lib/wine/winemp3.acm.so -lib/wine/wineoss.drv.so -lib/wine/winemenubuilder.exe.so -lib/wine/winenas.drv.so -lib/wine/winepath.exe.so -lib/wine/wineps.drv.so -lib/wine/wineps16.drv.so -lib/wine/winevdm.exe.so -lib/wine/winex11.drv.so -lib/wine/wing.dll.so -lib/wine/winhelp.exe.so -lib/wine/wininet.dll.so -lib/wine/winmm.dll.so -lib/wine/winnls.dll.so -lib/wine/winnls32.dll.so -lib/wine/winsock.dll.so -lib/wine/winspool.drv.so -lib/wine/wintab.dll.so -lib/wine/wintab32.dll.so -lib/wine/wintrust.dll.so -lib/wine/winver.exe.so -lib/wine/wldap32.dll.so -lib/wine/wnaspi32.dll.so -lib/wine/wordpad.exe.so -lib/wine/wow32.dll.so -lib/wine/wprocs.dll.so -lib/wine/ws2_32.dll.so -lib/wine/wsock32.dll.so -lib/wine/wtsapi32.dll.so -share/aclocal/wine.m4 -share/applications/wine.desktop -share/wine/wine.inf -share/wine/generic.ppd -%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.progman -%%PORTDOCS%%%%DOCSDIR%%/README.uninstaller -%%PORTDOCS%%%%DOCSDIR%%/README.wcmd -%%PORTDOCS%%%%DOCSDIR%%/README.winedbg -%%PORTDOCS%%%%DOCSDIR%%/README.winedump -%%PORTDOCS%%%%DOCSDIR%%/README.winemine -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm lib/wine -@dirrm include/wine/msvcrt/sys -@dirrm include/wine/msvcrt -@dirrm include/wine/windows/ddk -@dirrm include/wine/windows -@dirrm include/wine -@dirrmtry man/man3w -@dirrmtry share/applications -@dirrm share/wine |