4 files changed, 39 insertions, 43 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 3fd794495f45..5ee66d5f5a6e 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.9
+PORTVERSION=	0.10.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,15 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	MrL0Lz@gmail.com
 COMMENT=	A fast and lightweight GTK+ IDE
 
-USE_X_PREFIX=	no
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+USE_BZIP2=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--mandir="${MANPREFIX}/man"
 
-OPTIONS=	VTE "With vte" On
+OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
+		NLS	"Enable Native Language support"		on
 
-MAN1=	geany.1
+MAN1=		geany.1
 
 .include <bsd.port.pre.mk>
 
@@ -34,11 +36,11 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_VTE)
-CONFIGURE_ARGS+=--disable-vte
-.else
+.if !defined(WITHOUT_VTE)
 USE_GNOME+=	vte
 CONFIGURE_ARGS+=--enable-vte
+.else
+CONFIGURE_ARGS+=--disable-vte
 .endif
 
 post-patch:
@@ -52,9 +54,6 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications
-
-.if ${OSVERSION} < 500036
-EXTRA_PATCHES+=	${PATCHDIR}/extra-*
-.endif
+	${INSTALL_MAN} ${WRKSRC}/doc/geany.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index f420266a80db..de8e36ea83e4 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-MD5 (geany-0.9.tar.bz2) = 9b7732ebaecddd878c01f9e1d7705fa8
-SHA256 (geany-0.9.tar.bz2) = ece67034afdf5046e66391772463dc1227d262cc067e60250fa2b9cad72388d3
-SIZE (geany-0.9.tar.bz2) = 1375341
+MD5 (geany-0.10.2.tar.bz2) = 49bb265a9b8284de8692aff5628b961c
+SHA256 (geany-0.10.2.tar.bz2) = 4e62fa11be5d1ab6b96152ab133e60dedf64a49499e81ec5d8305a0adb7a2e7d
+SIZE (geany-0.10.2.tar.bz2) = 1589998
diff --git a/devel/geany/files/extra-patch-src-socket.c b/devel/geany/files/extra-patch-src-socket.c
deleted file mode 100644
index 9a5565415623..000000000000
--- a/devel/geany/files/extra-patch-src-socket.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/socket.c.orig	Wed Sep 27 00:29:44 2006
-+++ src/socket.c	Mon Oct  2 15:40:39 2006
-@@ -26,6 +26,9 @@
- #ifdef HAVE_SOCKET
- 
- #ifndef G_OS_WIN32
-+# include <string.h>
-+# include <sys/time.h>
-+# include <sys/types.h>
- # include <sys/socket.h>
- # include <sys/un.h>
- # include <netinet/in.h>
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index 876652a965fb..ca6ed083b995 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -1,5 +1,7 @@
 bin/geany
 share/applications/geany.desktop
+share/pixmaps/geany.ico
+share/pixmaps/geany.png
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -28,20 +30,22 @@ share/applications/geany.desktop
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s07.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s08.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s09.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04s02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04s03.html
 %%PORTDOCS%%%%DOCSDIR%%/html/geany.css
-%%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_interface.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_keys.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_toolbar.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/find_in_files_dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_files.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_interface.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_keys.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_toolbar.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/replace_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%DATADIR%%/GPL-2
@@ -71,6 +75,7 @@ share/applications/geany.desktop
 %%DATADIR%%/filetypes.sh
 %%DATADIR%%/filetypes.sql
 %%DATADIR%%/filetypes.tcl
+%%DATADIR%%/filetypes.vhdl
 %%DATADIR%%/filetypes.xml
 %%DATADIR%%/global.tags
 %%DATADIR%%/html_entities.tags
@@ -82,16 +87,20 @@ share/applications/geany.desktop
 %%NLS%%share/locale/cs/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/de/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/es/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/it/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/geany.mo
-share/pixmaps/geany.ico
-share/pixmaps/geany.png
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/geany.mo
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/html/images
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/html/images
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/html
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
 @dirrmtry share/applications
+@dirrmtry share/pixmaps