Remove packages scheduled to be deleted according to the pkgsrc-2011Q2

release notes.
2011-10-02 14:11:51 +00:00 · 2011-10-02 14:11:51 +00:00 · 0922371859
commit 0922371859
parent 2a34a4c75a
252 changed files with 10 additions and 10486 deletions
--- a/comms/Makefile
+++ b/comms/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2011/08/28 06:46:56 dsainty Exp $
+# $NetBSD: Makefile,v 1.85 2011/10/02 14:11:51 wiz Exp $
 #

 COMMENT=	Communication utilities
@ -64,7 +64,6 @@ SUBDIR+=	ruby-termios
 SUBDIR+=	scmxx
 SUBDIR+=	snooper
 SUBDIR+=	spandsp
-SUBDIR+=	synce-dccm
 SUBDIR+=	synce-librapi2
 SUBDIR+=	synce-libsynce
 SUBDIR+=	synce-rra
--- a/comms/synce-dccm/DESCR
+++ b/comms/synce-dccm/DESCR
@ -1,4 +0,0 @@
-DCCM is part of the SynCE project.
-
-This daemon is required to be able to communicate with a handheld
-device.
--- a/comms/synce-dccm/Makefile
+++ b/comms/synce-dccm/Makefile
@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:09 joerg Exp $
-#
-
-DISTNAME=		synce-dccm-0.9.1
-CATEGORIES=		comms
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=synce/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://synce.sourceforge.net/
-COMMENT=		Listener daemon for connections from WinCE devices
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-
-.include "../../comms/synce-libsynce/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/comms/synce-dccm/PLIST
+++ b/comms/synce-dccm/PLIST
@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/13 15:05:16 wiz Exp $
-bin/dccm
-bin/synce-sound
-man/man1/dccm.1
-man/man1/synce-sound.1
--- a/comms/synce-dccm/distinfo
+++ b/comms/synce-dccm/distinfo
@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/13 15:05:16 wiz Exp $
-
-SHA1 (synce-dccm-0.9.1.tar.gz) = d43a89844ae7031b1eac0ebbe34ef910c964fc5f
-RMD160 (synce-dccm-0.9.1.tar.gz) = 80475bdf2cc7fa5869b3cc18872f4c0782643200
-Size (synce-dccm-0.9.1.tar.gz) = 292930 bytes
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1493 2011/09/15 09:15:43 wiz Exp $
+# $NetBSD: Makefile,v 1.1494 2011/10/02 14:11:51 wiz Exp $
 #

 COMMENT=	Development utilities
@ -456,7 +456,6 @@ SUBDIR+=	netbeans-ide
 SUBDIR+=	netbsd-iscsi-lib
 SUBDIR+=	netcdf
 SUBDIR+=	newfile
-SUBDIR+=	newt
 SUBDIR+=	noweb
 SUBDIR+=	nqc
 SUBDIR+=	nsis
--- a/devel/newt/DESCR
+++ b/devel/newt/DESCR
@ -1,10 +0,0 @@
-Newt is a windowing toolkit for text mode built from the slang
-library. It allows color text mode applications to easily use
-stackable windows, push buttons, check boxes, radio buttons, lists,
-entry fields, labels, and displayable text. Scrollbars are supported,
-and forms may be nested to provide extra functionality.
-
-Besides the newt library, this package provides whiptail, which may
-be used from shell scripts similarly to Savio Lam's "dialog". Newt
-provides the textual interface for the Red Hat and Debian boot
-disks.
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2011/04/22 13:43:21 obache Exp $
-
-.include "Makefile.common"
-
-PKGREVISION=	4
-COMMENT=	Windowing toolkit based on libslang
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_LIBTOOL=	yes
-NO_EXPORT_CPP=	yes
-GNU_CONFIGURE=	yes
-
-INSTALLATION_DIRS=	bin include lib
-
-do-install:
-	cd ${WRKSRC}; \
-	 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} libnewt.la ${DESTDIR}${PREFIX}/lib;\
-	 ${INSTALL_DATA} newt.h ${DESTDIR}${PREFIX}/include; \
-	 ${LIBTOOL} --mode=install ${INSTALL} whiptail ${DESTDIR}${PREFIX}/bin
-
-.include "../../devel/libslang/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/devel/newt/Makefile.common
+++ b/devel/newt/Makefile.common
@ -1,25 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2011/04/02 08:45:43 obache Exp $
-# used by devel/py-newt/Makefile
-
-DISTNAME=	newt-${VERSION}-5.src.rpm
-PKGNAME=	newt-${VERSION}
-VERSION=	0.51.6
-CATEGORIES=	devel
-MASTER_SITES=	http://download.fedora.redhat.com/pub/fedora/linux/core/3/SRPMS/
-EXTRACT_SUFX=	# empty
-
-MAINTAINER=	riz@NetBSD.org
-HOMEPAGE=	https://fedorahosted.org/newt/wiki
-
-BUILD_DEPENDS+=	rpm2pkg>=2.0:../../pkgtools/rpm2pkg
-
-DISTINFO_FILE=	${.CURDIR}/../../devel/newt/distinfo
-PATCHDIR=	${.CURDIR}/../../devel/newt/patches
-
-USE_TOOLS+=	gmake gzcat tar
-
-WRKSRC=		${WRKDIR}/newt-${VERSION}
-
-do-extract:
-	${LOCALBASE}/sbin/rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DISTNAME}
-	cd ${WRKDIR} ; ${GZCAT} ${WRKSRC}.tar.gz | ${TAR} -xf -
--- a/devel/newt/PLIST
+++ b/devel/newt/PLIST
@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
-bin/whiptail
-include/newt.h
-lib/libnewt.la
--- a/devel/newt/TODO
+++ b/devel/newt/TODO
@ -1 +0,0 @@
- Add TCL support options
--- a/devel/newt/buildlink3.mk
+++ b/devel/newt/buildlink3.mk
@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:25 joerg Exp $
-
-BUILDLINK_TREE+=	newt
-
-.if !defined(NEWT_BUILDLINK3_MK)
-NEWT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.newt+=	newt>=0.51.6
-BUILDLINK_ABI_DEPENDS.newt?=	newt>=0.51.6nb2
-BUILDLINK_PKGSRCDIR.newt?=	../../devel/newt
-
-.include "../../devel/libslang/buildlink3.mk"
-.endif # NEWT_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-newt
--- a/devel/newt/distinfo
+++ b/devel/newt/distinfo
@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2008/04/13 09:54:42 wiz Exp $
-
-SHA1 (newt-0.51.6-5.src.rpm) = 69f705b6593ba48169219c11259704467811a321
-RMD160 (newt-0.51.6-5.src.rpm) = b5791cb36a7209da132ce7cd24c6d93d976ddf1e
-Size (newt-0.51.6-5.src.rpm) = 174867 bytes
-SHA1 (patch-aa) = f81b1879a7d1a6b2fa5ce58ffaf4ada4d8b1003c
--- a/devel/newt/patches/patch-aa
+++ b/devel/newt/patches/patch-aa
@ -1,159 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/04/13 09:54:42 wiz Exp $
--- Makefile.in.orig	2003-11-06 06:56:47.000000000 +0000
-+++ Makefile.in
-@@ -1,18 +1,16 @@
-LIBS = -lslang -lm #-lefence
-SHLIBS = -lslang -lm -lc
-+LIBS = libnewt.la -lslang -lm -lpopt #-lefence
-+SHLIBS = -lslang -lm -lc -lpopt
- 
- GPM_SUPPORT=@gpm_support@
- 
-CFLAGS = $(RPM_OPT_FLAGS) -Wall -I/usr/include/slang -D_GNU_SOURCE
-ifeq ($(RPM_OPT_FLAGS),)
-CFLAGS += -g 
-endif
-+CFLAGS += -I${PREFIX}/include
-+#LDFLAGS += -L${PREFIX}/lib -R${PREFIX}/lib
- 
- VERSION = @VERSION@
- CVSTAG = r$(subst .,-,$(VERSION))
- SONAME = @SONAME@
- 
-PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
-+#PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
- 
- WHIPTCLSO=
- #WHIPTCLSO=whiptcl.so
-@@ -21,16 +19,16 @@ PROGS = test whiptail $(WHIPTCLSO) testg
- TESTOBJS = test.o
- NDIALOGOBJS = whiptail.o dialogboxes.o
- WHIPTCLOBJS = whiptcl.o dialogboxes.o
-LIBNEWT = libnewt.a
-+LIBNEWT = libnewt.la
- LIBNEWTSH = libnewt.so.$(VERSION)
- LIBNEWTSONAME = libnewt.so.$(SONAME)
-LIBOBJS = newt.o button.o form.o checkbox.o entry.o label.o listbox.o \
-+LIBOBJS = button.o form.o checkbox.o entry.o label.o listbox.o \
-           scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
- 	  checkboxtree.o
- 
-SHCFLAGS = -fPIC
-+#SHCFLAGS = ${CFLAGS} -fPIC
- 
-prefix = /usr
-+prefix = ${PREFIX}
- includedir = $(prefix)/include
- libdir = $(prefix)/lib
- bindir = $(prefix)/bin
-@@ -38,6 +36,7 @@ ARCHNAME = $(shell uname -m | sed 's/i.8
- 
- #--------------------------------------
- 
-+LIBSOURCES = $(subst .o,.c,$(LIBOBJS))
- SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
- 
- SHAREDDIR = shared
-@@ -49,43 +48,49 @@ else
- TARGET=depend $(PROGS)
- endif
- 
-all:	$(TARGET) _snackmodule.so
-+all:	$(TARGET)
-+#all:	$(TARGET) _snackmodule.so
- 
- test:	$(TESTOBJS) $(LIBNEWT)
-	gcc -g -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
-+	${LIBTOOL} --mode=link ${CC} -g -o test $(TESTOBJS) $(LIBS) -static
- 
- testgrid:	testgrid.o $(LIBNEWT)
-	gcc -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
-+	${LIBTOOL} --mode=link ${CC} -g -o testgrid testgrid.o $(LIBS)
- 
- testtree:	testtree.o $(LIBNEWT)
-	gcc -g -o testtree testtree.o $(LIBNEWT) $(LIBS)
-+	${LIBTOOL} --mode=link ${CC} -g -o testtree testtree.o $(LIBS)
- 
- showchars:	showchars.o $(LIBNEWT)
-	gcc -g -o showchars showchars.o $(LIBNEWT) $(LIBS)
-+	${LIBTOOL} --mode=link ${CC} -g -o showchars showchars.o $(LIBS)
- 
- showkey:	showkey.o $(LIBNEWT)
-	gcc -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
-+	${LIBTOOL} --mode=link ${CC} -g -o showkey showkey.o $(LIBS)
- 
- _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
- 	for ver in $(PYTHONVERS) ; do \
- 	    if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
- 	    	mkdir -p $$ver ;\
-	        gcc $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
-		gcc --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
-+	        ${CC} $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
-+		${CC} --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
- 	    fi ; \
- 	done
- 
-whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
-	gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
-
-whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
-	gcc -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) -ltcl -lslang -lpopt -lm
-+whiptail: $(NDIALOGOBJS) $(LIBNEWT)
-+	${LIBTOOL} --mode=link ${CC} -g -o whiptail $(NDIALOGOBJS) $(LIBS)
- 
-$(LIBNEWT): $(LIBOBJS)
-	ar rv $@ $^
-+whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWT)
-+	${LIBTOOL} --mode=link ${CC} -shared $(SHCFLAGS) -o whiptcl.so \
-+	$(WHIPTCLOBJS) -ltcl ${LIBS}
-+
-+$(LIBNEWT): $(LIBOBJS) newt.o
-+	${LIBTOOL} --mode=link ${CC} -o ${LIBNEWT} ${LIBOBJS:.o=.lo} \
-+	newt.lo -rpath ${PREFIX}/lib -version-number 0:51:6 ${SHLIBS}
- 
- newt.o: newt.c Makefile
-	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-+	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-+
-+%.o: %.c
-+	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c -o $@ $<
- 
- veryclean: clean
- 	rm -f .depend
-@@ -97,19 +102,19 @@ clean:
- depend:
- 	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
- 
-$(SHAREDDIR):
-	mkdir -p $(SHAREDDIR)
-+#$(SHAREDDIR):
-+#	mkdir -p $(SHAREDDIR)
- 
-sharedlib: $(LIBNEWTSH)
-+#sharedlib: $(LIBNEWTSH)
- 
-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
-	gcc -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
-+#$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
-+#	${CC} -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
- 
-$(SHAREDDIR)/%.o : %.c
-	$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
-+#$(SHAREDDIR)/%.o : %.c
-+#	$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
- 
-$(SHAREDDIR)/newt.o: newt.c Makefile
-	$(CC) $(SHCFLAGS) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-+#$(SHAREDDIR)/newt.o: newt.c Makefile
-+#	$(CC) $(SHCFLAGS) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
- 
- 
- install: $(LIBNEWT) install-sh whiptail
-@@ -147,7 +152,3 @@ archive:    configure
- 	@rm -f /tmp/newt-$(VERSION).tar.gz
- 	@echo " "
- 	@echo "The final archive is ./newt-$(VERSION).tar.gz."
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
--- a/emulators/Makefile
+++ b/emulators/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.190 2011/08/15 09:08:32 wiz Exp $
+# $NetBSD: Makefile,v 1.191 2011/10/02 14:11:51 wiz Exp $
 #

 COMMENT=	Emulators for other operating systems
@ -42,7 +42,6 @@ SUBDIR+=	darwin_lib
 SUBDIR+=	dega
 SUBDIR+=	dgen
 SUBDIR+=	dosbox
-SUBDIR+=	doscmd
 SUBDIR+=	dynagen
 SUBDIR+=	dynamips
 SUBDIR+=	e-uae
@ -72,7 +71,6 @@ SUBDIR+=	ia64sim
 SUBDIR+=	kegs
 SUBDIR+=	kenigma
 SUBDIR+=	libspectrum
-SUBDIR+=	linuxppc_lib
 SUBDIR+=	lrmi
 SUBDIR+=	m1
 SUBDIR+=	makeppf
--- a/emulators/doscmd/DESCR
+++ b/emulators/doscmd/DESCR
@ -1,7 +0,0 @@
-doscmd, an MS-DOS emulator (NetBSD/i386 only)
-
-Doscmd simulates an MS-DOS environment for running DOS software. Rather
-than provide a software emulation of the 8086 CPU, it uses the
-NetBSD/i386 system call i386_vm86() call to access the VM86 mode of i386
-and later CPUs. It therefore runs much more quickly, at the cost of not
-running on other architectures.
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:34 jlam Exp $
-#
-
-DISTNAME=		doscmd-19960502-2
-PKGNAME=		doscmd-19960502.2
-CATEGORIES=		emulators
-MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/arch/i386/doscmd/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		MS-DOS emulator (NetBSD/i386 only)
-
-# mmap() portability (no MAP_FIXED), and objcopy problems on NetBSD-1.6-i386 and later
-ONLY_FOR_PLATFORM=	NetBSD-1.[345]*-i386
-
-WRKSRC=			${WRKDIR}/doscmd
-MAKE_ENV+=		X11BASE=${X11BASE:Q}
-
-MANCOMPRESSED_IF_MANZ=	yes
-
-do-configure:
-	@cd ${WRKSRC} && \
-	${SED} "s=%PREFIX%=${PREFIX}=" < doscmd.1 >doscmd.1.new && \
-	${MV} doscmd.1.new doscmd.1 && \
-	${SED} "s=%PREFIX%=${PREFIX}=" < doscmd_loader.c >dl.new && \
-	${MV} dl.new doscmd_loader.c
-
-.include "../../mk/bsd.pkg.mk"
--- a/emulators/doscmd/PLIST
+++ b/emulators/doscmd/PLIST
@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:33 zuntum Exp $
-bin/doscmd
-man/man1/doscmd.1
-man/cat1/doscmd.0
-libexec/doscmd.kernel
-libexec/instbsdi.exe
--- a/emulators/doscmd/distinfo
+++ b/emulators/doscmd/distinfo
@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (doscmd-19960502-2.tar.gz) = 85ec8e478d32d0f2861084d6d19186b5e1f0fc95
-RMD160 (doscmd-19960502-2.tar.gz) = e4eb842d7d765f6f608bdc0d08c7e2f1b4edb469
-Size (doscmd-19960502-2.tar.gz) = 109791 bytes
-SHA1 (patch-aa) = 56e3f9951ac3dcb6e07cd1f76c665286a694d67b
-SHA1 (patch-ab) = c83d7e5b8b514ca7f88b0bd3a0be963b7f77d3a4
-SHA1 (patch-ac) = 09757f9522e52b7491c3052dbb856a9b3828ce45
-SHA1 (patch-ae) = 6a33c0eff738caab4e30513dbe9b9f57d7b21d09
-SHA1 (patch-af) = b0091e54d0ffe8a2ebcae28a924fad24888ed20e
-SHA1 (patch-ag) = bbbca5339d66cb52b93019b712d21301d910d32b
-SHA1 (patch-ah) = 65e9a252e27b8ea339048d20df2d5f23977b5f66
-SHA1 (patch-ai) = e72e42897f221929aa269800a11e37ea2dd4419c
-SHA1 (patch-aj) = c400eb5ec1f46def1105ddb6e6a2a1397f8ec54e
--- a/emulators/doscmd/patches/patch-aa
+++ b/emulators/doscmd/patches/patch-aa
@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/11/29 23:39:30 sommerfe Exp $
-
--- signal.c.orig	Thu May  2 16:03:39 1996
-+++ signal.c	Sun Nov 29 18:27:37 1998
-@@ -98,11 +98,18 @@
- 	if (s >= 0 && s < NSIG) {
- 		handler[s] = h;
- 
-		sa.sa_handler = generichandler;
-+		sa.sa_handler = (void (*)())generichandler;
-+#if defined(__LIBC12_SOURCE__)
- 		sa.sa_mask = sigmask(SIGIO) | sigmask(SIGALRM);
-+#else
-+		sigemptyset(&sa.sa_mask);
-+		sigaddset(&sa.sa_mask, SIGIO);
-+		sigaddset(&sa.sa_mask, SIGALRM);
-+#endif
- 		sa.sa_flags = SA_ONSTACK;
- 		sigaction(s, &sa, NULL);
- 
-+		sigemptyset(&set);
- 		sigaddset(&set, s);
- 		sigprocmask(SIG_UNBLOCK, &set, 0);
- 	}
--- a/emulators/doscmd/patches/patch-ab
+++ b/emulators/doscmd/patches/patch-ab
@ -1,59 +0,0 @@
-$NetBSD: patch-ab,v 1.6 1999/12/18 22:10:02 christos Exp $
-
--- Makefile.orig	Thu May  2 13:55:19 1996
-+++ Makefile	Sat Dec 18 17:02:32 1999
-@@ -8,30 +8,45 @@
- 	int1a.c int2f.c intff.c \
- 	mem.c mouse.c net.c null.c port.c setver.c signal.c timer.c trace.c trap.c tty.c xms.c
- 
-+BINDIR= ${PREFIX}/bin
-+MANDIR=	${PREFIX}/man
-+
- BINGRP=	kmem
- EXEGRP=	bin
- BINMODE=2555
- EXEMODE=444
-CFLAGS+=-I/usr/X11/include -DDISASSEMBLER -g
-LDFLAGS+=-L/usr/X11/lib
-+START_ADDRESS=0x110000
-+CFLAGS+=-I${X11BASE}/include -DDISASSEMBLER -g -DSTART_ADDRESS=${START_ADDRESS}
-+LDFLAGS+=-L${X11BASE}/lib -R${X11BASE}/lib
- LDADD+=	-lX11 -li386 -lgcc -lc -lgcc
-DPADD+=	/usr/X11/lib/libX11.a ${LIBC} ${LIBGCC}
-+DPADD+=	${X11BASE}/lib/libX11.a ${LIBC} ${LIBGCC}
-+
-+.include <bsd.prog.mk>
-+.if ${OBJECT_FMT} == "ELF"
-+TEXT=-e start -Ttext ${START_ADDRESS}
-+CRTBEGIN=/usr/lib/crtbegin.o
-+.else
-+TEXT=-e _start -T ${START_ADDRESS}
-+CRTBEGIN=
-+.endif
-+
- 
- afterinstall:
- 	install ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
-		doscmd.kernel ${DESTDIR}/usr/libexec/doscmd.kernel
-+		doscmd.kernel ${PREFIX}/libexec/doscmd.kernel
- 	install -c -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
-		${.CURDIR}/instbsdi.exe ${DESTDIR}/usr/dos/
-+		${.CURDIR}/instbsdi.exe ${PREFIX}/libexec/
- 
-doscmd: doscmd.kernel ${LIBCRT0} doscmd_loader.o
-	ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD}
-+doscmd: doscmd.kernel ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o
-+	ld -N -Bstatic -o doscmd ${LDFLAGS:S/^-Wl,//g} ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o ${LDADD}
- 
-.include <bsd.prog.mk>
- 
- .depend: doscmd_loader.c
- 
- doscmd.kernel: crt0.o ${OBJS}
-	ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS} crt0.o ${OBJS} ${LDADD}
-+	ld -N -Bstatic ${TEXT} -o doscmd.bin ${LDFLAGS:S/^-Wl,//g} crt0.o ${OBJS} ${LDADD}
-+	objcopy -O binary doscmd.bin $@
-+	@rm -f doscmd.bin
- 
- doscmd.0: doscmd.1
- 	tbl ${.IMPSRC} | nroff -mandoc > ${.TARGET}
--- a/emulators/doscmd/patches/patch-ac
+++ b/emulators/doscmd/patches/patch-ac
@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/02/27 17:20:10 wiz Exp $
-
--- doscmd.1.orig	Wed Apr 10 09:38:59 1996
-+++ doscmd.1	Tue Feb 27 18:17:16 2001
-@@ -305,13 +305,13 @@
- .Fl ro
- flag is specified, it is a read only file system.
- These assignments will not take place when booting DOS until the
-.Pa /usr/dos/instbsdi.exe
-+.Pa %PREFIX%/libexec/instbsdi.exe
- binary is run.
- .\"
- .\"
- .\"
- .It Cm assign Xo
-.Cm lpt Ns Op Cm 0-4 :
-+.Cm lpt Ns Op Cm 1-4 :
- .Op Cm direct
- .Ar path
- .Op Ar timeout
--- a/emulators/doscmd/patches/patch-ae
+++ b/emulators/doscmd/patches/patch-ae
@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/10/28 01:29:16 hubertf Exp $
-
--- doscmd.h.BAK	Wed Oct 28 01:48:56 1998
-+++ doscmd.h	Wed Oct 28 01:49:02 1998
-@@ -58,7 +58,7 @@
- 
- #define	MAX_AVAIL_SEG 0xa000
- char *dosmem;
-char cmdname[];
-+char cmdname[256];
- int dosmem_size;
- 
- int pspseg;                                     /* segment # of PSP */
--- a/emulators/doscmd/patches/patch-af
+++ b/emulators/doscmd/patches/patch-af
@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.3 2001/03/16 13:58:58 wiz Exp $
-
--- doscmd.c.orig	Thu May  2 21:37:33 1996
-+++ doscmd.c
-@@ -100,7 +100,7 @@
- char *dos_path = 0;
- char cmdname[256];
- 
-char *memfile = "/tmp/doscmd.XXXXXX";
-+char memfile[] = "/tmp/doscmd.XXXXXX";
- 
- int
- main(int argc, char **argv)
-@@ -133,6 +133,14 @@
- 	if (fd != 3 && fd != 4)
- 		close (fd);
- 
-+#ifdef __ELF__
-+	if (mmap((void *)4096, 1024 * 1024, PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_FIXED|MAP_PRIVATE, -1, (off_t)0) == MAP_FAILED) {
-+		perror("mmap botch");
-+		quit(1);
-+	}
-+#endif
-+
- 	fd = -1;
- 
- 	debug_set(0);		/* debug any D_TRAPS without intnum */
-@@ -581,7 +589,11 @@
- 	SET16(sc.sc_fs, 0x0000);
- 	SET16(sc.sc_gs, 0x0000);
- 	
-+#if defined(__LIBC12_SOURCE__)
- 	sc.sc_mask = 0;
-+#else
-+	sigemptyset(&sc.sc_mask);
-+#endif
- 	sc.sc_onstack = 0;
- 
- 	if (tflag) {
--- a/emulators/doscmd/patches/patch-ag
+++ b/emulators/doscmd/patches/patch-ag
@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/03/16 13:58:58 wiz Exp $
-
--- AsyncIO.c.orig	Thu May  2 08:51:00 1996
-+++ AsyncIO.c
-@@ -320,6 +320,7 @@
- 		abort();
- 	}
- 	if (stackp++ == 0) {
-+		sigemptyset(&set);
- 		sigaddset(&set, SIGIO);
- 		sigprocmask(SIG_BLOCK, &set, 0);
- 	}
-@@ -335,6 +336,7 @@
- 		abort();
- 	}
- 	if (--stackp == 0) {
-+		sigemptyset(&set);
- 		sigaddset(&set, SIGIO);
- 		sigprocmask(SIG_UNBLOCK, &set, 0);
- 	}
--- a/emulators/doscmd/patches/patch-ah
+++ b/emulators/doscmd/patches/patch-ah
@ -1,74 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/06/06 11:55:07 jmmv Exp $
-
--- doscmd_loader.c.orig	2003-06-06 14:00:18.000000000 +0200
-+++ doscmd_loader.c
-@@ -31,38 +31,50 @@
-  */
- 
- #include <stdio.h>
-#include <a.out.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+#include <sys/mman.h>
- 
- /*
-  * reserve space in "low" memory for the interrupt vector table
-  */
- static const char filler[4096] = { 0, };
- 
-#define _PATH_DOS_KERNEL_DIR	"/usr/libexec/"
-+#define _PATH_DOS_KERNEL_DIR	"%PREFIX%/libexec/"
- #define _PATH_DOS_KERNEL	"doscmd.kernel"
- 
-int
-+static char *locations[] = {
-+	_PATH_DOS_KERNEL,
-+	"obj/" _PATH_DOS_KERNEL,
-+	_PATH_DOS_KERNEL_DIR _PATH_DOS_KERNEL,
-+	NULL
-+};
-+
-+u_long
- load_kernel(void)
- {
-	FILE *fp;
-	struct exec exec;
-	int start_address;
-
-	if ((fp = fopen(_PATH_DOS_KERNEL, "r")) == NULL &&
-	    (fp = fopen("obj/" _PATH_DOS_KERNEL, "r")) == NULL &&
-	    (fp = fopen(_PATH_DOS_KERNEL_DIR _PATH_DOS_KERNEL, "r")) == NULL)
-+	int i, fd;
-+	size_t size;
-+	struct stat st;
-+
-+	for (i = 0; locations[i] != NULL; i++) {
-+		if ((fd = open(locations[i], O_RDONLY)) != -1)
-+			break;
-+	}
-+	if (locations[i] == NULL)
- 		err(1, "load_kernel");
- 
-	if (fread(&exec, sizeof(exec), 1, fp) != 1 || N_GETMAGIC(exec) != OMAGIC)
-		errx(1, "bad kernel file format");
-+	if (fstat(fd, &st) == -1)
-+		err(1, "fstat");
- 
-	start_address = exec.a_entry & (~(getpagesize() - 1));
-	if (brk(start_address + exec.a_text + exec.a_data + exec.a_bss) < 0)
-		err(1, "load_kernel");
-	fread((char *)start_address, exec.a_text + exec.a_data, 1, fp);
-	bzero((char *)(start_address + exec.a_text + exec.a_data), exec.a_bss);
-	fclose(fp);
-	return(exec.a_entry);
-+	size = st.st_size + START_ADDRESS;
-+
-+	if (mmap((void *)START_ADDRESS, st.st_size,
-+	    PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0) == MAP_FAILED)
-+		err(1, "mmap");
-+		
-+	return(START_ADDRESS);
- }
- 
- void
--- a/emulators/doscmd/patches/patch-ai
+++ b/emulators/doscmd/patches/patch-ai
@ -1,27 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/12/18 01:46:29 christos Exp $
-
--- int13.c.orig	Thu May  2 16:49:57 1996
-+++ int13.c	Fri Dec 17 20:36:23 1999
-@@ -296,7 +296,7 @@
-     di->secsize = 512;
-     di->path = strdup(file);
- 
-    di->location = ((table & 0xf0000) << 12) | (table & 0xffff);
-+    di->location = ((htable & 0xf0000) << 12) | (htable & 0xffff);
- 
-     if (drive == 0) {
- 	ivec[0x41] = di->location;
-@@ -413,11 +413,11 @@
- 	di->path = strdup(file);
-     }
-     di->fd = -1;
-    di->location = ((table & 0xf0000) << 12) | (table & 0xffff);
-+    di->location = ((ftable & 0xf0000) << 12) | (ftable & 0xffff);
-     di->sector0 = 0;
-     di->offset = 0;
- 
-    ivec[0x1e] = ((ftable & 0xf0000) << 12) | (ftable & 0xffff);
-+    ivec[0x1e] = di->location;
- 
-     table = ftable + drive * 0x0a;
- 
--- a/emulators/doscmd/patches/patch-aj
+++ b/emulators/doscmd/patches/patch-aj
@ -1,33 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/03/16 13:59:54 wiz Exp $
-
--- port.c.orig	Wed Apr 10 12:52:15 1996
-+++ port.c
-@@ -63,7 +63,7 @@
- 	goto bad;
-     }
-     while (cnt--) {
-	ioports[port/32] |= (1 << (port%32));
-+	ioports[port/32] &= ~(1 << (port%32));
- 	port++;
-     }
-     if (i386_set_ioperm(ioports) < 0) {
-@@ -82,7 +82,7 @@
- 	goto bad;
-     }
-     while (cnt--) {
-	ioports[port/32] &= ~(1 << (port%32));
-+	ioports[port/32] |= (1 << (port%32));
- 	port++;
-     }
-     if (i386_set_ioperm(ioports) < 0) {
-@@ -169,6 +169,10 @@
- 	    portsw[i].p_inb = inb_nullport;
- 	if (portsw[i].p_outb == 0)
- 	    portsw[i].p_outb = outb_nullport;
-+    }
-+
-+    for (i = 0; i < MAXPORT/32; i++) {
-+	ioports[i] = 0xffffffff;
-     }
- }
- 
--- a/emulators/linuxppc_lib/DESCR
+++ b/emulators/linuxppc_lib/DESCR
@ -1,5 +0,0 @@
-These libraries are part of the Linux compatibility options
-for NetBSD/powerpc.
-
-The kernel option `COMPAT_LINUX' needs to be in your kernel config
-file for this to work as well.
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@ -1,83 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2009/03/22 04:53:38 manu Exp $
-
-DISTNAME=		linuxppc_lib-2000.4.6
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-RPMFILES=	glibc-2.1.3-15f.ppc.rpm glib-1.2.8-3.ppc.rpm \
-		libjpeg-6b-13.ppc.rpm libpng-1.0.5-3.ppc.rpm \
-		libstdc++-2.10.0-2n.ppc.rpm libtermcap-2.0.8-20.ppc.rpm \
-		libtiff-3.5.5-2.ppc.rpm XFree86-libs-3.3.6-20b.ppc.rpm \
-		zlib-1.1.3-6.ppc.rpm ldconfig-1.9.5-16.ppc.rpm \
-		libjpeg6a-6a-5.ppc.rpm xpm-3.4k-1.ppc.rpm \
-		ncurses-5.0-12.ppc.rpm readline-2.2.1-7a.ppc.rpm
-DISTFILES+=	${RPMFILES}
-DISTFILES+=	openmotif-2.1.30-3_MLI_jdk.tar.gz
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		Libraries to run Linux binaries on NetBSD/powerpc (includes X11)
-
-BUILD_DEPENDS+=		rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-
-CONFLICTS=		suse_base-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-1.5[U-Z]-powerpc NetBSD-1.5Z[A-Z]-powerpc \
-			NetBSD-1.6*-powerpc NetBSD-[2-9]*-powerpc
-
-WRKSRC=			${WRKDIR}/${DISTNAME}
-CHECK_SHLIBS_SUPPORTED=	no
-DIST_SUBDIR=		linuxppc_lib
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-USE_TOOLS+=		gtar
-
-EMUL_LINUX=		emul/linux
-LINUX_LDCONFIG=		${PREFIX}/${EMUL_LINUX}/sbin/ldconfig
-RPM2PKG=		rpm2pkg
-SORT=			sort
-RPMARGS+=		-i usr/man -i usr/doc -i usr/info
-.for TEMP in ${RPMFILES}
-RPMARGS+=		${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-
-do-build:	#do nothing
-
-do-install:
-	${RM} -f ${WRKDIR}/PLIST_DYNAMIC
-	${INSTALL_DATA_DIR} ${PREFIX}/${EMUL_LINUX}
-	${INSTALL_DATA_DIR} /${EMUL_LINUX}
-	${RPM2PKG} -d ${PREFIX} -f ${WRKDIR}/PLIST_DYNAMIC -p emul/linux ${RPMARGS}
-
-	# Fix Linux's ldd paths (ldd is a shell script on Linux)
-	${SED} 's|^\(TEXTDOMAINDIR=\)\(/usr/share/locale\)|\1${PREFIX}/${EMUL_LINUX}\2|; \
-		s|^\(RTLD=\)\(/lib/ld.so.1\)|\1${PREFIX}/${EMUL_LINUX}\2|' \
-		${PREFIX}/${EMUL_LINUX}/usr/bin/ldd > \
-		${PREFIX}/${EMUL_LINUX}/usr/bin/ldd.new
-	${MV} ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd.new \
-	    ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd
-	${CHMOD} 755 ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd
-
-	# Unpack shared libraries for OpenMotif
-	cd ${PREFIX}/${EMUL_LINUX}/usr/X11R6 ; ${GTAR} -x 'lib/*.so*' \
-	    -zvf ${DISTDIR}/${DIST_SUBDIR}/openmotif-2.1.30-3_MLI_jdk.tar.gz | \
-	    ${SED} -e "s|^|${EMUL_LINUX}/usr/X11R6/|" >> ${WRKDIR}/PLIST_DYNAMIC
-
-	# Make the link /usr/pkg/emul/linux -> /emul/linux
-	${TEST} -f /emul/linux/lib/ld.so.1 || ( ${RMDIR} /${EMUL_LINUX} && \
-	    ${LN} -sf ${PREFIX}/${EMUL_LINUX} /${EMUL_LINUX} )
-
-	# Create ld.so.conf and ld.so.cache. (uses Linux's ldconfig)
-	${TOUCH} ${PREFIX}/${EMUL_LINUX}/etc/ld.so.cache~
-	${CP} ${FILESDIR}/ld.so.conf ${PREFIX}/${EMUL_LINUX}/etc/ld.so.conf
-	${LINUX_LDCONFIG} -r ${PREFIX}/${EMUL_LINUX} -v | \
-		${SED} -n '/^\/.*:$$/h; /(changed)$$/{G; \
-		s|[[:blank:]]\([^ ]\{1,\}\) =>.*\n/\(.*\):$$|${EMUL_LINUX}/\2/\1|p;}' \
-		>> ${WRKDIR}/PLIST_DYNAMIC
-	${ECHO} "${EMUL_LINUX}/etc/ld.so.conf" >> ${WRKDIR}/PLIST_DYNAMIC
-	${SORT} -r ${WRKDIR}/PLIST_DYNAMIC > ${WRKDIR}/PLIST_DYNAMIC.sorted
-	${MV} ${WRKDIR}/PLIST_DYNAMIC.sorted ${WRKDIR}/PLIST_DYNAMIC
-
-.include "../../mk/bsd.pkg.mk"
--- a/emulators/linuxppc_lib/distinfo
+++ b/emulators/linuxppc_lib/distinfo
@ -1,48 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 8a73a18041c6b1f41556dc974752dab55f2e125c
-RMD160 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 7b6a7e784d9aac080abfaa83b3ef2665fd749da0
-Size (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 9503167 bytes
-SHA1 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = f067429860346dafb3c348eed8d59d370feb671b
-RMD160 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = d67d41fd8a72a19dd077995d5d6129eb5f9877e1
-Size (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = 142829 bytes
-SHA1 (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = a6b91fcc3348bb6625a70c843478d73dc2032e41
-RMD160 (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = 8454c628897a303eeb1b5500352855555590bb48
-Size (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = 125558 bytes
-SHA1 (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = 92a88a28142bf0698c3a71f82d40ebf86b8d97dc
-RMD160 (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = f1a15dda95fca48d0bb05807c6dab5e52d8fbaeb
-Size (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = 116067 bytes
-SHA1 (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = a8cb630e24a180a0c2fce1fa13e444dab9660fc3
-RMD160 (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = a63fa3107f393a10e9881d0fc46ea49fe382d2c7
-Size (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = 1110869 bytes
-SHA1 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 84673baa788a90c00ce4a6f52a5bcba80cf9a19c
-RMD160 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = d0437e1b8598d02f3c5630fb4faf2ede17a61d76
-Size (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 57125 bytes
-SHA1 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = d406ae6353300a0b21c01282a5d2148c63ec05aa
-RMD160 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = 483c61188a6cd2e7aeaf11c14fac87072585456e
-Size (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = 204823 bytes
-SHA1 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = 3ed6da7dca7b4fc5ac81acbbbefd0ccfd7b8472a
-RMD160 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = d91efda504df84ceeeebd01be4e332638904b3b2
-Size (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = 939474 bytes
-SHA1 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 9a813540e080c5c621b2abb0ada4f48ea274bf09
-RMD160 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 0da794b1ee885717ff541ffc562c012156c42d42
-Size (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 30894 bytes
-SHA1 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 785b2e72bc8cc51ddded7f746f1e4712aeca773b
-RMD160 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = a92546b1b4d990f7a91743cf79fee7ca415b5bd2
-Size (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 124309 bytes
-SHA1 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 633da2a887d03c43acb7ddf9d66b6139c240cccd
-RMD160 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 39da6439cd0058cfa7184d3b420d3e7fe57f0c11
-Size (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 62388 bytes
-SHA1 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 94e080372f65d3dc91570175334d43273e1c216a
-RMD160 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = e66c42fc168a9b7ea2e388e6505d78d2f758a42f
-Size (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 73072 bytes
-SHA1 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 1d5863dfc29473472bda89d237bafd84de602df4
-RMD160 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 987b45dec71db60bbdefddb45aabfeb6dc8c8fa7
-Size (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 808456 bytes
-SHA1 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 29458422f6991affc2d88c5eba9c0f7f2c9d796b
-RMD160 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 91b32ac137fd03353931fa1768a917430a026c73
-Size (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 145051 bytes
-SHA1 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = b9af158b947829d0bbe2831842ff4f4b4a7313a0
-RMD160 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = d6aea78941bbffc662c6d540908e3fbf986f684c
-Size (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = 2631074 bytes
-SHA1 (patch-aa) = 04840c534103f659fce4c00b5a6d63f79e03bf08
--- a/emulators/linuxppc_lib/files/ld.so.conf
+++ b/emulators/linuxppc_lib/files/ld.so.conf
@ -1,3 +0,0 @@
-/lib
-/usr/lib
-/usr/X11R6/lib
--- a/emulators/linuxppc_lib/patches/patch-aa
+++ b/emulators/linuxppc_lib/patches/patch-aa
@ -1,8 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/23 22:29:48 manu Exp $
--- etc/ld.so.conf.orig	Sun Jan 14 22:29:50 2001
-+++ etc/ld.so.conf	Sun Jan 14 22:30:05 2001
-@@ -0,0 +1,4 @@
-+/lib
-+/usr/lib
-+/usr/local/lib
-+/usr/X11R6/lib
--- a/mail/Makefile
+++ b/mail/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.413 2011/09/16 12:07:32 obache Exp $
+# $NetBSD: Makefile,v 1.414 2011/10/02 14:11:51 wiz Exp $
 #

 COMMENT=	Electronic mail utilities
@ -137,7 +137,6 @@ SUBDIR+=	mailfront
 SUBDIR+=	mailgraph
 SUBDIR+=	mailhops
 SUBDIR+=	mailman
-SUBDIR+=	mailscanner
 SUBDIR+=	mailserv
 SUBDIR+=	mailsync
 SUBDIR+=	mailwrapper
--- a/mail/mailscanner/DESCR
+++ b/mail/mailscanner/DESCR
@ -1,22 +0,0 @@
-MailScanner is a complete e-mail security system designed for use on
-e-mail gateways. It protects against viruses, and detects attacks against
-e-mail client packages (such as Outlook, Outlook Express, Eudora). It
-can also detect almost all unsolicited commercial e-mail (spam) passing
-through it and respond to all incidents in a wide variety of ways.
-
-Not only can it scan for known viruses, but it can also protect against
-unknown viruses hidden inside e-mail attachments by refusing entry to
-attachments whose filenames match any given pattern. This can include
-generic patterns that trap filenames attempting to hide the true filename
-extension (e.g. ".txt.vbs").
-
-It is superior to many commercial packages in its ability to handle
-attacks against itself, such as Denial Of Service attacks caused by
-messages containing the "Zip of Death". It is easy to install into an
-existing e-mail gateway, requiring very little knowledge of sendmail
-and no change to an existing sendmail configuration.
-
-MailScanner itself is entirely open source, but it uses widely known
-commercial virus scanning packages at its core. The other software it
-uses is all high quality open source software, leading to a system that
-can be trusted for performance and reliability.
--- a/mail/mailscanner/MESSAGE
+++ b/mail/mailscanner/MESSAGE
@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/09/25 04:18:06 grant Exp $
-
-See ${PREFIX}/share/doc/MailScanner/README and the MailScanner(8) and
-MailScanner.conf(5) man pages for further instructions.
-
-As MailScanner supports a wide variety of external 3rd party software,
-you must install other packages separately to achieve your desired
-MailScanner functionality.
-
-You need at the very least an MTA. You will probably also want SpamAssassin
-and/or a virus scanner. Some suggested packages are:
-
-	mail/spamassassin
-	mail/clamav
-	mail/p5-Mail-ClamAV
-
-You will need to edit at least the following config file before MailScanner
-will work correctly:
-
-	${PKG_SYSCONFDIR}/MailScanner.conf
-
-===========================================================================
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@ -1,144 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2010/11/20 20:51:51 gls Exp $
-#
-
-DISTNAME=		MailScanner-4.30.3-2
-PKGNAME=		mailscanner-4.30.3.2
-PKGREVISION=		3
-CATEGORIES=		mail
-MASTER_SITES=		http://www.mailscanner.info/files/4/tar/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.mailscanner.info/
-COMMENT=		Powerful spam/virus filter with many options
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-WRKSRC=			${WRKDIR}/MailScanner-4.30.3
-
-PKG_SYSCONFSUBDIR=	MailScanner
-
-DEPENDS+=		p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
-DEPENDS+=		p5-Convert-BinHex-[0-9]*:../../converters/p5-Convert-BinHex
-DEPENDS+=		p5-Net-CIDR>=0.09:../../devel/p5-Net-CIDR
-DEPENDS+=		p5-MIME-tools>=0:../../mail/p5-MIME-tools
-DEPENDS+=		tnef>=1.0:../../mail/tnef
-
-NO_BUILD=		YES
-USE_TOOLS+=		perl:run bash:run
-REPLACE_BASH+=		 bin/update_virus_scanners
-REPLACE_PERL+=		bin/MailScanner
-REPLACE_PERL+=		lib/panda-wrapper lib/rav-wrapper lib/*-autoupdate
-
-DOCSDIR=		${LOCALBASE}/share/doc/MailScanner
-EGDIR=			${LOCALBASE}/share/examples/MailScanner
-LIBDIR=			${LOCALBASE}/lib/MailScanner
-LIBEXECDIR=		${LOCALBASE}/libexec/MailScanner
-
-OWN_DIRS=		${PKG_SYSCONFDIR}/CustomFunctions
-OWN_DIRS+=		${PKG_SYSCONFDIR}/rules
-
-PLIST_SUBST+=		DOCSDIR=${DOCSDIR:Q}
-PLIST_SUBST+=		EGDIR=${EGDIR:Q}
-PLIST_SUBST+=		LIBDIR=${LIBDIR:Q}
-PLIST_SUBST+=		LIBEXECDIR=${LIBEXECDIR:Q}
-
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-MS_CONFIG_FILES=	filename.rules.conf \
-			filetype.rules.conf spam.assassin.prefs.conf \
-			spam.lists.conf virus.scanners.conf \
-			rules/bounce.rules rules/spam.whitelist.rules
-
-CONF_FILES+=		${EGDIR}/MailScanner.conf ${PKG_SYSCONFDIR}/MailScanner.conf
-.for _f_ in ${MS_CONFIG_FILES}
-CONF_FILES+=		${EGDIR}/${_f_} ${PKG_SYSCONFDIR}/${_f_}
-.endfor
-
-RCD_SCRIPTS=		mailscanner
-
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	bin/MailScanner etc/MailScanner.conf
-SUBST_FILES.paths+=	etc/virus.scanners.conf bin/update_virus_scanners
-SUBST_FILES.paths+=	lib/MailScanner/ConfigDefs.pl
-SUBST_SED.paths=	-e s,/opt/MailScanner/lib/MailScanner/CustomFunctions,${PKG_SYSCONFDIR}/CustomFunctions,g
-SUBST_SED.paths+=	-e s,/opt/MailScanner/lib,${LIBDIR},g
-SUBST_SED.paths+=	-e s,/opt/MailScanner/etc/reports,${EGDIR}/reports,g
-SUBST_SED.paths+=	-e s,/opt/MailScanner/etc,${PKG_SYSCONFDIR},g
-SUBST_SED.paths+=	-e s,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g
-SUBST_SED.paths+=	-e s,/opt/MailScanner/bin,${PREFIX}/bin,g
-
-.include "../../mk/bsd.prefs.mk"
-
-# XXX this could use some improvement
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		sendmail
-SUBST_STAGE.sendmail=	post-patch
-SUBST_FILES.sendmail=	bin/MailScanner etc/MailScanner.conf
-SUBST_FILES.sendmail+=	etc/virus.scanners.conf bin/update_virus_scanners
-SUBST_FILES.sendmail+=	lib/MailScanner/ConfigDefs.pl
-SUBST_SED.sendmail=	-e s,/usr/lib/sendmail,/usr/sbin/mailwrapper,g
-.endif
-
-SUBST_CLASSES+=		systemdefs
-SUBST_STAGE.systemdefs=	post-patch
-SUBST_FILES.systemdefs=	lib/MailScanner/SystemDefs.pm
-SUBST_SED.systemdefs=	-e s,/bin/cat,${CAT},g
-SUBST_SED.systemdefs=	-e s,/bin/cp,${CP},g
-SUBST_SED.systemdefs=	-e s,/bin/rm,${RM},g
-# we can't use sed from pkgsrc as it won't be registered as a
-# dependency. XXX tools.mk needs a way to tell us about this dependency.
-.if empty(SED:M${LOCALBASE}*)
-SUBST_SED.systemdefs=	-e s,/bin/sed,${SED},g
-.endif
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-
-# get rid of CVS backup files
-post-extract:
-	cd ${WRKSRC} && ${RM} -f */.#*
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/rules
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${DESTDIR}${PREFIX}/bin
-
-	${INSTALL_LIB_DIR} ${DESTDIR}${LIBEXECDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners ${DESTDIR}${LIBEXECDIR}
-	cd ${WRKSRC}/lib && ${FIND} . -name "*-autoupdate" -exec ${INSTALL_SCRIPT} '{}' ${DESTDIR}${LIBEXECDIR} \;
-	cd ${WRKSRC}/lib && ${FIND} . -name "*-wrapper" -exec ${INSTALL_SCRIPT} '{}' ${DESTDIR}${LIBEXECDIR} \;
-
-	${INSTALL_DATA} ${WRKSRC}/etc/MailScanner.conf ${DESTDIR}${EGDIR}/MailScanner.conf
-.for _f_ in ${MS_CONFIG_FILES}
-	${INSTALL_DATA} ${WRKSRC}/etc/${_f_} ${DESTDIR}${EGDIR}
-.endfor
-	cd ${WRKSRC}/etc/rules && ${INSTALL_DATA} \
-		EXAMPLES README spam.whitelist.rules bounce.rules \
-		${DESTDIR}${EGDIR}/rules
-	cd ${WRKSRC}/etc && ${FIND} reports -type d -exec ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/'{}' \;
-	cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${DESTDIR}${EGDIR}/'{}' \;
-
-	${INSTALL_LIB_DIR} ${DESTDIR}${LIBDIR}
-	${INSTALL_LIB_DIR} ${DESTDIR}${LIBDIR}/MailScanner
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm ${DESTDIR}${LIBDIR}
-	cd ${WRKSRC}/lib/MailScanner && ${FIND} . -name "*.pm" -exec ${INSTALL_DATA} '{}' ${DESTDIR}${LIBDIR}/MailScanner \;
-	cd ${WRKSRC}/lib/MailScanner && ${FIND} . -name "*.pl" -exec ${INSTALL_DATA} '{}' ${DESTDIR}${LIBDIR}/MailScanner \;
-
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCSDIR}
-	cd ${WRKSRC}/docs && ${FIND} * -type d -exec ${INSTALL_DATA_DIR} ${DESTDIR}${DOCSDIR}'/{}' \;
-	cd ${WRKSRC}/docs && ${FIND} * -type f -exec ${INSTALL_DATA} '{}' ${DESTDIR}${DOCSDIR} \;
-	cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-	cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-
-post-install:
-	${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-	${ECHO} bin/MailScanner >> ${PLIST_SRC}
-	${ECHO} man/man5/MailScanner.conf.5 >> ${PLIST_SRC}
-	${ECHO} man/man8/MailScanner.8 >> ${PLIST_SRC}
-.for _dir_ in ${DOCSDIR} ${EGDIR} ${LIBDIR} ${LIBEXECDIR}
-	${FIND} ${DESTDIR}${_dir_} \( -type f -o -type l \) -print \
-		| ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g" \
-		>> ${PLIST_SRC}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
--- a/mail/mailscanner/PLIST
+++ b/mail/mailscanner/PLIST
@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:00 reed Exp $
-@comment this PLIST automatically generated
-share/examples/rc.d/mailscanner
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (MailScanner-4.30.3-2.tar.gz) = ef9503dc57ec6d6f97a7333fce2b3e283d972498
-RMD160 (MailScanner-4.30.3-2.tar.gz) = f6dbe8acb329068e342d2cbfb16f3309d4db1a7a
-Size (MailScanner-4.30.3-2.tar.gz) = 996850 bytes
--- a/mail/mailscanner/files/mailscanner.sh
+++ b/mail/mailscanner/files/mailscanner.sh
@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-#	$NetBSD: mailscanner.sh,v 1.1.1.1 2004/09/25 00:33:19 grant Exp $
-#
-# PROVIDE: mailscanner
-# REQUIRE: LOGIN
-
-. /etc/rc.subr
-
-name="MailScanner"
-rcvar="mailscanner"
-start_cmd="@PREFIX@/bin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-
-load_rc_config $name
-run_rc_command "$1"
--- a/misc/Makefile
+++ b/misc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.361 2011/06/12 09:08:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.362 2011/10/02 14:11:52 wiz Exp $
 #

 COMMENT=	Miscellaneous utilities
@ -165,8 +165,6 @@ SUBDIR+=	multitail
 SUBDIR+=	nxtvepg
 SUBDIR+=	open2300
 SUBDIR+=	open2300-mysql
-SUBDIR+=	openoffice2
-SUBDIR+=	openoffice2-bin
 SUBDIR+=	openoffice3
 SUBDIR+=	openoffice3-bin
 SUBDIR+=	orca
--- a/misc/openoffice2-bin/DEINSTALL
+++ b/misc/openoffice2-bin/DEINSTALL
@ -1,15 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
-#
-# This file contains the contents of the OOo rpm pre-uninstall,
-# post-uninstall scripts.
-
-PRODUCTINSTALLLOCATION=${PKG_PREFIX}/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
--- a/misc/openoffice2-bin/DESCR
+++ b/misc/openoffice2-bin/DESCR
@ -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.
--- a/misc/openoffice2-bin/INSTALL
+++ b/misc/openoffice2-bin/INSTALL
@ -1,18 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
-#
-# This file contains the contents of the OOo rpm pre-install, post-install
-# scripts.
-
-PRODUCTINSTALLLOCATION=${PKG_PREFIX}/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
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@ -1,79 +0,0 @@
-# $NetBSD: Makefile,v 1.43 2011/03/08 12:10:01 obache Exp $
-
-DISTNAME=		openoffice2-bin	# overridden below
-PKGNAME=		openoffice2-bin-${OO_RELEASE}
-CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
-
-MAINTAINER=		pkgsrc-users@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+=		openoffice3-bin-[0-9]*
-CONFLICTS+=		openoffice2-[0-9]*
-CONFLICTS+=		openoffice3-[0-9]*
-CONFLICTS+=		openoffice-linux-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-OO_VER=			2.4
-OO_RELEASE=		2.4.3
-PLIST_SUBST+=		VER=${OO_VER: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
-
-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
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${EMUL_PLATFORM} == "linux-i386"
-DISTNAME=		OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=			${WRKDIR}/OOH680_m21_native_packed-2_en-US.9421
-.elif ${EMUL_PLATFORM} == "solaris-i386"
-DISTNAME=		OOo_${OO_RELEASE}_Solarisx86_install_en-US
-WRKSRC=			${WRKDIR}/OOH680_m21_native_packed-1_en-US.9421/packages
-.elif ${EMUL_PLATFORM} == "solaris-sparc"
-DISTNAME=		OOo_${OO_RELEASE}_SolarisSparc_install_en-US
-WRKSRC=			${WRKDIR}/OOH680_m21_native_packed-1_en-US.9421/packages
-.endif
-
-INSTALLATION_DIRS=	bin
-
-.include "options.mk"
-
-do-install:
-	uniq ${RPM2PKG_PLIST} > ${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 ../openoffice.org${OO_VER}/program/soffice ${DESTDIR}${PREFIX}/bin/soffice
-.endif
-.for i in scalc sdraw simpress smath spadmin swriter
-	${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
--- a/misc/openoffice2-bin/PLIST.proglinks
+++ b/misc/openoffice2-bin/PLIST.proglinks
@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.proglinks,v 1.2 2009/01/31 21:56:32 bad Exp $
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/smath
-bin/soffice
-bin/spadmin
-bin/swriter
--- a/misc/openoffice2-bin/distinfo
+++ b/misc/openoffice2-bin/distinfo
@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.17 2009/12/05 15:00:16 bad Exp $
-
-SHA1 (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = 104df4d0f6bdc17eff57ba79f07b232f30d247fd
-RMD160 (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = aec3ea23b5f468f550eaa5194c7c32dc1a0c0052
-Size (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = 154263012 bytes
--- a/misc/openoffice2-bin/files/soffice
+++ b/misc/openoffice2-bin/files/soffice
@ -1,17 +0,0 @@
-#!/bin/sh
-#
-#	$NetBSD: soffice,v 1.3 2005/10/26 18:26:52 mrauch Exp $
-#
-SOINST=@@PREFIX@@/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 "$@"
--- a/misc/openoffice2-bin/options.mk
+++ b/misc/openoffice2-bin/options.mk
@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/10/23 20:11:47 rillig 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=	blackdown-jdk13 sun-jdk13 sun-jdk14 sun-jdk15
-USE_JAVA=		run
-.include "../../mk/java-vm.mk"
-.endif
--- a/misc/openoffice2/DESCR
+++ b/misc/openoffice2/DESCR
@ -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.
--- a/misc/openoffice2/MESSAGE
+++ b/misc/openoffice2/MESSAGE
@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2008/11/19 01:54:25 hira Exp $
-
-  OpenOffice has now been installed in ${OO_PREFIX}.
-
-  Before using this package for the first time, each user has to run
-  a setup program, which is automatically invoked at the first start.
-  Thereafter, OpenOffice can be started using the
-  ${PREFIX}/bin/soffice command.
-===========================================================================
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@ -1,212 +0,0 @@
-# $NetBSD: Makefile,v 1.88 2011/07/21 13:05:59 obache Exp $
-#
-
-OO_VER=			2.4.3
-DISTNAME=		openoffice-${OO_VER}
-PKGNAME=		openoffice2-${OO_VER}
-PKGREVISION=		12
-CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
-DIST_SUBDIR=		${DISTNAME}
-
-DISTFILES=		OOo_${OO_VER}_src_core.tar.bz2
-DISTFILES+=		OOo_${OO_VER}_src_binfilter.tar.bz2
-DISTFILES+=		OOo_${OO_VER}_src_l10n.tar.bz2
-#DISTFILES+=		OOo_${OO_VER}_src_sdk.tar.bz2
-DISTFILES+=		OOo_${OO_VER}_src_system.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.openoffice.org/
-COMMENT=		Integrated office productivity suite (version 2)
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-BUILD_DEPENDS+=		zip-[0-9]*:../../archivers/zip
-BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
-BUILD_DEPENDS+=		p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
-
-DEPENDS+=		libpaper-[0-9]*:../../print/libpaper
-
-.include "../../mk/bsd.prefs.mk"
-
-WRKSRC=			${WRKDIR}/OOH680_m21
-CONFIGURE_DIRS=		config_office
-
-# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
-GCC_REQD+=		3.4
-USE_LANGUAGES+=		c c++
-
-USE_TOOLS+=		bash gmake imake perl pkg-config tar
-PTHREAD_OPTS+=		require
-PTHREAD_AUTO_VARS=	yes
-
-CONFLICTS+=		staroffice-[0-9]*
-CONFLICTS+=		openoffice-[0-9]*
-CONFLICTS+=		openoffice3-[0-9]*
-CONFLICTS+=		openoffice-bin-[0-9]*
-CONFLICTS+=		openoffice2-bin-[0-9]*
-CONFLICTS+=		openoffice3-bin-[0-9]*
-CONFLICTS+=		openoffice-linux-[0-9]*
-
-ONLY_FOR_PLATFORM=	FreeBSD-*-i386 FreeBSD-*-x86_64
-ONLY_FOR_PLATFORM+=	NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+=	NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64
-
-GNU_CONFIGURE=		yes
-
-REPLACE_PERL+=		sd/res/webview/editpic.pl	\
-			sd/res/webview/poll.pl		\
-			sd/res/webview/savepic.pl	\
-			sd/res/webview/show.pl		\
-			sd/res/webview/webview.pl
-REPLACE_PYTHON+=	scripting/source/pyprov/mailmerge.py
-
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
-SUBST_MESSAGE.prefix=	Fixing prefix
-SUBST_FILES.prefix=	sysui/desktop/share/openoffice.sh
-SUBST_FILES.prefix+=	sysui/desktop/share/printeradmin.sh
-SUBST_SED.prefix=	-e 's|@OO_PREFIX@|${OO_PREFIX}|g'
-
-SUBST_CLASSES+=		lib
-SUBST_STAGE.lib=	post-patch
-SUBST_MESSAGE.lib=	Adding library paths
-SUBST_FILES.lib=	solenv/inc/pkgsrc.mk
-SUBST_SED.lib+=		-e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
-SUBST_SED.lib+=		-e 's|@OO_LIBDIR@|${OO_PREFIX}/program|g'
-.for pkg in db4 expat icu jpeg zlib
-LIB.${pkg}=		-L${BUILDLINK_PREFIX.${pkg}}/lib
-LIB.${pkg}+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
-SUBST_SED.lib+=		-e 's|@LIB_${pkg}@|${LIB.${pkg}}|g'
-LIBS+=			${LIB.${pkg}}
-.endfor
-
-CONFIGURE_ENV+=		LIBS=${LIBS:O:u:Q}
-CONFIGURE_ENV+=		X_LIBS=${X11_LDFLAGS:M*:Q}
-CONFIGURE_ENV+=		BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
-CONFIGURE_ENV+=		BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
-CONFIGURE_ENV+=		ac_cv_path_SYSTEM_GENBRK=${PREFIX}/bin/genbrk
-CONFIGURE_ENV+=		ac_cv_path_SYSTEM_GENCCODE=${PREFIX}/sbin/genccode
-CONFIGURE_ENV+=		ac_cv_path_SYSTEM_GENCMN=${PREFIX}/sbin/gencmn
-
-CONFIGURE_ARGS+=	--with-use-shell=bash
-CONFIGURE_ARGS+=	--enable-binfilter
-CONFIGURE_ARGS+=	--enable-cairo
-CONFIGURE_ARGS+=	--disable-ldap
-CONFIGURE_ARGS+=	--disable-vba
-CONFIGURE_ARGS+=	--with-system-stdlibs
-CONFIGURE_ARGS+=	--with-system-curl
-CONFIGURE_ARGS+=	--with-system-db
-CONFIGURE_ARGS+=	--with-system-expat
-CONFIGURE_ARGS+=	--with-system-freetype
-CONFIGURE_ARGS+=	--with-system-icu
-CONFIGURE_ARGS+=	--with-system-jpeg
-CONFIGURE_ARGS+=	--with-system-libxml2
-CONFIGURE_ARGS+=	--with-system-libxslt
-CONFIGURE_ARGS+=	--with-system-python
-CONFIGURE_ARGS+=	--with-system-zlib
-CONFIGURE_ARGS+=	--with-dynamic-xinerama
-
-# `portable' supports all platforms.
-CONFIGURE_ARGS+=	--enable-epm --with-package-format=portable
-
-# XXX: Error in OOo internal libsndfile.
-CONFIGURE_ARGS+=	--disable-pasf
-
-# Disable Java.
-CONFIGURE_ARGS+=	--without-java --disable-odk --disable-gcjaot
-
-# NOTE: In this version, this value should be separated by space (comma
-#       causes build error).
-CONFIGURE_ARGS+=	--with-lang=${OO_LANGS:Q}
-
-.include "options.mk"
-
-UNLIMIT_RESOURCES+=	datasize
-
-OO_RELEASE=		OpenOffice.org${OO_VER}
-PLIST_SRC=		${PKGDIR}/PLIST
-PLIST_SRC+=		${WRKDIR}/PLIST
-PLIST_SUBST+=		OO_UNXNAME=${OO_UNXNAME}
-PLIST_SUBST+=		OO_ICON_PREFIX=openofficeorg24
-MESSAGE_SUBST+=		OO_PREFIX=${OO_PREFIX}
-INSTALLATION_DIRS=	bin lib/${OO_RELEASE} share/applications \
-			share/application-registry share/mime-info \
-			share/packages share/mime/packages
-
-OO_UNXNAME=	openoffice.org2.4
-OO_PKGPATH=	${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
-OO_LANGPACKPATH=${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice_languagepack/portable/install
-OO_PROGRAMS=	scalc sdraw simpress soffice swriter unopkg
-OO_PREFIX=	${PREFIX}/lib/${OO_RELEASE}
-
-post-extract:
-	cd ${WRKSRC}/bridges/source/cpp_uno &&			\
-	mv gcc3_netbsd_intel gcc3_netbsd_intel.orig &&		\
-	cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel &&		\
-	cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64
-
-do-build:
-	${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules && build.pl -P${MAKE_JOBS:U1} --all product=full && cd util && dmake openoffice_${OO_BASELANG} && dmake ooolanguagepack"
-
-do-install:
-	cd ${DESTDIR}${OO_PREFIX} &&				\
-	for f in ${OO_PKGPATH:Q}/${OO_BASELANG}/*/*.sw; do	\
-		tar xpf $$f;					\
-	done;							\
-	for lang in ${OO_LANGPACKS}; do				\
-		for f in ${OO_LANGPACKPATH:Q}/$$lang/*/*.sw; do	\
-			tar xpf $$f;				\
-		done;						\
-	done
-	cd ${DESTDIR}${OO_PREFIX}/program &&			\
-	chmod ${SHAREMODE} hid.lst testtoolrc
-	for f in ${OO_PROGRAMS}; do				\
-		ln -sf ${DESTDIR}${OO_PREFIX}/program/$$f	\
-			${DESTDIR}${PREFIX}/bin/$$f;		\
-	done
-	cd ${WRKSRC}/sysui/${OPENOFFICE_OUTPATH}.pro/misc/openoffice.org && \
-	${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} _PREFIX=${PREFIX}	\
-		GNOME=${PKG_OPTIONS:Mgnome} KDE=${PKG_OPTIONS:Mkde}	\
-		OO_PREFIX=${OO_PREFIX} ${SH} create_tree.sh
-
-post-install:
-	cd ${DESTDIR}${PREFIX} &&				\
-	find lib/${OO_RELEASE} \! -type d -print |		\
-	sort > ${WRKDIR}/PLIST
-
-# OS specific Makefile
-.if exists(Makefile.${OPSYS})
-.  include "Makefile.${OPSYS}"
-.endif
-
-.include "../../mk/compiler.mk"
-
-.include "../../databases/db4/buildlink3.mk"
-.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/misc/openoffice2/Makefile.FreeBSD
+++ b/misc/openoffice2/Makefile.FreeBSD
@ -1,17 +0,0 @@
-# $NetBSD: Makefile.FreeBSD,v 1.3 2008/02/06 16:41:07 hira Exp $
-#
-
-BUILD_DEPENDS+=		coreutils>=*:../../sysutils/coreutils
-BUILD_DEPENDS+=		patch>=*:../../devel/patch
-CONFIGURE_ARGS+=	--with-gnu-cp=${PREFIX}/bin/gcp
-CONFIGURE_ARGS+=	--with-gnu-patch=${PREFIX}/bin/gpatch
-
-.if ${MACHINE_ARCH} == "i386"
-#OPENOFFICE_DLLSUFFIX=	fi
-OPENOFFICE_OUTPATH=	unxfbsdi
-OPENOFFICE_SETFILE=	FreeBSDX86
-.elif ${MACHINE_ARCH} == "x86_64"
-#OPENOFFICE_DLLSUFFIX=	fx
-OPENOFFICE_OUTPATH=	unxfbsdx
-OPENOFFICE_SETFILE=	FreeBSDAMD
-.endif
--- a/misc/openoffice2/Makefile.NetBSD
+++ b/misc/openoffice2/Makefile.NetBSD
@ -1,24 +0,0 @@
-# $NetBSD: Makefile.NetBSD,v 1.2 2008/10/05 21:36:35 cube Exp $
-#
-
-# systray quickstarter is broken with mutex handling?
-CONFIGURE_ARGS+=	--disable-systray
-
-# *.pc files are required, but these don't exist on NetBSD.
-.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
-. for _pkg_ in freetype2 Xfixes Xrandr Xrender
-.  if !exists(${X11BASE}/lib/pkgconfig/${_pkg_:tl}.pc)
-USE_BUILTIN.${_pkg_}=	no
-.  endif
-. endfor
-.endif
-
-.if ${MACHINE_ARCH} == "i386"
-#OPENOFFICE_DLLSUFFIX=	bi
-OPENOFFICE_OUTPATH=	unxbsdi3
-OPENOFFICE_SETFILE=	NetBSDX86
-.elif ${MACHINE_ARCH} == "x86_64"
-#OPENOFFICE_DLLSUFFIX=	bx
-OPENOFFICE_OUTPATH=	unxbsdx3
-OPENOFFICE_SETFILE=	NetBSDX86-64
-.endif
--- a/misc/openoffice2/PLIST
+++ b/misc/openoffice2/PLIST
@ -1,300 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2009/01/26 15:39:05 hira Exp $
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/soffice
-bin/swriter
-bin/unopkg
-bin/${OO_UNXNAME}
-bin/${OO_UNXNAME}-printeradmin
-share/applications/${OO_UNXNAME}-base.desktop
-share/applications/${OO_UNXNAME}-calc.desktop
-share/applications/${OO_UNXNAME}-draw.desktop
-share/applications/${OO_UNXNAME}-extension.desktop
-share/applications/${OO_UNXNAME}-impress.desktop
-share/applications/${OO_UNXNAME}-math.desktop
-share/applications/${OO_UNXNAME}-printeradmin.desktop
-share/applications/${OO_UNXNAME}-writer.desktop
-share/application-registry/${OO_UNXNAME}.applications
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-base.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-calc.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-draw.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-impress.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-math.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-writer.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-base.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-calc.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-draw.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-impress.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-math.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-writer.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-base.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-calc.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-draw.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-impress.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-math.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-printeradmin.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-writer.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-database.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-drawing.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-formula.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-master-document.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-presentation.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-text-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-drawing-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-drawing.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-extension.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-formula.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-master-document.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-database.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-drawing-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-drawing.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-formula.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-master-document.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-presentation-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-presentation.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-spreadsheet-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-spreadsheet.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-text-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-text.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-web-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-presentation-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-presentation.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text.desktop
-share/mime/packages/openoffice.org.xml
-share/mime-info/${OO_UNXNAME}.mime
-share/mime-info/${OO_UNXNAME}.keys
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@ -1,79 +0,0 @@
-$NetBSD: distinfo,v 1.55 2009/09/13 03:54:13 hira Exp $
-
-SHA1 (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = 8c5175b933df18fa88adec59d366e5b191555d22
-RMD160 (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = be6e0215d00ff78ecfd35ba51c86b37e9c2ba899
-Size (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = 6738021 bytes
-SHA1 (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 40193da67ec5f76d7528e03c94599f4db8e61dfb
-RMD160 (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 44fde99dbd4991c893dd18816f8e98e54fb0aacd
-Size (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 152311420 bytes
-SHA1 (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 89c3420231808b0492dc07c83f5dc0421a3c5836
-RMD160 (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 540dd0fdae81b1f434db73882691b5d62cd0c75d
-Size (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 81490942 bytes
-SHA1 (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = a250d4327bb4bcf8e025fbe7c706121044cfc949
-RMD160 (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = 01441eeaa0785b8988f1d464974119b54572f009
-Size (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = 41621781 bytes
-SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
-SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
-SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
-SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
-SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
-SHA1 (patch-ak) = 3bb19e2c8e606a66609024a49ec311161b375f10
-SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
-SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
-SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
-SHA1 (patch-ap) = cf32f3205e7f8f6ff90518f262374b6c7260b431
-SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
-SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
-SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
-SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 86d4f2fa8554ba69cb026197543494750ef8add7
-SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
-SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
-SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
-SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
-SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
-SHA1 (patch-bh) = c5fdc5597895c6ea4034355dc225f9e72ed1d218
-SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
-SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
-SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
-SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d
-SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
-SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
-SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
-SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
-SHA1 (patch-bq) = 486c7e8198e2d8342e4472871bb31fc0b1321286
-SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
-SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
-SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
-SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
-SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
-SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = 751f14379d9274690c3f6aa0fe30322af2822e1f
-SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
-SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
-SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
-SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
-SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
-SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
-SHA1 (patch-cs) = 01e2cb3ac9eab523540bd6d388081cccc425e204
-SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
-SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
-SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
-SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
-SHA1 (patch-cx) = b718aa55917eaf42d4d4868cab46503e6c8c538d
-SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
-SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
-SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
-SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573
-SHA1 (patch-dt) = 0b3c91b128b2b0dbe7492665b44f4383379e2067
-SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858
-SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
-SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f
-SHA1 (patch-ef) = 03c1e3fb27e0ba12dec92866fb592f66442a0c1a
-SHA1 (patch-eg) = 0c6119bd2a91c91ab71348558b8c75224ffa90dc
-SHA1 (patch-eh) = bb09b068066309ccdc1dc707b8d97e2dd9bf64e5
-SHA1 (patch-ei) = b8b0ca35c15cff58cc53a937f8f3a127e4cd0d03
-SHA1 (patch-ej) = 1300efe96fb675b89df2c345cc68f1fc79a8bd69
-SHA1 (patch-ga) = ba2ecca04fa39f37180080338fe9107f854ceb95
-SHA1 (patch-gb) = adabfee3d06e31741b462f5f9ab6dab26a243688
-SHA1 (patch-gc) = 91865d8bd5cdb0499f4b63d626b6ef22ef0c37b2
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@ -1,93 +0,0 @@
-# $NetBSD: options.mk,v 1.28 2010/12/02 07:35:05 dholland Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
-PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde nas ooo-external-libwpd # xulrunner
-# The list from completelangiso in solenv/inc/postset.mk.
-OO_SUPPORTED_LANGUAGES=		af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
-				cs cy da de dz el en-GB en-US en-ZA eo es et \
-				eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
-				ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \
-				nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
-				rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
-				ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \
-				zh-TW zu all
-.for l in ${OO_SUPPORTED_LANGUAGES}
-PKG_SUPPORTED_OPTIONS+=		lang-${l}
-.endfor
-PKG_SUGGESTED_OPTIONS=		gtk2 lang-en-US
-PKG_OPTIONS_LEGACY_OPTS+=	gnome-vfs:gnome
-
-.include "../../mk/bsd.options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(PKG_OPTIONS:Mlang-all)
-OO_LANGS=	ALL
-OO_BASELANG=	en-US
-OO_LANGPACKS=	${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1}
-.else
-.  for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
-OO_LANGS+=	${lang}
-OO_BASELANG?=	${lang} # Get first one.
-.  endfor
-.endif
-OO_LANGS?=	en-US
-OO_BASELANG?=	en-US
-OO_LANGPACKS?=	${OO_LANGS:S/${OO_BASELANG}//1}
-
-.if !empty(PKG_OPTIONS:Mxulrunner)
-CONFIGURE_ARGS+=	--with-system-mozilla=mozilla
-.include "../../devel/xulrunner/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-mozilla
-.endif
-
-.if !empty(PKG_OPTIONS:Mooo-external-libwpd)
-CONFIGURE_ARGS+=	--with-system-libwpd
-.include "../../converters/libwpd/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mcups)
-CONFIGURE_ARGS+=	--enable-cups
-.include "../../print/cups/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-cups
-.endif
-
-PLIST_VARS+=		gnome
-.if !empty(PKG_OPTIONS:Mgnome)
-PLIST.gnome=		yes
-CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-evolution2
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-gnome-vfs --disable-evolution2
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+=	--enable-gtk
-.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-gtk
-.endif
-
-PLIST_VARS+=		kde
-.if !empty(PKG_OPTIONS:Mkde)
-PLIST.kde=		yes
-CONFIGURE_ENV+=		KDEDIR=${BUILDLINK_PREFIX.kdelibs:Q}
-CONFIGURE_ARGS+=	--enable-kde --enable-kdeab
-.include "../../x11/kdelibs3/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-kde --disable-kdeab
-.endif
-
-.if !empty(PKG_OPTIONS:Mnas)
-CONFIGURE_ARGS+=	--with-system-nas
-# Build error with nas<=1.9.
-BUILDLINK_API_DEPENDS.nas+=	nas>=1.9nb1
-.include "../../audio/nas/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-nas
-.endif
--- a/misc/openoffice2/patches/patch-ac
+++ b/misc/openoffice2/patches/patch-ac
@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/03/04 13:11:18 hira Exp $
-
--- sal/inc/osl/endian.h.orig	2007-02-17 23:15:28.000000000 +0900
-+++ sal/inc/osl/endian.h	2007-02-17 23:16:59.000000000 +0900
-@@ -76,11 +76,14 @@
- #ifdef NETBSD
- #   include <machine/endian.h>
- #   if BYTE_ORDER == LITTLE_ENDIAN
-#   	define _LITTLE_ENDIAN
-+#	undef _BIG_ENDIAN
-+#	undef _PDP_ENDIAN
- #   elif BYTE_ORDER == BIG_ENDIAN
-#   	define _BIG_ENDIAN
-+#	undef _LITTLE_ENDIAN
-+#	undef _PDP_ENDIAN
- #   elif BYTE_ORDER == PDP_ENDIAN
-#   	define _PDP_ENDIAN
-+#	undef _LITTLE_ENDIAN
-+#	undef _BIG_ENDIAN
- #   endif
- #endif
- 
--- a/misc/openoffice2/patches/patch-ad
+++ b/misc/openoffice2/patches/patch-ad
@ -1,47 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/10/06 20:02:22 hira Exp $
-
--- sal/osl/unx/system.c.orig	2007-07-05 18:05:56.000000000 +0900
-+++ sal/osl/unx/system.c	2007-09-26 17:14:54.000000000 +0900
-@@ -71,8 +71,11 @@
- struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
- #endif /* BUILD_OS_APPLEOSX */
- #else /* MACOSX */
-+#if (__NetBSD_Version__ < 299001000)
- struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
-+#endif
- #endif /* MACOSX */
-+#if (__NetBSD_Version__ < 299001000)
- {
-   	struct passwd* res;
- 
-@@ -138,8 +141,9 @@
-         return(res);
- #endif /* MACOSX */
- }
-+#endif
- 
-#if defined(NETBSD) || defined(MACOSX)
-+#if (defined(NETBSD) && (__NetBSD_Version__ < 299001000)) || defined(MACOSX)
- int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-            size_t buflen, struct passwd **result)
- {
-@@ -432,7 +436,7 @@
- }
- #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
- 
-#if defined(MACOSX)
-+#if defined(MACOSX) || defined(NETBSD)
- /*
-  * This section works around calls that are missing or broken
-  * in MacOS X 10.1.x and earlier.
-@@ -476,6 +480,10 @@
-     return nRet;
- }
- 
-+#endif
-+
-+#if defined(MACOSX)
-+
- /* No reentrant asctime() either... */
- 
- /*******************************************************************************/
--- a/misc/openoffice2/patches/patch-ag
+++ b/misc/openoffice2/patches/patch-ag
@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2007/03/04 13:11:18 hira Exp $
-
--- solenv/bin/checkdll.sh.orig	2007-02-17 17:27:21.000000000 +0900
-+++ solenv/bin/checkdll.sh	2007-02-17 17:27:43.000000000 +0900
-@@ -37,7 +37,7 @@
- # checkdll.sh - execute checkdll with all -L arguments to this script
- #               prepended to LD_LIBRARY_PATH
- 
-set -- `getopt "L:" "$@"` ||  {
-+set -- `getopt "L:R:" "$@"` ||  {
-     echo "Usage: `basename $0` [-L library_path] <shared_library>" 1>&2
-     exit 1
- }
-@@ -49,6 +49,7 @@
-     do
- 	case $1 in
- 	    -L) shift; option=$1;;
-+	    -R) shift;;
- 	    --) break;;
- 	esac
- 	case "${libpath+X}" in
--- a/misc/openoffice2/patches/patch-ah
+++ b/misc/openoffice2/patches/patch-ah
@ -1,94 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2007/10/06 20:02:22 hira Exp $
-
--- solenv/inc/_tg_app.mk.orig	2007-06-27 23:01:57.000000000 +0900
-+++ solenv/inc/_tg_app.mk	2007-09-26 19:50:23.000000000 +0900
-@@ -94,7 +94,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_1.cmd
-	@cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+	@cat $(mktmp /dev/null $(APP1LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
-@@ -292,7 +292,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_2.cmd
-	@cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+	@cat $(mktmp /dev/null $(APP2LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
-@@ -490,7 +490,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_3.cmd
-	@cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+	@cat $(mktmp /dev/null $(APP3LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
-@@ -688,7 +688,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_4.cmd
-	@cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+	@cat $(mktmp /dev/null $(APP4LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
-@@ -886,7 +886,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_5.cmd
-	@cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+	@cat $(mktmp /dev/null $(APP5LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
-@@ -1084,7 +1084,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_6.cmd
-	@cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+	@cat $(mktmp /dev/null $(APP6LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
-@@ -1282,7 +1282,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_7.cmd
-	@cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+	@cat $(mktmp /dev/null $(APP7LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
-@@ -1480,7 +1480,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_8.cmd
-	@cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+	@cat $(mktmp /dev/null $(APP8LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
-@@ -1678,7 +1678,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_9.cmd
-	@cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+	@cat $(mktmp /dev/null $(APP9LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
-@@ -1876,7 +1876,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_10.cmd
-	@cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
-+	@cat $(mktmp /dev/null $(APP10LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
--- a/misc/openoffice2/patches/patch-ai
+++ b/misc/openoffice2/patches/patch-ai
@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2007/10/06 20:02:22 hira Exp $
-
--- solenv/inc/tg_app.mk.orig	2007-07-02 18:23:33.000000000 +0900
-+++ solenv/inc/tg_app.mk	2007-09-26 17:53:57.000000000 +0900
-@@ -131,7 +131,7 @@
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- 	@echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP$(TNR)OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-	@cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-+	@cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- 	@echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
--- a/misc/openoffice2/patches/patch-ak
+++ b/misc/openoffice2/patches/patch-ak
@ -1,105 +0,0 @@
-$NetBSD: patch-ak,v 1.8 2008/04/13 20:32:43 hira Exp $
-
--- config_office/set_soenv.in.orig	2008-01-23 17:07:28.000000000 +0000
-+++ config_office/set_soenv.in	2008-04-14 04:39:32.000000000 +0000
-@@ -40,7 +40,7 @@
- #
- my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
-      $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
-     $wps, $wps2, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
-+     $wps, $wps2, $cur_dir, $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW,
-      $USE_MINGW, $platform, $NOWRAPCMD,
-      $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include, 
-      $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
-@@ -90,7 +90,7 @@
-      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
-      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
- 	 $PROEXT,
-     $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
-+     $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -132,6 +132,7 @@
- $par_dir        = "..";             # parrent directory
- $I              = " -I";            # include search path
- $L              = " -L";            # library search path
-+$R              = " -R";            # library search path
- $D              = " -D";            # define search path
- $empty          = "";               # used as argument
- $no_stl         = "NO_STLPORT4";    # possible argument
-@@ -284,6 +285,16 @@
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-    }
-+   elsif ($platform =~ m/^x86_64/)
-+   {  print "Setting NetBSD x86-64 specific values... ";
-+      $outfile        = "NetBSDX86-64Env.Set"; 
-+      $CPU            = "X";
-+      $CPUNAME        = "X86_64";
-+      $OUTPATH        = "unxbsdx";
-+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+   }
-    elsif ($platform =~ m/^sparc/)
-    {  print "Setting NetBSD Sparc specific values... ";
-       $outfile        = "NetBSDSparcEnv.Set"; 
-@@ -310,7 +321,14 @@
-    }
-    #Conditional setting depending on gcc3:
-       $CVER           = "C300";
-      $OUTPATH        = $OUTPATH."2";
-+      if (@GCCVER@ >= 30401) {
-+         $CVER           = "C341";
-+         $OUTPATH        = $OUTPATH."3";
-+      }
-+      else {
-+         $CVER           = "C300";
-+         $OUTPATH        = $OUTPATH."2";
-+      }
-    # General NetBSD settings:
-       $BIG_SVX        = "TRUE";
-       $COM            = "GCC";
-@@ -1387,7 +1405,8 @@
-                         $L.$JRETOOLKITDIR.
-                         $L.$JRETHREADDIR.
-                         $L_STLPORT_LIB.
-                        $L.$XLIB;
-+                        $L.$XLIB.
-+                        $R.$XLIB;
- }
- elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
- {  $SOLARLIB          = $L.$par_dir.$LIB.
-@@ -1548,6 +1567,7 @@
- }
- 
- if ($SYSTEM_PYTHON eq "NO") {
-+    $PYTHON		  = python
-     $PYTHONPATH           = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
-     $PYTHONHOME           = $SOLARVER.$ds.$INPATH;
-     if ($GUIBASE eq "WIN") {
-@@ -1693,6 +1713,7 @@
- ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
- }
- ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
-+ToFile( "X11_LDFLAGS",       "@X_LIBS@",           "e" );
- ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
- ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
- ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-@@ -1942,6 +1963,7 @@
- ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
- ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
- ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
-+ToFile( "MOZ_NSS_LIBS",      "@MOZ_NSS_LIBS@",     "e" );
- ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
- ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" );
- ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
-@@ -1967,6 +1989,7 @@
- ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
- ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
- ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
-+ToFile( "PYTHON",            "@PYTHON@",           "e" );
- ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
- ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
- if ($SYSTEM_PYTHON eq "NO") {
--- a/misc/openoffice2/patches/patch-am
+++ b/misc/openoffice2/patches/patch-am
@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- soltools/checkdll/makefile.mk.orig	2007-02-17 17:42:05.000000000 +0900
-+++ soltools/checkdll/makefile.mk	2007-02-17 17:42:44.000000000 +0900
-@@ -57,7 +57,7 @@
- STDLIB += -ldl
- .ENDIF
- .IF "$(OS)"=="NETBSD"
-APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
-+APP1STDLIBS    += -u _Unwind_Resume -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
- .ENDIF
- .ENDIF # "$(GUI)"=="UNX"
- 
--- a/misc/openoffice2/patches/patch-an
+++ b/misc/openoffice2/patches/patch-an
@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- psprint/source/printergfx/printerjob.cxx.orig	2007-02-17 17:43:14.000000000 +0900
-+++ psprint/source/printergfx/printerjob.cxx	2007-02-17 17:43:55.000000000 +0900
-@@ -82,6 +82,17 @@
- 
- #include "glyphset.hxx"
- 
-+#if defined(NETBSD)
-+#if defined(__cplusplus)
-+extern "C" {
-+#endif
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+	       size_t buflen, struct passwd **result);
-+#if defined(__cplusplus)
-+}
-+#endif
-+#endif
-+
- using namespace psp;
- using namespace rtl;
- 
--- a/misc/openoffice2/patches/patch-ao
+++ b/misc/openoffice2/patches/patch-ao
@ -1,19 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- i18npool/source/breakiterator/gendict.cxx.orig	2007-02-17 23:18:38.000000000 +0900
-+++ i18npool/source/breakiterator/gendict.cxx	2007-02-17 23:20:08.000000000 +0900
-@@ -74,8 +74,12 @@
- 	fprintf(cfp, "extern \"C\" {\n");
- 
- 	sal_Int32 count, i, j;
-	sal_Int32 lenArrayCurr = 0, lenArrayCount = 0, lenArrayLen = 0, *lenArray = NULL, charArray[0x10000];
-	sal_Bool exist[0x10000];
-+	sal_Int32 lenArrayCurr = 0, lenArrayCount = 0, lenArrayLen = 0, *lenArray = NULL, *charArray;
-+	sal_Bool *exist;
-+	charArray = (sal_Int32*) malloc(0x10000*sizeof(*charArray));
-+	if (charArray == NULL) exit(1);
-+	exist = (sal_Bool*) malloc(0x10000*sizeof(*exist));
-+	if (exist == NULL) exit(1);
- 	for (i = 0; i < 0x10000; i++) {
- 	    exist[i] = sal_False;
- 	    charArray[i] = 0;
--- a/misc/openoffice2/patches/patch-ap
+++ b/misc/openoffice2/patches/patch-ap
@ -1,82 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2007/10/06 20:02:22 hira Exp $
-
--- stlport/STLport-4.5.patch.orig	2007-09-27 00:35:49.000000000 +0900
-+++ stlport/STLport-4.5.patch	2007-09-27 01:38:51.000000000 +0900
-@@ -1068,3 +1068,77 @@
-   #ifndef _STLP_CMATH
-   #include <cmath>
-   #endif
-+*** misc/STLport-4.5/src/gcc-3.0-netbsd.mak	Wed Sep 26 22:26:07 2007
-+--- misc/build/STLport-4.5/src/gcc-3.0-netbsd.mak	Wed Sep 26 22:23:39 2007
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,68 ----
-+! #
-+! # Note : this makefile is for gcc-3 !
-+! #
-+! 
-+! #
-+! # compiler
-+! #
-+! CC+= -D_REENTRANT
-+! CXX+= -D_REENTRANT
-+!
-+! #
-+! # Basename for libraries
-+! #
-+! LIB_BASENAME = libstlport_gcc
-+! 
-+! #
-+! # guts for common stuff
-+! #
-+! #
-+! LINK=ar cr
-+! DYN_LINK=$(CXX) $(LDFLAGS) $(PTHREAD_LIBS) -fexceptions -shared -o
-+! 
-+! OBJEXT=o
-+! DYNEXT=so
-+! STEXT=a
-+! RM=rm -rf
-+! PATH_SEP=/
-+! MKDIR=mkdir -p
-+! COMP=GCC$(ARCH)
-+! INSTALL_STEP = install_unix
-+! 
-+! all:  all_dynamic all_static symbolic_links
-+! 
-+! include common_macros.mak
-+! 
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+! 
-+! CXXFLAGS_COMMON =  -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} $(CXXFLAGS)
-+! CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+! 
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+! 
-+! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
-+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+! 
-+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
-+! include common_percent_rules.mak
-+! include common_rules.mak
-+! 
-+! 
-+! #install: all
-+! #    cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+! 
-+! #%.s: %.cpp
-+! #    $(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-+! 
--- a/misc/openoffice2/patches/patch-aq
+++ b/misc/openoffice2/patches/patch-aq
@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2007/10/06 20:02:22 hira Exp $
-
--- stlport/makefile.mk.orig	2007-07-31 22:10:28.000000000 +0900
-+++ stlport/makefile.mk	2007-09-27 00:26:24.000000000 +0900
-@@ -111,7 +111,7 @@
- TAR_EXCLUDES=*/SC5/*
- .ENDIF          # "$(USE_SHELL)"=="4nt"
- 
-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak
-+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/gcc-3.0-netbsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak
- 
- 
- CONFIGURE_ACTION=none
-@@ -133,6 +133,8 @@
- 		# FreeBSD needs a special makefile
- 		.IF "$(OS)"=="FREEBSD"
- 			BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-+		.ELIF "$(OS)"=="NETBSD"
-+			BUILD_FLAGS=-f gcc-3.0-netbsd.mak
- 		.ELIF "$(OS)"=="MACOSX"
- 			BUILD_FLAGS=-f gcc-3.0-macosx.mak
- 		.ELIF "$(GUI)"=="WNT"
--- a/misc/openoffice2/patches/patch-ar
+++ b/misc/openoffice2/patches/patch-ar
@ -1,24 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- sal/osl/unx/tempfile.c.orig	2007-02-17 23:20:56.000000000 +0900
-+++ sal/osl/unx/tempfile.c	2007-02-17 23:22:45.000000000 +0900
-@@ -38,6 +38,9 @@
- /*****************************************************************/
- 
- #include <stdio.h>
-+#if defined(NETBSD)
-+#include <paths.h>
-+#endif
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -91,6 +94,9 @@
- #if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD)
- 		if ( !pValue )
- 			pValue = P_tmpdir;
-+#elif defined(NETBSD)
-+		if ( !pValue )
-+			pValue = _PATH_TMP;
- #endif
- 	}
- #endif /* MACOSX */
--- a/misc/openoffice2/patches/patch-as
+++ b/misc/openoffice2/patches/patch-as
@ -1,46 +0,0 @@
-$NetBSD: patch-as,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- sal/osl/unx/file.cxx.orig	2007-02-17 23:02:10.000000000 +0900
-+++ sal/osl/unx/file.cxx	2007-02-17 23:04:04.000000000 +0900
-@@ -1424,7 +1424,7 @@
- 
- #ifdef HAVE_STATFS_H
- 
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-+#if defined(FREEBSD) || defined(MACOSX)
- #   define __OSL_STATFS_STRUCT      			struct statfs
- #   define __OSL_STATFS(dir, sfs)   			statfs((dir), (sfs))
- #   define __OSL_STATFS_BLKSIZ(a)   			((sal_uInt64)((a).f_bsize))
-@@ -1438,6 +1438,32 @@
- #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
- #endif /* FREEBSD || NETBSD */
- 
-+#if defined(NETBSD)
-+
-+#include <sys/param.h>
-+
-+/* statvfs() replaced statfs() in 2.99.9 */
-+# if __NetBSD_Version__ >= 299000900
-+       /* 2.0D or later */
-+#   define __OSL_STATFS_STRUCT                         struct statvfs
-+#   define __OSL_STATFS(dir, sfs)                      statvfs((dir), (sfs))
-+#   define __OSL_STATFS_ISREMOTE(a)                    (((a).f_flag & ST_LOCAL) == 0)
-+
-+# else
-+       /* version before 2.0D */
-+#   define __OSL_STATFS_STRUCT                         struct statfs
-+#   define __OSL_STATFS(dir, sfs)                      statfs((dir), (sfs))
-+#   define __OSL_STATFS_ISREMOTE(a)                    (((a).f_type & MNT_LOCAL) == 0)
-+
-+# endif /* >2.0D */
-+
-+#   define __OSL_STATFS_BLKSIZ(a)                      ((sal_uInt64)((a).f_bsize))
-+#   define __OSL_STATFS_TYPENAME(a)                    ((a).f_fstypename)
-+
-+#      define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)      (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0)
-+#      define __OSL_STATFS_IS_CASE_PRESERVING_FS(a)    (strcmp((a).f_fstypename, "msdos") != 0)
-+#endif
-+
- #if defined(LINUX)
- #	define __OSL_NFS_SUPER_MAGIC				 0x6969
- #	define __OSL_SMB_SUPER_MAGIC				 0x517B
--- a/misc/openoffice2/patches/patch-aw
+++ b/misc/openoffice2/patches/patch-aw
@ -1,23 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- sal/osl/unx/system.h.orig	2007-02-17 23:26:16.000000000 +0900
-+++ sal/osl/unx/system.h	2007-02-17 22:59:36.000000000 +0900
-@@ -136,7 +136,10 @@
- #endif
- 
- #ifdef NETBSD
-+#	include <sys/param.h>
-+#  ifndef ETIME
- #	define  ETIME ETIMEDOUT
-+#  endif
- #	define _POSIX_THREAD_SYSCALL_SOFT 1
- #	include <pthread.h>
- #	include <netdb.h>
-@@ -530,7 +533,6 @@
- 
- #ifdef NO_PTHREAD_RTL
- #if !defined FREEBSD || (__FreeBSD_version < 500112)
-struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);
- extern struct spwd *getspnam_r(const char *name, struct spwd *result,
- 							   char *buffer, int buflen);
- 
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@ -1,188 +0,0 @@
-$NetBSD: patch-ba,v 1.15 2009/09/10 00:27:08 tnn Exp $
-
--- config_office/configure.orig	2008-05-20 18:28:55.000000000 +0200
-+++ config_office/configure
-@@ -3176,11 +3176,11 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6
- 		test_cups=no
- 		_os=OSF1
- 		;;
-	netbsd)
-+	*netbsd*)
- 		test_gtk=yes
- 		build_cairo=yes
- 		test_kde=yes
-		test_cups=no
-+		test_cups=yes
- 		PTHREAD_CFLAGS="-pthread"
- 		PTHREAD_LIBS="-pthread -lpthread"
- 		_os=NetBSD
-@@ -10304,7 +10304,7 @@ echo "$as_me: error: $_javadoc_path not 
- fi
- 
- if test "$SOLAR_JAVA" != ""; then
-        if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
-+        if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
-       if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
-         cat > findhome.java <<_ACEOF
- import java.io.File;
-@@ -10404,7 +10404,7 @@ echo "$as_me: WARNING: in case JAVA_HOME
-          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
-          echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
-          echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-         if test "$JDK" == "gcj"; then
-+         if test "$JDK" = "gcj"; then
-              echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
-          fi
-       fi
-@@ -13098,7 +13098,7 @@ fi
- if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
-    test "$with_system_libxslt" != "no"; then
-     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-      test "$with_system_libxml" == "no"; then
-+      test "$with_system_libxml" = "no"; then
-       # somehow AC_MSG_WARN won't work...
-        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
-        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
-@@ -13108,7 +13108,7 @@ fi
- if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
-    test "$with_system_libxml" != "no"; then
-     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-      test "$with_system_libxslt" == "no"; then
-+      test "$with_system_libxslt" = "no"; then
-       # somehow AC_MSG_WARN won't work...
-        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
-        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
-@@ -13591,13 +13591,14 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" 
- 
- 
-    python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
-+   python_ldflags=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LDFLAGS');"`
-    python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
-    PYTHON_CFLAGS="-I$python_include"
- 
-    if test "$_os" = "Darwin"; then
-       PYTHON_LIBS="-framework Python"
-    else
-      PYTHON_LIBS="-lpython$python_version"
-+      PYTHON_LIBS="-lpython$python_version $python_ldflags"
-    fi
- 
-       save_CPPFLAGS="$CPPFLAGS"
-@@ -13868,7 +13869,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
-   DB_INCLUDES=/usr/include
-+   DB_INCLUDES=${BLNK_PREFIX_db4}/include/db4
- else
- 
-              CFLAGS=-I/usr/include/db4
-@@ -13991,13 +13992,13 @@ echo "${ECHO_T}no. you need at least db 
-     #AC_CHECK_LIB(db, db_create, [],
-     #  [AC_MSG_ERROR([db library not installed or functional])], [])
- 
-echo "$as_me:$LINENO: checking for main in -ldb" >&5
-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for main in -ldb4" >&5
-+echo $ECHO_N "checking for main in -ldb4... $ECHO_C" >&6
- if test "${ac_cv_lib_db_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb  $LIBS"
-+LIBS="-ldb4  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14054,7 +14055,7 @@ if test $ac_cv_lib_db_main = yes; then
- #define HAVE_LIBDB 1
- _ACEOF
- 
-  LIBS="-ldb $LIBS"
-+  LIBS="-ldb4 $LIBS"
- 
- else
-   { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
-@@ -15758,23 +15759,23 @@ fi
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom " >&5
-echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom ... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for libxul" >&5
-+echo $ECHO_N "checking for libxul ... $ECHO_C" >&6
- 
-        if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom " ; then
-+        if $PKG_CONFIG --exists libxul; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
- echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
-            MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom "`
-+            MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags libxul`
-             echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
- echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
- echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
-            MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom "`
-+            MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs libxul`
-             echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
- echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
-         else
-@@ -19718,7 +19719,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
- echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
- if test $ac_cv_header_audio_audiolib_h = yes; then
-   NAS_INCLUDES=/usr/include
-+   NAS_INCLUDES=${BLNK_PREFIX_nas}/include
- else
- 
-              CFLAGS=-I/usr/X11R6/include
-@@ -20526,7 +20527,7 @@ echo "${ECHO_T}internal" >&6
-     NEON_CFLAGS=
-     BUILD_TYPE="$BUILD_TYPE NEON"
- fi
-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
-+if test "$USE_BUILTIN_openssl" = "yes" && test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
-    with_system_openssl=yes
- fi
- echo "$as_me:$LINENO: checking which libssl to use" >&5
-@@ -20537,7 +20538,7 @@ if test -n "$with_system_openssl" -o -n 
- echo "${ECHO_T}external" >&6
-     # Mac OS builds should get out without extra stuff is the Mac porters'
-     # wish. And pkg-config is although Xcode ships a .pc for openssl
-    if test "$_os" = "Darwin"; then
-+    if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
-         OPENSSL_CFLAGS=
-         OPENSSL_LIBS="-lssl -lcrypto"
-     else
-@@ -23949,7 +23950,7 @@ echo "${ECHO_T}yes" >&6
-   ENABLE_REPORTDESIGN=YES
-   echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
- echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
-  if test "$with_system_jfreereport" == "yes"; then
-+  if test "$with_system_jfreereport" = "yes"; then
-    	SYSTEM_JFREEREPORT=YES
-   	echo "$as_me:$LINENO: result: external" >&5
- echo "${ECHO_T}external" >&6
-@@ -24466,7 +24467,7 @@ your KDE installation by exporting KDEDI
-     fi
- 
-         KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
-+    KDE_LIBS="-L$kde_libdir -Wl,-R$kde_libdir -L$qt_libdir -Wl,-R$qt_libdir -lkdeui -lkdecore -lqt-mt"
- fi
- 
- 
-@@ -25019,7 +25020,7 @@ if test "$_os" = "Darwin"; then
-    XINERAMA_LINK=dynamic
-    echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-+elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
-    if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
-       # we have both versions, let the user decide but use the dynamic one
-       # per default
--- a/misc/openoffice2/patches/patch-bb
+++ b/misc/openoffice2/patches/patch-bb
@ -1,22 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- sal/osl/unx/backtrace.h.orig	2007-02-17 22:54:13.000000000 +0900
-+++ sal/osl/unx/backtrace.h	2007-02-17 22:57:00.000000000 +0900
-@@ -34,7 +34,7 @@
-  ************************************************************************/
- 
- 
-#if defined (SOLARIS) || (FREEBSD) 
-+#if defined (SOLARIS) || (FREEBSD) || (NETBSD)
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -47,7 +47,7 @@
- void backtrace_symbols_fd( void **buffer, int size, int fd );
- 
- /* no frame.h on FreeBSD */
-#if defined FREEBSD
-+#if defined FREEBSD || NETBSD
- struct frame {
- 	long	arg0[8];
- 	long	arg1[6];
--- a/misc/openoffice2/patches/patch-bc
+++ b/misc/openoffice2/patches/patch-bc
@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- portaudio/portaudio_v18_1.patch.orig	2007-02-19 01:22:02.000000000 +0900
-+++ portaudio/portaudio_v18_1.patch	2007-02-19 01:22:28.000000000 +0900
-@@ -98,7 +98,7 @@
-   
-   #ifdef __linux__
-   #include <linux/soundcard.h>
-+ #elif defined (__FreeBSD__)
-++ #elif defined (__FreeBSD__) || defined (__NetBSD__)
- + #include <sys/soundcard.h>
-   #else
-   #include <machine/soundcard.h> /* JH20010905 */
--- a/misc/openoffice2/patches/patch-bd
+++ b/misc/openoffice2/patches/patch-bd
@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- sal/rtl/source/makefile.mk.orig	2007-02-22 20:55:50.000000000 +0900
-+++ sal/rtl/source/makefile.mk	2007-02-22 20:56:44.000000000 +0900
-@@ -135,6 +135,10 @@
- 
- .ENDIF # .IF "$(OS)"=="LINUX"
- 
-+.IF "$(OS)" == "NETBSD"
-+CDEFS+= -DFORCE_SYSALLOC
-+.ENDIF
-+
- #.ENDIF
- 
- .ENDIF
--- a/misc/openoffice2/patches/patch-bf
+++ b/misc/openoffice2/patches/patch-bf
@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- soltools/cpp/cpp.h.orig	2007-02-23 12:14:25.000000000 +0900
-+++ soltools/cpp/cpp.h	2007-02-23 12:14:59.000000000 +0900
-@@ -2,7 +2,7 @@
-        
- #define	INS			32768	/* input buffer								*/
- #define	OBS			8092    /* outbut buffer							*/
-#define	NARG		32      /* Max number arguments to a macro			*/
-+#define	NARG		64      /* Max number arguments to a macro			*/
- #define	NINCLUDE	32      /* Max number of include directories (-I)	*/
- #define	NIF			64		/* depth of nesting of #if					*/
- #define	NINC		32		/* depth of nesting of #include				*/
--- a/misc/openoffice2/patches/patch-bg
+++ b/misc/openoffice2/patches/patch-bg
@ -1,15 +0,0 @@
-$NetBSD: patch-bg,v 1.4 2008/04/07 16:24:51 hira Exp $
-
--- vcl/util/makefile.mk.orig	2008-01-24 02:19:40.000000000 +0900
-+++ vcl/util/makefile.mk	2008-04-07 18:15:43.000000000 +0900
-@@ -323,8 +323,8 @@
- 
- .IF "$(GUIBASE)"=="unx"
- 
-SHL2STDLIBS += -lXext -lSM -lICE -lX11
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
-+SHL2STDLIBS += $(X11_LDFLAGS) -lXext -lSM -lICE -lX11
-+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
- # needed by salprnpsp.cxx
- SHL2STDLIBS+= -ldl
- .ENDIF
--- a/misc/openoffice2/patches/patch-bh
+++ b/misc/openoffice2/patches/patch-bh
@ -1,12 +0,0 @@
-$NetBSD: patch-bh,v 1.3 2007/10/06 20:02:23 hira Exp $
-
--- psprint/util/makefile.mk.orig	2007-06-27 22:51:57.000000000 +0900
-+++ psprint/util/makefile.mk	2007-09-26 17:42:01.000000000 +0900
-@@ -75,6 +75,7 @@
-             $(COMPHELPERLIB)    \
-             $(CPPULIB)          \
- 			$(SALLIB)			\
-+			$(X11_LDFLAGS)			\
- 			-lX11
- .IF "$(SOLAR_JAVA)"!=""
- SHL1STDLIBS+=$(JVMFWKLIB)
--- a/misc/openoffice2/patches/patch-bi
+++ b/misc/openoffice2/patches/patch-bi
@ -1,13 +0,0 @@
-$NetBSD: patch-bi,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- shell/source/unix/misc/makefile.mk.orig	2007-02-23 18:59:47.000000000 +0900
-+++ shell/source/unix/misc/makefile.mk	2007-02-23 19:00:19.000000000 +0900
-@@ -59,7 +59,7 @@
- APP1OBJS = \
- 	$(OBJ)$/gnome-open-url.obj
- APP1LIBS =
-.IF "$(OS)"!="FREEBSD"
-+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
- APP1STDLIBS=-ldl
- .ENDIF
- 
--- a/misc/openoffice2/patches/patch-bj
+++ b/misc/openoffice2/patches/patch-bj
@ -1,20 +0,0 @@
-$NetBSD: patch-bj,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- toolkit/util/makefile.mk.orig	2007-02-23 19:08:23.000000000 +0900
-+++ toolkit/util/makefile.mk	2007-02-23 19:09:14.000000000 +0900
-@@ -84,13 +84,13 @@
- 
- .IF "$(GUIBASE)"=="unx"
- SHL1STDLIBS +=\
-	-lX11 -lXt -lXmu
-+	$(X11_LDFLAGS) -lX11 -lXt -lXmu
- .ENDIF
- 
- .ELSE
- .IF "$(GUI)"=="UNX"
- SHL1STDLIBS +=\
-	-lX11
-+	$(X11_LDFLAGS) -lX11
- .ENDIF
- .ENDIF
- 
--- a/misc/openoffice2/patches/patch-bk
+++ b/misc/openoffice2/patches/patch-bk
@ -1,18 +0,0 @@
-$NetBSD: patch-bk,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- forms/util/makefile.mk.orig	2007-02-23 19:13:29.000000000 +0900
-+++ forms/util/makefile.mk	2007-02-23 19:13:44.000000000 +0900
-@@ -111,11 +111,11 @@
- .IF "$(OS)"=="MACOSX"
- .IF "$(GUIBASE)"=="unx"
- SHL1STDLIBS +=\
-        -lX11 -lXt -lXmu
-+        $(X11_LDFLAGS) -lX11 -lXt -lXmu
- .ENDIF
- .ELSE
- SHL1STDLIBS +=\
-	-lX11
-+	$(X11_LDFLAGS) -lX11
- .ENDIF # OS == MACOSX
- 
- .ENDIF
--- a/misc/openoffice2/patches/patch-bl
+++ b/misc/openoffice2/patches/patch-bl
@ -1,12 +0,0 @@
-$NetBSD: patch-bl,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- padmin/source/makefile.mk.orig	2007-02-23 19:14:40.000000000 +0900
-+++ padmin/source/makefile.mk	2007-02-23 19:14:51.000000000 +0900
-@@ -103,6 +103,7 @@
- 	$(CPPUHELPERLIB)	\
- 	$(CPPULIB)			\
- 	$(SALLIB)			\
-+	$(X11_LDFLAGS)		\
- 	-lXext -lX11
- 
- .ENDIF
--- a/misc/openoffice2/patches/patch-bm
+++ b/misc/openoffice2/patches/patch-bm
@ -1,18 +0,0 @@
-$NetBSD: patch-bm,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- binfilter/bf_forms/util/makefile.mk.orig	2007-02-24 00:55:39.000000000 +0900
-+++ binfilter/bf_forms/util/makefile.mk	2007-02-24 00:56:10.000000000 +0900
-@@ -109,11 +109,11 @@
- .IF "$(OS)"=="MACOSX"
- .IF "$(GUIBASE)"=="unx"
- SHL1STDLIBS +=\
-        -lX11 -lXt -lXmu
-+        $(X11_LDFLAGS) -lX11 -lXt -lXmu
- .ENDIF
- .ELSE
- SHL1STDLIBS +=\
-	-lX11
-+	$(X11_LDFLAGS) -lX11
- .ENDIF # OS == MACOSX
- 
- .ENDIF
--- a/misc/openoffice2/patches/patch-bn
+++ b/misc/openoffice2/patches/patch-bn
@ -1,15 +0,0 @@
-$NetBSD: patch-bn,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- crashrep/source/unx/makefile.mk.orig	2007-02-24 00:59:23.000000000 +0900
-+++ crashrep/source/unx/makefile.mk	2007-02-24 00:59:55.000000000 +0900
-@@ -70,8 +70,8 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
- 
-APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS=$(DYNAMIC) $(X11_LDFLAGS) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD" && "$(OS)" != "NETBSD"
- APP1STDLIBS+=-ldl -lnsl
- .ENDIF
- .IF "$(OS)" == "SOLARIS"
--- a/misc/openoffice2/patches/patch-bo
+++ b/misc/openoffice2/patches/patch-bo
@ -1,13 +0,0 @@
-$NetBSD: patch-bo,v 1.3 2007/04/05 23:24:01 hira Exp $
-
--- extensions/source/plugin/unx/makefile.mk.orig	2006-12-01 23:19:00.000000000 +0900
-+++ extensions/source/plugin/unx/makefile.mk	2007-04-01 22:05:33.000000000 +0900
-@@ -81,7 +81,7 @@
- APP1STDLIBS+=-lXaw 
- .ENDIF
- .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-APP1STDLIBS+= -lXt -lXext -lX11
-+APP1STDLIBS+=$(X11_LDFLAGS) -lXt -lXext -lX11
- .ELSE
- APP1STDLIBS+= -lXt -lXext -lX11 -ldl
- .ENDIF
--- a/misc/openoffice2/patches/patch-bp
+++ b/misc/openoffice2/patches/patch-bp
@ -1,13 +0,0 @@
-$NetBSD: patch-bp,v 1.2 2007/03/04 13:11:19 hira Exp $
-
--- extensions/source/nsplugin/source/makefile.mk.orig	2007-02-24 02:05:26.000000000 +0900
-+++ extensions/source/nsplugin/source/makefile.mk	2007-02-24 02:13:01.000000000 +0900
-@@ -115,7 +115,7 @@
- 			$(TOOLSLIB)
- 
- .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD"
- .ELSE
- APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
- .ENDIF
--- a/misc/openoffice2/patches/patch-bq
+++ b/misc/openoffice2/patches/patch-bq
@ -1,59 +0,0 @@
-$NetBSD: patch-bq,v 1.5 2008/10/31 11:02:55 hira Exp $
-
--- instsetoo_native/util/makefile.mk.orig	2008-10-31 19:34:16.000000000 +0900
-+++ instsetoo_native/util/makefile.mk	2008-10-31 19:36:17.000000000 +0900
-@@ -61,6 +61,9 @@
- ENABLE_DOWNLOADSETS=TRUE
- .ENDIF			# "$(FORCE_DOWNLOADSETS)"!=""
- 
-+# Don't create download set with pkgsrc.
-+ENABLE_DOWNLOADSETS=
-+
- .EXPORT: ENABLE_DOWNLOADSETS
- .EXPORT: LAST_MINOR
- .EXPORT: PRJ
-@@ -131,7 +134,8 @@
- 
- .IF "$(alllangiso)"!=""
- 
-openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
-+openoffice:
-+	@echo -n ""
- 
- openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
- 
-@@ -236,7 +240,7 @@
- .ELSE			# "$(PKGFORMAT)"!=""
- openoffice_% :
- .ENDIF			# "$(PKGFORMAT)"!=""
-	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
-+	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
- 	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
- 
- .IF "$(PKGFORMAT)"!=""
-@@ -265,7 +269,7 @@
- .ELSE			# "$(PKGFORMAT)"!=""
- ooolanguagepack_% :
- .ENDIF			# "$(PKGFORMAT)"!=""
-	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
-+	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
- 
- .IF "$(PKGFORMAT)"!=""
- $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-@@ -403,11 +407,11 @@
- 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
- 	-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
- 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-	$(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
-	$(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
-	$(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-	$(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
-	$(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-+	$(GNUCOPY) -Rp $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
-+	$(GNUCOPY) -Rp $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
-+	$(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-+	$(GNUCOPY) -Rp $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
-+	$(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
- 	$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
- 	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
--- a/misc/openoffice2/patches/patch-bs
+++ b/misc/openoffice2/patches/patch-bs
@ -1,36 +0,0 @@
-$NetBSD: patch-bs,v 1.3 2008/04/13 20:32:43 hira Exp $
-
--- xmlsecurity/util/makefile.mk.orig	2008-04-14 05:03:09.000000000 +0000
-+++ xmlsecurity/util/makefile.mk	2008-04-14 05:10:23.000000000 +0000
-@@ -101,6 +101,7 @@
- 	$(TOOLSLIB)			\
- 	$(COMPHELPERLIB)	\
- 	$(CPPUHELPERLIB)	\
-+	$(LIBXML_LIBS)		\
- 	$(XMLOFFLIB)
- 
- .IF "$(SYSTEM_MOZILLA)" == "YES"
-@@ -110,6 +111,9 @@
- .IF "$(NSS_LIB)" != ""
- SHL2STDLIBS += $(NSS_LIB)
- .ENDIF
-+.IF "$(MOZ_NSS_LIBS)" != ""
-+SHL2STDLIBS += $(MOZ_NSS_LIBS)
-+.ENDIF
- .ENDIF
- 
- .IF "$(CRYPTO_ENGINE)" == "mscrypto"
-@@ -159,11 +163,12 @@
- 				$(SOTLIB)			\
- 				$(SVLLIB)			\
- 				$(SFXLIB)			\
-+				$(LIBXML_LIBS)		\
- 				$(XMLOFFLIB)		\
- 				$(SVXLIB)
- 
- #MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings
-SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB)
-+SHL4STDLIBS+= $(LIBXML_LIBS) $(LIBXML2LIB) $(XMLSECLIB)
- 
- SHL4VERSIONMAP = xmlsecurity.map
- SHL4DEPN=
--- a/misc/openoffice2/patches/patch-bt
+++ b/misc/openoffice2/patches/patch-bt
@ -1,27 +0,0 @@
-$NetBSD: patch-bt,v 1.3 2007/03/04 13:11:20 hira Exp $
-
--- epm/epm-3.7.patch.orig	2007-02-28 11:29:52.000000000 +0900
-+++ epm/epm-3.7.patch	2007-02-28 20:00:38.000000000 +0900
-@@ -697,3 +697,22 @@
-   }
-   
- --- 457,462 ----
-+*** misc/epm-3.7/configure	Wed Feb 28 11:36:52 2007
-+--- misc/build/epm-3.7/configure	Wed Feb 28 11:35:57 2007
-+***************
-+*** 4944,4950 ****
-+  fi
-+  
-+  
-+! if test "x$FLTKCONFIG" = x; then
-+  	GUIS=""
-+  	GUILIBS=""
-+  	INSTALL_GUIS=""
-+--- 4944,4950 ----
-+  fi
-+  
-+  
-+! if test "x$FLTKCONFIG" = x -o x"$enable_fltk" = x"no"; then
-+  	GUIS=""
-+  	GUILIBS=""
-+  	INSTALL_GUIS=""
--- a/misc/openoffice2/patches/patch-bv
+++ b/misc/openoffice2/patches/patch-bv
@ -1,29 +0,0 @@
-$NetBSD: patch-bv,v 1.1 2007/03/04 13:11:20 hira Exp $
-
--- setup_native/scripts/linuxpatchscript.sh.orig	2007-03-04 21:42:59.000000000 +0900
-+++ setup_native/scripts/linuxpatchscript.sh	2007-03-04 21:43:36.000000000 +0900
-@@ -25,7 +25,7 @@
- echo
- read -p "Patching the installation in ${PRODUCTINSTALLLOCATION}. Continue (y/n) ? " -n 1 reply leftover
- echo
-[ "$reply" == "y" ] || exit 1
-+[ "$reply" = "y" ] || exit 1
- 
- echo
- echo "About to update the following packages ..."
-@@ -53,13 +53,13 @@
-   # Check, that $RPMLIST does not contain online update rpm (then it is already installed)
-   ONLINEPDATEINSTALLED=`grep onlineupdate ${RPMLIST}`
- 
-  if [ "x$ONLINEPDATEINSTALLED" == "x" ]; then
-+  if [ "x$ONLINEPDATEINSTALLED" = "x" ]; then
-     # Ask user, if online update shall be installed
-     echo
-     read -p "Do you want to install the new online update feature (y/n) ? " -n 1 reply leftover
-     echo
-     
-    if [ "$reply" == "y" ]; then
-+    if [ "$reply" = "y" ]; then
-       # Install the online update rpm
-       rpm --install -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $ONLINEUPDATERPM
-     fi
--- a/misc/openoffice2/patches/patch-bw
+++ b/misc/openoffice2/patches/patch-bw
@ -1,16 +0,0 @@
-$NetBSD: patch-bw,v 1.2 2007/04/05 23:24:01 hira Exp $
-
--- canvas/source/cairo/makefile.mk.orig	2007-02-02 03:59:18.000000000 +0900
-+++ canvas/source/cairo/makefile.mk	2007-04-01 22:07:07.000000000 +0900
-@@ -83,9 +83,9 @@
- SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB)
- 
- .IF "$(SYSTEM_CAIRO)" == "YES"
-SHL1STDLIBS+= $(CAIRO_LIBS) -lX11 -lXrender
-+SHL1STDLIBS+= $(CAIRO_LIBS) $(X11_LDFLAGS) -lX11 -lXrender
- .ELSE
-SHL1STDLIBS+= -lcairo -lX11 -lXrender
-+SHL1STDLIBS+= -lcairo $(X11_LDFLAGS) -lX11 -lXrender
- .ENDIF
- 
- SHL1IMPLIB=i$(TARGET)
--- a/misc/openoffice2/patches/patch-bx
+++ b/misc/openoffice2/patches/patch-bx
@ -1,14 +0,0 @@
-$NetBSD: patch-bx,v 1.2 2007/10/06 20:02:23 hira Exp $
-
--- filter/source/config/fragments/makefile.mk.orig	2007-05-10 22:13:05.000000000 +0900
-+++ filter/source/config/fragments/makefile.mk	2007-10-06 13:06:37.000000000 +0900
-@@ -153,7 +153,8 @@
- 
- .IF "$(SOLAR_JAVA)"==""
- #cmc, hack to workaround the java build requirement
-MERGE:=python ../tools/merge/pyAltFCFGMerge
-+MERGE:=$(PYTHON) ../tools/merge/pyAltFCFGMerge
-+PACKLANG:=$(PERL) langfilter.pl
- .ELSE
- MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
- .ENDIF
--- a/misc/openoffice2/patches/patch-by
+++ b/misc/openoffice2/patches/patch-by
@ -1,23 +0,0 @@
-$NetBSD: patch-by,v 1.2 2007/04/05 23:24:02 hira Exp $
-
--- filter/source/config/fragments/langfilter.pl.orig	2007-03-19 22:40:51.000000000 +0900
-+++ filter/source/config/fragments/langfilter.pl	2007-03-19 22:41:34.000000000 +0900
-@@ -0,0 +1,18 @@
-+#!/usr/pkg/bin/perl
-+
-+use strict;
-+
-+# XXX
-+my $infile = $ARGV[1];
-+my $lang = $ARGV[4];
-+
-+open(IN, $infile) || die "cannot open: $!";
-+
-+while (<IN>) {
-+	if (/^\s*<value xml:lang="\s*(.*)\s*".*$/) {
-+		next if ($1 ne $lang);
-+	}
-+	print $_;
-+}
-+
-+close(IN);
--- a/misc/openoffice2/patches/patch-ch
+++ b/misc/openoffice2/patches/patch-ch
@ -1,183 +0,0 @@
-$NetBSD: patch-ch,v 1.5 2008/10/31 11:02:55 hira Exp $
-
--- solenv/inc/unxbsdi3.mk.orig	2007-10-05 10:11:25.000000000 +0900
-+++ solenv/inc/unxbsdi3.mk	2007-10-05 10:14:03.000000000 +0900
-@@ -0,0 +1,178 @@
-+#
-+# mk file for NetBSD/i386 with gcc 3.4.x and higher.
-+#
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA=
-+JAVAFLAGSDEBUG=-g
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF 
-+
-+# architecture dependent flags for the C and C++ compiler that can be changed by
-+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-+ARCH_FLAGS*=
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+# flags for C and C++ Compiler
-+CFLAGS+=-fmessage-length=0 -c
-+
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
-+.ELSE  # "$(PRODUCT)"!=""
-+CFLAGSOPT=                                     # no optimizing for non products
-+.ENDIF # "$(PRODUCT)"!=""
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for enabling optimizations
-+# CFLAGSOPT=-O2
-+# reduce to -O1 to avoid optimization problems
-+CFLAGSOPT=-O1
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+
-+CFLAGSWARNCC=
-+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-+CFLAGSWERRCC=-Werror
-+
-+# switches for dynamic and static linking
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic 
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic 
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lgcc_s -lstdc++
-+
-+# default objectfilenames to link
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+STDOBJVCL=$(L)$/salmain.o
-+
-+# libraries for linking applications
-+STDLIBGUIMT=-lX11 -lpthread -lm -lc -lgcc_s -lstdc++
-+STDLIBCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
-+STDSHLCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPOSTFIX=bi
-+DLLPRE=lib
-+DLLPOST=.so
--- a/misc/openoffice2/patches/patch-ci
+++ b/misc/openoffice2/patches/patch-ci
@ -1,19 +0,0 @@
-$NetBSD: patch-ci,v 1.2 2007/10/12 15:41:43 hira Exp $
-
--- solenv/inc/unx.mk.orig	2006-07-19 18:26:37.000000000 +0900
-+++ solenv/inc/unx.mk	2007-04-05 10:30:18.000000000 +0900
-@@ -151,6 +151,14 @@
- .INCLUDE : unxbsdi2.mk
- .ENDIF
- 
-+.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDI"
-+.INCLUDE : unxbsdi3.mk
-+.ENDIF
-+
-+.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDX"
-+.INCLUDE : unxbsdx3.mk
-+.ENDIF
-+
- .IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS"
- .INCLUDE : unxbsds.mk
- .ENDIF
--- a/misc/openoffice2/patches/patch-cj
+++ b/misc/openoffice2/patches/patch-cj
@ -1,19 +0,0 @@
-$NetBSD: patch-cj,v 1.2 2007/10/06 20:02:23 hira Exp $
-
--- tools/inc/tools/inetdef.hxx.orig	2007-09-26 17:35:00.000000000 +0900
-+++ tools/inc/tools/inetdef.hxx	2007-09-26 17:36:01.000000000 +0900
-@@ -51,11 +51,11 @@
- #elif defined SCO
- #define TOOLS_INETDEF_OS "SCO"
- #elif defined NETBSD && defined X86
-#define TOOLS_INETDEF_OS "NETBSD x86"
-+#define TOOLS_INETDEF_OS "NetBSD/i386"
- #elif defined NETBSD && defined ARM32
-#define TOOLS_INETDEF_OS "NETBSD ARM32"
-+#define TOOLS_INETDEF_OS "NetBSD/arm32"
- #elif defined NETBSD && defined SPARC
-#define TOOLS_INETDEF_OS "NETBSD Sparc"
-+#define TOOLS_INETDEF_OS "NetBSD/sparc"
- #elif defined LINUX && defined X86
- #define TOOLS_INETDEF_OS "Linux"
- #elif defined FREEBSD && defined X86
--- a/misc/openoffice2/patches/patch-cn
+++ b/misc/openoffice2/patches/patch-cn
@ -1,17 +0,0 @@
-$NetBSD: patch-cn,v 1.1 2007/06/10 04:55:06 hira Exp $
-
--- desktop/scripts/soffice.sh.orig	2007-06-10 11:44:31.000000000 +0900
-+++ desktop/scripts/soffice.sh	2007-06-10 11:45:05.000000000 +0900
-@@ -55,6 +55,12 @@
-     export JITC_PROCESSOR_TYPE
- fi
- 
-+# XXX: Ignore "unlocking unlocked mutex" error.
-+if [ $sd_platform = "NetBSD" ]; then
-+    PTHREAD_DIAGASSERT=AEL
-+    export PTHREAD_DIAGASSERT
-+fi
-+
- # set -x
- 
- # resolve installation directory
--- a/misc/openoffice2/patches/patch-cp
+++ b/misc/openoffice2/patches/patch-cp
@ -1,12 +0,0 @@
-$NetBSD: patch-cp,v 1.2 2008/04/07 16:24:51 hira Exp $
-
--- pyuno/source/module/makefile.mk.orig	2008-01-03 02:29:28.000000000 +0900
-+++ pyuno/source/module/makefile.mk	2008-04-07 18:22:21.000000000 +0900
-@@ -96,6 +96,7 @@
- 		$(CPPULIB)		\
- 		$(CPPUHELPERLIB)	\
- 		$(SALLIB)		\
-+		$(PYTHON_LIBS) 		\
- 		$(PYTHONLIB) 		\
- 		$(EXTRA_FRAMEWORK_FLAG) 
- 
--- a/misc/openoffice2/patches/patch-cq
+++ b/misc/openoffice2/patches/patch-cq
@ -1,13 +0,0 @@
-$NetBSD: patch-cq,v 1.1 2007/10/06 20:02:24 hira Exp $
-
--- bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk.orig	2007-10-06 03:53:00.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk	2007-10-06 03:53:08.000000000 +0900
-@@ -46,7 +46,7 @@
- 
- # --- Files --------------------------------------------------------
- 
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3"
- 
- .IF "$(cppu_no_leak)" == ""
- CFLAGS += -DLEAK_STATIC_DATA
--- a/misc/openoffice2/patches/patch-cr
+++ b/misc/openoffice2/patches/patch-cr
@ -1,22 +0,0 @@
-$NetBSD: patch-cr,v 1.2 2008/04/07 16:24:51 hira Exp $
-
--- setup_native/scripts/linuxpatchscript.sh.orig	2008-04-07 17:55:52.000000000 +0900
-+++ setup_native/scripts/linuxpatchscript.sh	2008-04-07 18:23:25.000000000 +0900
-@@ -49,7 +49,7 @@
-   # Check, that $RPMLIST does not contain search toolbar rpm (then it is already installed)
-   SEARCHTOOLBARINSTALLED=`grep searchtoolbar ${RPMLIST}`
- 
-  if [ "x$SEARCHTOOLBARINSTALLED" == "x" ]; then
-+  if [ "x$SEARCHTOOLBARINSTALLED" = "x" ]; then
-     # Install the search toolbar rpm
-     RPMLIST="$RPMLIST $SEARCHTOOLBARRPM"
-   fi
-@@ -62,7 +62,7 @@
-   # Check, that $RPMLIST does not contain kde integration rpm (then it is already installed)
-   KDERPMINSTALLED=`grep kde-integration ${RPMLIST}`
- 
-  if [ "x$KDERPMINSTALLED" == "x" ]; then
-+  if [ "x$KDERPMINSTALLED" = "x" ]; then
-     # Install the kde integration rpm
-     RPMLIST="$RPMLIST $KDERPM"
-   fi
--- a/Show more
+++ b/Show more