Hi,
Here is an update of Geany to the last version, take maintainership.
"the diff looks pretty OK" and "you can take maintainership" current
maintainer.
Tested by Fabien Romano and by me on amd64, please test and commit.
Cheer,
Jonathan Armani
Index: Makefile
===================================================================
RCS file: /cvs/openbsd/ports/devel/geany/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 15 Jun 2008 00:06:25 -0000 1.17
+++ Makefile 5 Mar 2009 09:27:08 -0000
@@ -2,13 +2,13 @@
COMMENT= small and lightweight IDE
-DISTNAME= geany-0.13
-PKGNAME= ${DISTNAME}p2
+DISTNAME= geany-0.16
+PKGNAME= ${DISTNAME}
CATEGORIES= devel
HOMEPAGE= http://geany.uvena.de/
-MAINTAINER= Vlad Glagolev <[email protected]>
+MAINTAINER= Jonathan Armani <[email protected]>
# GPL + Scintilla License
PERMIT_PACKAGE_CDROM= Yes
@@ -29,7 +29,7 @@
WANTLIB= X11 Xext Xrender Xau Xcursor Xdmcp Xfixes Xi \
Xcomposite Xdamage pcre \
Xinerama Xrandr expat stdc++ c m z glitz png \
- glib-2.0 gmodule-2.0 gobject-2.0 \
+ glib-2.0 gmodule-2.0 gobject-2.0 gio-2.0 \
fontconfig freetype atk-1.0 cairo \
pango-1.0 pangoft2-1.0 pangocairo-1.0 pixman-1
Index: distinfo
===================================================================
RCS file: /cvs/openbsd/ports/devel/geany/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 6 Feb 2008 10:55:12 -0000 1.7
+++ distinfo 5 Mar 2009 09:27:08 -0000
@@ -1,5 +1,5 @@
-MD5 (geany-0.13.tar.bz2) = DcTzC17pEy8Tb9Pn5PAuDA==
-RMD160 (geany-0.13.tar.bz2) = KGwOUxeN/ivTMSYYKE+ZH1StkEI=
-SHA1 (geany-0.13.tar.bz2) = nnuxb+3ohQpiE5MpkQjWShXPL5w=
-SHA256 (geany-0.13.tar.bz2) = z3VQU5LqgfJWo4CkwknRUyXCkPq6yVtFhLD2avQyqaE=
-SIZE (geany-0.13.tar.bz2) = 2052311
+MD5 (geany-0.16.tar.bz2) = Nu3pQqbkrUZg6RjJjLnPFQ==
+RMD160 (geany-0.16.tar.bz2) = zzV28MyqGUd4GVnqWsJjNdeyIC8=
+SHA1 (geany-0.16.tar.bz2) = I7Hn1QrEog9iDO8gPhLVDC39Zwg=
+SHA256 (geany-0.16.tar.bz2) = 5IG/3gZFs6DABL2fuZn3Z89NdjBc19C/JM96CuPTDeg=
+SIZE (geany-0.16.tar.bz2) = 2286258
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/openbsd/ports/devel/geany/patches/patch-doc_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 12 Oct 2007 09:44:21 -0000 1.1
+++ patches/patch-doc_Makefile_in 5 Mar 2009 09:27:08 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.1 2007/10/12 09:44:21 ajacoutot Exp $
---- doc/Makefile.in.orig Fri Oct 12 10:53:01 2007
-+++ doc/Makefile.in Fri Oct 12 10:53:21 2007
-@@ -452,11 +452,6 @@ install-data-local:
+$OpenBSD$
+--- doc/Makefile.in.orig Wed Feb 25 10:56:11 2009
++++ doc/Makefile.in Wed Feb 25 10:57:35 2009
+@@ -469,12 +469,6 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/geany.html $(DOCDIR)/html/index.html
$(INSTALL_DATA) $(srcdir)/geany.txt $(DOCDIR)/manual.txt
$(INSTALL_DATA) $(top_srcdir)/README $(DOCDIR)
@@ -10,6 +10,7 @@
- $(INSTALL_DATA) $(top_srcdir)/COPYING $(DOCDIR)
- $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DOCDIR)
- $(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR)
+- $(INSTALL_DATA) $(top_srcdir)/THANKS $(DOCDIR)
$(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt
$(DOCDIR)/ScintillaLicense.txt
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: patches/patch-scintilla_Makefile_in
===================================================================
RCS file: patches/patch-scintilla_Makefile_in
diff -N patches/patch-scintilla_Makefile_in
--- patches/patch-scintilla_Makefile_in 12 Oct 2007 09:44:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-scintilla_Makefile_in,v 1.1 2007/10/12 09:44:21 ajacoutot Exp $
---- scintilla/Makefile.in.orig Fri Oct 12 10:42:25 2007
-+++ scintilla/Makefile.in Fri Oct 12 10:42:31 2007
-@@ -254,7 +254,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = include
- noinst_LIBRARIES = libscintilla.a
--AM_CXXFLAGS = -DNDEBUG -Os -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE
-+AM_CXXFLAGS = -DNDEBUG -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE
- LEXER_SRCS = \
- LexAsm.cxx \
- LexBasic.cxx \
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/openbsd/ports/devel/geany/pkg/PFRAG.shared,v
retrieving revision 1.2
diff -u -r1.2 PFRAG.shared
--- pkg/PFRAG.shared 6 Feb 2008 10:55:12 -0000 1.2
+++ pkg/PFRAG.shared 5 Mar 2009 09:27:08 -0000
@@ -1,7 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2008/02/06 10:55:12 landry Exp $
-lib/geany/autosave.so
lib/geany/classbuilder.so
lib/geany/export.so
lib/geany/filebrowser.so
lib/geany/htmlchars.so
+lib/geany/saveactions.so
+lib/geany/splitwindow.so
lib/geany/vcdiff.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/openbsd/ports/devel/geany/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 17 Apr 2008 08:10:10 -0000 1.9
+++ pkg/PLIST 5 Mar 2009 09:27:08 -0000
@@ -1,8 +1,44 @@
@comment $OpenBSD: PLIST,v 1.9 2008/04/17 08:10:10 ajacoutot Exp $
%%SHARED%%
-bin/geany
+...@bin bin/geany
+include/geany/
+include/geany/dialogs.h
+include/geany/document.h
+include/geany/editor.h
+include/geany/encodings.h
+include/geany/filetypes.h
+include/geany/geany.h
+include/geany/geanyfunctions.h
+include/geany/highlighting.h
+include/geany/keybindings.h
+include/geany/msgwindow.h
+include/geany/plugindata.h
+include/geany/pluginmacros.h
+include/geany/plugins.h
+include/geany/prefs.h
+include/geany/project.h
+include/geany/scintilla/
+include/geany/scintilla/SciLexer.h
+include/geany/scintilla/Scintilla.h
+include/geany/scintilla/Scintilla.iface
+include/geany/scintilla/ScintillaWidget.h
+include/geany/sciwrappers.h
+include/geany/search.h
+include/geany/support.h
+include/geany/tagmanager/
+include/geany/tagmanager/tm_file_entry.h
+include/geany/tagmanager/tm_project.h
+include/geany/tagmanager/tm_source_file.h
+include/geany/tagmanager/tm_symbol.h
+include/geany/tagmanager/tm_tag.h
+include/geany/tagmanager/tm_tagmanager.h
+include/geany/tagmanager/tm_work_object.h
+include/geany/tagmanager/tm_workspace.h
+include/geany/templates.h
+include/geany/toolbar.h
+include/geany/ui_utils.h
+include/geany/utils.h
lib/geany/
-lib/geany/autosave.a
@comment lib/geany/autosave.la
lib/geany/classbuilder.a
@comment lib/geany/classbuilder.la
@@ -12,8 +48,14 @@
@comment lib/geany/filebrowser.la
lib/geany/htmlchars.a
@comment lib/geany/htmlchars.la
+lib/geany/saveactions.a
+lib/geany/saveactions.la
+lib/geany/splitwindow.a
+lib/geany/splitwindow.la
lib/geany/vcdiff.a
@comment lib/geany/vcdiff.la
+lib/pkgconfig/
+lib/pkgconfig/geany.pc
@man man/man1/geany.1
share/applications/geany.desktop
share/doc/geany/
@@ -23,10 +65,13 @@
share/doc/geany/html/images/
share/doc/geany/html/images/find_dialog.png
share/doc/geany/html/images/find_in_files_dialog.png
-share/doc/geany/html/images/pref_dialog_display.png
-share/doc/geany/html/images/pref_dialog_edit.png
+share/doc/geany/html/images/pref_dialog_edit_completions.png
+share/doc/geany/html/images/pref_dialog_edit_display.png
+share/doc/geany/html/images/pref_dialog_edit_features.png
+share/doc/geany/html/images/pref_dialog_edit_indentation.png
share/doc/geany/html/images/pref_dialog_files.png
-share/doc/geany/html/images/pref_dialog_gen.png
+share/doc/geany/html/images/pref_dialog_gen_misc.png
+share/doc/geany/html/images/pref_dialog_gen_startup.png
share/doc/geany/html/images/pref_dialog_interface.png
share/doc/geany/html/images/pref_dialog_keys.png
share/doc/geany/html/images/pref_dialog_printing.png
@@ -39,10 +84,12 @@
share/doc/geany/manual.txt
share/geany/
share/geany/GPL-2
+share/geany/c99.tags
share/geany/filetype_extensions.conf
share/geany/filetypes.asm
share/geany/filetypes.c
share/geany/filetypes.caml
+share/geany/filetypes.cmake
share/geany/filetypes.common
share/geany/filetypes.conf
share/geany/filetypes.cpp
@@ -51,9 +98,11 @@
share/geany/filetypes.d
share/geany/filetypes.diff
share/geany/filetypes.docbook
+share/geany/filetypes.f77
share/geany/filetypes.ferite
share/geany/filetypes.fortran
share/geany/filetypes.freebasic
+share/geany/filetypes.glsl
share/geany/filetypes.haskell
share/geany/filetypes.haxe
share/geany/filetypes.html
@@ -62,24 +111,30 @@
share/geany/filetypes.latex
share/geany/filetypes.lua
share/geany/filetypes.makefile
-share/geany/filetypes.oms
+share/geany/filetypes.matlab
+share/geany/filetypes.nsis
share/geany/filetypes.pascal
share/geany/filetypes.perl
share/geany/filetypes.php
+share/geany/filetypes.po
share/geany/filetypes.python
+share/geany/filetypes.r
share/geany/filetypes.restructuredtext
share/geany/filetypes.ruby
share/geany/filetypes.sh
share/geany/filetypes.sql
share/geany/filetypes.tcl
+share/geany/filetypes.vala
share/geany/filetypes.vhdl
share/geany/filetypes.xml
-share/geany/global.tags
+share/geany/filetypes.yaml
share/geany/html_entities.tags
share/geany/latex.tags
share/geany/pascal.tags
share/geany/php.tags
+share/geany/python.tags
share/geany/snippets.conf
+share/geany/ui_toolbar.xml
share/icons/
share/icons/hicolor/
share/icons/hicolor/16x16/
@@ -107,11 +162,14 @@
share/locale/hu/LC_MESSAGES/geany.mo
share/locale/it/LC_MESSAGES/geany.mo
share/locale/ja/LC_MESSAGES/geany.mo
+share/locale/ko/LC_MESSAGES/geany.mo
share/locale/nl/LC_MESSAGES/geany.mo
share/locale/pl/LC_MESSAGES/geany.mo
share/locale/pt_BR/LC_MESSAGES/geany.mo
+share/locale/ro/LC_MESSAGES/geany.mo
share/locale/ru/LC_MESSAGES/geany.mo
share/locale/sv/LC_MESSAGES/geany.mo
+share/locale/tr/LC_MESSAGES/geany.mo
share/locale/uk/LC_MESSAGES/geany.mo
share/locale/vi/LC_MESSAGES/geany.mo
share/locale/zh_CN/LC_MESSAGES/geany.mo
