Update to 2.0.

Quickstart improved, but still a lot of bugs.

6 files changed, 12 insertions, 86 deletions

diff --git a/x11/oooqs/Makefile b/x11/oooqs/Makefile
index 52fa62966edc..d4e3a2c48c21 100644
--- a/x11/oooqs/Makefile
+++ b/x11/oooqs/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	oooqs
-PORTVERSION=	1.0.R.3
+PORTVERSION=	2.0
 CATEGORIES=	x11
 MASTER_SITES=	http://download.berlios.de/segfaultskde/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.R./_rc/}
@@ -17,7 +17,4 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 USE_KDELIBS_VER=	3
 
-post-install:
-	@${LN} -s ${PREFIX}/share/doc/HTML/en/common ${PREFIX}/share/doc/HTML/en/oooqs/common
-
 .include <bsd.port.mk>
diff --git a/x11/oooqs/distinfo b/x11/oooqs/distinfo
index 8c25f70a7c52..36ccf2a14024 100644
--- a/x11/oooqs/distinfo
+++ b/x11/oooqs/distinfo
@@ -1 +1 @@
-MD5 (oooqs-1.0_rc3.tar.gz) = d1eecb568523748ee8489c9d61ffadc6
+MD5 (oooqs-2.0.tar.gz) = 8926f2d372990b74c9ab1e610259421b
diff --git a/x11/oooqs/pkg-plist b/x11/oooqs/pkg-plist
index eb5301778129..b7ec2e047914 100644
--- a/x11/oooqs/pkg-plist
+++ b/x11/oooqs/pkg-plist
@@ -1,46 +1,12 @@
 bin/oooqs
-share/applnk/Office/oooqs.desktop
-share/icons/hicolor/32x32/apps/oooqs.png
-share/icons/hicolor/32x32/apps/ooo_web.xpm
-share/icons/hicolor/32x32/apps/ooo_calc.xpm
-share/icons/hicolor/32x32/apps/ooo_draw.xpm
-share/icons/hicolor/32x32/apps/ooo_global.xpm
-share/icons/hicolor/32x32/apps/ooo_gulls.xpm
-share/icons/hicolor/32x32/apps/ooo_impress.xpm
-share/icons/hicolor/32x32/apps/ooo_math.xpm
-share/icons/hicolor/32x32/apps/ooo_printeradmin.xpm
-share/icons/hicolor/32x32/apps/ooo_writer.xpm
+share/icons/hicolor/64x64/apps/oooqs.png
 share/icons/hicolor/16x16/apps/oooqs.png
+share/icons/hicolor/32x32/apps/oooqs.png
 share/icons/hicolor/48x48/apps/oooqs.png
-share/icons/hicolor/48x48/apps/ooo_calc.xpm
-share/icons/hicolor/48x48/apps/ooo_draw.xpm
-share/icons/hicolor/48x48/apps/ooo_global.xpm
-share/icons/hicolor/48x48/apps/ooo_gulls.xpm
-share/icons/hicolor/48x48/apps/ooo_impress.xpm
-share/icons/hicolor/48x48/apps/ooo_math.xpm
-share/icons/hicolor/48x48/apps/ooo_printeradmin.xpm
-share/icons/hicolor/48x48/apps/ooo_web.xpm
-share/icons/hicolor/48x48/apps/ooo_writer.xpm
-share/icons/hicolor/64x64/apps/oooqs.png
-share/icons/locolor/16x16/apps/ooo_calc.xpm
-share/icons/locolor/16x16/apps/ooo_draw.xpm
-share/icons/locolor/16x16/apps/ooo_global.xpm
-share/icons/locolor/16x16/apps/ooo_gulls.xpm
-share/icons/locolor/16x16/apps/ooo_impress.xpm
-share/icons/locolor/16x16/apps/ooo_math.xpm
-share/icons/locolor/16x16/apps/ooo_printeradmin.xpm
-share/icons/locolor/16x16/apps/ooo_web.xpm
-share/icons/locolor/16x16/apps/ooo_writer.xpm
+share/applnk/Utilities/oooqs.desktop
 share/locale/de/LC_MESSAGES/oooqs.mo
-share/locale/fr/LC_MESSAGES/oooqs.mo
-share/doc/HTML/en/oooqs/index.docbook
-share/doc/HTML/en/oooqs/index.cache.bz2
-share/doc/HTML/en/oooqs/common
-@dirrm share/doc/HTML/en/oooqs
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Office 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
diff --git a/x11/oooqs2/Makefile b/x11/oooqs2/Makefile
index 52fa62966edc..d4e3a2c48c21 100644
--- a/x11/oooqs2/Makefile
+++ b/x11/oooqs2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	oooqs
-PORTVERSION=	1.0.R.3
+PORTVERSION=	2.0
 CATEGORIES=	x11
 MASTER_SITES=	http://download.berlios.de/segfaultskde/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.R./_rc/}
@@ -17,7 +17,4 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 USE_KDELIBS_VER=	3
 
-post-install:
-	@${LN} -s ${PREFIX}/share/doc/HTML/en/common ${PREFIX}/share/doc/HTML/en/oooqs/common
-
 .include <bsd.port.mk>
diff --git a/x11/oooqs2/distinfo b/x11/oooqs2/distinfo
index 8c25f70a7c52..36ccf2a14024 100644
--- a/x11/oooqs2/distinfo
+++ b/x11/oooqs2/distinfo
@@ -1 +1 @@
-MD5 (oooqs-1.0_rc3.tar.gz) = d1eecb568523748ee8489c9d61ffadc6
+MD5 (oooqs-2.0.tar.gz) = 8926f2d372990b74c9ab1e610259421b
diff --git a/x11/oooqs2/pkg-plist b/x11/oooqs2/pkg-plist
index eb5301778129..b7ec2e047914 100644
--- a/x11/oooqs2/pkg-plist
+++ b/x11/oooqs2/pkg-plist
@@ -1,46 +1,12 @@
 bin/oooqs
-share/applnk/Office/oooqs.desktop
-share/icons/hicolor/32x32/apps/oooqs.png
-share/icons/hicolor/32x32/apps/ooo_web.xpm
-share/icons/hicolor/32x32/apps/ooo_calc.xpm
-share/icons/hicolor/32x32/apps/ooo_draw.xpm
-share/icons/hicolor/32x32/apps/ooo_global.xpm
-share/icons/hicolor/32x32/apps/ooo_gulls.xpm
-share/icons/hicolor/32x32/apps/ooo_impress.xpm
-share/icons/hicolor/32x32/apps/ooo_math.xpm
-share/icons/hicolor/32x32/apps/ooo_printeradmin.xpm
-share/icons/hicolor/32x32/apps/ooo_writer.xpm
+share/icons/hicolor/64x64/apps/oooqs.png
 share/icons/hicolor/16x16/apps/oooqs.png
+share/icons/hicolor/32x32/apps/oooqs.png
 share/icons/hicolor/48x48/apps/oooqs.png
-share/icons/hicolor/48x48/apps/ooo_calc.xpm
-share/icons/hicolor/48x48/apps/ooo_draw.xpm
-share/icons/hicolor/48x48/apps/ooo_global.xpm
-share/icons/hicolor/48x48/apps/ooo_gulls.xpm
-share/icons/hicolor/48x48/apps/ooo_impress.xpm
-share/icons/hicolor/48x48/apps/ooo_math.xpm
-share/icons/hicolor/48x48/apps/ooo_printeradmin.xpm
-share/icons/hicolor/48x48/apps/ooo_web.xpm
-share/icons/hicolor/48x48/apps/ooo_writer.xpm
-share/icons/hicolor/64x64/apps/oooqs.png
-share/icons/locolor/16x16/apps/ooo_calc.xpm
-share/icons/locolor/16x16/apps/ooo_draw.xpm
-share/icons/locolor/16x16/apps/ooo_global.xpm
-share/icons/locolor/16x16/apps/ooo_gulls.xpm
-share/icons/locolor/16x16/apps/ooo_impress.xpm
-share/icons/locolor/16x16/apps/ooo_math.xpm
-share/icons/locolor/16x16/apps/ooo_printeradmin.xpm
-share/icons/locolor/16x16/apps/ooo_web.xpm
-share/icons/locolor/16x16/apps/ooo_writer.xpm
+share/applnk/Utilities/oooqs.desktop
 share/locale/de/LC_MESSAGES/oooqs.mo
-share/locale/fr/LC_MESSAGES/oooqs.mo
-share/doc/HTML/en/oooqs/index.docbook
-share/doc/HTML/en/oooqs/index.cache.bz2
-share/doc/HTML/en/oooqs/common
-@dirrm share/doc/HTML/en/oooqs
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Office 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true