fix duplicate files

This commit is contained in:
robert 2010-06-09 12:50:23 +00:00
parent 3d9e53cb59
commit 1c2418bd2b
2 changed files with 3 additions and 67 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2010/05/26 20:36:31 robert Exp $
# $OpenBSD: Makefile,v 1.44 2010/06/09 12:50:23 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -10,7 +10,7 @@ VERSION= 3.2.0
DISTNAME= OOo_${VERSION}
WRKDIST= ${WRKDIR}/OOO320_m12
PKGNAME= openoffice-${VERSION}p1
PKGNAME-main= openoffice-${VERSION}p3
PKGNAME-main= openoffice-${VERSION}p4
PKGNAME-kde= openoffice-kde-${VERSION}p1
PKGNAME-java= openoffice-java-${VERSION}p2
CATEGORIES= editors productivity

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2010/04/21 13:53:01 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2010/06/09 12:50:23 robert Exp $
@pkgpath editors/openoffice
@pkgpath editors/openoffice,-main
%%SHARED%%
@ -432,8 +432,6 @@ openoffice.org/basis3.2/share/config/soffice.cfg/global/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/global/accelerator/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/global/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/global/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/global/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/global/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/BasicIDE/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/BasicIDE/accelerator/
@ -462,16 +460,10 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/StartModule/toolbar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/StartModule/toolbar/standardbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/en-GB/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/en-GB/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/statusbar/
@ -484,24 +476,16 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/toolbar/tableobje
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbapp/toolbar/toolbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/en-GB/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/en-GB/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/menubar/compat.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/toolbar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbbrowser/toolbar/toolbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbquery/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbquery/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbquery/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbquery/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbquery/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbquery/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbquery/menubar/
@ -549,16 +533,10 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtable/toolbar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtable/toolbar/toolbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/en-GB/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/en-GB/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/dbtdata/toolbar/
@ -568,14 +546,8 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/sbibliography/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sbibliography/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/scalc/statusbar/
@ -675,14 +647,8 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/sdraw/toolbar/viewerbar
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sdraw/toolbar/zoombar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sglobal/statusbar/
@ -793,14 +759,8 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/smath/toolbar/standardb
openoffice.org/basis3.2/share/config/soffice.cfg/modules/smath/toolbar/toolbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/statusbar/
@ -841,14 +801,8 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/toolbar/toolbar.xm
openoffice.org/basis3.2/share/config/soffice.cfg/modules/sweb/toolbar/viewerbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/statusbar/
@ -893,14 +847,8 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/toolbar/toolbar.
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swform/toolbar/viewerbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/statusbar/
@ -945,14 +893,8 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/toolbar/toolba
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swreport/toolbar/viewerbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/statusbar/
@ -996,14 +938,8 @@ openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/toolbar/toolbar
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swriter/toolbar/viewerbar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/de/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/de/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/en-US/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/en-US/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/es/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/es/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/fr/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/accelerator/fr/default.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/menubar/
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/menubar/menubar.xml
openoffice.org/basis3.2/share/config/soffice.cfg/modules/swxform/statusbar/