4 files changed, 27 insertions, 97 deletions

diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index 88f476395ec0..23e436f2bc56 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdissert
-PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTVERSION=	1.0.3.4
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://www.kde-apps.org/content/files/
 DISTNAME=	12725-${PORTNAME}-${PORTVERSION}
@@ -37,76 +36,7 @@ do-build:
 	@cd ${WRKSRC} && scons
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/kdissert/kdissert ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/lib/kde3
-	${INSTALL_DATA} ${WRKSRC}/src/templates/*.la ${PREFIX}/lib/kde3
-	${INSTALL_DATA} ${WRKSRC}/src/templates/*.so ${PREFIX}/lib/kde3
-	@${MKDIR} ${PREFIX}/share/applications/kde
-	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissert.desktop \
-		${PREFIX}/share/applications/kde
-	@${MKDIR} ${PREFIX}/share/applnk/Utilities
-	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissert.desktop \
-		${PREFIX}/share/applnk/Utilities
-	@${MKDIR} ${PREFIX}/share/apps/kdissert
-	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissertui.rc \
-		${PREFIX}/share/apps/kdissert
-	${INSTALL_DATA} ${WRKSRC}/src/appdata/tips \
-		${PREFIX}/share/apps/kdissert
-	@${MKDIR} ${PREFIX}/share/apps/kdissert/pics
-	${INSTALL_DATA} ${WRKSRC}/src/pics/nopix.png \
-		${PREFIX}/share/apps/kdissert/pics
-	@${MKDIR} ${PREFIX}/share/apps/kdissert/templatedata
-	${INSTALL_DATA} ${WRKSRC}/src/templates/*.tar.gz \
-		${PREFIX}/share/apps/kdissert/templatedata
-	@${MKDIR} ${PREFIX}/share/apps/kdissertpart
-	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissertpart.rc \
-		${PREFIX}/share/apps/kdissertpart
-	@${MKDIR} ${PREFIX}/share/config.kcfg
-	${INSTALL_DATA} ${WRKSRC}/src/kdissert/kdissert.kcfg \
-		${PREFIX}/share/config.kcfg
-.for lang in en
-	@${MKDIR} ${PREFIX}/share/doc/HTML/${lang}/kdissert
-	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/index.cache.bz2 \
-		${PREFIX}/share/doc/HTML/${lang}/kdissert
-	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/index.docbook \
-		${PREFIX}/share/doc/HTML/${lang}/kdissert
-	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/screenshot.jpg \
-		${PREFIX}/share/doc/HTML/${lang}/kdissert
-.endfor
-.for lang in fr
-	@${MKDIR} ${PREFIX}/share/doc/HTML/${lang}/kdissert
-	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/index.cache.bz2 \
-		${PREFIX}/share/doc/HTML/${lang}/kdissert
-	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/index.docbook \
-		${PREFIX}/share/doc/HTML/${lang}/kdissert
-.endfor
-.for size in 16 22 32 64 128
-	@${MKDIR} ${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions
-	${INSTALL_DATA} ${WRKSRC}/src/pics/toolbar/cr${size}-action-kdissert_sort.png \
-		${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions/kdissert_sort.png
-.endfor
-.for size in 16 22 32
-	@${MKDIR} ${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions
-	${INSTALL_DATA} ${WRKSRC}/src/pics/toolbar/cr${size}-action-kdissert_link.png \
-		${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions/kdissert_link.png
-	${INSTALL_DATA} ${WRKSRC}/src/pics/toolbar/cr${size}-action-kdissert_point.png \
-		${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions/kdissert_point.png
-.endfor
-.for size in 16 22 32 64 128
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/${size}x${size}/apps
-	${INSTALL_DATA} ${WRKSRC}/src/appdata/hi${size}-app-kdissert.png \
-		${PREFIX}/share/icons/hicolor/${size}x${size}/apps/kdissert.png
-.endfor
-.for lang in de fr it nl pl
-	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/${lang}.gmo \
-		${PREFIX}/share/locale/${lang}/LC_MESSAGES/kdissert.mo
-.endfor
-	@${MKDIR} ${PREFIX}/share/mimelnk/application
-	${INSTALL_DATA} ${WRKSRC}/src/appdata/x-kdissert.desktop \
-		${PREFIX}/share/mimelnk/application
-	@${MKDIR} ${PREFIX}/share/services
-	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissertpart.desktop \
-		${PREFIX}/share/services
+	@cd ${WRKSRC} && scons install
+	@${STRIP_CMD} ${PREFIX}/bin/kdissert
 
 .include <bsd.port.mk>
diff --git a/deskutils/kdissert/distinfo b/deskutils/kdissert/distinfo
index b4062af7c90b..68222e8a1abb 100644
--- a/deskutils/kdissert/distinfo
+++ b/deskutils/kdissert/distinfo
@@ -1,2 +1,2 @@
-MD5 (12725-kdissert-0.9.0.tar.bz2) = 7cc80508547f57ed0e528aa22366008f
-SIZE (12725-kdissert-0.9.0.tar.bz2) = 480955
+MD5 (12725-kdissert-1.0.3.4.tar.bz2) = 275f5c7c584241842bc805b71ee87038
+SIZE (12725-kdissert-1.0.3.4.tar.bz2) = 478621
diff --git a/deskutils/kdissert/files/patch-SConstruct b/deskutils/kdissert/files/patch-SConstruct
index d7eb9a2b182b..979ed36f956c 100644
--- a/deskutils/kdissert/files/patch-SConstruct
+++ b/deskutils/kdissert/files/patch-SConstruct
@@ -1,13 +1,13 @@
---- SConstruct.orig	Wed Mar  9 02:57:54 2005
-+++ SConstruct	Wed Mar  9 14:47:59 2005
-@@ -9,6 +9,10 @@
- # TODO : remove
- env.AppendUnique( ENV = os.environ )
+--- SConstruct.orig	Mon Jul 11 00:47:41 2005
++++ SConstruct	Sun Jul 24 02:59:09 2005
+@@ -21,6 +21,10 @@
+ 
+ env.KDEuse("environ rpath")
  
 +env['CXX'] = "%%CXX%%"
 +env['CPPFLAGS'] = "%%CXXFLAGS%%"
 +env.AppendUnique(LINKFLAGS = ['%%LINKFLAGS%%'])
 +
- ## The target make dist requires the python module shutil which is in 2.3
- env.EnsurePythonVersion(2, 3)
- 
+ ###################################################################
+ # SCRIPTS FOR BUILDING THE TARGETS
+ ###################################################################
diff --git a/deskutils/kdissert/pkg-plist b/deskutils/kdissert/pkg-plist
index 242915a095aa..ca8fefdfa81a 100644
--- a/deskutils/kdissert/pkg-plist
+++ b/deskutils/kdissert/pkg-plist
@@ -17,7 +17,8 @@ lib/kde3/libkdisspdflatexbook.la
 lib/kde3/libkdisspdflatexbook.so
 lib/kde3/libkdissprosperslides.la
 lib/kde3/libkdissprosperslides.so
-share/applications/kde/kdissert.desktop
+lib/kde3/libkdissstx.la
+lib/kde3/libkdissstx.so
 share/applnk/Utilities/kdissert.desktop
 share/apps/kdissert/kdissertui.rc
 share/apps/kdissert/pics/nopix.png
@@ -30,29 +31,29 @@ share/apps/kdissert/templatedata/kdisshtmldoc.tar.gz
 share/apps/kdissert/templatedata/kdisspdflatexarticle.tar.gz
 share/apps/kdissert/templatedata/kdisspdflatexbook.tar.gz
 share/apps/kdissert/templatedata/kdissprosperslides.tar.gz
+share/apps/kdissert/templatedata/kdissstx.tar.gz
 share/apps/kdissert/tips
 share/apps/kdissertpart/kdissertpart.rc
-share/config.kcfg/kdissert.kcfg
 share/doc/HTML/en/kdissert/index.cache.bz2
 share/doc/HTML/en/kdissert/index.docbook
 share/doc/HTML/en/kdissert/screenshot.jpg
 share/doc/HTML/fr/kdissert/index.cache.bz2
 share/doc/HTML/fr/kdissert/index.docbook
-share/icons/crystalsvg/128x128/actions/kdissert_sort.png
-share/icons/crystalsvg/16x16/actions/kdissert_link.png
-share/icons/crystalsvg/16x16/actions/kdissert_point.png
-share/icons/crystalsvg/16x16/actions/kdissert_sort.png
-share/icons/crystalsvg/22x22/actions/kdissert_link.png
-share/icons/crystalsvg/22x22/actions/kdissert_point.png
-share/icons/crystalsvg/22x22/actions/kdissert_sort.png
-share/icons/crystalsvg/32x32/actions/kdissert_link.png
-share/icons/crystalsvg/32x32/actions/kdissert_point.png
-share/icons/crystalsvg/32x32/actions/kdissert_sort.png
-share/icons/crystalsvg/64x64/actions/kdissert_sort.png
+share/icons/hicolor/128x128/actions/kdissert_sort.png
 share/icons/hicolor/128x128/apps/kdissert.png
+share/icons/hicolor/16x16/actions/kdissert_link.png
+share/icons/hicolor/16x16/actions/kdissert_point.png
+share/icons/hicolor/16x16/actions/kdissert_sort.png
 share/icons/hicolor/16x16/apps/kdissert.png
+share/icons/hicolor/22x22/actions/kdissert_link.png
+share/icons/hicolor/22x22/actions/kdissert_point.png
+share/icons/hicolor/22x22/actions/kdissert_sort.png
 share/icons/hicolor/22x22/apps/kdissert.png
+share/icons/hicolor/32x32/actions/kdissert_link.png
+share/icons/hicolor/32x32/actions/kdissert_point.png
+share/icons/hicolor/32x32/actions/kdissert_sort.png
 share/icons/hicolor/32x32/apps/kdissert.png
+share/icons/hicolor/64x64/actions/kdissert_sort.png
 share/icons/hicolor/64x64/apps/kdissert.png
 share/locale/de/LC_MESSAGES/kdissert.mo
 share/locale/fr/LC_MESSAGES/kdissert.mo
@@ -60,7 +61,6 @@ share/locale/it/LC_MESSAGES/kdissert.mo
 share/locale/nl/LC_MESSAGES/kdissert.mo
 share/locale/pl/LC_MESSAGES/kdissert.mo
 share/mimelnk/application/x-kdissert.desktop
-share/services/kdissertpart.desktop
 @dirrm share/doc/HTML/fr/kdissert
 @dirrm share/doc/HTML/en/kdissert
 @dirrm share/apps/kdissertpart