summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emulators/Makefile10
-rw-r--r--emulators/suse100_32_gdk-pixbuf/Makefile5
-rw-r--r--emulators/suse100_32_gtk/Makefile5
-rw-r--r--emulators/suse100_32_vmware/Makefile5
-rw-r--r--emulators/suse100_gdk-pixbuf/DESCR6
-rw-r--r--emulators/suse100_gdk-pixbuf/Makefile14
-rw-r--r--emulators/suse100_gdk-pixbuf/distinfo11
-rw-r--r--emulators/suse100_gtk/DESCR6
-rw-r--r--emulators/suse100_gtk/Makefile15
-rw-r--r--emulators/suse100_gtk/distinfo20
-rw-r--r--emulators/suse100_vmware/DEINSTALL9
-rw-r--r--emulators/suse100_vmware/DESCR5
-rw-r--r--emulators/suse100_vmware/INSTALL158
-rw-r--r--emulators/suse100_vmware/Makefile15
-rw-r--r--emulators/suse100_vmware/distinfo11
-rw-r--r--emulators/suse113_32_vmware/Makefile5
-rw-r--r--emulators/suse113_vmware/DEINSTALL9
-rw-r--r--emulators/suse113_vmware/DESCR5
-rw-r--r--emulators/suse113_vmware/INSTALL158
-rw-r--r--emulators/suse113_vmware/Makefile14
-rw-r--r--emulators/suse113_vmware/distinfo8
-rw-r--r--meta-pkgs/suse100/Makefile8
-rw-r--r--meta-pkgs/suse113/Makefile5
-rw-r--r--mk/emulator/linux.mk5
24 files changed, 9 insertions, 503 deletions
diff --git a/emulators/Makefile b/emulators/Makefile
index 83d997e9482..707ef19596c 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2012/03/17 04:59:33 obache Exp $
+# $NetBSD: Makefile,v 1.196 2012/03/17 06:08:15 obache Exp $
#
COMMENT= Emulators for other operating systems
@@ -118,9 +118,7 @@ SUBDIR+= suse100_32_compat
SUBDIR+= suse100_32_expat
SUBDIR+= suse100_32_fontconfig
SUBDIR+= suse100_32_freetype2
-SUBDIR+= suse100_32_gdk-pixbuf
SUBDIR+= suse100_32_glx
-SUBDIR+= suse100_32_gtk
SUBDIR+= suse100_32_gtk2
SUBDIR+= suse100_32_krb5
SUBDIR+= suse100_32_libcups
@@ -134,7 +132,6 @@ SUBDIR+= suse100_32_openmotif
SUBDIR+= suse100_32_openssl
SUBDIR+= suse100_32_resmgr
SUBDIR+= suse100_32_slang
-SUBDIR+= suse100_32_vmware
SUBDIR+= suse100_32_x11
SUBDIR+= suse100_alsa
SUBDIR+= suse100_aspell
@@ -143,9 +140,7 @@ SUBDIR+= suse100_compat
SUBDIR+= suse100_expat
SUBDIR+= suse100_fontconfig
SUBDIR+= suse100_freetype2
-SUBDIR+= suse100_gdk-pixbuf
SUBDIR+= suse100_glx
-SUBDIR+= suse100_gtk
SUBDIR+= suse100_gtk2
SUBDIR+= suse100_krb5
SUBDIR+= suse100_libcups
@@ -160,7 +155,6 @@ SUBDIR+= suse100_openmotif
SUBDIR+= suse100_openssl
SUBDIR+= suse100_resmgr
SUBDIR+= suse100_slang
-SUBDIR+= suse100_vmware
SUBDIR+= suse100_x11
SUBDIR+= suse113_32_alsa
SUBDIR+= suse113_32_aspell
@@ -185,7 +179,6 @@ SUBDIR+= suse113_32_openmotif
SUBDIR+= suse113_32_openssl
SUBDIR+= suse113_32_qt4
SUBDIR+= suse113_32_slang
-SUBDIR+= suse113_32_vmware
SUBDIR+= suse113_32_x11
SUBDIR+= suse113_alsa
SUBDIR+= suse113_aspell
@@ -211,7 +204,6 @@ SUBDIR+= suse113_openmotif
SUBDIR+= suse113_openssl
SUBDIR+= suse113_qt4
SUBDIR+= suse113_slang
-SUBDIR+= suse113_vmware
SUBDIR+= suse113_x11
SUBDIR+= swarm
SUBDIR+= tme
diff --git a/emulators/suse100_32_gdk-pixbuf/Makefile b/emulators/suse100_32_gdk-pixbuf/Makefile
deleted file mode 100644
index cf2d832e5e7..00000000000
--- a/emulators/suse100_32_gdk-pixbuf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/08/01 18:52:26 jlam Exp $
-
-SUSE_COMPAT32= yes
-
-.include "${.CURDIR}/../suse100_gdk-pixbuf/Makefile"
diff --git a/emulators/suse100_32_gtk/Makefile b/emulators/suse100_32_gtk/Makefile
deleted file mode 100644
index 01aeec08c77..00000000000
--- a/emulators/suse100_32_gtk/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/08/01 18:52:26 jlam Exp $
-
-SUSE_COMPAT32= yes
-
-.include "${.CURDIR}/../suse100_gtk/Makefile"
diff --git a/emulators/suse100_32_vmware/Makefile b/emulators/suse100_32_vmware/Makefile
deleted file mode 100644
index f0cfa5915d6..00000000000
--- a/emulators/suse100_32_vmware/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/08/01 18:52:29 jlam Exp $
-
-SUSE_COMPAT32= yes
-
-.include "${.CURDIR}/../suse100_vmware/Makefile"
diff --git a/emulators/suse100_gdk-pixbuf/DESCR b/emulators/suse100_gdk-pixbuf/DESCR
deleted file mode 100644
index dc8cea9566b..00000000000
--- a/emulators/suse100_gdk-pixbuf/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution.
-Please visit http://www.suse.com/ for more information about SuSE
-Linux.
-
-This package supports running ELF binaries linked with glibc2 that
-require gdk-pixbuf shared libraries.
diff --git a/emulators/suse100_gdk-pixbuf/Makefile b/emulators/suse100_gdk-pixbuf/Makefile
deleted file mode 100644
index 7da8eb25961..00000000000
--- a/emulators/suse100_gdk-pixbuf/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:44 jlam Exp $
-
-DISTNAME= suse_gdk-pixbuf-${SUSE_VERSION}
-PKGREVISION= 3
-CATEGORIES= emulators
-DISTFILES= gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Linux compatibility package for gdk-pixbuf
-
-EMUL_MODULES.linux= gtk
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gdk-pixbuf/distinfo b/emulators/suse100_gdk-pixbuf/distinfo
deleted file mode 100644
index f9bcff50a98..00000000000
--- a/emulators/suse100_gdk-pixbuf/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-SHA1 (suse100/i586/gdk-pixbuf-0.22.0-72.3.i586.rpm) = 2a19277535849c43f262aa3d92ff9ab562c8c192
-RMD160 (suse100/i586/gdk-pixbuf-0.22.0-72.3.i586.rpm) = 6de2bc6c4c28dbb19c8bcb548acbadf7a33afba6
-Size (suse100/i586/gdk-pixbuf-0.22.0-72.3.i586.rpm) = 171225 bytes
-SHA1 (suse100/ppc/gdk-pixbuf-0.22.0-72.3.ppc.rpm) = b7aa7a4720e09cff42f925154a102c4c073868ac
-RMD160 (suse100/ppc/gdk-pixbuf-0.22.0-72.3.ppc.rpm) = 1f7076d8f220aec308a7fd6c5a1822e3e333d3bb
-Size (suse100/ppc/gdk-pixbuf-0.22.0-72.3.ppc.rpm) = 199734 bytes
-SHA1 (suse100/x86_64/gdk-pixbuf-0.22.0-72.3.x86_64.rpm) = 83ac8116f04864749b21031b1c45aeff9db9c878
-RMD160 (suse100/x86_64/gdk-pixbuf-0.22.0-72.3.x86_64.rpm) = 0835ee12577465eebba06e24fe494f000c79ae60
-Size (suse100/x86_64/gdk-pixbuf-0.22.0-72.3.x86_64.rpm) = 181471 bytes
diff --git a/emulators/suse100_gtk/DESCR b/emulators/suse100_gtk/DESCR
deleted file mode 100644
index 91db428d711..00000000000
--- a/emulators/suse100_gtk/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution.
-Please visit http://www.suse.com/ for more information about SuSE
-Linux.
-
-This package supports running ELF binaries linked with glibc2 that
-require GTK+-1.x shared libraries.
diff --git a/emulators/suse100_gtk/Makefile b/emulators/suse100_gtk/Makefile
deleted file mode 100644
index 7001ae0a831..00000000000
--- a/emulators/suse100_gtk/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2008/05/25 14:45:17 tron Exp $
-
-DISTNAME= suse_gtk-${SUSE_VERSION}
-PKGREVISION= 2
-CATEGORIES= emulators
-DISTFILES= glib-1.2.10-595.${SUSE_ARCH}.rpm \
- gtk-1.2.10-888.${SUSE_ARCH}.rpm
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Linux compatibility package for GTK+-1.x
-
-EMUL_MODULES.linux= x11
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gtk/distinfo b/emulators/suse100_gtk/distinfo
deleted file mode 100644
index 8bf1e69d2d5..00000000000
--- a/emulators/suse100_gtk/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/04/18 14:02:07 tron Exp $
-
-SHA1 (suse100/i586/glib-1.2.10-595.i586.rpm) = 11e5ee642ccd90428fa010a056bbe59886f330ff
-RMD160 (suse100/i586/glib-1.2.10-595.i586.rpm) = 1bbd780b9acef3561f2da4c271671968090f32d7
-Size (suse100/i586/glib-1.2.10-595.i586.rpm) = 118007 bytes
-SHA1 (suse100/i586/gtk-1.2.10-888.i586.rpm) = 7f55bb1df76f5bc89adbc21af40f77af94658eb2
-RMD160 (suse100/i586/gtk-1.2.10-888.i586.rpm) = 505880707817835fdde0071c8dcf4136dfa3f67b
-Size (suse100/i586/gtk-1.2.10-888.i586.rpm) = 814624 bytes
-SHA1 (suse100/ppc/glib-1.2.10-595.ppc.rpm) = d96428d46a8eec9a850a2b7f64df6cf45231befb
-RMD160 (suse100/ppc/glib-1.2.10-595.ppc.rpm) = 032f1bf87d5f54605c46716adc29ac87caa658ea
-Size (suse100/ppc/glib-1.2.10-595.ppc.rpm) = 136932 bytes
-SHA1 (suse100/ppc/gtk-1.2.10-888.ppc.rpm) = 8164b5299580f9bd351602d8f80719a62e95d987
-RMD160 (suse100/ppc/gtk-1.2.10-888.ppc.rpm) = c403c77a53436824ddff813a3f248b14abf4e9c6
-Size (suse100/ppc/gtk-1.2.10-888.ppc.rpm) = 895058 bytes
-SHA1 (suse100/x86_64/glib-1.2.10-595.x86_64.rpm) = c9525d3a2412f7130485878d984c9bd4f83c8c23
-RMD160 (suse100/x86_64/glib-1.2.10-595.x86_64.rpm) = 30810ee4694a94564667cd12631372204280a12c
-Size (suse100/x86_64/glib-1.2.10-595.x86_64.rpm) = 134046 bytes
-SHA1 (suse100/x86_64/gtk-1.2.10-888.x86_64.rpm) = 9fb52de9b3539a2b16e56acf6422423f14d53fc4
-RMD160 (suse100/x86_64/gtk-1.2.10-888.x86_64.rpm) = 3e49dc59b7be2b75ceb4c843ce7b023d2adc3b17
-Size (suse100/x86_64/gtk-1.2.10-888.x86_64.rpm) = 900131 bytes
diff --git a/emulators/suse100_vmware/DEINSTALL b/emulators/suse100_vmware/DEINSTALL
deleted file mode 100644
index eaf7327d1f8..00000000000
--- a/emulators/suse100_vmware/DEINSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:00 jlam Exp $
-
-case "${STAGE}" in
-DEINSTALL)
- # Run any actions that require root privileges.
- ${TEST} ! -x ./+ROOT_ACTIONS ||
- ./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1
- ;;
-esac
diff --git a/emulators/suse100_vmware/DESCR b/emulators/suse100_vmware/DESCR
deleted file mode 100644
index efff03682f1..00000000000
--- a/emulators/suse100_vmware/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution.
-Please visit http://www.suse.com/ for more information about SuSE
-Linux.
-
-This package is a helper package for running VMware.
diff --git a/emulators/suse100_vmware/INSTALL b/emulators/suse100_vmware/INSTALL
deleted file mode 100644
index c0ef7aa3968..00000000000
--- a/emulators/suse100_vmware/INSTALL
+++ /dev/null
@@ -1,158 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2007/08/22 02:19:15 jlam Exp $
-
-# Generate a +ROOT_ACTIONS script that runs certain actions that require
-# superuser privileges.
-#
-case "${STAGE},$1" in
-UNPACK,|UNPACK,+ROOT_ACTIONS)
- ${CAT} > ./+ROOT_ACTIONS << 'EOF'
-#!@SH@
-#
-# +ROOT_ACTIONS - run actions requiring superuser privileges
-#
-# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir]
-#
-# This script runs certain actions that require superuser privileges.
-# If such privileges are not available, then simply output a message
-# asking the user to run this script with the appropriate elevated
-# privileges.
-#
-# Lines starting with "# SYMLINK: " are data read by this script that
-# name the source paths and corresponding symlink that is managed by
-# this script. If the symlink path is relative, then it is taken to be
-# relative to ${PKG_PREFIX}. The source path is always unchanged.
-#
-# # SYMLINK: /dev/rcd0a ${EMULSUBDIR}/dev/cdrom
-#
-
-CAT="@CAT@"
-CHMOD="@CHMOD@"
-ECHO="@ECHO@"
-ID="@ID@"
-LN="@LN@"
-PWD_CMD="@PWD_CMD@"
-RM="@RM@"
-SED="@SED@"
-TEST="@TEST@"
-
-SELF=$0
-ACTION=$1
-
-CURDIR=`${PWD_CMD}`
-PKG_METADATA_DIR="${2-${CURDIR}}"
-: ${PKGNAME=${PKG_METADATA_DIR##*/}}
-: ${PKG_PREFIX=@PREFIX@}
-
-ROOT_ACTIONS_COOKIE="./+ROOT_ACTIONS_done"
-EUID=`${ID} -u`
-
-exitcode=0
-case $ACTION,$EUID in
-ADD,0)
- ${ECHO} "" > ${ROOT_ACTIONS_COOKIE}
- ${CHMOD} g+w ${ROOT_ACTIONS_COOKIE}
- ${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} |
- while read src dst; do
- case $src in
- "") continue ;;
- esac
- case $dst in
- "") continue ;;
- [!/]*) dst="${PKG_PREFIX}/$dst" ;;
- esac
-
- if ${TEST} ! -e "$dst"; then
- ${ECHO} "${PKGNAME}: linking $dst -> $src"
- ${LN} -fs "$src" "$dst"
- else
- ${ECHO} "${PKGNAME}: $dst already exists"
- fi
- done
- ;;
-
-REMOVE,0)
- ${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} |
- while read src dst; do
- case $src in
- "") continue ;;
- esac
- case $dst in
- "") continue ;;
- [!/]*) dst="${PKG_PREFIX}/$dst" ;;
- esac
-
- if ${TEST} -h "$dst"; then
- ${ECHO} "${PKGNAME}: removing $dst"
- ${RM} -f "$dst"
- fi
- done
- ${RM} -f ${ROOT_ACTIONS_COOKIE}
- ;;
-
-ADD,*)
- if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then
- ${CAT} << EOM
-==============================================================================
-Please run the following command with superuser privileges to complete
-the installation of ${PKGNAME}:
-
- cd ${PKG_METADATA_DIR} && ${SELF} ADD
-
-==============================================================================
-EOM
- fi
- ;;
-
-REMOVE,*)
- if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then
- ${CAT} << EOM
-==============================================================================
-Please run the following command with superuser privileges to begin the
-removal of ${PKGNAME}:
-
- cd ${PKG_METADATA_DIR} && ${SELF} REMOVE
-
-Then, please run pkg_delete(1) again to complete the removal of this
-package.
-
-==============================================================================
-EOM
- exitcode=1
- fi
- ;;
-esac
-exit $exitcode
-
-EOF
- ${SED} -n "/^\# SYMLINK: /p" ${SELF} >> ./+ROOT_ACTIONS
- ${CHMOD} +x ./+ROOT_ACTIONS
- ;;
-esac
-
-# SYMLINK: /dev/rcd0a @EMULSUBDIR@/dev/cdrom
-# SYMLINK: /dev/rfd0a @EMULSUBDIR@/dev/fd0
-# SYMLINK: /dev/wd0d @EMULSUBDIR@/dev/hda
-# SYMLINK: /dev/wd1d @EMULSUBDIR@/dev/hdb
-# SYMLINK: /dev/wd2d @EMULSUBDIR@/dev/hdc
-# SYMLINK: /dev/wd3d @EMULSUBDIR@/dev/hdd
-# SYMLINK: /dev/sd0d @EMULSUBDIR@/dev/hde
-# SYMLINK: /dev/sd1d @EMULSUBDIR@/dev/hdf
-# SYMLINK: /dev/sd2d @EMULSUBDIR@/dev/hdg
-# SYMLINK: /dev/sd3d @EMULSUBDIR@/dev/hdh
-# SYMLINK: /dev/sd4d @EMULSUBDIR@/dev/hdi
-# SYMLINK: /dev/ttyE0 @EMULSUBDIR@/dev/tty1
-# SYMLINK: /dev/ttyE1 @EMULSUBDIR@/dev/tty2
-# SYMLINK: /dev/ttyE2 @EMULSUBDIR@/dev/tty3
-# SYMLINK: /dev/ttyE3 @EMULSUBDIR@/dev/tty4
-# SYMLINK: /dev/ttyE4 @EMULSUBDIR@/dev/tty5
-# SYMLINK: /dev/ttyE5 @EMULSUBDIR@/dev/tty6
-# SYMLINK: /dev/ttyE6 @EMULSUBDIR@/dev/tty7
-# SYMLINK: /dev/ttyE7 @EMULSUBDIR@/dev/tty8
-# SYMLINK: tty1 @EMULSUBDIR@/dev/tty0
-
-case "${STAGE}" in
-POST-INSTALL)
- ${TEST} ! -x ./+ROOT_ACTIONS ||
- ./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR}
- ;;
-esac
diff --git a/emulators/suse100_vmware/Makefile b/emulators/suse100_vmware/Makefile
deleted file mode 100644
index 7aa29d62549..00000000000
--- a/emulators/suse100_vmware/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/08/22 02:19:15 jlam Exp $
-
-DISTNAME= suse_vmware-${SUSE_VERSION}
-PKGREVISION= 2
-CATEGORIES= emulators
-DISTFILES= grep-2.5.1a-5.${SUSE_ARCH}.rpm
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Linux compatibility package to help run VMware
-
-EMUL_MODULES.linux= base x11
-RPMIGNOREPATH= usr
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_vmware/distinfo b/emulators/suse100_vmware/distinfo
deleted file mode 100644
index 41dd56c3353..00000000000
--- a/emulators/suse100_vmware/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/07/29 05:19:01 jlam Exp $
-
-SHA1 (suse100/i586/grep-2.5.1a-5.i586.rpm) = 728aab187b21e2e3ca8157a04e6bfec289c0fe43
-RMD160 (suse100/i586/grep-2.5.1a-5.i586.rpm) = 884f721b66cf236d7baccf83711495ed67529e52
-Size (suse100/i586/grep-2.5.1a-5.i586.rpm) = 179908 bytes
-SHA1 (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = 8a73f4feb5c263c33899d4466545f083d888b6fd
-RMD160 (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = a9da42c0b55eb8984a51c6b64f213ddb1e207537
-Size (suse100/ppc/grep-2.5.1a-5.ppc.rpm) = 187765 bytes
-SHA1 (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = 0727852e8e75fb8af48dc463882efe810e76378a
-RMD160 (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = cfde4f3da0f7a1fb463f46ef5dbaa9ef0b2a949a
-Size (suse100/x86_64/grep-2.5.1a-5.x86_64.rpm) = 182763 bytes
diff --git a/emulators/suse113_32_vmware/Makefile b/emulators/suse113_32_vmware/Makefile
deleted file mode 100644
index 0579aa0f2f2..00000000000
--- a/emulators/suse113_32_vmware/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/24 01:27:48 chs Exp $
-
-SUSE_COMPAT32= yes
-
-.include "${.CURDIR}/../suse113_vmware/Makefile"
diff --git a/emulators/suse113_vmware/DEINSTALL b/emulators/suse113_vmware/DEINSTALL
deleted file mode 100644
index 1d35cee6b6e..00000000000
--- a/emulators/suse113_vmware/DEINSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2010/09/24 01:28:12 chs Exp $
-
-case "${STAGE}" in
-DEINSTALL)
- # Run any actions that require root privileges.
- ${TEST} ! -x ./+ROOT_ACTIONS ||
- ./+ROOT_ACTIONS REMOVE ${PKG_METADATA_DIR} || exit 1
- ;;
-esac
diff --git a/emulators/suse113_vmware/DESCR b/emulators/suse113_vmware/DESCR
deleted file mode 100644
index efff03682f1..00000000000
--- a/emulators/suse113_vmware/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution.
-Please visit http://www.suse.com/ for more information about SuSE
-Linux.
-
-This package is a helper package for running VMware.
diff --git a/emulators/suse113_vmware/INSTALL b/emulators/suse113_vmware/INSTALL
deleted file mode 100644
index d1d36a1e1d9..00000000000
--- a/emulators/suse113_vmware/INSTALL
+++ /dev/null
@@ -1,158 +0,0 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2010/09/24 01:28:12 chs Exp $
-
-# Generate a +ROOT_ACTIONS script that runs certain actions that require
-# superuser privileges.
-#
-case "${STAGE},$1" in
-UNPACK,|UNPACK,+ROOT_ACTIONS)
- ${CAT} > ./+ROOT_ACTIONS << 'EOF'
-#!@SH@
-#
-# +ROOT_ACTIONS - run actions requiring superuser privileges
-#
-# Usage: ./+ROOT_ACTIONS ADD|REMOVE [metadatadir]
-#
-# This script runs certain actions that require superuser privileges.
-# If such privileges are not available, then simply output a message
-# asking the user to run this script with the appropriate elevated
-# privileges.
-#
-# Lines starting with "# SYMLINK: " are data read by this script that
-# name the source paths and corresponding symlink that is managed by
-# this script. If the symlink path is relative, then it is taken to be
-# relative to ${PKG_PREFIX}. The source path is always unchanged.
-#
-# # SYMLINK: /dev/rcd0a ${EMULSUBDIR}/dev/cdrom
-#
-
-CAT="@CAT@"
-CHMOD="@CHMOD@"
-ECHO="@ECHO@"
-ID="@ID@"
-LN="@LN@"
-PWD_CMD="@PWD_CMD@"
-RM="@RM@"
-SED="@SED@"
-TEST="@TEST@"
-
-SELF=$0
-ACTION=$1
-
-CURDIR=`${PWD_CMD}`
-PKG_METADATA_DIR="${2-${CURDIR}}"
-: ${PKGNAME=${PKG_METADATA_DIR##*/}}
-: ${PKG_PREFIX=@PREFIX@}
-
-ROOT_ACTIONS_COOKIE="./+ROOT_ACTIONS_done"
-EUID=`${ID} -u`
-
-exitcode=0
-case $ACTION,$EUID in
-ADD,0)
- ${ECHO} "" > ${ROOT_ACTIONS_COOKIE}
- ${CHMOD} g+w ${ROOT_ACTIONS_COOKIE}
- ${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} |
- while read src dst; do
- case $src in
- "") continue ;;
- esac
- case $dst in
- "") continue ;;
- [!/]*) dst="${PKG_PREFIX}/$dst" ;;
- esac
-
- if ${TEST} ! -e "$dst"; then
- ${ECHO} "${PKGNAME}: linking $dst -> $src"
- ${LN} -fs "$src" "$dst"
- else
- ${ECHO} "${PKGNAME}: $dst already exists"
- fi
- done
- ;;
-
-REMOVE,0)
- ${SED} -n "/^\# SYMLINK: /{s/^\# SYMLINK: //;p;}" ${SELF} |
- while read src dst; do
- case $src in
- "") continue ;;
- esac
- case $dst in
- "") continue ;;
- [!/]*) dst="${PKG_PREFIX}/$dst" ;;
- esac
-
- if ${TEST} -h "$dst"; then
- ${ECHO} "${PKGNAME}: removing $dst"
- ${RM} -f "$dst"
- fi
- done
- ${RM} -f ${ROOT_ACTIONS_COOKIE}
- ;;
-
-ADD,*)
- if ${TEST} ! -f ${ROOT_ACTIONS_COOKIE}; then
- ${CAT} << EOM
-==============================================================================
-Please run the following command with superuser privileges to complete
-the installation of ${PKGNAME}:
-
- cd ${PKG_METADATA_DIR} && ${SELF} ADD
-
-==============================================================================
-EOM
- fi
- ;;
-
-REMOVE,*)
- if ${TEST} -f ${ROOT_ACTIONS_COOKIE}; then
- ${CAT} << EOM
-==============================================================================
-Please run the following command with superuser privileges to begin the
-removal of ${PKGNAME}:
-
- cd ${PKG_METADATA_DIR} && ${SELF} REMOVE
-
-Then, please run pkg_delete(1) again to complete the removal of this
-package.
-
-==============================================================================
-EOM
- exitcode=1
- fi
- ;;
-esac
-exit $exitcode
-
-EOF
- ${SED} -n "/^\# SYMLINK: /p" ${SELF} >> ./+ROOT_ACTIONS
- ${CHMOD} +x ./+ROOT_ACTIONS
- ;;
-esac
-
-# SYMLINK: /dev/rcd0a @EMULSUBDIR@/dev/cdrom
-# SYMLINK: /dev/rfd0a @EMULSUBDIR@/dev/fd0
-# SYMLINK: /dev/wd0d @EMULSUBDIR@/dev/hda
-# SYMLINK: /dev/wd1d @EMULSUBDIR@/dev/hdb
-# SYMLINK: /dev/wd2d @EMULSUBDIR@/dev/hdc
-# SYMLINK: /dev/wd3d @EMULSUBDIR@/dev/hdd
-# SYMLINK: /dev/sd0d @EMULSUBDIR@/dev/hde
-# SYMLINK: /dev/sd1d @EMULSUBDIR@/dev/hdf
-# SYMLINK: /dev/sd2d @EMULSUBDIR@/dev/hdg
-# SYMLINK: /dev/sd3d @EMULSUBDIR@/dev/hdh
-# SYMLINK: /dev/sd4d @EMULSUBDIR@/dev/hdi
-# SYMLINK: /dev/ttyE0 @EMULSUBDIR@/dev/tty1
-# SYMLINK: /dev/ttyE1 @EMULSUBDIR@/dev/tty2
-# SYMLINK: /dev/ttyE2 @EMULSUBDIR@/dev/tty3
-# SYMLINK: /dev/ttyE3 @EMULSUBDIR@/dev/tty4
-# SYMLINK: /dev/ttyE4 @EMULSUBDIR@/dev/tty5
-# SYMLINK: /dev/ttyE5 @EMULSUBDIR@/dev/tty6
-# SYMLINK: /dev/ttyE6 @EMULSUBDIR@/dev/tty7
-# SYMLINK: /dev/ttyE7 @EMULSUBDIR@/dev/tty8
-# SYMLINK: tty1 @EMULSUBDIR@/dev/tty0
-
-case "${STAGE}" in
-POST-INSTALL)
- ${TEST} ! -x ./+ROOT_ACTIONS ||
- ./+ROOT_ACTIONS ADD ${PKG_METADATA_DIR}
- ;;
-esac
diff --git a/emulators/suse113_vmware/Makefile b/emulators/suse113_vmware/Makefile
deleted file mode 100644
index 9d81baf3e7d..00000000000
--- a/emulators/suse113_vmware/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2011/02/10 02:55:48 chs Exp $
-
-DISTNAME= suse_vmware-${SUSE_VERSION}
-CATEGORIES= emulators
-DISTFILES= grep-2.5.4-7.1.${SUSE_ARCH}.rpm
-
-MAINTAINER= chs@NetBSD.org
-COMMENT= Linux compatibility package to help run VMware
-
-EMUL_MODULES.linux= base x11
-RPMIGNOREPATH= usr
-
-.include "../../emulators/suse113_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse113_vmware/distinfo b/emulators/suse113_vmware/distinfo
deleted file mode 100644
index 0dae01fc26a..00000000000
--- a/emulators/suse113_vmware/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/24 01:28:12 chs Exp $
-
-SHA1 (suse113/i586/grep-2.5.4-7.1.i586.rpm) = e9c17b93376cc6a78b134f2330703d7f562f68d3
-RMD160 (suse113/i586/grep-2.5.4-7.1.i586.rpm) = e82657e5336697d525b3718e880d380a765eb29e
-Size (suse113/i586/grep-2.5.4-7.1.i586.rpm) = 164953 bytes
-SHA1 (suse113/x86_64/grep-2.5.4-7.1.x86_64.rpm) = 14b489e6ad01dbf36c2b182515807ff76cac65a0
-RMD160 (suse113/x86_64/grep-2.5.4-7.1.x86_64.rpm) = 97dc3035fc546647e6cca484ef7a4480e302b0b6
-Size (suse113/x86_64/grep-2.5.4-7.1.x86_64.rpm) = 167022 bytes
diff --git a/meta-pkgs/suse100/Makefile b/meta-pkgs/suse100/Makefile
index 8157a655432..4b1dd1ae52a 100644
--- a/meta-pkgs/suse100/Makefile
+++ b/meta-pkgs/suse100/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/12/19 12:27:30 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2012/03/17 06:08:15 obache Exp $
DISTNAME= suse-${SUSE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= emulators meta-pkgs
MASTER_SITES= # empty
@@ -9,8 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= SUSE-based Linux binary emulation environment
EMUL_MODULES.linux= aspell base compat cups expat fontconfig \
- freetype2 gdk-pixbuf glx gtk gtk2 jpeg locale \
- motif openssl png slang tiff vmware x11 xml2
+ freetype2 glx gtk jpeg locale \
+ motif openssl png slang tiff x11 xml2
EMUL_PKG_FMT= plain
META_PACKAGE= yes
diff --git a/meta-pkgs/suse113/Makefile b/meta-pkgs/suse113/Makefile
index 3f32a1b8bba..a4ab8a9a697 100644
--- a/meta-pkgs/suse113/Makefile
+++ b/meta-pkgs/suse113/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/09/24 17:04:43 chs Exp $
+# $NetBSD: Makefile,v 1.3 2012/03/17 06:08:16 obache Exp $
DISTNAME= suse-${SUSE_VERSION}
+PKGREVISION= 1
CATEGORIES= emulators meta-pkgs
MASTER_SITES= # empty
@@ -9,7 +10,7 @@ COMMENT= SUSE-based Linux binary emulation environment
EMUL_MODULES.linux= alsa aspell base compat cups expat fontconfig \
freetype2 glx gtk2 jpeg krb5 libsigc++2 locale \
- motif openssl png qt4 slang tiff vmware x11 xml2
+ motif openssl png qt4 slang tiff x11 xml2
EMUL_PKG_FMT= plain
META_PACKAGE= yes
diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk
index a1b8dba75e8..9602804406d 100644
--- a/mk/emulator/linux.mk
+++ b/mk/emulator/linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: linux.mk,v 1.15 2012/03/17 04:59:34 obache Exp $
+# $NetBSD: linux.mk,v 1.16 2012/03/17 06:08:17 obache Exp $
#
# Linux binary emulation framework
#
@@ -68,9 +68,7 @@ _EMUL_MODULES+= drm
_EMUL_MODULES+= expat
_EMUL_MODULES+= fontconfig
_EMUL_MODULES+= freetype2
-_EMUL_MODULES+= gdk-pixbuf
_EMUL_MODULES+= glx
-_EMUL_MODULES+= gtk
_EMUL_MODULES+= gtk2
_EMUL_MODULES+= jpeg
_EMUL_MODULES+= krb5
@@ -83,7 +81,6 @@ _EMUL_MODULES+= qt4
_EMUL_MODULES+= resmgr
_EMUL_MODULES+= slang
_EMUL_MODULES+= tiff
-_EMUL_MODULES+= vmware
_EMUL_MODULES+= x11
_EMUL_MODULES+= xml2