- Update to 0.7.1

- Optionalize vte dependency

PR:		ports/100844
Submitted by:	ports@c0decafe.net <ports@c0decafe.net>
Approved by:	Remington L <mrl0lz@gmail.com> (maintainer)

6 files changed, 79 insertions, 71 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 9e165e72e279..5a52cdea0dd9 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.4
+PORTVERSION=	0.7.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +17,28 @@ COMMENT=	A fast and lightweight GTK+ IDE
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	vte
+USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
+OPTIONS=	VTE "With vte" On
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.if defined(WITHOUT_VTE)
+CONFIGURE_ARGS+=--disable-vte
+.else
+USE_GNOME+=	vte
+CONFIGURE_ARGS+=--enable-vte
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}|' ${WRKSRC}/scintilla/Makefile.in
 .if defined(NOPORTDOCS)
@@ -29,4 +48,4 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index e80d9f80c4d2..4377456607f6 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-MD5 (geany-0.4.tar.bz2) = a1ed7e40762dd55763b28fe97fed9feb
-SHA256 (geany-0.4.tar.bz2) = 9ac508b80d9e3a698550146b882664d6068ccc20345df66048549275f3cf53b5
-SIZE (geany-0.4.tar.bz2) = 993117
+MD5 (geany-0.7.1.tar.bz2) = bc6b93011b75b7a5256c164761141fb3
+SHA256 (geany-0.7.1.tar.bz2) = 0d9004578f4da4bb1b6211c8ada892a409cb1b13ce558fd78803b0b63748a0c9
+SIZE (geany-0.7.1.tar.bz2) = 1061842
diff --git a/devel/geany/files/patch-Makefile.in b/devel/geany/files/patch-Makefile.in
deleted file mode 100644
index 6286d8cd4da7..000000000000
--- a/devel/geany/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Tue Apr  4 13:17:33 2006
-+++ Makefile.in	Tue Apr  4 13:17:41 2006
-@@ -418,7 +418,6 @@
- 	fi
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
- 	$(INSTALL_DATA) global.tags $(DESTDIR)$(pkgdatadir); \
--	$(INSTALL_DATA) COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \
- 	for file in $(srcdir)/data/*; do \
- 	  if test -f $$file; then \
- 	    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/; \
diff --git a/devel/geany/files/patch-src_callbacks.c b/devel/geany/files/patch-src_callbacks.c
deleted file mode 100644
index eb5910fd1eb5..000000000000
--- a/devel/geany/files/patch-src_callbacks.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/callbacks.c.orig	Tue Apr  4 14:17:38 2006
-+++ src/callbacks.c	Tue Apr  4 14:20:19 2006
-@@ -151,7 +151,8 @@
- 		gtk_widget_destroy(app->default_tag_tree);
- 	}
- 	gtk_widget_destroy(app->window);
--	if (app->have_vte) vte_close();
-+	// this causes a crash, for some reason
-+	// if (app->have_vte) vte_close();
- 
- 	g_free(app);
- 
diff --git a/devel/geany/files/patch-src_main.c b/devel/geany/files/patch-src_main.c
deleted file mode 100644
index f605454daf24..000000000000
--- a/devel/geany/files/patch-src_main.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/main.c.orig	Tue Apr  4 14:21:13 2006
-+++ src/main.c	Tue Apr  4 14:21:16 2006
-@@ -241,7 +241,10 @@
- 	gtk_init(&argc, &argv);
- 
- 	// inits
--	app = g_new(MyApp, 1);
-+	// use g_new0() to make sure that all members are initialized
-+	// to NULL (otherwise it segfaults in destroyapp() when trying
-+	// to g_free() some undefined pointers)
-+	app = g_new0(MyApp, 1);
- #ifdef GEANY_DEBUG
- 	geany_debug("debug mode built in (can't be disabled)");
- #endif
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index adfe8d4814ed..c2a641c6df42 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -1,30 +1,22 @@
 bin/geany
-share/applications/geany.desktop
-share/locale/de/LC_MESSAGES/geany.mo
-share/pixmaps/geany.png
-%%DATADIR%%/filetypes.asm
-%%DATADIR%%/filetypes.c
-%%DATADIR%%/filetypes.common
-%%DATADIR%%/filetypes.conf
-%%DATADIR%%/filetypes.css
-%%DATADIR%%/filetypes.docbook
-%%DATADIR%%/filetypes.java
-%%DATADIR%%/filetypes.makefile
-%%DATADIR%%/filetypes.markup
-%%DATADIR%%/filetypes.pascal
-%%DATADIR%%/filetypes.perl
-%%DATADIR%%/filetypes.python
-%%DATADIR%%/filetypes.sh
-%%DATADIR%%/filetypes.tex
-%%DATADIR%%/global.tags
-%%PORTDOCS%%%%DOCSDIR%%/geany.txt
+%%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
 %%PORTDOCS%%%%DOCSDIR%%/html/apa.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apbs02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apbs03.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch01s04.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch02s02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch02s03.html
@@ -35,16 +27,49 @@ share/pixmaps/geany.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s05.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s06.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s07.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_templ.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/ch03s08.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch03s09.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-@dirrmtry share/applications
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
 %%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%%/filetypes.asm
+%%DATADIR%%/filetypes.c
+%%DATADIR%%/filetypes.caml
+%%DATADIR%%/filetypes.common
+%%DATADIR%%/filetypes.conf
+%%DATADIR%%/filetypes.cpp
+%%DATADIR%%/filetypes.css
+%%DATADIR%%/filetypes.docbook
+%%DATADIR%%/filetypes.java
+%%DATADIR%%/filetypes.latex
+%%DATADIR%%/filetypes.makefile
+%%DATADIR%%/filetypes.oms
+%%DATADIR%%/filetypes.pascal
+%%DATADIR%%/filetypes.perl
+%%DATADIR%%/filetypes.php
+%%DATADIR%%/filetypes.python
+%%DATADIR%%/filetypes.ruby
+%%DATADIR%%/filetypes.sh
+%%DATADIR%%/filetypes.sql
+%%DATADIR%%/filetypes.tcl
+%%DATADIR%%/filetypes.xml
+@dirrmtry %%DATADIR%%