Get rid of the old and vulnerable linux binary version of OpenOffice 3.

misc/openoffice3 is a good enough substitute.

12 files changed, 1 insertions, 217 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 3dcaf194f76..9ee114b4e6e 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.409 2013/12/02 12:33:05 wiz Exp $
+# $NetBSD: Makefile,v 1.410 2013/12/08 13:22:38 bad Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -165,7 +165,6 @@ SUBDIR+=	libkgeomap
 SUBDIR+=	libkvkontakte
 SUBDIR+=	libquantum
 SUBDIR+=	libreoffice
-SUBDIR+=	libreoffice3-bin
 SUBDIR+=	libreoffice4
 SUBDIR+=	libreoffice4-bin
 SUBDIR+=	libutf
diff --git a/misc/openoffice3-bin/DEINSTALL b/misc/openoffice3-bin/DEINSTALL
deleted file mode 100644
index 8487fb6980e..00000000000
--- a/misc/openoffice3-bin/DEINSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2010/03/02 22:57:03 bad Exp $
-#
-# This file contains the contents of the OOo rpm pre-uninstall,
-# post-uninstall scripts.
-
-PRODUCTINSTALLLOCATION=${PKG_PREFIX}/opt/openoffice.org@VER@
-
-case ${STAGE} in
-DEINSTALL)
-	if [ -h $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ]
-	then
-	  ${RM} $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1
-	fi
-	;;
-esac
diff --git a/misc/openoffice3-bin/DESCR b/misc/openoffice3-bin/DESCR
deleted file mode 100644
index 0eecb8e7ef8..00000000000
--- a/misc/openoffice3-bin/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
-  * A universal word processing application for creating business
-    letters, extensive text documents, professional layouts, and HTML
-    documents.
-  * A sophisticated application for performing advanced spreadsheet
-    functions, such as analyzing figures, creating lists, and viewing data.
-  * A tool for creating effective eye-catching presentations.
-  * A vector-oriented draw module that enables the creation of 3D
-    illustrations.
diff --git a/misc/openoffice3-bin/INSTALL b/misc/openoffice3-bin/INSTALL
deleted file mode 100644
index 8e807bbf7af..00000000000
--- a/misc/openoffice3-bin/INSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2010/03/02 22:57:03 bad Exp $
-#
-# This file contains the contents of the OOo rpm pre-install, post-install
-# scripts.
-
-PRODUCTINSTALLLOCATION=${PKG_PREFIX}/opt/openoffice.org@VER@
-
-case ${STAGE} in
-POST-INSTALL)
-	if [ ! -f $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ]
-	then
-	  if [ -f $PRODUCTINSTALLLOCATION/program/filter/libfreetype.so.6 ]
-	  then
-	    ${LN} -s $PRODUCTINSTALLLOCATION/program/filter/libfreetype.so.6 $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1
-	  fi
-	fi
-	;;
-esac
diff --git a/misc/openoffice3-bin/Makefile b/misc/openoffice3-bin/Makefile
deleted file mode 100644
index 9dd5268ac7f..00000000000
--- a/misc/openoffice3-bin/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 09:57:31 asau Exp $
-
-DISTNAME=		openoffice3-bin	# overridden below
-PKGNAME=		openoffice3-bin-${OO_RELEASE}
-PKGREVISION=		2
-CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
-
-MAINTAINER=		bad@NetBSD.org
-HOMEPAGE=		http://www.openoffice.org/
-COMMENT=		Integrated office productivity suite (binary pkg)
-
-CONFLICTS+=		staroffice-[0-9]*
-CONFLICTS+=		openoffice-[0-9]*
-CONFLICTS+=		openoffice-bin-[0-9]*
-CONFLICTS+=		openoffice2-bin-[0-9]*
-CONFLICTS+=		openoffice2-[0-9]*
-CONFLICTS+=		openoffice3-[0-9]*
-CONFLICTS+=		openoffice-linux-[0-9]*
-
-OO_VER=			3
-OO_BASEVER=		3.2
-OO_RELEASE=		3.2.1
-PLIST_SUBST+=		VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
-MESSAGE_SUBST+=		VER=${OO_VER:Q}
-FILES_SUBST+=		VER=${OO_VER:Q}
-
-TEMP?=			${WRKSRC}
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-BUILD_DIRS=		# empty
-
-PLIST_SRC=		${PKGDIR}/PLIST.proglinks
-PLIST_SRC+=		${WRKDIR}/PLIST
-PLIST_SRC+=		${PKGDIR}/PLIST.dirs
-
-EMUL_PLATFORMS=		linux-i386
-#EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
-EMUL_MODULES.linux=	compat freetype2 x11
-EMUL_REQD=		suse>=10.0
-
-EMUL_PKG_FMT=		rpm
-RPMFILES=		${WRKSRC}/RPMS/*.rpm
-RPM2PKG_PREFIX=		${DESTDIR}${PREFIX}
-RPM2PKG_SUBPREFIX=	# empty
-RPM2PKG_STAGE=		do-install
-RUN_LDCONFIG=		no
-
-USE_TOOLS+=	patch
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${EMUL_PLATFORM} == "linux-i386"
-DISTNAME=		OOo_${OO_RELEASE}_Linux_x86_install-rpm_en-US
-WRKSRC=			${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502
-.elif ${EMUL_PLATFORM} == "solaris-i386"
-DISTNAME=		OOo_${OO_RELEASE}_Solaris_x86_install_en-US
-WRKSRC=			${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
-.elif ${EMUL_PLATFORM} == "solaris-sparc"
-DISTNAME=		OOo_${OO_RELEASE}_Solaris_Sparc_install_en-US
-WRKSRC=			${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
-.endif
-
-.include "options.mk"
-
-INSTALLATION_DIRS= bin
-
-do-install:
-	${PATCH} -d ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch
-	${RM} -f ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program/soffice.orig
-	${PATCH} -d ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch
-	${RM} -f ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program/spadmin.orig
-	uniq ${RPM2PKG_PLIST} | \
-		sed -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST
-.if defined(PKG_JVM) && !empty(PKG_JVM)
-	${RM} -f ${DESTDIR}${PREFIX}/bin/soffice
-	${SED}  -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
-		-e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
-		< ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice
-	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice
-.else
-	${LN} -sf ../opt/openoffice.org${OO_VER}/program/soffice ${DESTDIR}${PREFIX}/bin/soffice
-.endif
-.for i in scalc sdraw simpress smath spadmin swriter
-	${LN} -sf ../opt/openoffice.org${OO_VER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/openoffice3-bin/PLIST.dirs b/misc/openoffice3-bin/PLIST.dirs
deleted file mode 100644
index 726f70f6512..00000000000
--- a/misc/openoffice3-bin/PLIST.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.dirs,v 1.1 2010/03/02 22:57:03 bad Exp $
-@pkgdir opt/openoffice.org/basis${BASEVER}
-@pkgdir opt/openoffice.org
-@pkgdir opt/openoffice.org${VER}
-@pkgdir opt
diff --git a/misc/openoffice3-bin/PLIST.proglinks b/misc/openoffice3-bin/PLIST.proglinks
deleted file mode 100644
index e77f2259487..00000000000
--- a/misc/openoffice3-bin/PLIST.proglinks
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.proglinks,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/smath
-bin/soffice
-bin/spadmin
-bin/swriter
diff --git a/misc/openoffice3-bin/distinfo b/misc/openoffice3-bin/distinfo
deleted file mode 100644
index 063d117183e..00000000000
--- a/misc/openoffice3-bin/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2010/06/15 16:48:19 bad Exp $
-
-SHA1 (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = 4848b76debd50b3ec063d2b74f11cfa6a710f000
-RMD160 (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = ae7cd0255c9b51f73500c3133eba036d42b556a5
-Size (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = 153892134 bytes
diff --git a/misc/openoffice3-bin/files/soffice b/misc/openoffice3-bin/files/soffice
deleted file mode 100644
index aad31dade27..00000000000
--- a/misc/openoffice3-bin/files/soffice
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-#	$NetBSD: soffice,v 1.2 2010/03/02 22:57:03 bad Exp $
-#
-SOINST=@@PREFIX@@/opt/openoffice.org@@OO_VER@@
-
-# make sure we can find `whoami` on solaris
-PATH=${PATH}:/usr/ucb
-
-# add the chosen java directory to $PATH to allow OOo to
-# automatically find it
-PATH=${PATH}:@@JAVA_HOME@@
-
-# default data seg size is too small for java
-ulimit -d `ulimit -H -d`
-
-exec ${SOINST}/program/soffice "$@"
diff --git a/misc/openoffice3-bin/files/soffice-patch b/misc/openoffice3-bin/files/soffice-patch
deleted file mode 100644
index 416b9f44fe0..00000000000
--- a/misc/openoffice3-bin/files/soffice-patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# $NetBSD: soffice-patch,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $
-#
-
---- soffice.orig	2009-01-18 23:49:18.000000000 +0100
-+++ soffice	2009-01-19 00:10:22.000000000 +0100
-@@ -73,6 +73,10 @@
-   esac
- done
- 
-+# Set LD_LIBRARY_PATH so that javaldx finds libuno_sal.so.3:
-+LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/../ure/lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-+export LD_LIBRARY_PATH
-+
- # extend the ld_library_path for java: javaldx checks the sofficerc for us
- if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
diff --git a/misc/openoffice3-bin/files/spadmin-patch b/misc/openoffice3-bin/files/spadmin-patch
deleted file mode 100644
index 18d1787eb85..00000000000
--- a/misc/openoffice3-bin/files/spadmin-patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# $NetBSD: spadmin-patch,v 1.1 2009/12/02 22:22:57 bad Exp $
-#
-
---- spadmin.orig	2009-10-08 12:21:04.000000000 +0200
-+++ spadmin	2009-10-08 12:22:22.000000000 +0200
-@@ -56,6 +56,10 @@
-   esac
- done
- 
-+# Set LD_LIBRARY_PATH so that javaldx finds libuno_sal.so.3:
-+LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/../ure/lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-+export LD_LIBRARY_PATH
-+
- # extend the ld_library_path for java: javaldx checks the sofficerc for us
- if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
diff --git a/misc/openoffice3-bin/options.mk b/misc/openoffice3-bin/options.mk
deleted file mode 100644
index 66128179ad9..00000000000
--- a/misc/openoffice3-bin/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2010/09/13 22:32:02 bad Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.openoffice-bin
-PKG_SUPPORTED_OPTIONS=	java
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mjava)
-PKG_JVMS_ACCEPTED=	jdk15 sun-jdk6
-USE_JAVA=		run
-.include "../../mk/java-vm.mk"
-.endif