aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasil Dimov <vd@FreeBSD.org>2006-12-04 13:10:31 +0000
committerVasil Dimov <vd@FreeBSD.org>2006-12-04 13:10:31 +0000
commita61d3f6bedcafe389ddf89fb5efbb8fb53c938df (patch)
treefd2f2cae557cf3588f73eb61c0e32ed52ce7a2d4
parent78a1261ed2cb180bcb41aa5cf61727a6baa53ce1 (diff)
downloadports-a61d3f6bedcafe389ddf89fb5efbb8fb53c938df.tar.gz
ports-a61d3f6bedcafe389ddf89fb5efbb8fb53c938df.zip
Remove expired ports:
2006-12-01 audio/xmms-rateplug: Project disappeared from the internet 2006-12-01 chinese/iiimf-le-chewing: fails to install (dependency problem) 2006-12-01 deskutils/mhc-xemacs21-mule: hangs during build 2006-12-01 devel/alleyoop: Does not compile 2006-12-01 devel/hs-crypto: is incompatible with current GHC, needs updating 2006-12-01 editors/gedit-autocomplete-plugin: Not compatible with gedit versions >= 2.14 2006-12-01 emulators/basiliskII: Does not compile 2006-12-01 emulators/vmware-tools2: Unfetchable 2006-12-01 emulators/vmware2: Unfetchable 2006-12-03 finance/ccard: Project disappeared from the internet
Notes
Notes: svn path=/head/; revision=178817
-rw-r--r--LEGAL3
-rw-r--r--MOVED10
-rw-r--r--audio/Makefile1
-rw-r--r--audio/xmms-rateplug/Makefile45
-rw-r--r--audio/xmms-rateplug/distinfo3
-rw-r--r--audio/xmms-rateplug/files/install-user22
-rw-r--r--audio/xmms-rateplug/pkg-descr10
-rw-r--r--audio/xmms-rateplug/pkg-message4
-rw-r--r--chinese/Makefile1
-rw-r--r--chinese/iiimf-le-chewing/Makefile32
-rw-r--r--chinese/iiimf-le-chewing/distinfo3
-rw-r--r--chinese/iiimf-le-chewing/pkg-descr9
-rw-r--r--chinese/iiimf-le-chewing/pkg-plist4
-rw-r--r--deskutils/Makefile1
-rw-r--r--deskutils/mhc-xemacs21-mule/Makefile17
-rw-r--r--devel/Makefile2
-rw-r--r--devel/alleyoop/Makefile51
-rw-r--r--devel/alleyoop/distinfo3
-rw-r--r--devel/alleyoop/files/patch-configure14
-rw-r--r--devel/alleyoop/files/patch-src::legolas.c20
-rw-r--r--devel/alleyoop/pkg-descr16
-rw-r--r--devel/alleyoop/pkg-plist51
-rw-r--r--devel/hs-crypto/Makefile64
-rw-r--r--devel/hs-crypto/distinfo3
-rw-r--r--devel/hs-crypto/pkg-descr16
-rw-r--r--devel/hs-crypto/pkg-plist82
-rw-r--r--editors/Makefile1
-rw-r--r--editors/gedit-autocomplete-plugin/Makefile34
-rw-r--r--editors/gedit-autocomplete-plugin/distinfo3
-rw-r--r--editors/gedit-autocomplete-plugin/files/patch-makefile14
-rw-r--r--editors/gedit-autocomplete-plugin/pkg-descr6
-rw-r--r--emulators/Makefile3
-rw-r--r--emulators/basiliskII/Makefile49
-rw-r--r--emulators/basiliskII/distinfo3
-rw-r--r--emulators/basiliskII/pkg-descr4
-rw-r--r--emulators/basiliskII/pkg-message8
-rw-r--r--emulators/basiliskII/pkg-plist5
-rw-r--r--emulators/vmware-tools2/Makefile43
-rw-r--r--emulators/vmware-tools2/distinfo2
-rw-r--r--emulators/vmware-tools2/pkg-descr14
-rw-r--r--emulators/vmware-tools2/pkg-message5
-rw-r--r--emulators/vmware-tools2/pkg-plist2
-rw-r--r--emulators/vmware2/Makefile215
-rw-r--r--emulators/vmware2/distinfo6
-rw-r--r--emulators/vmware2/files/Hints.FreeBSD167
-rw-r--r--emulators/vmware2/files/Makefile5
-rw-r--r--emulators/vmware2/files/Makefile.vmmon12
-rw-r--r--emulators/vmware2/files/Makefile_FreeBSD.patch12
-rw-r--r--emulators/vmware2/files/README.FreeBSD79
-rw-r--r--emulators/vmware2/files/cdevsw.patch138
-rw-r--r--emulators/vmware2/files/config7
-rw-r--r--emulators/vmware2/files/df31
-rw-r--r--emulators/vmware2/files/driver_c.patch58
-rw-r--r--emulators/vmware2/files/filedesc.patch32
-rw-r--r--emulators/vmware2/files/fo_ioctl.patch67
-rw-r--r--emulators/vmware2/files/hostif_c.patch11
-rw-r--r--emulators/vmware2/files/kmoddeps.patch12
-rw-r--r--emulators/vmware2/files/kse.patch581
-rw-r--r--emulators/vmware2/files/m_waitok.patch25
-rw-r--r--emulators/vmware2/files/patch-bc11
-rw-r--r--emulators/vmware2/files/patch-bd37
-rw-r--r--emulators/vmware2/files/patch-be151
-rw-r--r--emulators/vmware2/files/patch-bf15
-rw-r--r--emulators/vmware2/files/pmap.patch11
-rw-r--r--emulators/vmware2/files/vm_types_h.patch13
-rw-r--r--emulators/vmware2/files/vmnet-only+Makefile.patch18
-rw-r--r--emulators/vmware2/files/vmware26
-rw-r--r--emulators/vmware2/files/vmware.sh95
-rw-r--r--emulators/vmware2/pkg-descr14
-rw-r--r--emulators/vmware2/pkg-message11
-rw-r--r--emulators/vmware2/pkg-plist135
-rw-r--r--emulators/vmware2/scripts/configure160
-rw-r--r--emulators/vmware2/scripts/pre-install32
-rw-r--r--finance/Makefile1
-rw-r--r--finance/ccard/Makefile33
-rw-r--r--finance/ccard/distinfo3
-rw-r--r--finance/ccard/pkg-descr15
77 files changed, 10 insertions, 2912 deletions
diff --git a/LEGAL b/LEGAL
index 82322afeecbb..e40014de2653 100644
--- a/LEGAL
+++ b/LEGAL
@@ -567,8 +567,6 @@ tkman-2.* misc/tkman Do not sell for profit
tolkien-ttf-* x11-fonts/tolkien-ttf Shareware. Commercial usage
or redistribution requires
license.
-tools-for-freebsd-* emulators/vmware-tools2 Not sure if we can
- redistribute this
tracker-*.tgz audio/tracker Non-redistributable beta
triangle-*/* math/triangle No commercial use without prior
arrangement with the author
@@ -608,7 +606,6 @@ vice-* emulators/vice ROMs are copyrighted by
Commodore Business Machines
vwnc7.3.1/* lang/visualworks Do not redistribute
vje30/* japanese/vje30 Commercial software
-VMware-*.tar.gz emulators/vmware2 Not sure if we can redistribute this
vmware-freebsd-tools.* emulators/vmware-guestd3 Not sure if we can redistribute this
vmware-freebsd-tools.* emulators/vmware-guestd4 Not sure if we can redistribute this
[RESTRICTED]
diff --git a/MOVED b/MOVED
index 1a106831947d..c1f01931f47f 100644
--- a/MOVED
+++ b/MOVED
@@ -2550,3 +2550,13 @@ net/ripetools|net/ripe-whois|2006-11-24|Has expired: project no longer exists
devel/sge||2006-11-26|Removed
mail/pantomime-ssl|mail/pantomime|2006-12-01|Removed
x11-toolkits/p5-Gtk2-PodViewer|x11-toolkits/p5-Gtk2-Ex-PodViewer|2006-12-03|CPAN module renamed
+audio/xmms-rateplug||2006-12-04|Has expired: Project disappeared from the internet
+chinese/iiimf-le-chewing||2006-12-04|Has expired: fails to install (dependency problem)
+deskutils/mhc-xemacs21-mule||2006-12-04|Has expired: hangs during build
+devel/alleyoop||2006-12-04|Has expired: Does not compile
+devel/hs-crypto||2006-12-04|Has expired: is incompatible with current GHC, needs updating
+editors/gedit-autocomplete-plugin||2006-12-04|Has expired: Not compatible with gedit versions >= 2.14
+emulators/basiliskII||2006-12-04|Has expired: Does not compile
+emulators/vmware-tools2||2006-12-04|Has expired: Unfetchable
+emulators/vmware2||2006-12-04|Has expired: Unfetchable
+finance/ccard||2006-12-04|Has expired: Project disappeared from the internet
diff --git a/audio/Makefile b/audio/Makefile
index add72fb37b21..0a70cb9329f1 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -671,7 +671,6 @@
SUBDIR += xmms-osssurround
SUBDIR += xmms-pipe
SUBDIR += xmms-quix3dn
- SUBDIR += xmms-rateplug
SUBDIR += xmms-real-random
SUBDIR += xmms-sapplug
SUBDIR += xmms-scrobbler
diff --git a/audio/xmms-rateplug/Makefile b/audio/xmms-rateplug/Makefile
deleted file mode 100644
index cf5a27b99fc5..000000000000
--- a/audio/xmms-rateplug/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for: xmms-rateplug
-# Date created: 15 Jul 2005
-# Whom: Emanuel Haupt <ehaupt@critical.ch>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xmms-rateplug
-DISTVERSION= 0.4.2-3
-PORTREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= xmmsassesment
-
-MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= Add song rating control to the XMMS playlist
-
-DEPRECATED= Project disappeared from the internet
-EXPIRATION_DATE=2006-12-01
-
-BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-
-USE_X_PREFIX= yes
-USE_GNOME= gtk12
-
-CXXFLAGS+= -w -shared -fPIC `xmms-config --cflags` `gtk-config --cflags` \
- `gtk-config --libs`
-PLUGIN= rateplug
-
-PLIST_FILES= lib/xmms/General/rateplug.so
-
-do-build:
- ${CXX} ${CXXFLAGS} ${WRKSRC}/${PLUGIN}.c++ -o ${WRKSRC}/${PLUGIN}.so
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PLUGIN}.so ${PREFIX}/lib/xmms/General
-
-post-install:
- @${CAT} ${PKGMESSAGE}
-
-install-user:
- ${SH} ${FILESDIR}/install-user
-
-.include <bsd.port.mk>
diff --git a/audio/xmms-rateplug/distinfo b/audio/xmms-rateplug/distinfo
deleted file mode 100644
index 36438e546919..000000000000
--- a/audio/xmms-rateplug/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xmms-rateplug-0.4.2-3.tar.gz) = a29ddbf2b16632ce5c26228c8ee3a76c
-SHA256 (xmms-rateplug-0.4.2-3.tar.gz) = d2a96e5cd1d18637767616e10d99ed78f4518495b461659a253d996cd753124b
-SIZE (xmms-rateplug-0.4.2-3.tar.gz) = 20041
diff --git a/audio/xmms-rateplug/files/install-user b/audio/xmms-rateplug/files/install-user
deleted file mode 100644
index a0230195f394..000000000000
--- a/audio/xmms-rateplug/files/install-user
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# Emanuel Haupt <ehaupt@critical.ch>
-#
-# This script creates the users configfile that needs to
-# exist in order to use this plugin
-#
-# $FreeBSD$
-
-
-if [ ! -d ~/.xmms ]; then
- echo "===> Creating xmms directory"
- mkdir ~/.xmms
-fi
-
-if [ -f ~/.xmms/database.txt ]; then
- echo "===> Database already exists"
-else
- echo "===> Initializing database"
- touch ~/.xmms/database.txt
- echo "===> Database initialized"
-fi
diff --git a/audio/xmms-rateplug/pkg-descr b/audio/xmms-rateplug/pkg-descr
deleted file mode 100644
index 6454e5e563d2..000000000000
--- a/audio/xmms-rateplug/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Adds extra control to the XMMS playlist and automatically skips songs you don't
-like and play the ones you do like.
-
- * High rated songs will be played privileged
- * Manual manipulation of the assessment of single songs
- * Ignore single songs
- * Configurable
-
-- ehaupt
-ehaupt@critical.ch
diff --git a/audio/xmms-rateplug/pkg-message b/audio/xmms-rateplug/pkg-message
deleted file mode 100644
index 02c0fcb93ade..000000000000
--- a/audio/xmms-rateplug/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-===============================================================================
-You can run "make install-user" in this directory as user to initialize the
-rating database.
-===============================================================================
diff --git a/chinese/Makefile b/chinese/Makefile
index 971b348800ca..0b57b8f1208f 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -53,7 +53,6 @@
SUBDIR += hanzim
SUBDIR += hc
SUBDIR += hztty
- SUBDIR += iiimf-le-chewing
SUBDIR += iiimf-le-newpy
SUBDIR += iiimf-le-ude
SUBDIR += iiimf-le-xcin
diff --git a/chinese/iiimf-le-chewing/Makefile b/chinese/iiimf-le-chewing/Makefile
deleted file mode 100644
index 97b0856b3689..000000000000
--- a/chinese/iiimf-le-chewing/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for: iiimf-le-chewing
-# Date created: 8 Sep 2004
-# Whom: Kuang-che Wu <kcwu@csie.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= iiimf-le-chewing
-PORTVERSION= 0.0.2
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= chinese textproc
-MASTER_SITES= http://chewing.csie.net/download/iiimf/
-DISTNAME= ${PORTNAME:C/-le-/-/}-${PORTVERSION}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= IIIMF Chewing engine, an intelligent Chinese phonetic input method
-
-BROKEN= fails to install (dependency problem)
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-LIB_DEPENDS= chewing.2:${PORTSDIR}/chinese/libchewing
-RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server
-
-USE_XLIB= yes
-USE_ICONV= yes
-GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
-
-.include <bsd.port.mk>
diff --git a/chinese/iiimf-le-chewing/distinfo b/chinese/iiimf-le-chewing/distinfo
deleted file mode 100644
index 60a374f3b4b8..000000000000
--- a/chinese/iiimf-le-chewing/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (iiimf-chewing-0.0.2.tar.gz) = d44a8c3d2d9e246d15df41ee7a123bbb
-SHA256 (iiimf-chewing-0.0.2.tar.gz) = dbbfa12d6a7fffdcf0f5e39aeac66d085b6766d2bc77a48ab8851f7f0f7651f9
-SIZE (iiimf-chewing-0.0.2.tar.gz) = 366048
diff --git a/chinese/iiimf-le-chewing/pkg-descr b/chinese/iiimf-le-chewing/pkg-descr
deleted file mode 100644
index 20c2a5e67862..000000000000
--- a/chinese/iiimf-le-chewing/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-IIIMF stands for Internet/Intranet Input Method Framework.
-IIIMF is designed to be the next generation of input method framework
-
-Chewing - An Intelligent Chinese Phonetic Input Method for UNIX
-
-WWW: http://chewing.csie.net/
-
-- Kuang-che Wu
- kcwu@csie.org
diff --git a/chinese/iiimf-le-chewing/pkg-plist b/chinese/iiimf-le-chewing/pkg-plist
deleted file mode 100644
index 841717e9b3d0..000000000000
--- a/chinese/iiimf-le-chewing/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/im/leif/chewing.la
-lib/im/leif/chewing.so
-@dirrmtry lib/im/leif
-@dirrmtry lib/im
diff --git a/deskutils/Makefile b/deskutils/Makefile
index eb3e7214d96c..3d2efebe3ab8 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -122,7 +122,6 @@
SUBDIR += metabar
SUBDIR += mhc
SUBDIR += mhc-emacs20
- SUBDIR += mhc-xemacs21-mule
SUBDIR += mnemo
SUBDIR += moregroupware
SUBDIR += mrundlg
diff --git a/deskutils/mhc-xemacs21-mule/Makefile b/deskutils/mhc-xemacs21-mule/Makefile
deleted file mode 100644
index 0e102c1a2842..000000000000
--- a/deskutils/mhc-xemacs21-mule/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for: mhc (for xemacs21-mule)
-# Date created: 7 Apr 2001
-# Whom: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
-#
-# $FreeBSD$
-#
-
-MASTERDIR= ${.CURDIR}/../mhc
-MAINTAINER= yoichi@FreeBSD.org
-
-USE_EMACS= yes
-EMACS_PORT_NAME= xemacs21-mule
-IGNORE= hangs during build
-DEPRECATED= ${IGNORE}
-EXPIRATION_DATE=2006-12-01
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/Makefile b/devel/Makefile
index b9b246cda459..ca50dddeb87a 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -36,7 +36,6 @@
SUBDIR += alf
SUBDIR += allegro
SUBDIR += allegro-devel
- SUBDIR += alleyoop
SUBDIR += anjuta
SUBDIR += antlr
SUBDIR += apache-ant
@@ -409,7 +408,6 @@
SUBDIR += hs-buddha
SUBDIR += hs-c2hs
SUBDIR += hs-cpphs
- SUBDIR += hs-crypto
SUBDIR += hs-drift
SUBDIR += hs-fps
SUBDIR += hs-green-card
diff --git a/devel/alleyoop/Makefile b/devel/alleyoop/Makefile
deleted file mode 100644
index 75b51b0626d4..000000000000
--- a/devel/alleyoop/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for: Alleyoop
-# Date created: Fri Jun 17 23:52:44 UTC 2005
-# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= alleyoop
-PORTVERSION= 0.8.3
-PORTREVISION= 2
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
-
-MAINTAINER= lioux@FreeBSD.org
-COMMENT= A graphical front-end to Valgrind memory checker
-
-BUILD_DEPENDS= ${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd \
- ${GNULIBIBERTY_WRKSRC}/libiberty.a:${PORTSDIR}/devel/gnulibiberty:build \
- ${LOCALBASE}/include/libelf/elf_repl.h:${PORTSDIR}/devel/libelf
-RUN_DEPENDS= valgrind:${PORTSDIR}/devel/valgrind
-
-BROKEN= Does not compile
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-USE_GMAKE= yes
-USE_XLIB= yex
-USE_GETTEXT= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix \
- gconf2 \
- glib20 \
- gtk20 \
- libglade2 \
- libgnome \
- libgnomeui \
- pango
-
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${GNULIBIBERTY_WRKSRC} \
- ${LDFLAGS} -L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS= ${PORTNAME}.schemas
-
-.include <bsd.port.pre.mk>
-
-GNULIBIBERTY= ${PORTSDIR}/devel/gnulibiberty
-GNULIBIBERTY_WRKSRC!= cd ${PORTSDIR}/devel/gnulibiberty && ${MAKE} -V WRKSRC
-
-.include <bsd.port.post.mk>
diff --git a/devel/alleyoop/distinfo b/devel/alleyoop/distinfo
deleted file mode 100644
index 6de12996c6df..000000000000
--- a/devel/alleyoop/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (alleyoop-0.8.3.tar.gz) = 699b57bc6c0e4411c22739f61967c1ac
-SHA256 (alleyoop-0.8.3.tar.gz) = e26bb24aee79a72771e77027ef89f1e6846ef967e77b171ec27bc4a0f0f37960
-SIZE (alleyoop-0.8.3.tar.gz) = 301948
diff --git a/devel/alleyoop/files/patch-configure b/devel/alleyoop/files/patch-configure
deleted file mode 100644
index 669541344724..000000000000
--- a/devel/alleyoop/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig Sat Jun 18 00:47:36 2005
-+++ configure Sat Jun 18 00:48:09 2005
-@@ -7172,11 +7172,9 @@
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char bfd_get_error ();
- int
- main ()
- {
--bfd_get_error ();
- ;
- return 0;
- }
diff --git a/devel/alleyoop/files/patch-src::legolas.c b/devel/alleyoop/files/patch-src::legolas.c
deleted file mode 100644
index c9d2a1a754f0..000000000000
--- a/devel/alleyoop/files/patch-src::legolas.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/legolas.c.orig Sun Jan 18 16:46:00 2004
-+++ src/legolas.c Sat Jun 18 01:05:39 2005
-@@ -25,7 +25,7 @@
- #include <config.h>
- #endif
-
--#include <elf.h>
-+#include <libelf/libelf.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -130,7 +130,7 @@
- case EM_RH32: return "TRW RH-32";
- case EM_RCE: return "Motorola RCE";
- case EM_ARM: return "ARM";
-- case EM_FAKE_ALPHA: return "Digital Alpha";
-+ case EM_ALPHA: return "Digital Alpha";
- case EM_SH: return "Hitachi SH";
- case EM_SPARCV9: return "SPARC v9 64-bit";
- case EM_TRICORE: return "Siemens Tricore";
diff --git a/devel/alleyoop/pkg-descr b/devel/alleyoop/pkg-descr
deleted file mode 100644
index a4fd0f2463cc..000000000000
--- a/devel/alleyoop/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-[ excerpt from developer's www site ]
-
-Alleyoop is a graphical front-end to the increasingly popular
-Valgrind memory checker for x86 GNU/Linux using the Gtk+ widget
-set and other GNOME libraries for the X-Windows environment.
-
-Features include a right-click context menu to intelligently suppress
-errors or launch an editor on the source file/jumping to the exact
-line of the error condition. A searchbar at the top of the viewer
-can be used to limit the viewable errors to those that match the
-regex criteria entered. Also included is a fully functional
-Suppressions editor.
-
-WWW: http://alleyoop.sourceforge.net/
-
--- lioux@FreeBSD.org
diff --git a/devel/alleyoop/pkg-plist b/devel/alleyoop/pkg-plist
deleted file mode 100644
index 1a275e1cf3c6..000000000000
--- a/devel/alleyoop/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-bin/alleyoop
-share/locale/az/LC_MESSAGES/alleyoop.mo
-share/locale/ca/LC_MESSAGES/alleyoop.mo
-share/locale/cs/LC_MESSAGES/alleyoop.mo
-share/locale/de/LC_MESSAGES/alleyoop.mo
-share/locale/el/LC_MESSAGES/alleyoop.mo
-share/locale/en_CA/LC_MESSAGES/alleyoop.mo
-share/locale/en_GB/LC_MESSAGES/alleyoop.mo
-share/locale/es/LC_MESSAGES/alleyoop.mo
-share/locale/fr/LC_MESSAGES/alleyoop.mo
-share/locale/ga/LC_MESSAGES/alleyoop.mo
-share/locale/gu/LC_MESSAGES/alleyoop.mo
-share/locale/hr/LC_MESSAGES/alleyoop.mo
-share/locale/it/LC_MESSAGES/alleyoop.mo
-share/locale/ja/LC_MESSAGES/alleyoop.mo
-share/locale/mn/LC_MESSAGES/alleyoop.mo
-share/locale/ms/LC_MESSAGES/alleyoop.mo
-share/locale/nb/LC_MESSAGES/alleyoop.mo
-share/locale/nl/LC_MESSAGES/alleyoop.mo
-share/locale/no/LC_MESSAGES/alleyoop.mo
-share/locale/pl/LC_MESSAGES/alleyoop.mo
-share/locale/pt/LC_MESSAGES/alleyoop.mo
-share/locale/pt_BR/LC_MESSAGES/alleyoop.mo
-share/locale/ru/LC_MESSAGES/alleyoop.mo
-share/locale/sk/LC_MESSAGES/alleyoop.mo
-share/locale/sq/LC_MESSAGES/alleyoop.mo
-share/locale/sr/LC_MESSAGES/alleyoop.mo
-share/locale/sr@Latn/LC_MESSAGES/alleyoop.mo
-share/locale/sv/LC_MESSAGES/alleyoop.mo
-share/locale/uk/LC_MESSAGES/alleyoop.mo
-share/locale/zh_CN/LC_MESSAGES/alleyoop.mo
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/devel/hs-crypto/Makefile b/devel/hs-crypto/Makefile
deleted file mode 100644
index 9d7aee0f482c..000000000000
--- a/devel/hs-crypto/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# New ports collection makefile for: crypto
-# Date created: 23 June 2003
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= crypto
-PORTVERSION= 1.2.2
-PORTREVISION= 1
-CATEGORIES= devel haskell
-MASTER_SITES= http://www.haskell.org/crypto/downloads/
-PKGNAMEPREFIX= hs-
-EXTRACT_SUFX= .tar
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell Cryptographic Library
-
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GMAKE= yes
-ALL_TARGET= # empty
-
-GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version`
-PLIST_SUB+= GHC_VERSION="${GHC_VERSION}"
-
-.include <bsd.port.pre.mk>
-
-IGNORE= is incompatible with current GHC, needs updating
-DEPRECATED= ${IGNORE}
-EXPIRATION_DATE=2006-12-01
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
- ${WRKSRC}/Makefile ${WRKSRC}/package.conf
- @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
- ${WRKSRC}/Makefile ${WRKSRC}/package.conf
- @${REINPLACE_CMD} -e 's|ghc-pkg|-ghc-pkg|' \
- ${WRKSRC}/Makefile
-
-do-configure:
- @(cd ${WRKSRC} && ${GMAKE} depend)
-
-.if !defined(NOPORTDOCS)
-post-build:
- @(cd ${WRKSRC} && ${GMAKE} doc)
-.endif
-
-post-install:
- ${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/package.conf ${DATADIR}
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @(cd ${WRKSRC} && \
- ${INSTALL_DATA} *.html ReadMe.* haddock.css haskell_icon.gif ${DOCSDIR})
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/hs-crypto/distinfo b/devel/hs-crypto/distinfo
deleted file mode 100644
index 866fa0d9831c..000000000000
--- a/devel/hs-crypto/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (crypto-1.2.2.tar) = e6498f761ab7634f34cf14c3cedfa821
-SHA256 (crypto-1.2.2.tar) = d3b90b2ef34bd2fb7f088f63eaaa91b0eaa13c6256cee7044af68f278b75aa30
-SIZE (crypto-1.2.2.tar) = 296960
diff --git a/devel/hs-crypto/pkg-descr b/devel/hs-crypto/pkg-descr
deleted file mode 100644
index 91d51fb4b93f..000000000000
--- a/devel/hs-crypto/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Haskell Cryptographic Library
-
-This library collects together existing Haskell cryptographic functions and
-augments them so that they:
-
-* Have common type signatures.
-* Can be used with the standard mode and padding algorithms (in the case of
- block mode ciphers).
-
-It contains: DES, Blowfish, Cipher Block Chaining (CBC) mode, PKCS#5 and nulls
- padding, SHA-1, RSA, OAEP, ASN.1, and PKCS#8.
-
-WWW: http://www.haskell.org/crypto/
-
-- Oliver Braun
-obraun@FreeBSD.org
diff --git a/devel/hs-crypto/pkg-plist b/devel/hs-crypto/pkg-plist
deleted file mode 100644
index 34c2fa67c54c..000000000000
--- a/devel/hs-crypto/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-lib/HScrypto.o
-lib/libHScrypto.a
-lib/imports/HScrypto/Codec/ASN1/ASN1.hi
-lib/imports/HScrypto/Codec/Encryption/AES.hi
-lib/imports/HScrypto/Codec/Encryption/AESAux.hi
-lib/imports/HScrypto/Codec/Encryption/Blowfish.hi
-lib/imports/HScrypto/Codec/Encryption/BlowfishAux.hi
-lib/imports/HScrypto/Codec/Encryption/DES.hi
-lib/imports/HScrypto/Codec/Encryption/DESAux.hi
-lib/imports/HScrypto/Codec/Encryption/EMEOAEP.hi
-lib/imports/HScrypto/Codec/Encryption/LargeKey.hi
-lib/imports/HScrypto/Codec/Encryption/MD5.hi
-lib/imports/HScrypto/Codec/Encryption/MD5Aux.hi
-lib/imports/HScrypto/Codec/Encryption/MGF.hi
-lib/imports/HScrypto/Codec/Encryption/Modes.hi
-lib/imports/HScrypto/Codec/Encryption/NumberTheory.hi
-lib/imports/HScrypto/Codec/Encryption/PKCS8.hi
-lib/imports/HScrypto/Codec/Encryption/Padding.hi
-lib/imports/HScrypto/Codec/Encryption/RSA.hi
-lib/imports/HScrypto/Codec/Encryption/SHA1.hi
-lib/imports/HScrypto/Codec/Encryption/SHA1Aux.hi
-lib/imports/HScrypto/Codec/Encryption/Utils.hi
-%%PORTDOCS%%%%DOCSDIR%%/Codec.ASN1.ASN1.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.AES.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.AESAux.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.Blowfish.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.BlowfishAux.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.DES.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.DESAux.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.EMEOAEP.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.LargeKey.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.MD5.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.MD5Aux.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.MGF.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.Modes.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.NumberTheory.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.PKCS8.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.Padding.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.RSA.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.SHA1.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.SHA1Aux.html
-%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.Utils.html
-%%PORTDOCS%%%%DOCSDIR%%/ReadMe.html
-%%PORTDOCS%%%%DOCSDIR%%/ReadMe.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-47.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-A.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-B.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-C.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-D.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-E.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-F.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-G.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-H.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-I.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-L.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-M.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-N.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-O.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-P.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-R.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-S.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-T.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-U.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-V.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-W.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index-Z.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/package.conf
-@dirrm %%DATADIR%%
-@dirrm lib/imports/HScrypto/Codec/ASN1
-@dirrm lib/imports/HScrypto/Codec/Encryption
-@dirrm lib/imports/HScrypto/Codec
-@dirrm lib/imports/HScrypto
-@dirrm lib/imports
-@exec %D/bin/ghc-pkg -u -g -i %D/share/crypto/package.conf
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg -r crypto
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/editors/Makefile b/editors/Makefile
index 23b1fa7198fe..f4b96177ae9b 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -59,7 +59,6 @@
SUBDIR += fte
SUBDIR += gate
SUBDIR += gedit
- SUBDIR += gedit-autocomplete-plugin
SUBDIR += gedit-plugins
SUBDIR += ghex
SUBDIR += glimmer
diff --git a/editors/gedit-autocomplete-plugin/Makefile b/editors/gedit-autocomplete-plugin/Makefile
deleted file mode 100644
index 0244a9d7a0ad..000000000000
--- a/editors/gedit-autocomplete-plugin/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Ports collection makefile for: gedit-autocomplete-plugin
-# Date created: 2005-10-10
-# Whom: Andreas Kohn <andreas@syndrom23.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME= autocomplete-plugin
-PORTVERSION= 3.0
-PORTREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= http://usuarios.lycos.es/acisif/gedit/autocomplete/
-PKGNAMEPREFIX= gedit-
-
-MAINTAINER= andreas@syndrom23.de
-COMMENT= A simple autocompletion plugin for gedit
-
-BUILD_DEPENDS= gedit:${PORTSDIR}/editors/gedit
-RUN_DEPENDS= gedit:${PORTSDIR}/editors/gedit
-
-GEDIT_VERSION= 2.14
-
-BROKEN= Not compatible with gedit versions >= 2.14
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-USE_X_PREFIX= yes
-MAKEFILE= makefile
-MAKE_ARGS= GEDIT_VERSION=gedit-${GEDIT_VERSION}
-
-PLIST_FILES= lib/gedit-2/plugins/autocomplete.gedit-plugin \
- lib/gedit-2/plugins/libautocomplete.so
-
-.include <bsd.port.mk>
diff --git a/editors/gedit-autocomplete-plugin/distinfo b/editors/gedit-autocomplete-plugin/distinfo
deleted file mode 100644
index fb71e673aa6e..000000000000
--- a/editors/gedit-autocomplete-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (autocomplete-plugin-3.0.tar.gz) = 34e71a3caad1fa29fcaa0a4442406c9a
-SHA256 (autocomplete-plugin-3.0.tar.gz) = c8772e659e047f72e36845db2da5c2167d42cae70c2ea284c7218e64bc62ab99
-SIZE (autocomplete-plugin-3.0.tar.gz) = 6187
diff --git a/editors/gedit-autocomplete-plugin/files/patch-makefile b/editors/gedit-autocomplete-plugin/files/patch-makefile
deleted file mode 100644
index dd8312c404c1..000000000000
--- a/editors/gedit-autocomplete-plugin/files/patch-makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- makefile.orig Sun Sep 12 16:11:44 2004
-+++ makefile Mon Oct 17 08:06:34 2005
-@@ -2,8 +2,8 @@
- GEDIT_VERSION=gedit-2.4
-
- all:
-- gcc -march=i686 -O3 -s -Wall -fPIC -shared `pkg-config $(GEDIT_VERSION) --libs --cflags` *.c -o libautocomplete.so
-+ $(CC) $(CFLAGS) -Wall -fPIC -shared `pkg-config $(GEDIT_VERSION) --libs --cflags` *.c -o libautocomplete.so
-
- install:
-- cp libautocomplete.so /usr/lib/gedit-2/plugins/
-- cp autocomplete.gedit-plugin /usr/lib/gedit-2/plugins/
-+ $(BSD_INSTALL_PROGRAM) libautocomplete.so $(PREFIX)/lib/gedit-2/plugins/
-+ $(BSD_INSTALL_DATA) autocomplete.gedit-plugin $(PREFIX)/lib/gedit-2/plugins/
diff --git a/editors/gedit-autocomplete-plugin/pkg-descr b/editors/gedit-autocomplete-plugin/pkg-descr
deleted file mode 100644
index 9658c2c0a0d7..000000000000
--- a/editors/gedit-autocomplete-plugin/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-A simple autocomplete plugin for gedit.
-
-This plugin autocompletes words when you write words twice or more times
-in a document.
-
-WWW: http://usuarios.lycos.es/acisif/gedit/autocomplete/autocomplete.html
diff --git a/emulators/Makefile b/emulators/Makefile
index 21c5f4650e83..9da435fbcce4 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -6,7 +6,6 @@
SUBDIR += adamem
SUBDIR += aftp
SUBDIR += atari800
- SUBDIR += basiliskII
SUBDIR += bfe
SUBDIR += bochs
SUBDIR += bsvc
@@ -134,11 +133,9 @@
SUBDIR += vmware-guestd3
SUBDIR += vmware-guestd4
SUBDIR += vmware-guestd5
- SUBDIR += vmware-tools2
SUBDIR += vmware-tools3
SUBDIR += vmware-tools4
SUBDIR += vmware-tools5
- SUBDIR += vmware2
SUBDIR += vmware3
SUBDIR += vpce
SUBDIR += vx68k
diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile
deleted file mode 100644
index 3c1ba52b5b28..000000000000
--- a/emulators/basiliskII/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for: BasiliskII
-# Date created: 17 April 2000
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= basiliskII
-PORTVERSION= 1.0
-PORTREVISION= 3
-CATEGORIES= emulators
-MASTER_SITES= http://www.gibix.net/projects/basilisk2/files/
-MASTER_SITE_SUBDIR= basilisk
-DISTNAME= BasiliskII_src_01052006
-
-MAINTAINER= mmendez@energyhq.be
-COMMENT= A free, portable, Open Source 68k Mac emulator
-
-BROKEN= Does not compile
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-WRKSRC= ${WRKDIR}/BasiliskII-${PORTVERSION}/src/Unix
-
-USE_X_PREFIX= yes
-USE_BZIP2= yes
-USE_GNOME= esound gtk20
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-CONFIGURE_ARGS= --disable-fbdev-dga --enable-fpe=uae
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-MAN1= BasiliskII.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 400012
-CFLAGS+= -fpermissive
-.endif
-
-.if ${ARCH} == amd64
-BROKEN= does not compile on AMD64 architectures
-.endif
-
-post-install:
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/emulators/basiliskII/distinfo b/emulators/basiliskII/distinfo
deleted file mode 100644
index 9f8c36c099c7..000000000000
--- a/emulators/basiliskII/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (BasiliskII_src_01052006.tar.bz2) = dfe9e088649133485bae28a713979481
-SHA256 (BasiliskII_src_01052006.tar.bz2) = 6782f2ed3587d7790557a0994f5b7472d7a27ded0f1598b9380efabde16bd3cc
-SIZE (BasiliskII_src_01052006.tar.bz2) = 1310908
diff --git a/emulators/basiliskII/pkg-descr b/emulators/basiliskII/pkg-descr
deleted file mode 100644
index f3ebb4e742c2..000000000000
--- a/emulators/basiliskII/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Basilisk II is a free, portable, Open Source 68k Mac emulator. It requires a
-copy of a 512K or 1MB Mac ROM and a copy of MacOS 7.x or 8.x to run.
-
-WWW: http://www.gibix.net/projects/basilisk2/
diff --git a/emulators/basiliskII/pkg-message b/emulators/basiliskII/pkg-message
deleted file mode 100644
index 12929c1e3aad..000000000000
--- a/emulators/basiliskII/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-********************************************************************************
-
- NOTE: You have to get a copy of the original Mac ROM image and a copy of MacOS
- to run BasiliskII. Be aware that the only legal way to get ROM image is
- to rip it out from your Mac computer. See BasiliskII home page to get
- details.
-
-********************************************************************************
diff --git a/emulators/basiliskII/pkg-plist b/emulators/basiliskII/pkg-plist
deleted file mode 100644
index 95dfd91b2370..000000000000
--- a/emulators/basiliskII/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/BasiliskII
-share/BasiliskII/fbdevices
-share/BasiliskII/keycodes
-share/BasiliskII/tunconfig
-@dirrm share/BasiliskII
diff --git a/emulators/vmware-tools2/Makefile b/emulators/vmware-tools2/Makefile
deleted file mode 100644
index edf7c269bf65..000000000000
--- a/emulators/vmware-tools2/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for: VMware tools for FreeBSD
-# Date created: 10 Aug 2000
-# Whom: matusita@jp.FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= vmware-tools
-PORTVERSION= ${VMWARE_VER}.${BUILD_VER}
-CATEGORIES= emulators
-MASTER_SITES= http://vmware-svca.www.conxion.com/software/ \
- http://vmware-chil.www.conxion.com/software/ \
- http://vmware-heva.www.conxion.com/software/ \
- http://vmware.wespe.de/software/ \
- ftp://vmware.wespe.de/pub/software/
-DISTNAME= tools-for-freebsd-${BUILD_VER}
-
-MAINTAINER= matusita@FreeBSD.org
-COMMENT=VMware tools for guest OS (for VMware 2.x, FreeBSD version)
-
-BROKEN= Unfetchable
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-WRKSRC= ${WRKDIR}/vmware-freebsd-tools
-
-ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
-NO_BUILD= yes
-NO_LATEST_LINK= yes
-
-RESTRICTED= "Not sure if we can redistribute this."
-NO_PACKAGE= ${RESTRICTED}
-
-VMWARE_VER= 2.0.4
-BUILD_VER= 307
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/XF86_VMware ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/XF86Config.dist ${PREFIX}/etc/XF86Config_VMware
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/emulators/vmware-tools2/distinfo b/emulators/vmware-tools2/distinfo
deleted file mode 100644
index 2bbcea15b6b4..000000000000
--- a/emulators/vmware-tools2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (tools-for-freebsd-307.tar.gz) = c9e4b04abe26f7158003fa183bcfa48f
-SIZE (tools-for-freebsd-307.tar.gz) = 1232295
diff --git a/emulators/vmware-tools2/pkg-descr b/emulators/vmware-tools2/pkg-descr
deleted file mode 100644
index 2c11f4f3e02b..000000000000
--- a/emulators/vmware-tools2/pkg-descr
+++ /dev/null
@@ -1,14 +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 X server for Guest OS. However,
-vmware-toolbox for FreeBSD lacks some features that vmware-toolbox for
-Linux has, and dual-boot configulation is broken because checkvm
-doesn't work.
-
-So this port installs X server ONLY. If you want vmware-toolbox,
-install ports/emulators/linux-vmware-toolbox2 on your FreeBSD _Guest_ OS.
-
-WWW: http://www.vmware.com/download/downloadtools.html
diff --git a/emulators/vmware-tools2/pkg-message b/emulators/vmware-tools2/pkg-message
deleted file mode 100644
index b067e3ceb4e2..000000000000
--- a/emulators/vmware-tools2/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-XFree86 configulation file is in ${PREFIX}/etc/XF86Config_VMware.
-Copy this file to /etc/XF86Config before starting X.
-
-This package does not contain vmware-toolbox. You need to install
-ports/emulators/linux-vmware-toolbox2 if you want it.
diff --git a/emulators/vmware-tools2/pkg-plist b/emulators/vmware-tools2/pkg-plist
deleted file mode 100644
index fd515f110692..000000000000
--- a/emulators/vmware-tools2/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/XF86_VMware
-etc/XF86Config_VMware
diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
deleted file mode 100644
index bf7c3876860b..000000000000
--- a/emulators/vmware2/Makefile
+++ /dev/null
@@ -1,215 +0,0 @@
-# ports collection makefile for: VMware 2.0 for Linux
-# Date created: Fri 26 Nov 19:16:47 EST 1999
-# Whom: vns@delta.odessa.ua
-#
-# $FreeBSD$
-# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.15 2000/07/31 00:54:32 vsilyaev Exp $
-#
-
-PORTNAME= vmware2
-PORTVERSION= 2.0.4.1142
-PORTREVISION= 2
-CATEGORIES= emulators linux
-MASTER_SITES= ${FREEBSD_MODULE_SITES} \
- ${VMWARE_MIRROR_SITES}
-DISTFILES= VMware-${PORTVERSION:R}-${PORTVERSION:E}${EXTRACT_SUFX}:vmware \
- vmmon-freebsd-0.98${EXTRACT_SUFX}:patch \
- vmnet-freebsd-0.21${EXTRACT_SUFX}:patch
-
-MAINTAINER= freebsd-emulation@FreeBSD.org
-COMMENT= A virtual machine emulator - a full PC in a window
-
-RUN_DEPENDS= ${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc
-
-RESTRICTED= "Not sure if we can redistribute it"
-BROKEN= Unfetchable
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-VMWARE_MIRROR_SITES= \
- http://www.vmware.com/download1/software/:vmware \
- ftp://download1.vmware.com/pub/software/:vmware
-# http://vmware-svca.www.conxion.com/software/:vmware \
-# http://vmware-chil.www.conxion.com/software/:vmware \
-# http://vmware-heva.www.conxion.com/software/:vmware \
-# http://vmware.wespe.de/software/:vmware \
-# ftp://vmware.wespe.de/pub/software:vmware
-FREEBSD_MODULE_SITES= \
- http://www.mindspring.com/~vsilyaev/vmware/files/:patch
-# ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/:patch \
-# http://mirror.aarnet.edu.au/pub/vmware/freebsd/:patch
-
-USE_SUBMAKE= yes
-USE_PERL5= yes
-VMDIR= ${PREFIX}/lib/vmware
-SRC_BASE?= /usr/src
-
-ONLY_FOR_ARCHS= i386
-USE_LINUX= yes
-USE_X_PREFIX= yes
-WRKSRC= ${WRKDIR}/vmware-distrib
-GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract
-MAN1= vmware.1
-
-MODULES= vmmon vmnet
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400013
-IGNORE= Systems prior to 400013 is out of support
-.endif
-
-.if !defined(HAVE_LINPROCFS) && !exists(/modules/linprocfs.ko) && !exists(/boot/kernel/linprocfs.ko) && !exists(${PREFIX}/modules/linprocfs.ko)
-IGNORE= This software absolutely requires Linux procfs support
-.endif
-
-.if !exists(/${SRC_BASE}/Makefile)
-IGNORE= Kernel source files required
-.endif
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net)
-.include "${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net"
-.endif
-
-.if ${OSVERSION} < 500023
-VMNET1_MINOR= 0x00010001
-.else
-VMNET1_MINOR= 0x00800001
-.endif
-
-SCRIPTS_ENV+= LINUXBASE="${LINUXBASE}" \
- VMNET_HOST_IP="${VMNET_HOST_IP}" \
- VMNET_NETMASK="${VMNET_NETMASK}" \
- VMNET1_MINOR="${VMNET1_MINOR}"
-MAKE_ARGS= KMODDIR="${VMDIR}/lib/modules"
-PLIST_SUB= LINUXBASE="${LINUXBASE}" VMNET1_MINOR="${VMNET1_MINOR}"
-
-.if ${OSVERSION} < 500000
-PLIST_SUB+= FREEBSD5="@comment "
-.else
-PLIST_SUB+= FREEBSD5=""
-.endif
-
-.if ${OSVERSION} >= 500104
-LINUXBASE_MAYBE=
-.else
-LINUXBASE_MAYBE= ${LINUXBASE}
-.endif
-
-post-extract:
-.for m in ${MODULES}
- ${TAR} -xf ${WRKSRC}/lib/modules/source/${m}.tar -C ${WRKSRC}
-.endfor
- ${GUNZIP_CMD} ${WRKSRC}/man/man1/vmware.1.gz
-
-pre-patch:
- ${PERL} -i -ne 'if (m{^Index: vmnet-only/userif\.c$$}..m{^Index: vmnet-only/vm_oui\.h$$}) { next unless m{^Index: vmnet-only/vm_oui\.h$$} } print' ${WRKDIR}/vmnet-freebsd.diff
-.for m in ${MODULES}
- ${CP} -R ${WRKDIR}/${m}-only ${WRKSRC}/
- ${PATCH} ${PATCH_ARGS} < ${WRKDIR}/${m}-freebsd.diff
-.endfor
-
-post-patch:
-.if ${OSVERSION} >= 500023
- ${CAT} ${FILESDIR}/kse.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
-.if ${OSVERSION} >= 500027 || ${OSVERSION} < 500000 && ${OSVERSION} >= 480102
- ${CAT} ${FILESDIR}/pmap.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
- ${CP} ${FILESDIR}/Makefile ${WRKSRC}
- ${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile
- ${RM} -rf ${WRKSRC}/vmmon-only/linux/
-.if exists(/sys/compat/linux/linux_ioctl.h)
- ${PERL} -i -pe 's,i386(/linux/linux_ioctl\.h),compat$$1,' \
- ${WRKSRC}/vmnet-only/freebsd/vmnet_linux.c
-.endif
-.if exists(/usr/include/sys/selinfo.h)
- ${PERL} -i -pe 's,<sys/select\.h>,<sys/selinfo.h>,' \
- ${WRKSRC}/vmmon-only/freebsd/*.c
-.endif
- cd ${WRKSRC}/vmmon-only/freebsd && ${TOUCH} bus_if.h device_if.h
-.if ${OSVERSION} >= 500019
- ${PERL} -i -pe 's,<machine/ioctl_fd\.h>,<sys/fdcio.h>,' \
- ${WRKDIR}/vmmon-only/freebsd/*.c \
- ${WRKDIR}/vmware-distrib/vmmon-only/freebsd/*.c
-.endif
- ${CAT} ${FILESDIR}/kmoddeps.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
- ${CAT} ${FILESDIR}/Makefile_FreeBSD.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.if ${OSVERSION} >= 500038
- ${CAT} ${FILESDIR}/fo_ioctl.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
-.if ${OSVERSION} >= 500100
- ${CAT} ${FILESDIR}/filedesc.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
- ${CAT} ${FILESDIR}/m_waitok.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
-.if ${OSVERSION} >= 500104
- ${CAT} ${FILESDIR}/cdevsw.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
- ${CAT} ${FILESDIR}/driver_c.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
-.if ${OSVERSION} >= 500109 || ${OSVERSION} < 500000 && ${OSVERSION} >= 480102
- ${CAT} ${FILESDIR}/hostif_c.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
-.if ${OSVERSION} >= 500109
- ${CAT} ${FILESDIR}/vm_types_h.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
- ${CAT} ${FILESDIR}/vmnet-only+Makefile.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-
-setoptions:
- ${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
- -e 's;@@NETMASK@@;${VMNET_NETMASK};' \
- ${FILESDIR}/config > ${WRKDIR}/config
-
- ${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@LINUXBASE@@;${LINUXBASE_MAYBE};' \
- -e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
- -e 's;@@BRIDGED@@;${VMNET_BRIDGED};' \
- -e 's;@@BRIDGE_INTF@@;${VMNET_BRIDGED_INTERFACE};' \
- ${FILESDIR}/vmware.sh > ${WRKDIR}/vmware.sh
-
- ${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@LINUXBASE@@;${LINUXBASE};' \
- ${FILESDIR}/vmware > ${WRKDIR}/vmware
-
-pre-install: setoptions
- ${INSTALL_MAN} ${WRKSRC}/man/man1/vmware.1 ${MANPREFIX}/man/man1
- ${MKDIR} ${VMDIR}/lib/modules
-
- ${MKDIR} ${PREFIX}/etc/vmware
- ${INSTALL_DATA} ${WRKDIR}/config ${PREFIX}/etc/vmware
-
- ${INSTALL_SCRIPT} ${WRKDIR}/vmware.sh ${PREFIX}/etc/rc.d
-
- ${MKDIR} ${VMDIR}/bin
- ${INSTALL_SCRIPT} ${FILESDIR}/df ${VMDIR}/bin
- [ -f ${LINUXBASE}/bin/df ] || ${LN} -s ${VMDIR}/bin/df ${LINUXBASE}/bin/
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pl ${VMDIR}/bin
- for i in \
- vmnet-bridge vmnet-dhcpd vmnet-sniffer \
- vmware-loop vmware-ping vmware-wizard \
- ; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/$${i} ${VMDIR}/bin; \
- done
- ${INSTALL_SCRIPT} -m 4555 ${WRKSRC}/bin/vmware ${VMDIR}/bin
- ${INSTALL_SCRIPT} ${WRKDIR}/vmware ${PREFIX}/bin
- ${MKDIR} ${VMDIR}/lib
- ${INSTALL_DATA} ${WRKSRC}/lib/config ${VMDIR}/lib
- ${MKDIR} ${VMDIR}/lib/floppies
- ${INSTALL_DATA} ${WRKSRC}/lib/floppies/* ${VMDIR}/lib/floppies
- ${MKDIR} ${VMDIR}/lib/help
- ${INSTALL_DATA} ${WRKSRC}/lib/help/* ${VMDIR}/lib/help
- ${MKDIR} ${VMDIR}/lib/xkeymap
- ${INSTALL_DATA} ${WRKSRC}/lib/xkeymap/* ${VMDIR}/lib/xkeymap
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/vmware
- ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/vmware
-.for f in README.FreeBSD Hints.FreeBSD
- ${INSTALL_DATA} ${FILESDIR}/${f} ${PREFIX}/share/doc/vmware
-.endfor
-.endif
-
-post-install:
- ${LN} -sf ${PREFIX}/etc/vmware /etc/
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/emulators/vmware2/distinfo b/emulators/vmware2/distinfo
deleted file mode 100644
index 2fd84293332a..000000000000
--- a/emulators/vmware2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (VMware-2.0.4-1142.tar.gz) = 5f6432f91531b5fbf484765af3d62e06
-SIZE (VMware-2.0.4-1142.tar.gz) = 6533427
-MD5 (vmmon-freebsd-0.98.tar.gz) = ed381460a92c6733d9889192256e1023
-SIZE (vmmon-freebsd-0.98.tar.gz) = 24789
-MD5 (vmnet-freebsd-0.21.tar.gz) = bb79acba1a4d7d9f3063510ea2bd91ad
-SIZE (vmnet-freebsd-0.21.tar.gz) = 9841
diff --git a/emulators/vmware2/files/Hints.FreeBSD b/emulators/vmware2/files/Hints.FreeBSD
deleted file mode 100644
index 15aa5a2f69dc..000000000000
--- a/emulators/vmware2/files/Hints.FreeBSD
+++ /dev/null
@@ -1,167 +0,0 @@
-$FreeBSD$
-
-Here is a list of some useful hints on using VMware on FreeBSD.
-
-- Note that this port includes some kernel modules, which means you
-should rebuild and reinstall this port everytime you update the kernel
-so as to keep them in sync; otherwise VMware might coredump or crash
-together with the whole system if kernel interfaces were somewhat
-different than before.
-
-- Full screen text mode does not work. Don't ever do it!
-
-- Full screen graphics mode will work, but you have to be careful e.g.
-when running a DOS prompt on MS Windows. Hitting Alt+Enter will crash
-VMware before you can say "Chuck!"
-
-- Running VMware as root is NOT the right way to do it. Edit
-/etc/fbtab to obtain the proper permission for the device files that
-you are going to access, then run VMware as a normal user.
-
-- Raw disk may not work. Use virtual or plain disk instead.
-
-- The vmware-mount.pl utility does not work. If you want to mount
-the "disk" while VMware is not running, you must use plain disks
-instead of virtual ones. Set up a 63 sector file as an "mbr"
-section, then a file for each partition on the "plain" disk.
-To mount the "disk", use vnconfig -c /dev/vn__ file and
-then mount the vn device.
-
-If you are setting up a plain disk as a workaround for the broken
-raw disks, you will need to set up the disk description file
-by hand, as the configuration editor will complain. Here is a
-sample one:
-
-DRIVETYPE ide
-CYLINDERS 16383
-HEADS 16
-SECTORS 63
-ACCESS "/path/disk.mbr" 0 63
-ACCESS "/dev/rad0s1" 63 4192902
-RDONLY "/dev/null" 4192965 12305790
-
-The geometry must be the physical geometry reported by the disk.
-grep ad0 /var/run/dmesg.boot and look for the 3 numbers in the
-brackets. They are the C/H/S.
-
-In the example above, "disk.mbr" is file used to keep a replacement
-MBR for the disk. You can use dd if=/dev/rad0 bs=1b count=63 of=mbr
-to create it if you like. The reason is so that the guest's decision
-about which OS you booted last is different than the host's (this is
-for the FreeBSD boot manager). You can also feel free to replace
-the MBR with the standard boot manager if you like. fdisk(8) and a vn
-device can help with this, though you will have to be sure and
-supply the correct geometry to fdisk(8) since the vn device won't
-support those calls. This time it's the BIOS "fake" geometry.
-Watch out!
-
-As you can see, the 1st partition simply is a FreeBSD slice device.
-The first number after the filename is the offset in blocks where the
-given file starts in the plain disk. The last number on the line is
-the length of the block. If you are using a file, its length must
-be equal to this number * 512.
-
-The last entry is an example of how to block out partitions you don't
-want VMware to mess with. Why do this instead of simply making the
-C/H/S numbers for the disk smaller? Because then the guest's BIOS
-might not make the same choices about the "fake" geometry to use,
-which would prevent the OS from booting in most cases.
-
-You might be able to follow the same procedure to make SCSI drives
-work. It is slightly less likely to work as SCSI vendors often
-differ as to how they set up BIOS geometries. Your raw device
-must end up having the same BIOS geometry as a Bustek SCSI
-controller, which is the device VMware virtually supplies as the
-host adapter.
-
-- It is a good idea to disconnect removable media devices (CDROMs
-and Floppies and the like) from the "guest" either when they are
-empty or when you're about to eject the media.
-
-- Under FreeBSD, floppy device should be configured as follows:
-
- Type: file
- Path: /dev/fd0
-
-(Obtain the write permission on /dev/fd0 if you write floppy disks)
-
-- VMware creates a file that is about 25% larger than the guest OS's
-RAM size, unlinks it and mmap's on it on the first startup of the VM.
-
-The default directory for the mmap is the value of TMPDIR environment
-variable, or if it's undefined, /tmp.
-
-Therefore, it would be a good idea to have your TMPDIR variable
-defined as a directory 1) that performs fast, 2) that has sufficient
-free space, and 3) that isn't on MFS; if your /tmp doesn't meet those
-three conditions.
-
-1 is because that will significantly improve the performance, 2 is
-because the VM cannot even boot when the mmap fails, and 3 is because
-such a large, active file on MFS could lead the system to deadlocks.
-
-
-Alternatively, you can make /compat/linux/tmp to fake /tmp, however,
-you should note that it would cause you silly troubles: Imagine a
-Linux application (say, Linux Netscape) which creates a temporary file
-in /tmp and passes it to some external program; you'll see it actually
-creates a file in /compat/linux/tmp when the external program searches
-/tmp literally.
-
-- There is a bug you may wish to work around if you aren't running
-5-current or a very recent 4-stable system.
-
-Some background first: With FreeBSD, when you mmap a file, the syncer
-will attempt by default to periodically synchronize the on-disk version
-of the file with the changes being made in the mmap'd region. You can
-change this behavior using the MAP_NOSYNC flag to mmap(). With this
-flag, the syncer will leave the dirty pages alone and only the
-pagedaemon will flush them when it's absolutely necessary. However,
-Linux always behaves as if the MAP_NOSYNC flag was given, but the
-Linuxulator was not adding MAP_NOSYNC to the flags as part of the
-compatibility layer. But that is ok, since unlinking the last reference
-to an mmap()ed file causes FreeBSD to add MAP_NOSYNC in anyway (under
-the theory that if the machine reboots in that situation the file's
-inode would be freed since it would be an orphan).
-
-The problem is that VMware doesn't actually unlink the save-to-disk file
-when resuming -- it merely uses it in place. The result is that the
-MAP_NOSYNC flag doesn't get set, which causes the performance of a
-resumed session to be terrible compared to a new session. Every time the
-syncer runs (sysctl -a kern.filedelay), vmware hangs while the RAM file
-dirty pages are flushed.
-
-This problem has been fixed in 4.2-STABLE as of 2 Mar 2001
-(sys/i386/linux/linux_machdep.c versions 1.13 and 1.6.2.3).
-
-- If you configure vmware to use bridging, you must still specify the
-"Host only" mode to the VMware configurator. It will still work just
-like a bridged interface. If your bridged VMware guest is a DHCP client,
-you may wish to fix its Ethernet address so as not to generate a new
-lease every time you start VMware. To do so, add this line to your
-guest's .cfg file:
-
-ethernet0.address = "00:50:56:1e:ad:bf"
-
-You can only change the last 5 hex digits, which MUST be unique (at least
-within your LAN).
-
-Note that bridging only works on (real) Interfaces where both the 'set
-promisc 1' and 'set autosrc 0' steps function. This means that the
-interface must be capable of transmitting frames with other than its own
-Ethernet address and receiving promiscuously. Most interfaces can, but
-notably wi interfaces are among those that cannot. Note that promiscuous
-mode is entered when the vmware.sh startup script is run, which may
-cause increased interrupt loads on your machine if it's plugged into a
-busy network. If you only run vmware infrequently, it may be better to
-only manually run the vmware startup script (as root) just before you
-start vmware and again (with the stop argument this time) when you're
-finished.
-
-- Don't miss the VMware FAQ available on the official site.
-
- http://www.vmware.com/products/productfaq.html
-
---
-Akinori -Aki- MUSHA <knu@idaemons.org>
-Nick Sayer <nsayer@FreeBSD.org>
diff --git a/emulators/vmware2/files/Makefile b/emulators/vmware2/files/Makefile
deleted file mode 100644
index 73c7bbd4ac41..000000000000
--- a/emulators/vmware2/files/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= vmmon-only
-
-.include <bsd.subdir.mk>
diff --git a/emulators/vmware2/files/Makefile.vmmon b/emulators/vmware2/files/Makefile.vmmon
deleted file mode 100644
index ad418ac981a8..000000000000
--- a/emulators/vmware2/files/Makefile.vmmon
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-MAKE_SMP= make -f Makefile.FreeBSD SMP=YES
-MAKE_UP= make -f Makefile.FreeBSD SMP=NO
-
-all:
- ${MAKE_SMP} clean && ${MAKE_SMP}
- ${MAKE_UP} clean && ${MAKE_UP}
-
-install:
- ${MAKE_SMP} install
- ${MAKE_UP} install
diff --git a/emulators/vmware2/files/Makefile_FreeBSD.patch b/emulators/vmware2/files/Makefile_FreeBSD.patch
deleted file mode 100644
index b5c76a1535c5..000000000000
--- a/emulators/vmware2/files/Makefile_FreeBSD.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vmmon-only/Makefile.FreeBSD.orig Tue Jun 22 16:52:23 2004
-+++ vmmon-only/Makefile.FreeBSD Tue Jun 22 16:51:58 2004
-@@ -57,7 +59,9 @@
-
- device:
- rm -f /compat/linux/dev/${DEVNAME}
-+.if ${OSVERSION} > 500104
- mknod /compat/linux/dev/${DEVNAME} c ${CDEV_MAJOR} 0
-+.endif
-
-
- .include <bsd.kmod.mk>
diff --git a/emulators/vmware2/files/README.FreeBSD b/emulators/vmware2/files/README.FreeBSD
deleted file mode 100644
index 78ca8de35360..000000000000
--- a/emulators/vmware2/files/README.FreeBSD
+++ /dev/null
@@ -1,79 +0,0 @@
-VMware 2.0 for Linux on FreeBSD.
-$Date: 2000/01/23 22:28:10 $
-$FreeBSD$
-
-Introduction.
-
-This piece of software provides some basic support for running
-the VMware 2.0 for Linux on FreeBSD 4.0 and better ;) systems.
-
-===
-
-What's done.
-
-At this time I was able to successfully run the following operation systems
-under VMware on FreeBSD:
-
- - FreeBSD 4.0 Current
- - Linux (Debian 2.1)
- - Windows NT
- - Windows 95 OSR2 (in safe mode :)
- - MS DOS 7.0 (Part of Win'95)
-
-I think that all platforms supported by VMware should work under FreeBSD.
-
-
-Installation procedure.
-
-The easiest solution is to obtain the vmware port and try to build it.
-The name of the port is vmware.tar.gz, and it can be downloaded from the
-following location:
-
-http://www.mindspring.com/~vsilyaev/vmware/files/vmware.tar.gz
-
-If you are like to use the linux proc filesystem emulator, you are need
-to install the next port:
-
-http://www.mindspring.com/~vsilyaev/vmware/files/linuxproc.tar.gz
-
-At build time, you will get further instructions on how to proceed.
-
-After a successful port installation you will need to obtain a license key
-to run VMware (you can use an old one for Linux). If you want to obtain
-a new key from http://www.vmware.com , you will have to select Linux as the
-'server' platform.
-
-Features currently unsupported
-
- - Fullscreen text mode
-
- - Mounting vmware virtual drive
-
- - Parallel ports were never tested. However, to support bidirectional
- transfers, we will need a FreeBSD version of the vmppuser driver.
-
-Caveats.
-
- - Onle one guest may be runned at one time.
-
- - Floppy disk detection currently doesn't work. It is assumed that
- a disk is always present in the floppy drive. Because of that, if you
- have enabled both IDE and floppy drives in the same VMware session, you
- _must_ select the right booting order in the Phoenix BIOS Setup.
-
- - Support only for Host networking. Doesn't have a bridgink networking
- But really this mean, that you are need to enable gateway on
- our FreeBSD box. And after that virtual machine can communicate
- with a rest of the world.
-
-Copyright issue.
-
- Unclear. My own code has a BSD-style copyright license,
- but in order to write it, I used VMware-copyrighted sources.
- In any case, I'm distributing only my own patch set, and all
- modified files retain the original copyright information.
-
-Author.
-
- Vladimir N. Silyaev.
- E-Mail: vsilyaev@mindspring.com
diff --git a/emulators/vmware2/files/cdevsw.patch b/emulators/vmware2/files/cdevsw.patch
deleted file mode 100644
index 68b70e1a2c28..000000000000
--- a/emulators/vmware2/files/cdevsw.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- vmmon-only/freebsd/driver.c_original Wed Mar 5 19:22:35 2003
-+++ vmmon-only/freebsd/driver.c Wed Mar 5 19:22:44 2003
-@@ -155,6 +155,18 @@
-
- /* static struct cdevsw vmmon_cdevsw = { */
- static struct cdevsw vmmon_cdevsw = {
-+#if __FreeBSD_version >= 500104
-+#if __FreeBSD_version >= 502103
-+ .d_version = D_VERSION,
-+ .d_flags = D_NEEDGIANT,
-+#endif
-+ .d_open = FreeBSD_Driver_Open,
-+ .d_close = FreeBSD_Driver_Close,
-+ .d_ioctl = FreeBSD_Driver_Ioctl,
-+ .d_poll = FreeBSD_Driver_Poll,
-+ .d_name = DEVICE_NAME,
-+ .d_maj = CDEV_MAJOR
-+#else
- /* open */ FreeBSD_Driver_Open,
- /* close */ FreeBSD_Driver_Close,
- /* read */ noread,
-@@ -169,8 +177,7 @@
- /* psize */ nopsize,
- /* flags */ 0,
- /* bmaj */ -1
--
--
-+#endif
- };
-
-
-@@ -242,7 +249,11 @@
- sprintf(freebsdState.deviceBuf,DEVICE_NAME);
- freebsdState.major = CDEV_MAJOR;
- freebsdState.minor = CDEV_MINOR;
-+#if __FreeBSD_version < 500104
- retval = cdevsw_add(&vmmon_cdevsw);
-+#else
-+ retval = 0;
-+#endif
-
- #endif
- if (retval) {
-@@ -273,12 +284,14 @@
- int retval=0;
-
- destroy_dev(vmmon_dev);
-+#if __FreeBSD_version < 500104
- retval = cdevsw_remove(&vmmon_cdevsw);
- if (retval) {
- Warning("Module %s: error unregistering\n", freebsdState.deviceBuf);
- } else {
- Log("Module %s: unloaded\n", freebsdState.deviceBuf);
- }
-+#endif
-
- return 0;
- }
---- vmnet-only/freebsd/vmnet.c_original Wed Mar 5 19:21:51 2003
-+++ vmnet-only/freebsd/vmnet.c Wed Mar 5 19:22:00 2003
-@@ -103,6 +103,20 @@
- static int vmnet_modeevent(module_t mod, int cmd, void *arg);
-
- static struct cdevsw vmnet_cdevsw = {
-+#if __FreeBSD_version >= 500104
-+#if __FreeBSD_version >= 502103
-+ .d_version = D_VERSION,
-+ .d_flags = D_NEEDGIANT,
-+#endif
-+ .d_open = vmnet_open,
-+ .d_close = vmnet_close,
-+ .d_read = vmnet_read,
-+ .d_write = vmnet_write,
-+ .d_ioctl = vmnet_ioctl,
-+ .d_poll = vmnet_poll,
-+ .d_name = DEVICE_NAME,
-+ .d_maj = CDEV_MAJOR
-+#else
- /* open */ vmnet_open,
- /* close */ vmnet_close,
- /* read */ vmnet_read,
-@@ -115,10 +125,11 @@
- /* maj */ CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
-- /* flags */ 0,
-- /* bmaj */ -1
-+ /* flags */ 0, -/* bmaj */ -1
-+#endif
- };
-
-+
- /*
- * Now declare the module to the system.
- * IMPORTANT: Must be before netgraph node declaration.
-@@ -164,7 +175,7 @@
-
- s = splimp();
- if_attach(ifp);
-- ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
-+ ether_ifattach(ifp);
- bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
- splx(s);
-
-@@ -604,11 +615,13 @@
- static int
- init_module(void)
- {
--int error;
-+ int error = 0;
-
-+#if __FreeBSD_version < 500104
- error = cdevsw_add(&vmnet_cdevsw);
- if (error)
- return error;
-+#endif
-
- return error;
- }
-@@ -618,7 +631,7 @@
- static int
- cleanup_module(void)
- {
-- int error;
-+ int error = 0;
- struct vmnet_softc *sc;
-
- DLog(Lenter, "");
-@@ -629,7 +642,9 @@
- return error;
- }
- }
-+#if __FreeBSD_version < 500104
- error = cdevsw_remove(&vmnet_cdevsw);
-+#endif
- DLog(Linfo, "return %d", error);
- return error;
- }
diff --git a/emulators/vmware2/files/config b/emulators/vmware2/files/config
deleted file mode 100644
index cff0a0c66e6a..000000000000
--- a/emulators/vmware2/files/config
+++ /dev/null
@@ -1,7 +0,0 @@
-vmware.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware"
-wizard.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware-wizard"
-dhcpd.fullpath = "@@PREFIX@@/lib/vmware/bin/vmnet-dhcpd"
-loop.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware-loop"
-libdir = "@@PREFIX@@/lib/vmware/lib"
-vmnet1.HostOnlyAddress = "@@HOST_IP@@"
-vmnet1.HostOnlyNetMask = "@@NETMASK@@"
diff --git a/emulators/vmware2/files/df b/emulators/vmware2/files/df
deleted file mode 100644
index b9db0532e013..000000000000
--- a/emulators/vmware2/files/df
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-# Hacky emulation of GNU df.
-# Intented to use with vmware wizard.
-# Depend from the _absence_ linux version perl in the dir /compat/linux/usr/bin/
-#
-# $FreeBSD$
-#
-@NARGV=('-n');
-$type=0;
-foreach (@ARGV) {
- exit if $_ eq '-n'; # Aargh it's me again, exit immediatly
- next if $_ eq '-P';
- $type=1,next if $_ eq '-T';
- push @NARGV, $_;
-}
-
-$line = 0;
-
-open(DF,"-|") or exec '/bin/df', @NARGV;
-while(<DF>) {
-
- unless ($type) { print $_; next;}
- @cols = split();
- if ($line++) {
- $col = 'ext2fs';
- } else {
- $col = 'Type';
- }
- @cols = (@cols[0], $col, @cols[1..$#cols]);
- print join("\t", @cols),"\n";
-}
diff --git a/emulators/vmware2/files/driver_c.patch b/emulators/vmware2/files/driver_c.patch
deleted file mode 100644
index 0dad4c78be7b..000000000000
--- a/emulators/vmware2/files/driver_c.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- vmmon-only/freebsd/driver.c.original Tue Jun 22 15:24:52 2004
-+++ vmmon-only/freebsd/driver.c Tue Jun 22 10:01:30 2004
-@@ -157,8 +157,8 @@
- static struct cdevsw vmmon_cdevsw = {
- #if __FreeBSD_version >= 500104
- #if __FreeBSD_version >= 502103
-- .d_version = D_VERSION,
-- .d_flags = D_NEEDGIANT,
-+ .d_version = D_VERSION,
-+ .d_flags = D_NEEDGIANT,
- #endif
- .d_open = FreeBSD_Driver_Open,
- .d_close = FreeBSD_Driver_Close,
-@@ -233,7 +233,7 @@
- *
- *----------------------------------------------------------------------
- */
--static dev_t vmmon_dev;
-+static struct cdev * vmmon_dev;
- static int
- init_module(void)
- {
-@@ -359,7 +359,7 @@
- *----------------------------------------------------------------------
- */
- static int
--FreeBSD_Driver_Open(dev_t dev, int oflag, int devtype, struct thread *td)
-+FreeBSD_Driver_Open(struct cdev * dev, int oflag, int devtype, struct thread *td)
- {
- VMFreeBSD *vmFreeBSD;
- VMDriver *vm;
-@@ -439,7 +439,7 @@
- */
-
- static int
--FreeBSD_Driver_Close(dev_t dev, int fflag, int devtype, struct thread *td)
-+FreeBSD_Driver_Close(struct cdev * dev, int fflag, int devtype, struct thread *td)
- {
- VMFreeBSD *vmFreeBSD = (VMFreeBSD *) dev->si_drv1;
-
-@@ -491,7 +491,7 @@
- */
-
- static int
--FreeBSD_Driver_Poll(dev_t dev, int events, struct thread *td)
-+FreeBSD_Driver_Poll(struct cdev * dev, int events, struct thread *td)
- {
- int revents = 0;
-
-@@ -573,7 +573,7 @@
- *----------------------------------------------------------------------
- */
- static int
--FreeBSD_Driver_Ioctl( dev_t dev, u_long cmd, caddr_t parg, int mode,
-+FreeBSD_Driver_Ioctl( struct cdev * dev, u_long cmd, caddr_t parg, int mode,
- struct thread *td)
- {
- VMFreeBSD *vmFreeBSD = (VMFreeBSD *) dev->si_drv1;
diff --git a/emulators/vmware2/files/filedesc.patch b/emulators/vmware2/files/filedesc.patch
deleted file mode 100644
index 8c625917bd9d..000000000000
--- a/emulators/vmware2/files/filedesc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- vmnet-only/freebsd/vmnet_linux.c.orig Tue Feb 11 22:12:40 2003
-+++ vmnet-only/freebsd/vmnet_linux.c Tue Feb 11 22:25:20 2003
-@@ -32,6 +32,7 @@
- #include <sys/socket.h>
- #include <sys/proc.h>
- #include <sys/file.h>
-+#include <sys/filedesc.h>
-
- #include <net/if.h>
-
---- vmmon-only/freebsd/driver.c.orig Tue Feb 11 22:12:39 2003
-+++ vmmon-only/freebsd/driver.c Tue Feb 11 22:22:35 2003
-@@ -45,8 +45,9 @@
- #include <sys/kernel.h>
- #include <sys/module.h>
- #include <sys/conf.h>
- #include <sys/selinfo.h>
- #include <sys/fcntl.h>
-+#include <sys/filedesc.h>
- #include <sys/malloc.h>
- #include <sys/proc.h>
- #include <sys/ioccom.h>
---- vmmon-only/freebsd/linux_emu.c.orig Tue Feb 11 22:12:40 2003
-+++ vmmon-only/freebsd/linux_emu.c Tue Feb 11 22:24:42 2003
-@@ -36,6 +36,7 @@
- #include <sys/disklabel.h>
- #include <sys/cdio.h>
- #include <sys/file.h>
-+#include <sys/filedesc.h>
- #include <sys/selinfo.h>
-
- #include <sys/fdcio.h>
diff --git a/emulators/vmware2/files/fo_ioctl.patch b/emulators/vmware2/files/fo_ioctl.patch
deleted file mode 100644
index 6cfde2c4c06f..000000000000
--- a/emulators/vmware2/files/fo_ioctl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- vmmon-only/freebsd/linux_emu.c Tue Aug 20 12:40:02 2002
-+++ vmmon-only/freebsd/linux_emu.c Tue Aug 20 12:42:23 2002
-@@ -306,7 +306,7 @@
- struct linux_floppy_struct fls;
- struct fd_type fdt;
-
-- if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, td)) != 0)
-+ if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, td->td_ucred, td)) != 0)
- return error;
- bzero(&fls, sizeof(fls));
-
-@@ -330,7 +330,7 @@
- struct linux_hd_geometry drive_geo;
- struct disklabel dl;
-
-- if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
-+ if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td->td_ucred, td)) != 0)
- return error;
-
- bzero(&drive_geo, sizeof(drive_geo));
-@@ -351,7 +351,7 @@
- struct linux_hd_driveid driveid;
- unsigned int capacity;
-
-- if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
-+ if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td->td_ucred, td)) != 0)
- return error;
-
- bzero(&driveid, sizeof(driveid));
-@@ -388,7 +388,7 @@
- struct ioc_vol bsd_vol;
- struct linux_cdrom_volctrl linux_vol;
-
-- if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, td)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, td->td_ucred, td)) != 0)
- return error;
-
- linux_vol.channel0 = bsd_vol.vol[0];
-@@ -411,7 +411,7 @@
- if ((error = copyin(muls, &ms, sizeof(ms))) != 0)
- return error;
-
-- if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, td)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, td->td_ucred, td)) != 0)
- return error;
-
- bzero(&t, sizeof(t));
-@@ -419,7 +419,7 @@
- t.address_format = ms.addr_format ; /* BSD and LINUX formats equal */
- t.track = 0; /* get content from the first track */
-
-- if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, td)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, td->td_ucred, td)) != 0)
- return error;
-
- bsd_to_linux_msf_lba(ms.addr_format, &t.entry.addr, &ms.addr);
---- vmnet-only/freebsd/vmnet_linux.c Tue Aug 20 12:40:02 2002
-+++ vmnet-only/freebsd/vmnet_linux.c Tue Aug 20 12:42:59 2002
-@@ -90,7 +90,7 @@
-
- switch (macAddr.version) {
- case 1:
-- error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, td);
-+ error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, td->td_ucred, td);
- DEB(printf("Get ethernet address: %6D\n", macAddr.addr, ":"));
- break;
- default:
diff --git a/emulators/vmware2/files/hostif_c.patch b/emulators/vmware2/files/hostif_c.patch
deleted file mode 100644
index 58499ba714d3..000000000000
--- a/emulators/vmware2/files/hostif_c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmmon-only/freebsd/hostif.c.patched Tue Apr 8 15:15:20 2003
-+++ vmmon-only/freebsd/hostif.c Tue Apr 8 15:16:21 2003
-@@ -183,7 +183,7 @@
- {
- #define DEB(x)
- caddr_t addr = (caddr_t)VPN_2_VA(ppn);
-- pt_entry_t *pteptr = vtopte(addr);
-+ pt_entry_t *pteptr = vtopte((vm_offset_t)addr);
- PTE pte;
-
- DEB(printf("FindMPN: for page %d address %p(phys %p) pteptr %p", ppn, addr, (caddr_t)vtophys(addr), pteptr));
diff --git a/emulators/vmware2/files/kmoddeps.patch b/emulators/vmware2/files/kmoddeps.patch
deleted file mode 100644
index e282d8c20ff4..000000000000
--- a/emulators/vmware2/files/kmoddeps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vmmon-only/Makefile.FreeBSD.orig Fri Jun 14 08:45:33 2002
-+++ vmmon-only/Makefile.FreeBSD Fri Jun 14 08:47:42 2002
-@@ -40,7 +40,9 @@
- SRCS=
-
- # For 4.0-STABLE
-+.if ${OSVERSION} < 500002
- KMODDEPS= linux
-+.endif
-
- INCLUDE = -I$(.CURDIR)/include -I$(.CURDIR)/common -I$(.CURDIR)/freebsd -I$(.CURDIR)/export/include -I/sys
- INCLUDE += -I$(.CURDIR)/../vmnet-only/freebsd/
diff --git a/emulators/vmware2/files/kse.patch b/emulators/vmware2/files/kse.patch
deleted file mode 100644
index f4e611e6ee2a..000000000000
--- a/emulators/vmware2/files/kse.patch
+++ /dev/null
@@ -1,581 +0,0 @@
---- ./vmmon-only/common/vmx86.c.orig Sat Nov 10 16:54:14 2001
-+++ ./vmmon-only/common/vmx86.c Sat Nov 10 16:55:02 2001
-@@ -51,6 +51,7 @@
-
-
- static VMDriver *vmDriverList = NULL;
-+VMDriver * Vmx86_CurrentVM(void *uniqHandle);
-
- static int32 lockedPageLimit;
- static int32 numLockedPages;
---- ./vmmon-only/freebsd/driver.c.orig Sat Nov 10 16:54:17 2001
-+++ ./vmmon-only/freebsd/driver.c Sat Nov 10 16:54:52 2001
-@@ -147,6 +147,8 @@
- #endif
-
- #define CDEV_MINOR 0
-+
-+/* static struct cdevsw vmmon_cdevsw = { */
- static struct cdevsw vmmon_cdevsw = {
- /* open */ FreeBSD_Driver_Open,
- /* close */ FreeBSD_Driver_Close,
-@@ -162,8 +164,12 @@
- /* psize */ nopsize,
- /* flags */ 0,
- /* bmaj */ -1
-+
-+
- };
-
-+
-+
- /*
- *----------------------------------------------------------------------
- *
-@@ -329,7 +335,7 @@
- *----------------------------------------------------------------------
- */
- static int
--FreeBSD_Driver_Open(dev_t dev, int oflag, int devtype, struct proc *p)
-+FreeBSD_Driver_Open(dev_t dev, int oflag, int devtype, struct thread *td)
- {
- VMFreeBSD *vmFreeBSD;
- VMDriver *vm;
-@@ -353,7 +359,7 @@
- }
- memset(vmFreeBSD, 0, sizeof *vmFreeBSD);
-
-- vm = Vmx86_Init((void *)dev, (void *)(p->p_pid));
-+ vm = Vmx86_Init((void *)dev, (void *)(td->td_proc->p_pid));
- if (vm == NULL) {
- Warning("Vmx86_Init failed\n");
- free(vmFreeBSD, M_DEVBUF);
-@@ -409,7 +415,7 @@
- */
-
- static int
--FreeBSD_Driver_Close(dev_t dev, int fflag, int devtype, struct proc *p)
-+FreeBSD_Driver_Close(dev_t dev, int fflag, int devtype, struct thread *td)
- {
- VMFreeBSD *vmFreeBSD = (VMFreeBSD *) dev->si_drv1;
-
-@@ -419,7 +425,7 @@
-
- if (!vmFreeBSD->vm) {
- printf("/dev/" DEVICE_NAME ": (zombie) close fd for pid=%d\n",
-- p->p_pid);
-+ td->td_proc->p_pid);
- } else {
- /*printf("/dev/" DEVICE_NAME ": useCount DEC pid=%d\n",vmFreeBSD->pids[0]);*/
- }
-@@ -461,7 +467,7 @@
- */
-
- static int
--FreeBSD_Driver_Poll(dev_t dev, int events, struct proc *p)
-+FreeBSD_Driver_Poll(dev_t dev, int events, struct thread *td)
- {
- int revents = 0;
-
-@@ -492,7 +498,7 @@
- #if POLL_TRACE
- nanotime(&vmFreeBSD->time_sleep);
- #endif
-- selrecord(p, &vmFreeBSD->rsel);
-+ selrecord(td, &vmFreeBSD->rsel);
- vmFreeBSD->flags.twaiting = TRUE;
- vmFreeBSD->thandle = timeout(FreeBSD_DriverSelectTimeout, vmFreeBSD, 1);
- }
-@@ -544,7 +550,7 @@
- */
- static int
- FreeBSD_Driver_Ioctl( dev_t dev, u_long cmd, caddr_t parg, int mode,
-- struct proc *p)
-+ struct thread *td)
- {
- VMFreeBSD *vmFreeBSD = (VMFreeBSD *) dev->si_drv1;
- VMDriver *vm = vmFreeBSD->vm;
-@@ -575,7 +581,7 @@
- ASSERT(!err);
- err = Vmx86_CreateVM(vm, &initParams);
- if (err) {
-- p->p_retval[0] = -1;
-+ td->td_retval[0] = -1;
- retval = EAGAIN;
- }
- err = HostIF_CopyToUser((char*)arg,&initParams,sizeof(InitBlock));
-@@ -591,7 +597,7 @@
- case VMIO_RUN:
- ASSERT(vm != NULL);
- vm_hold = vm;
-- p->p_retval[0] = Vmx86_RunVM(vm);
-+ td->td_retval[0] = Vmx86_RunVM(vm);
- break;
-
- case VMIO_BEEP: { /* XXX for buggy Linux */
-@@ -625,7 +631,7 @@
- char *addr = (char *)arg;
- MPN mpn;
- mpn = HostIF_LookupUserMPN(vm,addr);
-- p->p_retval[0] = mpn;
-+ td->td_retval[0] = mpn;
- break;
- }
-
-@@ -633,18 +639,18 @@
- char *addr = (char *)arg;
- MPN mpn;
- mpn = Vmx86_LockPage(vm, addr, TRUE);
-- p->p_retval[0] = mpn;
-+ td->td_retval[0] = mpn;
- break;
- }
-
- case VMIO_UNLOCKPAGE: {
- char *addr = (char *)arg;
-- p->p_retval[0] = Vmx86_UnlockPage(vm, addr, TRUE);
-+ td->td_retval[0] = Vmx86_UnlockPage(vm, addr, TRUE);
- break;
- }
-
- case VMIO_GET_NUM_VMS : {
-- p->p_retval[0] = Vmx86_GetNumVMs();
-+ td->td_retval[0] = Vmx86_GetNumVMs();
- break;
- }
-
-@@ -660,7 +666,7 @@
- }
-
- case VMIO_GET_HARD_LIMIT: {
-- p->p_retval[0] = Vmx86_GetLockedPagesLimit();
-+ td->td_retval[0] = Vmx86_GetLockedPagesLimit();
- break;
- }
-
-@@ -762,9 +768,9 @@
-
- case VMIO_ISMPSAFE : {
- #ifdef SMP
-- p->p_retval[0] = TRUE;
-+ td->td_retval[0] = TRUE;
- #else
-- p->p_retval[0] = FALSE;
-+ td->td_retval[0] = FALSE;
- #endif
- break;
- }
-@@ -772,25 +778,25 @@
- case VMIO_APICBASE: {
- MA ma;
- ma = HostIF_APIC_Base(vm, (Bool)arg);
-- p->p_retval[0] = ma;
-+ td->td_retval[0] = ma;
- break;
- }
-
- case VMIO_IOAPICBASE: {
- MA ma;
- ma = HostIF_IOAPIC_Base(vm);
-- p->p_retval[0] = ma;
-+ td->td_retval[0] = ma;
- break;
- }
-
-
- case VMIO_CHECK_MEMORY :
-- p->p_retval[0] = HostIF_CheckMemory(vm);
-+ td->td_retval[0] = HostIF_CheckMemory(vm);
- break;
-
- case VMIO_REGISTER_PASSTHROUGH_IRQ: {
- #ifdef SUPPORT_PASSTHROUGH
-- p->p_retval[0] = Passthrough_RegisterIRQ((unsigned char) arg, "VMware", vmFreeBSD);
-+ td->td_retval[0] = Passthrough_RegisterIRQ((unsigned char) arg, "VMware", vmFreeBSD);
- #else
- retval = EINVAL;
- #endif
-@@ -802,7 +808,7 @@
- struct passthrough_iorange ior;
-
- err = HostIF_CopyFromUser(&ior, (char*)arg, sizeof(ior));
-- p->p_retval[0] = Passthrough_RegisterIORegion(ior.ioBase, ior.numPorts, "VMware");
-+ td->td_retval[0] = Passthrough_RegisterIORegion(ior.ioBase, ior.numPorts, "VMware");
- #else
- retval = EINVAL;
- #endif
-@@ -823,7 +829,7 @@
- struct passthrough_iorange ior;
-
- err = HostIF_CopyFromUser(&ior, (char*)arg, sizeof(ior));
-- p->p_retval[0] = Passthrough_ReleaseIORegion(ior.ioBase, ior.numPorts);
-+ td->td_retval[0] = Passthrough_ReleaseIORegion(ior.ioBase, ior.numPorts);
- #else
- retval = EINVAL;
- #endif
-@@ -832,7 +838,7 @@
-
- case VMIO_START_PASSTHROUGH: {
- #ifdef SUPPORT_PASSTHROUGH
-- p->p_retval[0] = Passthrough_Init(vmFreeBSD);
-+ td->td_retval[0] = Passthrough_Init(vmFreeBSD);
- #else
- retval = EINVAL;
- #endif
-@@ -841,7 +847,7 @@
-
- case VMIO_STOP_PASSTHROUGH: {
- #ifdef SUPPORT_PASSTHROUGH
-- p->p_retval[0] = Passthrough_Release(vmFreeBSD);
-+ td->td_retval[0] = Passthrough_Release(vmFreeBSD);
- #else
- retval = EINVAL;
- #endif
-@@ -853,7 +859,7 @@
- unsigned char irq;
- if (vmFreeBSD->numPendingPassthroughIRQs > 0) {
- irq = vmFreeBSD->pendingPassthroughIRQs[--vmFreeBSD->numPendingPassthroughIRQs],
-- p->p_retval[0] = vmFreeBSD->numPendingPassthroughIRQs;
-+ td->td_retval[0] = vmFreeBSD->numPendingPassthroughIRQs;
- } else {
- irq = 0x0;
- retval = EAGAIN;
-@@ -950,7 +956,7 @@
- va_list args;
-
-
-- vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+ vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
-
- va_start(args, fmt);
- vsprintf(freebsdState.buf, fmt, args);
-@@ -978,7 +984,7 @@
- va_list args;
-
-
-- vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+ vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
-
- va_start(args, fmt);
- vsprintf(freebsdState.buf, fmt, args);
-@@ -1009,7 +1015,7 @@
- void
- Panic(char *fmt, ...)
- {
-- VMDriver *vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+ VMDriver *vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
- va_list args;
-
- va_start(args, fmt);
-@@ -1029,13 +1035,13 @@
- if (vm) {
- vLog(vm->logFD);
- vWarning(vm);
-- sprintf(freebsdState.buf,"VMX86 driver panic. pid=%d\n\r",curproc->p_pid);
-+ sprintf(freebsdState.buf,"VMX86 driver panic. pid=%d\n\r",curthread->td_proc->p_pid);
- vLog(vm->logFD);
- vWarning(vm);
- }
-
- /* XXX Why it's right */
-- exit1(curproc, 0);
-+ exit1(curthread, 0);
- /* NOTREACHED */
- }
-
---- ./vmmon-only/freebsd/hostif.c.orig Sat Nov 10 16:56:01 2001
-+++ ./vmmon-only/freebsd/hostif.c Sat Nov 10 16:56:21 2001
-@@ -55,10 +55,9 @@
-
- #include <vm/vm.h>
- #include <vm/vm_param.h>
-+#include <sys/lock.h>
- #if __FreeBSD_version >= 500018
- #include <sys/mutex.h>
--#else
--#include <sys/lock.h>
- #endif
- #include <vm/pmap.h>
- #include <vm/vm_map.h>
---- ./vmmon-only/freebsd/linux_emu.c.orig Sat Nov 10 16:54:17 2001
-+++ ./vmmon-only/freebsd/linux_emu.c Sat Nov 10 16:54:57 2001
-@@ -300,13 +300,13 @@
- }
-
- static int
--linux_to_bsd_fdgetprm(struct proc *p, struct file *fp, struct linux_floppy_struct *flp)
-+linux_to_bsd_fdgetprm(struct thread *td, struct file *fp, struct linux_floppy_struct *flp)
- {
- int error;
- struct linux_floppy_struct fls;
- struct fd_type fdt;
-
-- if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, p)) != 0)
-+ if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, td)) != 0)
- return error;
- bzero(&fls, sizeof(fls));
-
-@@ -324,13 +324,13 @@
- }
-
- static int
--linux_to_bsd_get_geometry(struct proc *p, struct file *fp, struct linux_hd_geometry *geo)
-+linux_to_bsd_get_geometry(struct thread *td, struct file *fp, struct linux_hd_geometry *geo)
- {
- int error;
- struct linux_hd_geometry drive_geo;
- struct disklabel dl;
-
-- if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, p)) != 0)
-+ if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
- return error;
-
- bzero(&drive_geo, sizeof(drive_geo));
-@@ -344,14 +344,14 @@
- }
-
- static int
--linux_to_bsd_hdio_identity(struct proc *p, struct file *fp, struct linux_hd_driveid *id)
-+linux_to_bsd_hdio_identity(struct thread *td, struct file *fp, struct linux_hd_driveid *id)
- {
- int error;
- struct disklabel dl;
- struct linux_hd_driveid driveid;
- unsigned int capacity;
-
-- if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, p)) != 0)
-+ if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
- return error;
-
- bzero(&driveid, sizeof(driveid));
-@@ -382,13 +382,13 @@
- }
-
- static int
--linux_to_bsd_cdromvolread(struct proc *p, struct file *fp, struct linux_cdrom_volctrl *vol)
-+linux_to_bsd_cdromvolread(struct thread *td, struct file *fp, struct linux_cdrom_volctrl *vol)
- {
- int error;
- struct ioc_vol bsd_vol;
- struct linux_cdrom_volctrl linux_vol;
-
-- if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, p)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, td)) != 0)
- return error;
-
- linux_vol.channel0 = bsd_vol.vol[0];
-@@ -400,7 +400,7 @@
- }
-
- static int
--linux_cdrom_get_multisession(struct proc *p, struct file *fp, struct linux_cdrom_multisession *muls)
-+linux_cdrom_get_multisession(struct thread *td, struct file *fp, struct linux_cdrom_multisession *muls)
- {
- struct linux_cdrom_multisession ms;
- struct ioc_toc_header h;
-@@ -411,7 +411,7 @@
- if ((error = copyin(muls, &ms, sizeof(ms))) != 0)
- return error;
-
-- if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, p)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, td)) != 0)
- return error;
-
- bzero(&t, sizeof(t));
-@@ -419,7 +419,7 @@
- t.address_format = ms.addr_format ; /* BSD and LINUX formats equal */
- t.track = 0; /* get content from the first track */
-
-- if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, p)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, td)) != 0)
- return error;
-
- bsd_to_linux_msf_lba(ms.addr_format, &t.entry.addr, &ms.addr);
-@@ -430,37 +430,37 @@
- }
-
- static int
--linux_ioctl_hdfdcd(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_hdfdcd(struct thread *td, struct linux_ioctl_args *args)
- {
-- struct file *fp = p->p_fd->fd_ofiles[args->fd];
-+ struct file *fp = td->td_proc->p_fd->fd_ofiles[args->fd];
- switch (args->cmd & 0xffff) {
- case LINUX_HDIO_GET_IDENTITY:
- case LINUX_HDIO_OBSOLETE_IDENTITY:
-- return linux_to_bsd_hdio_identity(p, fp, (struct linux_hd_driveid *)args->arg);
-+ return linux_to_bsd_hdio_identity(td, fp, (struct linux_hd_driveid *)args->arg);
- case LINUX_HDIO_GETGEO:
-- return linux_to_bsd_get_geometry(p, fp, (struct linux_hd_geometry *)args->arg);
-+ return linux_to_bsd_get_geometry(td, fp, (struct linux_hd_geometry *)args->arg);
-
- case LINUX_FDTWADDLE:
- return 0;
- case LINUX_CDROMVOLREAD:
-- return linux_to_bsd_cdromvolread(p, fp, (struct linux_cdrom_volctrl*)args->arg);
-+ return linux_to_bsd_cdromvolread(td, fp, (struct linux_cdrom_volctrl*)args->arg);
- case LINUX_CDROMMULTISESSION:
-- return linux_cdrom_get_multisession(p, fp, (struct linux_cdrom_multisession *)args->arg);
-+ return linux_cdrom_get_multisession(td, fp, (struct linux_cdrom_multisession *)args->arg);
- case LINUX_CDROM_SET_OPTIONS:
- switch (args->arg) {
- case 0:
-- p->p_retval[0] = 0;
-+ td->td_retval[0] = 0;
- return 0;
- default:
- return ENOSYS;
- }
- break;
- case LINUX_CDROM_CLEAR_OPTIONS:
-- p->p_retval[0] = 0;
-+ td->td_retval[0] = 0;
- return 0;
- case LINUX_CDROM_LOCKDOOR:
- args->cmd = args->arg ? CDIOCPREVENT : CDIOCALLOW;
-- return ioctl(p, (struct ioctl_args *)args);
-+ return ioctl(td, (struct ioctl_args *)args);
- case LINUX_CDROM_MEDIA_CHANGED:
- case LINUX_CDROM_DRIVE_STATUS:
- case LINUX_CDROM_DISC_STATUS:
-@@ -470,7 +470,7 @@
- case LINUX_FDPOLLDRVSTAT:
- return linux_fdpolldrvstat((struct linux_floppy_drive_struct*)args->arg);
- case LINUX_FDGETPRM:
-- return linux_to_bsd_fdgetprm(p, fp, (struct linux_floppy_struct*)args->arg);
-+ return linux_to_bsd_fdgetprm(td, fp, (struct linux_floppy_struct*)args->arg);
- }
- return (ENOIOCTL);
- }
-@@ -482,7 +482,7 @@
- #define LINUX_TIOCLINUX 0x541C
-
- static int
--linux_tioclinux(struct proc *p, struct linux_ioctl_args *args)
-+linux_tioclinux(struct thread *td, struct linux_ioctl_args *args)
- {
- int type;
- int error = ENOIOCTL;
-@@ -503,7 +503,7 @@
-
-
- static int
--linux_ioctl_video(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_video(struct thread *td, struct linux_ioctl_args *args)
- {
- int error = ENOIOCTL;
-
-@@ -513,7 +513,7 @@
- error = 0;
- break;
- case LINUX_TIOCLINUX:
-- error = linux_tioclinux(p, args);
-+ error = linux_tioclinux(td, args);
- break;
- default:
- break;
-@@ -526,18 +526,17 @@
- LINUX_IOCTL_SET(vmmon, IOCTLCMD_NONE, IOCTLCMD_LAST);
-
- static int
--linux_ioctl_vmmon(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_vmmon(struct thread *td, struct linux_ioctl_args *args)
- {
- #define DEB(x)
-
- switch (args->cmd & 0xffff) {
- #define IOCTL(name) case IOCTLCMD_##name: args->cmd = VMIO_##name; \
- DEB(printf("vmmware: IOCTL %s arg %p\n", #name, (void *)args->arg)); \
-- return ioctl(p, (struct ioctl_args *)args);
-+ return ioctl(td, (struct ioctl_args *)args);
- #include "ioctls.h"
- #undef IOCTL
- }
- return (ENOIOCTL);
- #undef DEB
- }
--
---- ./vmnet-only/freebsd/vmnet_linux.c.orig Sat Nov 10 16:54:17 2001
-+++ ./vmnet-only/freebsd/vmnet_linux.c Sat Nov 10 16:54:59 2001
-@@ -76,9 +76,9 @@
-
-
- static int
--linux_ioctl_setmacaddr(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_setmacaddr(struct thread *td, struct linux_ioctl_args *args)
- {
-- struct file *fp = p->p_fd->fd_ofiles[args->fd];
-+ struct file *fp = td->td_proc->p_fd->fd_ofiles[args->fd];
- int error;
- VNet_SetMacAddrIOCTL macAddr;
-
-@@ -90,7 +90,7 @@
-
- switch (macAddr.version) {
- case 1:
-- error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, p);
-+ error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, td);
- DEB(printf("Get ethernet address: %6D\n", macAddr.addr, ":"));
- break;
- default:
-@@ -102,7 +102,7 @@
-
-
- static int
--linux_ioctl_net(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_net(struct thread *td, struct linux_ioctl_args *args)
- {
- int error=ENOIOCTL;
-
-@@ -116,7 +116,7 @@
- #endif
- case LINUX_SIOCSIFADDR:
- args->cmd = SIOCSIFADDR;
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- break;
- case LINUX_SIOCSLADRF:
- case LINUX_SIOCSKEEP:
-@@ -125,18 +125,18 @@
- break;
- case LINUX_SIOCPORT:
- args->cmd = VMIO_SIOCPORT;
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- break;
- case LINUX_SIOCBRIDGE:
- args->cmd = VMIO_SIOCBRIDGE;
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- break;
- case LINUX_SIOCNETIF:
- args->cmd = VMIO_SIOCNETIF;
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- break;
- case LINUX_SIOCSETMACADDR:
-- error = linux_ioctl_setmacaddr(p, args);
-+ error = linux_ioctl_setmacaddr(td, args);
- break;
- }
- DEB(printf(__FUNCTION__ ": return %d\n", error));
-@@ -147,16 +147,16 @@
-
- /* What is the dumb idea to use SIOCSIFFLAGS ioctl, and directly pass flags? */
- static int
--linux_ioctl_net_sifflags(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_net_sifflags(struct thread *td, struct linux_ioctl_args *args)
- {
- int error;
-
- DEB(printf(__FUNCTION__ ": cmd 0x%04lx arg %p\n", args->cmd, (void*)args->arg));
- args->cmd = SIOCGIFFLAGS;
-- error = ioctl(p, (struct ioctl_args *)args); /* First try standart */
-+ error = ioctl(td, (struct ioctl_args *)args); /* First try standart */
- if (error) {
- args->cmd = VMIO_SIOCSIFFLAGS; /* Than vmnet */
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- }
- DEB(printf(__FUNCTION__ ": return %d\n", error));
- return error;
diff --git a/emulators/vmware2/files/m_waitok.patch b/emulators/vmware2/files/m_waitok.patch
deleted file mode 100644
index 3c234edafe33..000000000000
--- a/emulators/vmware2/files/m_waitok.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- vmmon-only/freebsd/driver.c.orig Tue Feb 11 22:12:39 2003
-+++ vmmon-only/freebsd/driver.c Tue Feb 11 22:22:35 2003
-@@ -91,6 +92,10 @@
- typedef void driver_intr_t(void*);
- #endif
-
-+#ifndef M_WAITOK
-+#define M_WAITOK 0x0000
-+#endif
-+
- #ifdef SUPPORT_PASSTHROUGH
- #include "passthrough.h" // _driver_ version of passthrough.h
- #endif
---- vmmon-only/freebsd/hostif.c.orig Tue Feb 11 22:12:40 2003
-+++ vmmon-only/freebsd/hostif.c Tue Feb 11 22:22:15 2003
-@@ -100,6 +100,9 @@
-
- #define HOST_ISTRACKED_PFN(_vm, _pfn, _vpn) (PhysTrack_Test(_vm->physTracker, _pfn))
-
-+#ifndef M_WAITOK
-+#define M_WAITOK 0x0000
-+#endif
-
- static
- int host_lock_ppn(PPN ppn)
diff --git a/emulators/vmware2/files/patch-bc b/emulators/vmware2/files/patch-bc
deleted file mode 100644
index b2764c90596a..000000000000
--- a/emulators/vmware2/files/patch-bc
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmnet-only/freebsd/vmnet.c.orig Mon Jul 31 08:36:25 2000
-+++ vmnet-only/freebsd/vmnet.c Mon Sep 11 00:34:08 2000
-@@ -164,7 +164,7 @@
-
- s = splimp();
- if_attach(ifp);
-- ether_ifattach(ifp);
-+ ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
- bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
- splx(s);
-
diff --git a/emulators/vmware2/files/patch-bd b/emulators/vmware2/files/patch-bd
deleted file mode 100644
index f68352338738..000000000000
--- a/emulators/vmware2/files/patch-bd
+++ /dev/null
@@ -1,37 +0,0 @@
---- vmmon-only/freebsd/driver.c.orig Sat Apr 10 16:52:28 2004
-+++ vmmon-only/freebsd/driver.c Sat Apr 10 16:54:39 2004
-@@ -73,6 +73,24 @@
- #include "private.h"
- #endif
-
-+#if __FreeBSD_version >= 500013
-+enum intr_type {
-+ INTR_TYPE_TTY = 1,
-+ INTR_TYPE_BIO = 2,
-+ INTR_TYPE_NET = 4,
-+ INTR_TYPE_CAM = 8,
-+ INTR_TYPE_MISC = 16,
-+ INTR_HEAVY = 32, /* heavyweight interrupt process */
-+ INTR_LIGHT = 64, /* light weight interrupt thread */
-+ INTR_THREADED = INTR_LIGHT | INTR_HEAVY, /* any kind of interrupt thread */
-+ INTR_FAST = 128,
-+ INTR_EXCL = 256, /* exclusive interrupt */
-+ INTR_MPSAFE = 512 /* this interrupt is SMP safe */
-+};
-+
-+typedef void driver_intr_t(void*);
-+#endif
-+
- #ifdef SUPPORT_PASSTHROUGH
- #include "passthrough.h" // _driver_ version of passthrough.h
- #endif
-@@ -256,7 +274,9 @@
-
- #include <machine/md_var.h>
- #include <machine/segments.h>
-+#if __FreeBSD_version < 501114
- #include <i386/isa/intr_machdep.h>
-+#endif
-
- static int
- vmmon_modeevent(module_t mod, int cmd, void *arg)
diff --git a/emulators/vmware2/files/patch-be b/emulators/vmware2/files/patch-be
deleted file mode 100644
index 5ae4894ac02d..000000000000
--- a/emulators/vmware2/files/patch-be
+++ /dev/null
@@ -1,151 +0,0 @@
---- vmmon-only/freebsd/hostif.c.orig Sat Apr 10 16:52:23 2004
-+++ vmmon-only/freebsd/hostif.c Sat Apr 10 16:54:17 2004
-@@ -55,7 +55,11 @@
-
- #include <vm/vm.h>
- #include <vm/vm_param.h>
-+#if __FreeBSD_version >= 500018
-+#include <sys/mutex.h>
-+#else
- #include <sys/lock.h>
-+#endif
- #include <vm/pmap.h>
- #include <vm/vm_map.h>
- #include <vm/vm_page.h>
-@@ -107,7 +111,21 @@
-
- paddr = (vm_offset_t)addr;
- m = PHYS_TO_VM_PAGE(paddr);
-- vm_page_wire(m);
-+#if __FreeBSD_version >= 500038
-+ GIANT_REQUIRED;
-+ vm_page_lock_queues();
-+ vm_page_wire(m);
-+ vm_page_unlock_queues();
-+#elif __FreeBSD_version >= 500021
-+ GIANT_REQUIRED;
-+ vm_page_wire(m);
-+#elif __FreeBSD_version >= 500013
-+ mtx_lock(&vm_mtx);
-+ vm_page_wire(m);
-+ mtx_unlock(&vm_mtx);
-+#else
-+ vm_page_wire(m);
-+#endif
- return 0;
- }
-
-@@ -120,7 +138,21 @@
-
- paddr = (vm_offset_t)addr;
- m = PHYS_TO_VM_PAGE(paddr);
-+#if __FreeBSD_version >= 500038
-+ GIANT_REQUIRED;
-+ vm_page_lock_queues();
-+ vm_page_unwire(m, 1);
-+ vm_page_unlock_queues();
-+#elif __FreeBSD_version >= 500021
-+ GIANT_REQUIRED;
-+ vm_page_unwire(m, 1);
-+#elif __FreeBSD_version >= 500013
-+ mtx_lock(&vm_mtx);
- vm_page_unwire(m, 1);
-+ mtx_unlock(&vm_mtx);
-+#else
-+ vm_page_unwire(m, 1);
-+#endif
- return 0;
- }
-
-@@ -1006,8 +1038,12 @@
- HostIF_APIC_Base(VMDriver *vm, Bool setVMPtr)
- {
- #if defined(SMP)
-+#if __FreeBSD_version < 501114
- return cpu_apic_address;
-+#else
-+ return 0; /* XXX */
-+#endif
- #else
- return 0;
- #endif
- }
-@@ -1035,8 +1070,12 @@
- HostIF_IOAPIC_Base(VMDriver *vm)
- {
- #if defined(SMP)
-+#if __FreeBSD_version < 501114
- return io_apic_address[0]; /* XXX How about another APIC's */
- #else
-+ return 0; /* XXX */
-+#endif
-+#else
- return 0;
- #endif
- }
-@@ -1066,10 +1105,33 @@
- return NULL;
- }
- paddr = vtophys(addr);
-+#if __FreeBSD_version >= 500038
-+ GIANT_REQUIRED;
-+ ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
-+ ka->map = PHYS_TO_VM_PAGE(paddr);
-+ vm_page_lock_queues();
-+ vm_page_wire(ka->map);
-+ vm_page_unlock_queues();
-+ pmap_qenter(ka->kaddr, &ka->map, 1);
-+#elif __FreeBSD_version >= 500021
-+ GIANT_REQUIRED;
-+ ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
-+ ka->map = PHYS_TO_VM_PAGE(paddr);
-+ vm_page_wire(ka->map);
-+ pmap_kenter(ka->kaddr, paddr);
-+#elif __FreeBSD_version >= 500013
-+ mtx_lock(&vm_mtx);
-+ ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
-+ ka->map = PHYS_TO_VM_PAGE(paddr);
-+ vm_page_wire(ka->map);
-+ pmap_kenter(ka->kaddr, paddr);
-+ mtx_unlock(&vm_mtx);
-+#else
- ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
- ka->map = PHYS_TO_VM_PAGE(paddr);
- vm_page_wire(ka->map);
- pmap_kenter(ka->kaddr, paddr);
-+#endif
- return ka->kaddr;
- }
-
-@@ -1079,9 +1141,29 @@
- if (ka->map==NULL)
- return 0;
-
-- vm_page_unwire(ka->map, 1);
-- pmap_kremove(ka->kaddr);
-+#if __FreeBSD_version >= 500038
-+ GIANT_REQUIRED;
-+ vm_page_lock_queues();
-+ vm_page_unwire(ka->map, 1);
-+ vm_page_unlock_queues();
-+ pmap_qremove(ka->kaddr, 1);
- kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+#elif __FreeBSD_version >= 500021
-+ GIANT_REQUIRED;
-+ vm_page_unwire(ka->map, 1);
-+ pmap_kremove(ka->kaddr);
-+ kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+#elif __FreeBSD_version >= 500013
-+ mtx_lock(&vm_mtx);
-+ vm_page_unwire(ka->map, 1);
-+ pmap_kremove(ka->kaddr);
-+ kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+ mtx_unlock(&vm_mtx);
-+#else
-+ vm_page_unwire(ka->map, 1);
-+ pmap_kremove(ka->kaddr);
-+ kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+#endif
- ka->kaddr = 0;
- ka->map = NULL;
- return 0;
diff --git a/emulators/vmware2/files/patch-bf b/emulators/vmware2/files/patch-bf
deleted file mode 100644
index e2b7e590503f..000000000000
--- a/emulators/vmware2/files/patch-bf
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vmware-distrib/vmmon-only/common/hostif.h.orig Wed Jul 18 11:27:34 2001
-+++ ../vmware-distrib/vmmon-only/common/hostif.h Wed Jul 18 11:29:28 2001
-@@ -118,7 +118,12 @@
- EXTERN void HostIF_GlobalVMLock(int callerID);
- EXTERN void HostIF_GlobalVMUnLock(int callerID);
-
-+#ifdef __FreeBSD__
-+/* The HostIF_APIC_Base for FreeBSD still just takes two parameters */
-+EXTERN MA HostIF_APIC_Base(VMDriver *vm, Bool setVMPtr);
-+#else
- EXTERN MA HostIF_APIC_Base(VMDriver *vm, Bool setVMPtr, Bool probe);
-+#endif
- EXTERN MA HostIF_IOAPIC_Base(VMDriver *vm);
-
- EXTERN void HostIF_LockKernel(void);
diff --git a/emulators/vmware2/files/pmap.patch b/emulators/vmware2/files/pmap.patch
deleted file mode 100644
index 2a914e47c047..000000000000
--- a/emulators/vmware2/files/pmap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmmon-only/freebsd/hostif.c.orig Tue Dec 4 20:49:08 2001
-+++ vmmon-only/freebsd/hostif.c Tue Dec 4 20:49:44 2001
-@@ -170,7 +170,7 @@
- {
- #define DEB(x)
- caddr_t addr = (caddr_t)VPN_2_VA(ppn);
-- pt_entry_t pteptr = (pt_entry_t)vtopte(addr);
-+ pt_entry_t *pteptr = vtopte(addr);
- PTE pte;
-
- DEB(printf("FindMPN: for page %d address %p(phys %p) pteptr %p", ppn, addr, (caddr_t)vtophys(addr), pteptr));
diff --git a/emulators/vmware2/files/vm_types_h.patch b/emulators/vmware2/files/vm_types_h.patch
deleted file mode 100644
index 5a864a3b6a5d..000000000000
--- a/emulators/vmware2/files/vm_types_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vmmon-only/include/vm_types.h.patched Tue Apr 8 15:10:25 2003
-+++ vmmon-only/include/vm_types.h Tue Apr 8 15:12:07 2003
-@@ -144,10 +144,6 @@
- #define offsetof(type, member) ( (int) & ((type*)0) -> member )
- #endif
-
--
--#define MIN(_a, _b) (((_a) < (_b)) ? (_a) : (_b))
--#define MAX(_a, _b) (((_a) > (_b)) ? (_a) : (_b))
--
- #define ROUNDUP(x,y) (((x) + (y) - 1) / (y) * (y))
- #define ROUNDDOWN(x,y) ((x) / (y) * (y))
- #define ROUNDUPBITS(x, bits) (((uint32) (x) + MASK(bits)) & ~MASK(bits))
diff --git a/emulators/vmware2/files/vmnet-only+Makefile.patch b/emulators/vmware2/files/vmnet-only+Makefile.patch
deleted file mode 100644
index 066deb2fac00..000000000000
--- a/emulators/vmware2/files/vmnet-only+Makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- vmnet-only/freebsd/Makefile.orig Sun Apr 13 11:38:03 2003
-+++ vmnet-only/freebsd/Makefile Sun Apr 13 11:38:47 2003
-@@ -63,15 +63,5 @@
- echo -n >/dev/${IFACE}
- -ifconfig ${IFACE} inet ${IFADDR} netmask 255.255.255.0
-
--afterinstall: device
--
--device:
-- rm -f /dev/${DEVNAME}*
-- ln -s /dev/${DEVNAME}0 /dev/${DEVNAME}
-- for d in ${NDEVICES}; do \
-- mknod /dev/${DEVNAME}$$d c ${CDEV_MAJOR} `expr 65536 + $$d`; \
-- done
--
--
- .include <bsd.kmod.mk>
-
diff --git a/emulators/vmware2/files/vmware b/emulators/vmware2/files/vmware
deleted file mode 100644
index 6693fad91f09..000000000000
--- a/emulators/vmware2/files/vmware
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# Run vmware
-#
-# $FreeBSD$
-
-if [ ! -e @@LINUXBASE@@/proc/cpuinfo ]; then
- echo "************************************************************"
- echo "It seems Linux procfs is not mounted on @@LINUXBASE@@/proc."
- echo "VMware does not work without Linux procfs mounted."
- echo
- echo "For details, see linprocfs(5) manpage."
- echo "************************************************************"
- exit 1
-fi
-
-LANG=C
-PATH=/bin:$PATH
-
-if [ _$TMPDIR = _ ]; then
- TMPDIR=/var/tmp
- echo Setting TMPDIR="$TMPDIR".
- export TMPDIR
-fi
-
-exec @@PREFIX@@/lib/vmware/bin/vmware "$@"
diff --git a/emulators/vmware2/files/vmware.sh b/emulators/vmware2/files/vmware.sh
deleted file mode 100644
index c9f77fbb313d..000000000000
--- a/emulators/vmware2/files/vmware.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-#
-# Start or stop vmware
-#
-# $FreeBSD$
-
-vmware_config_file=@@PREFIX@@/etc/vmware/config
-
-if [ ! -e $vmware_config_file ]; then
- echo "$vmware_config_file does not exist!" >&2
- exit 255
-fi
-
-vmware_config() {
- cat $vmware_config_file | while read var eq value; do
- if [ "$1" = "$var" ]; then
- ret=`expr "$value" : '"\(.*\)"$'`
- echo ${ret:-$value}
- break
- fi
- done
-}
-
-vmware=`vmware_config vmware.fullpath`
-vmware_libdir=`vmware_config libdir`
-networking=@@NETWORKING@@
-bridged=@@BRIDGED@@
-bridge_interface=@@BRIDGE_INTF@@
-host_ip=`vmware_config vmnet1.HostOnlyAddress`
-netmask=`vmware_config vmnet1.HostOnlyNetMask`
-dev_vmnet1=@@LINUXBASE@@/dev/vmnet1
-
-if [ ! -x $vmware ]; then
- echo "$vmware does not exist!" >&2
- exit 255
-fi
-
-if [ `sysctl -n hw.ncpu` -eq 1 ]; then
- suffix=up
-else
- suffix=smp
-fi
-
-exec >/dev/null
-
-case $1 in
-start)
- kldstat -v | grep vmmon >/dev/null || kldload ${vmware_libdir}/modules/vmmon_${suffix}.ko
- if [ $networking -eq 1 ]; then
- kldstat -v | grep if_tap >/dev/null || kldload if_tap.ko
- if [ ! -e $dev_vmnet1 ]; then
- echo "$dev_vmnet1 does not exist!" >&2
- echo "Your VMware installation seems broken. Please reinstall VMware port." >&2
- exit 255
- fi
- (echo -n > $dev_vmnet1) 2>/dev/null || \
- echo -n > /dev/vmnet1 2>&1
- echo -n > /dev/vmnet1 2>&1 || true
- echo -n > $dev_vmnet1 2>&1
- ifconfig vmnet1 $host_ip netmask $netmask
- if [ X$bridged = XYES ]; then
- kldstat -v | grep netgraph >/dev/null || kldload netgraph.ko
- kldstat -v | grep ng_ether >/dev/null || kldload ng_ether.ko
- kldstat -v | grep ng_bridge >/dev/null || kldload ng_bridge.ko
- ngctl mkpeer vmnet1: bridge lower link0
- ngctl name vmnet1:lower vmnet_bridge
- ngctl connect vmnet_bridge: ${bridge_interface}: link1 lower
- ngctl connect vmnet_bridge: ${bridge_interface}: link2 upper
- ngctl msg ${bridge_interface}: setautosrc 0
- ngctl msg ${bridge_interface}: setpromisc 1
- ngctl msg vmnet1: setautosrc 0
- ngctl msg vmnet1: setpromisc 1
- fi
- fi
- echo -n " VMware" >&2
- ;;
-
-stop)
- kldunload vmmon_${suffix}
- if [ $networking -eq 1 ]; then
- ifconfig vmnet1 down
- ifconfig vmnet1 delete $host_ip
- if [ X$bridged = XYES ]; then
- ngctl shutdown vmnet_bridge:
- ngctl msg ${bridge_interface}: setautosrc 1
- ngctl msg ${bridge_interface}: setpromisc 0
- fi
- fi
- ;;
-
-*)
- echo "usage: `basename $0` {start|stop}" >&2
- exit 64
- ;;
-esac
diff --git a/emulators/vmware2/pkg-descr b/emulators/vmware2/pkg-descr
deleted file mode 100644
index 400a2f031035..000000000000
--- a/emulators/vmware2/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-This is the Linux version of the VMware virtual machine emulator made
-to run on FreeBSD using the Linux compatibility mode. VMware can be
-used to run Microsoft MS-DOS, Windows 95/98/NT/2000, Linux, FreeBSD,
-or any other operating system that runs on the i486.
-
-Official VMware, Inc. web site:
-WWW: http://www.vmware.com/
-
-
-We all are thankful to Vladimir N. Silyaev for porting vmmon/vmnet
-modules to FreeBSD. Have a look at his page for the latest
-information:
-
- http://www.mindspring.com/~vsilyaev/vmware/
diff --git a/emulators/vmware2/pkg-message b/emulators/vmware2/pkg-message
deleted file mode 100644
index 46a622351f49..000000000000
--- a/emulators/vmware2/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-************************************************************
-Get Linux procfs ready and initialize vmmon/vmnet as follows:
-
- ${PREFIX}/etc/rc.d/vmware.sh start
-
-then you'll be ready to start vmware.
-
-Don't miss the documents installed:
-
- vmware(1) ${PREFIX}/share/doc/vmware/*
-************************************************************
diff --git a/emulators/vmware2/pkg-plist b/emulators/vmware2/pkg-plist
deleted file mode 100644
index a2c71a1bbb33..000000000000
--- a/emulators/vmware2/pkg-plist
+++ /dev/null
@@ -1,135 +0,0 @@
-bin/vmware
-etc/rc.d/vmware.sh
-etc/vmware/config
-lib/vmware/bin/df
-lib/vmware/bin/vmware
-lib/vmware/bin/vmnet-bridge
-lib/vmware/bin/vmnet-dhcpd
-lib/vmware/bin/vmnet-sniffer
-lib/vmware/bin/vmware-config.pl
-lib/vmware/bin/vmware-mount.pl
-lib/vmware/bin/vmware-uninstall.pl
-lib/vmware/bin/vmware-loop
-lib/vmware/bin/vmware-ping
-lib/vmware/bin/vmware-wizard
-lib/vmware/lib/config
-lib/vmware/lib/floppies/linux.flp
-lib/vmware/lib/floppies/windows.flp
-lib/vmware/lib/help/AutoFit.htm
-lib/vmware/lib/help/ConfigDiskPartition.htm
-lib/vmware/lib/help/ConfigDisks.htm
-lib/vmware/lib/help/ConfigEditor.htm
-lib/vmware/lib/help/ConfigEthernet.htm
-lib/vmware/lib/help/ConfigFloppy.htm
-lib/vmware/lib/help/ConfigGuestOS.htm
-lib/vmware/lib/help/ConfigMemory.htm
-lib/vmware/lib/help/ConfigMisc.htm
-lib/vmware/lib/help/ConfigParallel.htm
-lib/vmware/lib/help/ConfigScsiDisks.htm
-lib/vmware/lib/help/ConfigSerial.htm
-lib/vmware/lib/help/ConfigSound.htm
-lib/vmware/lib/help/ConfigWiz.htm
-lib/vmware/lib/help/Configuration.htm
-lib/vmware/lib/help/Fit.htm
-lib/vmware/lib/help/FullScreen.gif
-lib/vmware/lib/help/Fullscreen.htm
-lib/vmware/lib/help/GeneralInput.htm
-lib/vmware/lib/help/GeneralMemory.htm
-lib/vmware/lib/help/GeneralPreferences.htm
-lib/vmware/lib/help/Glossary.htm
-lib/vmware/lib/help/Help.gif
-lib/vmware/lib/help/Interacting.htm
-lib/vmware/lib/help/Introduction.htm
-lib/vmware/lib/help/Power.htm
-lib/vmware/lib/help/PowerOff.gif
-lib/vmware/lib/help/PowerOff.htm
-lib/vmware/lib/help/PowerOn.gif
-lib/vmware/lib/help/PowerOn.htm
-lib/vmware/lib/help/PowerReset.gif
-lib/vmware/lib/help/PowerReset.htm
-lib/vmware/lib/help/Resume.gif
-lib/vmware/lib/help/Resume.htm
-lib/vmware/lib/help/RunVM.htm
-lib/vmware/lib/help/SendCtlAltDel.htm
-lib/vmware/lib/help/Setremdev.htm
-lib/vmware/lib/help/Settings.htm
-lib/vmware/lib/help/ShowAllHints.htm
-lib/vmware/lib/help/StatusBar.htm
-lib/vmware/lib/help/Suspend.gif
-lib/vmware/lib/help/Suspend.htm
-lib/vmware/lib/help/ToolbarButtons.htm
-lib/vmware/lib/help/ToolsInstall.htm
-lib/vmware/lib/help/View.htm
-lib/vmware/lib/help/Wizcd.htm
-lib/vmware/lib/help/Wizcongrats.htm
-lib/vmware/lib/help/Wizdisk.htm
-lib/vmware/lib/help/Wizdisk3.htm
-lib/vmware/lib/help/WizdiskType.htm
-lib/vmware/lib/help/Wizfloppy.htm
-lib/vmware/lib/help/Wiznetwork.htm
-lib/vmware/lib/help/Wizos.htm
-lib/vmware/lib/help/Wizpath.htm
-lib/vmware/lib/help/toc.htm
-%%FREEBSD5%%lib/vmware/lib/modules/linker.hints
-lib/vmware/lib/modules/vmmon_smp.ko
-lib/vmware/lib/modules/vmmon_up.ko
-lib/vmware/lib/xkeymap/be101
-lib/vmware/lib/xkeymap/be104
-lib/vmware/lib/xkeymap/chde101
-lib/vmware/lib/xkeymap/chde104
-lib/vmware/lib/xkeymap/chfr101
-lib/vmware/lib/xkeymap/chfr104
-lib/vmware/lib/xkeymap/de101
-lib/vmware/lib/xkeymap/de104
-lib/vmware/lib/xkeymap/dk101
-lib/vmware/lib/xkeymap/dk104
-lib/vmware/lib/xkeymap/es101
-lib/vmware/lib/xkeymap/es104
-lib/vmware/lib/xkeymap/fi101
-lib/vmware/lib/xkeymap/fi104
-lib/vmware/lib/xkeymap/fr101
-lib/vmware/lib/xkeymap/fr104
-lib/vmware/lib/xkeymap/gb101
-lib/vmware/lib/xkeymap/gb104
-lib/vmware/lib/xkeymap/is101
-lib/vmware/lib/xkeymap/is104
-lib/vmware/lib/xkeymap/it101
-lib/vmware/lib/xkeymap/it104
-lib/vmware/lib/xkeymap/jp106
-lib/vmware/lib/xkeymap/jp109
-lib/vmware/lib/xkeymap/no101
-lib/vmware/lib/xkeymap/no104
-lib/vmware/lib/xkeymap/pt101
-lib/vmware/lib/xkeymap/pt104
-lib/vmware/lib/xkeymap/se101
-lib/vmware/lib/xkeymap/se104
-lib/vmware/lib/xkeymap/us101
-lib/vmware/lib/xkeymap/us104
-share/doc/vmware/CHANGES
-share/doc/vmware/DHCP-COPYRIGHT
-share/doc/vmware/EULA
-share/doc/vmware/Hints.FreeBSD
-share/doc/vmware/INSTALL
-share/doc/vmware/README
-share/doc/vmware/README.FreeBSD
-share/doc/vmware/SAMBA-LICENSE
-@exec mkdir -p %%LINUXBASE%%/dev;for n in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/ttyv$n %%LINUXBASE%%/dev/tty$n;done
-@exec ln -s /dev/ttyva %%LINUXBASE%%/dev/tty10
-@exec ln -s /dev/ttyvb %%LINUXBASE%%/dev/tty11
-@exec mknod %%LINUXBASE%%/dev/null c 2 2
-@exec chmod 666 %%LINUXBASE%%/dev/null
-@exec mknod %%LINUXBASE%%/dev/hda b 0 0x00010002
-@exec mknod %%LINUXBASE%%/dev/hdb b 0 0x0001000a
-@exec ln -sf %D/etc/vmware /etc/
-@exec mknod %%LINUXBASE%%/dev/vmmon c 200 0
-@exec mknod %%LINUXBASE%%/dev/vmnet1 c 149 %%VMNET1_MINOR%%
-@unexec rm -f /etc/vmware %%LINUXBASE%%/dev/vmmon %%LINUXBASE%%/dev/vmnet1 %%LINUXBASE%%/bin/df %%LINUXBASE%%/dev/tty[0-9]* %%LINUXBASE%%/dev/hd? %%LINUXBASE%%/dev/null
-@dirrm etc/vmware
-@dirrm lib/vmware/bin
-@dirrm lib/vmware/lib/floppies
-@dirrm lib/vmware/lib/help
-@dirrm lib/vmware/lib/modules
-@dirrm lib/vmware/lib/xkeymap
-@dirrm lib/vmware/lib
-@dirrm lib/vmware
-@dirrm share/doc/vmware
diff --git a/emulators/vmware2/scripts/configure b/emulators/vmware2/scripts/configure
deleted file mode 100644
index 4b00cb17e72e..000000000000
--- a/emulators/vmware2/scripts/configure
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-
-[ "_$VMNET_HOST_IP" = _ ] && VMNET_HOST_IP="192.168.254.1"
-[ "_$VMNET_NETMASK" = _ ] && VMNET_NETMASK="255.255.255.0"
-
-host_ip=$VMNET_HOST_IP
-netmask=$VMNET_NETMASK
-title="VMware network options"
-
-get_network_settings() {
- bridged="NO"
- /usr/bin/dialog --title "$title" --clear --yesno \
-"\n"\
-"Do you want to use netgraph bridging?\n"\
- 10 50
- if [ $? -eq 0 ]; then
- bridged="YES"
- result=`/usr/bin/dialog --title "$title" --clear --inputbox \
-"\n"\
-"To which interface would you\n"\
-"like to tie the bridge?:"\
- 10 50 "" \
- 2>&1 > /dev/tty`
- case $? in
- 0)
- if [ -z "$result" ]; then
- return 1
- fi
- bdg_interface=$result
- ;;
- 1)
- return 1
- ;;
- esac
- host_ip=192.168.0.1
- netmask=255.255.255.0
- else
-
- result=`/usr/bin/dialog --title "$title" --clear --inputbox \
-"\n"\
-"What will be the IP address of your host\n"\
-"on your private network?:"\
- 10 50 $host_ip \
- 2>&1 >/dev/tty `
-
- case $? in
- 0)
- if [ -z "$result" ]; then
- return 1
- fi
- host_ip=$result
- ;;
- 1)
- return 1
- ;;
- esac
-
- result=`/usr/bin/dialog --title "$title" --clear --inputbox \
-"\n"\
-"What will be the netmask of your private\n"\
-"network?:"\
- 10 50 $netmask \
- 2>&1 >/dev/tty `
-
- case $? in
- 0)
- if [ -z "$result" ]; then
- return 1
- fi
- netmask=$result
- ;;
- 1)
- return 1
- ;;
- esac
- return 0;
- fi
-}
-
-do_network() {
- while true; do
- get_network_settings
-
- if [ "X$bridged" != "XYES" ]; then
- /usr/bin/dialog --title "Confirmation" --clear --yesno \
-"\n"\
-"Are the following options correct?\n\n"\
-"Configuration: host only\n"\
-"IP address: $host_ip\n"\
-"Netmask: $netmask\n"\
- 10 50
- [ $? -eq 0 ] && return 0
- else
- /usr/bin/dialog --title "Confirmation" --clear --yesno \
-"\n"\
-"Are the following options correct?\n\n"\
-"Configuration: bridged\n"\
-"Interface: $bdg_interface\n"\
- 10 50
- [ $? -eq 0 ] && return 0
- fi
-
- /usr/bin/dialog --title "Confirmation" --clear --yesno \
-"\n"\
-"Do you want to edit network options again?\n"\
- 10 50
- [ $? -eq 0 ] && continue
-
- /usr/bin/dialog --title "Confirmation" --clear --yesno \
-"\n"\
-"Do you want to continue without networking?\n"\
- 10 50
- [ $? -eq 0 ] && return 1
-
- host_ip=$VMNET_HOST_IP
- netmask=$VMNET_NETMASK
-
- return 0;
- done
-}
-
-networking=0
-if [ _$BATCH = _ ]; then
- do_network
-
- if [ $? -eq 0 ]; then
- networking=1
- if [ X$bridged = XYES ]; then
- /usr/bin/dialog --title "$title" --infobox \
-"\n"\
-"The following options will be used.\n\n"\
-"Configuration: bridged\n"\
-"Interface: $bdg_interface\n"\
- 10 50
- else
- /usr/bin/dialog --title "$title" --infobox \
-"\n"\
-"The following options will be used.\n\n"\
-"Configuration: host only\n"\
-"IP address: $host_ip\n"\
-"Netmask: $netmask\n"\
- 10 50
- fi
- fi
-else #BATCH
- [ -f ${WRKDIR}/Makefile.inc.net ] && exit 0
-fi #BATCH
-
-(
-exec > ${WRKDIR}/Makefile.inc.net
-
-echo '#' `date`
-echo VMNET_BRIDGED=$bridged
-echo VMNET_BRIDGED_INTERFACE=$bdg_interface
-echo VMNET_HOST_IP=$host_ip
-echo VMNET_NETMASK=$netmask
-echo VMNET_NETWORKING=$networking
-)
-
-exit 0
diff --git a/emulators/vmware2/scripts/pre-install b/emulators/vmware2/scripts/pre-install
deleted file mode 100644
index 9539dabbd9be..000000000000
--- a/emulators/vmware2/scripts/pre-install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-echo Setup Linux compatible /dev directory
-linux_dev=${LINUXBASE}/dev
-if [ ! -d $linux_dev ]; then
- echo Creating $linux_dev
- mkdir $linux_dev
- chown root:wheel $linux_dev
- chmod 755 $linux_dev
-fi
-echo Creating $linux_dev/tty\?
-for n in 0 1 2 3 4 5 6 7 8 9; do
- ln -s /dev/ttyv$n $linux_dev/tty`expr 1 + $n`;
-done
-ln -s /dev/ttyva ${linux_dev}/tty11
-ln -s /dev/ttyvb ${linux_dev}/tty12
-ln -s ${linux_dev}/tty1 ${linux_dev}/tty0
-mknod ${linux_dev}/null c 2 2
-chmod 666 ${linux_dev}/null
-rm -f /compat/linux/dev/vmnet1
-if [ "$OSVERSION" -lt "500104" ]; then
- echo Creating vmnet1 node
- mknod /compat/linux/dev/vmnet1 c 149 ${VMNET1_MINOR}
-fi
-echo Creating $linux_dev/hd\?
-mknod ${linux_dev}/hda b 0 0x00010002
-mknod ${linux_dev}/hdb b 0 0x0001000a
-# Do not enable below, because vmware-wizard is locked when
-# doing something like access("/dev/hdc"...)
-#mknod ${linux_dev}/hdc b 0 0x00010012
-#mknod ${linux_dev}/hdd b 0 0x0001001a
-echo Done
diff --git a/finance/Makefile b/finance/Makefile
index 85980431088c..1d647b9e08d5 100644
--- a/finance/Makefile
+++ b/finance/Makefile
@@ -6,7 +6,6 @@
SUBDIR += aqbanking
SUBDIR += aqmoney
SUBDIR += cbb
- SUBDIR += ccard
SUBDIR += expense
SUBDIR += gnofin
SUBDIR += gnomepm
diff --git a/finance/ccard/Makefile b/finance/ccard/Makefile
deleted file mode 100644
index b319361dcc19..000000000000
--- a/finance/ccard/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for: ccard
-# Date created: 12 Aug 2005
-# Whom: Emanuel Haupt <ehaupt@critical.ch>
-#
-# $FreeBSD$
-#
-
-PORTNAME= ccard
-PORTVERSION= 1.1
-CATEGORIES= finance
-MASTER_SITES= http://critical.ch/distfiles/ \
- http://energy.critical.ch/distfiles/
-DISTNAME= ${PORTNAME}.${PORTVERSION}
-
-MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= A command line offline credit card validator/analyzer
-
-DEPRECATED= Project disappeared from the internet
-EXPIRATION_DATE=2006-12-03
-
-GNU_CONFIGURE= yes
-
-PLIST_FILES= bin/ccard
-MAN1= ccard.1
-
-post-configure:
- ${REINPLACE_CMD} -e 's/^CFLAGS/CFLAGS?/' ${WRKSRC}/Makefile
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/man1/${PORTNAME}.1 ${MANPREFIX}/man/man1
-
-.include <bsd.port.mk>
diff --git a/finance/ccard/distinfo b/finance/ccard/distinfo
deleted file mode 100644
index 4f1dc72f2dde..000000000000
--- a/finance/ccard/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ccard.1.1.tar.gz) = d0532c30b42834c3c99cc8e94d0069a3
-SHA256 (ccard.1.1.tar.gz) = f5d3e9f5bf6c4af519529011abfe74bf3abb61c5ae352c586a5d87e68497e479
-SIZE (ccard.1.1.tar.gz) = 25077
diff --git a/finance/ccard/pkg-descr b/finance/ccard/pkg-descr
deleted file mode 100644
index ed90cdffffa1..000000000000
--- a/finance/ccard/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The CCard program is a program to validate credit card numbers.
-
-It can also determine the following credit card types:
-
- * Mastercard
- * Visa
- * American Express
- * Diners Club/Carte Blanche
- * Discover
- * enRoute
- * Japanese Credit Bureau
- * Australian Bankcard
-
-- ehaupt
-ehaupt@critical.ch