Index: Makefile
===================================================================
--- Makefile	(revision 327854)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	klavaro
-PORTVERSION=	1.9.6
-PORTREVISION=	1
+PORTVERSION=	1.9.9
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/
 
@@ -22,7 +21,7 @@
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
 
-USES=		pkgconfig gettext iconv
+USES=		pkgconfig gettext iconv pathfix
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
@@ -32,7 +31,7 @@
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/gtkdatabox
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -rdynamic
 
 GNU_CONFIGURE=	yes
 
@@ -39,8 +38,13 @@
 MAN1=		${PORTNAME}.1
 
 NO_STAGE=	yes
+
 post-extract:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
 		${WRKSRC}/data/klavaro.desktop.in
 
+pre-build:
+	@${REINPLACE_CMD} -e 's|^am__append_1|#am__append_1|' \
+		${WRKSRC}/src/Makefile
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 327854)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (klavaro-1.9.6.tar.bz2) = 6d7fc916eb83d0381b0719c1525c8ea13a5032abcadd438755c7451b9f071561
-SIZE (klavaro-1.9.6.tar.bz2) = 773462
+SHA256 (klavaro-1.9.9.tar.bz2) = 26bdc403355e6b32221b548c038c64dc07abe154401d9433996fae50485a4ca8
+SIZE (klavaro-1.9.9.tar.bz2) = 859928
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 327854)
+++ pkg-plist	(working copy)
@@ -8,6 +8,8 @@
 %%DATADIR%%/azerty_fr_ibook.kbd
 %%DATADIR%%/basic_lessons.txt
 %%DATADIR%%/beep.png
+%%DATADIR%%/bg.paragraphs
+%%DATADIR%%/bg.words
 %%DATADIR%%/bn.paragraphs
 %%DATADIR%%/bn.words
 %%DATADIR%%/colemak_us.kbd
@@ -17,6 +19,7 @@
 %%DATADIR%%/da.words
 %%DATADIR%%/de.paragraphs
 %%DATADIR%%/de.words
+%%DATADIR%%/dvorak_bg.kbd
 %%DATADIR%%/dvorak_br_nativo.kbd
 %%DATADIR%%/dvorak_br_us.kbd
 %%DATADIR%%/dvorak_ca_fr.kbd
@@ -32,6 +35,8 @@
 %%DATADIR%%/dvorak_tr_F.kbd
 %%DATADIR%%/dvorak_uk.kbd
 %%DATADIR%%/dvorak_us.kbd
+%%DATADIR%%/el.paragraphs
+%%DATADIR%%/el.words
 %%DATADIR%%/en_GB.paragraphs
 %%DATADIR%%/en_GB.words
 %%DATADIR%%/eo.paragraphs
@@ -81,6 +86,8 @@
 %%DATADIR%%/pt_BR.paragraphs
 %%DATADIR%%/pt_BR.words
 %%DATADIR%%/qwerty_ar.kbd
+%%DATADIR%%/qwerty_bg.kbd
+%%DATADIR%%/qwerty_bg_2.kbd
 %%DATADIR%%/qwerty_br.kbd
 %%DATADIR%%/qwerty_br_abnt2.kbd
 %%DATADIR%%/qwerty_ca_multling.kbd
@@ -90,6 +97,7 @@
 %%DATADIR%%/qwerty_dk.kbd
 %%DATADIR%%/qwerty_es.kbd
 %%DATADIR%%/qwerty_gr.kbd
+%%DATADIR%%/qwerty_gr_old.kbd
 %%DATADIR%%/qwerty_il.kbd
 %%DATADIR%%/qwerty_il_old.kbd
 %%DATADIR%%/qwerty_it.kbd
@@ -130,10 +138,12 @@
 share/icons/hicolor/32x32/apps/klavaro.png
 share/icons/hicolor/48x48/apps/klavaro.png
 share/locale/ar/LC_MESSAGES/klavaro.mo
+share/locale/bg/LC_MESSAGES/klavaro.mo
 share/locale/bn/LC_MESSAGES/klavaro.mo
 share/locale/cs/LC_MESSAGES/klavaro.mo
 share/locale/da/LC_MESSAGES/klavaro.mo
 share/locale/de/LC_MESSAGES/klavaro.mo
+share/locale/el/LC_MESSAGES/klavaro.mo
 share/locale/en_GB/LC_MESSAGES/klavaro.mo
 share/locale/eo/LC_MESSAGES/klavaro.mo
 share/locale/es/LC_MESSAGES/klavaro.mo