Update to version 0.3.7

PR:		ports/78735
Submitted by:	Ports Fury

8 files changed, 46 insertions, 38 deletions

diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index 67e6407..c3a48df 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdissert
-PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTVERSION=	0.3.7
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://www.freehackers.org/~tnagy/kdissert/ \
 		ftp://ftp.fasta.fh-dortmund.de/mirror/gentoo/distfiles/
@@ -21,12 +20,6 @@ BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons \
 USE_BZIP2=	yes
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--qtincludes=${QT_PREFIX}/include \
-		--qtlibs=${QT_PREFIX}/lib \
-		--kdeincludes=${KDE_PREFIX}/include \
-		--kdelibs=${KDE_PREFIX}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -36,6 +29,13 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's:|sed:|gsed:g' ${WRKSRC}/kde.py
 
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" \
+		QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" scons configure
+
+do-build:
+	@cd ${WRKSRC} && scons
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/kdissert/kdissert ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/lib/kde3
@@ -92,7 +92,7 @@ do-install:
 	${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 32 64 128
+.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
diff --git a/deskutils/kdissert/distinfo b/deskutils/kdissert/distinfo
index c81d6d0..2992656 100644
--- a/deskutils/kdissert/distinfo
+++ b/deskutils/kdissert/distinfo
@@ -1,2 +1,2 @@
-MD5 (kdissert-0.3.5.tar.bz2) = d40e9e116702f1ff62cc6eb84700aa6c
-SIZE (kdissert-0.3.5.tar.bz2) = 419104
+MD5 (kdissert-0.3.7.tar.bz2) = 13f58391696e297895aa3c7d88dae48f
+SIZE (kdissert-0.3.7.tar.bz2) = 507596
diff --git a/deskutils/kdissert/files/patch-SConstruct b/deskutils/kdissert/files/patch-SConstruct
index 73986f9..d7eb9a2 100644
--- a/deskutils/kdissert/files/patch-SConstruct
+++ b/deskutils/kdissert/files/patch-SConstruct
@@ -1,13 +1,13 @@
---- SConstruct.orig	Wed Feb  2 09:35:41 2005
-+++ SConstruct	Wed Feb  2 21:47:51 2005
-@@ -20,6 +20,10 @@
- 
- env.AppendUnique(LIBS = ['qt-mt', 'kdecore'])
+--- 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 )
  
 +env['CXX'] = "%%CXX%%"
-+env['CXXFLAGS'] = "%%CXXFLAGS%%"
++env['CPPFLAGS'] = "%%CXXFLAGS%%"
 +env.AppendUnique(LINKFLAGS = ['%%LINKFLAGS%%'])
 +
- if env['INSTALL_ALL'] == 1:
-     env['ITARGETS'] = []
+ ## The target make dist requires the python module shutil which is in 2.3
+ env.EnsurePythonVersion(2, 3)
  
diff --git a/deskutils/kdissert/pkg-plist b/deskutils/kdissert/pkg-plist
index 48acb9a..f8b52ad 100644
--- a/deskutils/kdissert/pkg-plist
+++ b/deskutils/kdissert/pkg-plist
@@ -1,6 +1,8 @@
 bin/kdissert
 lib/kde3/libkdissOOOdoc.la
 lib/kde3/libkdissOOOdoc.so
+lib/kde3/libkdissOOOimpress.la
+lib/kde3/libkdissOOOimpress.so
 lib/kde3/libkdissasciidoc.la
 lib/kde3/libkdissasciidoc.so
 lib/kde3/libkdissbeamerslides.la
@@ -18,6 +20,7 @@ share/applnk/Utilities/kdissert.desktop
 share/apps/kdissert/kdissertui.rc
 share/apps/kdissert/pics/nopix.png
 share/apps/kdissert/templatedata/kdissOOOdoc.tar.gz
+share/apps/kdissert/templatedata/kdissOOOimpress.tar.gz
 share/apps/kdissert/templatedata/kdissasciidoc.tar.gz
 share/apps/kdissert/templatedata/kdissbeamerslides.tar.gz
 share/apps/kdissert/templatedata/kdisshtmldoc.tar.gz
@@ -45,6 +48,7 @@ share/icons/crystalsvg/32x32/actions/kdissert_sort.png
 share/icons/crystalsvg/64x64/actions/kdissert_sort.png
 share/icons/hicolor/128x128/apps/kdissert.png
 share/icons/hicolor/16x16/apps/kdissert.png
+share/icons/hicolor/22x22/apps/kdissert.png
 share/icons/hicolor/32x32/apps/kdissert.png
 share/icons/hicolor/64x64/apps/kdissert.png
 share/locale/de/LC_MESSAGES/kdissert.mo
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 67e6407..c3a48df 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdissert
-PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTVERSION=	0.3.7
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://www.freehackers.org/~tnagy/kdissert/ \
 		ftp://ftp.fasta.fh-dortmund.de/mirror/gentoo/distfiles/
@@ -21,12 +20,6 @@ BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons \
 USE_BZIP2=	yes
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--qtincludes=${QT_PREFIX}/include \
-		--qtlibs=${QT_PREFIX}/lib \
-		--kdeincludes=${KDE_PREFIX}/include \
-		--kdelibs=${KDE_PREFIX}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -36,6 +29,13 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's:|sed:|gsed:g' ${WRKSRC}/kde.py
 
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" \
+		QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" scons configure
+
+do-build:
+	@cd ${WRKSRC} && scons
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/kdissert/kdissert ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/lib/kde3
@@ -92,7 +92,7 @@ do-install:
 	${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 32 64 128
+.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
diff --git a/deskutils/semantik/distinfo b/deskutils/semantik/distinfo
index c81d6d0..2992656 100644
--- a/deskutils/semantik/distinfo
+++ b/deskutils/semantik/distinfo
@@ -1,2 +1,2 @@
-MD5 (kdissert-0.3.5.tar.bz2) = d40e9e116702f1ff62cc6eb84700aa6c
-SIZE (kdissert-0.3.5.tar.bz2) = 419104
+MD5 (kdissert-0.3.7.tar.bz2) = 13f58391696e297895aa3c7d88dae48f
+SIZE (kdissert-0.3.7.tar.bz2) = 507596
diff --git a/deskutils/semantik/files/patch-SConstruct b/deskutils/semantik/files/patch-SConstruct
index 73986f9..d7eb9a2 100644
--- a/deskutils/semantik/files/patch-SConstruct
+++ b/deskutils/semantik/files/patch-SConstruct
@@ -1,13 +1,13 @@
---- SConstruct.orig	Wed Feb  2 09:35:41 2005
-+++ SConstruct	Wed Feb  2 21:47:51 2005
-@@ -20,6 +20,10 @@
- 
- env.AppendUnique(LIBS = ['qt-mt', 'kdecore'])
+--- 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 )
  
 +env['CXX'] = "%%CXX%%"
-+env['CXXFLAGS'] = "%%CXXFLAGS%%"
++env['CPPFLAGS'] = "%%CXXFLAGS%%"
 +env.AppendUnique(LINKFLAGS = ['%%LINKFLAGS%%'])
 +
- if env['INSTALL_ALL'] == 1:
-     env['ITARGETS'] = []
+ ## The target make dist requires the python module shutil which is in 2.3
+ env.EnsurePythonVersion(2, 3)
  
diff --git a/deskutils/semantik/pkg-plist b/deskutils/semantik/pkg-plist
index 48acb9a..f8b52ad 100644
--- a/deskutils/semantik/pkg-plist
+++ b/deskutils/semantik/pkg-plist
@@ -1,6 +1,8 @@
 bin/kdissert
 lib/kde3/libkdissOOOdoc.la
 lib/kde3/libkdissOOOdoc.so
+lib/kde3/libkdissOOOimpress.la
+lib/kde3/libkdissOOOimpress.so
 lib/kde3/libkdissasciidoc.la
 lib/kde3/libkdissasciidoc.so
 lib/kde3/libkdissbeamerslides.la
@@ -18,6 +20,7 @@ share/applnk/Utilities/kdissert.desktop
 share/apps/kdissert/kdissertui.rc
 share/apps/kdissert/pics/nopix.png
 share/apps/kdissert/templatedata/kdissOOOdoc.tar.gz
+share/apps/kdissert/templatedata/kdissOOOimpress.tar.gz
 share/apps/kdissert/templatedata/kdissasciidoc.tar.gz
 share/apps/kdissert/templatedata/kdissbeamerslides.tar.gz
 share/apps/kdissert/templatedata/kdisshtmldoc.tar.gz
@@ -45,6 +48,7 @@ share/icons/crystalsvg/32x32/actions/kdissert_sort.png
 share/icons/crystalsvg/64x64/actions/kdissert_sort.png
 share/icons/hicolor/128x128/apps/kdissert.png
 share/icons/hicolor/16x16/apps/kdissert.png
+share/icons/hicolor/22x22/apps/kdissert.png
 share/icons/hicolor/32x32/apps/kdissert.png
 share/icons/hicolor/64x64/apps/kdissert.png
 share/locale/de/LC_MESSAGES/kdissert.mo