4 files changed, 77 insertions, 34 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 5a52cdea0dd9..3fd794495f45 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.7.1
+PORTVERSION=	0.9
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	MrL0Lz@gmail.com
 COMMENT=	A fast and lightweight GTK+ IDE
 
-USE_X_PREFIX=	yes
+USE_X_PREFIX=	no
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
@@ -22,6 +22,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS=	VTE "With vte" On
 
+MAN1=	geany.1
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NLS)
@@ -44,8 +46,15 @@ post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 .endif
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in
+.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications
 
+.if ${OSVERSION} < 500036
+EXTRA_PATCHES+=	${PATCHDIR}/extra-*
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index 4377456607f6..f420266a80db 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-MD5 (geany-0.7.1.tar.bz2) = bc6b93011b75b7a5256c164761141fb3
-SHA256 (geany-0.7.1.tar.bz2) = 0d9004578f4da4bb1b6211c8ada892a409cb1b13ce558fd78803b0b63748a0c9
-SIZE (geany-0.7.1.tar.bz2) = 1061842
+MD5 (geany-0.9.tar.bz2) = 9b7732ebaecddd878c01f9e1d7705fa8
+SHA256 (geany-0.9.tar.bz2) = ece67034afdf5046e66391772463dc1227d262cc067e60250fa2b9cad72388d3
+SIZE (geany-0.9.tar.bz2) = 1375341
diff --git a/devel/geany/files/extra-patch-src-socket.c b/devel/geany/files/extra-patch-src-socket.c
new file mode 100644
index 000000000000..9a5565415623
--- /dev/null
+++ b/devel/geany/files/extra-patch-src-socket.c
@@ -0,0 +1,12 @@
+--- 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 c2a641c6df42..876652a965fb 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -1,13 +1,12 @@
 bin/geany
-%%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_keys.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.jpg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
-%%PORTDOCS%%%%DOCSDIR%%/html/geany.css
+share/applications/geany.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/html/apa.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apbs02.html
@@ -29,28 +28,24 @@ bin/geany
 %%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/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%share/locale/de/LC_MESSAGES/geany.mo
-%%NLS%%share/locale/es/LC_MESSAGES/geany.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
-%%NLS%%share/locale/be/LC_MESSAGES/geany.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/geany.mo
-share/applications/geany.desktop
-share/pixmaps/geany.png
-@dirrmtry share/applications
-%%DATADIR%%/global.tags
 %%DATADIR%%/GPL-2
+%%DATADIR%%/filetype_extensions.conf
 %%DATADIR%%/filetypes.asm
 %%DATADIR%%/filetypes.c
 %%DATADIR%%/filetypes.caml
@@ -58,7 +53,12 @@ share/pixmaps/geany.png
 %%DATADIR%%/filetypes.conf
 %%DATADIR%%/filetypes.cpp
 %%DATADIR%%/filetypes.css
+%%DATADIR%%/filetypes.d
+%%DATADIR%%/filetypes.diff
 %%DATADIR%%/filetypes.docbook
+%%DATADIR%%/filetypes.ferite
+%%DATADIR%%/filetypes.fortran
+%%DATADIR%%/filetypes.html
 %%DATADIR%%/filetypes.java
 %%DATADIR%%/filetypes.latex
 %%DATADIR%%/filetypes.makefile
@@ -72,4 +72,26 @@ share/pixmaps/geany.png
 %%DATADIR%%/filetypes.sql
 %%DATADIR%%/filetypes.tcl
 %%DATADIR%%/filetypes.xml
-@dirrmtry %%DATADIR%%
+%%DATADIR%%/global.tags
+%%DATADIR%%/html_entities.tags
+%%DATADIR%%/latex.tags
+%%DATADIR%%/pascal.tags
+%%DATADIR%%/php.tags
+%%NLS%%share/locale/be/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
+%%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/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
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/html/images
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
+@dirrmtry share/pixmaps
+@dirrmtry share/applications