3 files changed, 20 insertions, 23 deletions

diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 4035ee731873..2075ede22a16 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -1,15 +1,9 @@
-# New ports collection makefile for:	semantik
-# Date created:				2009-08-11
-# Whom:					Nick Hibma <nick@anywi.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	semantik
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.3
 CATEGORIES=	deskutils kde
-MASTER_SITES=	http://${PORTNAME}.googlecode.com/files/ \
-		http://freehackers.org/~tnagy/
+MASTER_SITES=	http://${PORTNAME}.googlecode.com/files/
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	KDE mind mapping tool
@@ -20,10 +14,12 @@ USE_KDE4=	kdehier kdelibs kdeprefix
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
 USE_PYTHON=	2.5+
-USE_QT4=	corelib gui linguist svg webkit xml \
+USE_QT4=	corelib gui linguist_build svg webkit xml \
 		moc_build qmake_build uic_build
 USE_BZIP2=	yes
-CONFIGURE_ENV=	PATH="${KDE4_PREFIX}/bin:$$PATH" WAF_HOME="${WRKSRC}"
+CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS}" \
+		PATH="${KDE4_PREFIX}/bin:$$PATH" \
+		WAF_HOME="${WRKSRC}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_SAFE=	yes
@@ -38,23 +34,25 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-pre-configure:
-	${REINPLACE_CMD} -e 's/kde-config/kde4-config/g' \
-		-e '/conf.env.CXXFLAGS =/ s|= '"'"'[^'"'"']*|= '"'"'${CXXFLAGS}|' \
+post-patch:
+	@${REINPLACE_CMD} -e 's/kde-config/kde4-config/g' \
 		${WRKSRC}/wscript
-.if empty(PORT_OPTIONS:MNLS)
-	${REINPLACE_CMD} -e '/langs/ d' \
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e '/langs/ d' \
 		${WRKSRC}/wscript
 .endif
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./waf configure --prefix=${PREFIX}
+	@cd ${WRKSRC}; \
+		${SETENV} ${CONFIGURE_ENV} ./waf configure --prefix=${PREFIX}
 
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build ${_MAKE_JOBS}
+	@cd ${WRKSRC}; \
+		${SETENV} ${MAKE_ENV} ./waf build ${_MAKE_JOBS}
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install
+	@cd ${WRKSRC}; \
+		${SETENV} ${MAKE_ENV} ./waf install
 	@${STRIP_CMD} ${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/deskutils/semantik/distinfo b/deskutils/semantik/distinfo
index 5c1aa2a45548..b59f01da1206 100644
--- a/deskutils/semantik/distinfo
+++ b/deskutils/semantik/distinfo
@@ -1,2 +1,2 @@
-SHA256 (semantik-0.8.0.tar.bz2) = 0755ed0ef4c2461c97a1591ed5e62a4154e1f10080db0729af5b092a626a144a
-SIZE (semantik-0.8.0.tar.bz2) = 385223
+SHA256 (semantik-0.8.3.tar.bz2) = 202227e42e403a80ee0a3885cda728620fe69cbac735af27d21eb7e511c092a0
+SIZE (semantik-0.8.3.tar.bz2) = 395936
diff --git a/deskutils/semantik/pkg-plist b/deskutils/semantik/pkg-plist
index c2fed539b11a..7e9a72fa4abf 100644
--- a/deskutils/semantik/pkg-plist
+++ b/deskutils/semantik/pkg-plist
@@ -161,6 +161,7 @@ share/apps/semantik/templates/s5/ui/default/outline.css
 share/apps/semantik/templates/s5/ui/default/pretty.css
 share/apps/semantik/templates/s5/ui/default/print.css
 share/apps/semantik/templates/s5/ui/default/s5-core.css
+share/apps/semantik/templates/s5/ui/default/semantik.css
 share/apps/semantik/templates/s5/ui/default/slides.css
 share/apps/semantik/templates/s5/ui/default/slides.js
 share/apps/semantik/templates/semantik.sem.py
@@ -186,14 +187,12 @@ share/icons/oxygen/32x32/actions/semantik_point.png
 share/icons/oxygen/32x32/actions/semantik_sort.png
 share/icons/oxygen/48x48/actions/semantik_move.png
 share/icons/oxygen/64x64/actions/semantik_sort.png
-%%NLS%%share/locale/cz/LC_MESSAGES/semantik.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/semantik.mo
 %%NLS%%share/locale/el/LC_MESSAGES/semantik.mo
 %%NLS%%share/locale/es/LC_MESSAGES/semantik.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/semantik.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/semantik.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/semantik.mo
-%%NLS%%@dirrmtry share/locale/cz/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cz
 @dirrm share/apps/semantik/templates/s5/ui/default
 @dirrm share/apps/semantik/templates/s5/ui
 @dirrm share/apps/semantik/templates/s5