From e91163d5345919c4ef7c2f870198ee0177a7b773 Mon Sep 17 00:00:00 2001 From: fgsch Date: Mon, 8 Apr 2013 22:28:04 +0000 Subject: [PATCH] Update to geany 1.2.3. benoit@ ok. maintainer timed-out. --- devel/geany/Makefile | 28 ++++----- devel/geany/distinfo | 7 +-- devel/geany/patches/patch-doc_Makefile_in | 10 +-- devel/geany/pkg/PLIST | 74 ++++++++++++++++++----- 4 files changed, 79 insertions(+), 40 deletions(-) diff --git a/devel/geany/Makefile b/devel/geany/Makefile index 86e8bf065e4..c29860b589e 100644 --- a/devel/geany/Makefile +++ b/devel/geany/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.39 2013/03/21 08:45:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.40 2013/04/08 22:28:04 fgsch Exp $ SHARED_ONLY= Yes COMMENT= small and lightweight IDE -DISTNAME= geany-0.20 -REVISION = 5 +DISTNAME = geany-1.23 CATEGORIES= devel @@ -25,27 +24,26 @@ MODULES= devel/gettext \ USE_GMAKE= Yes USE_GROFF = Yes -WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo -WANTLIB += drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 -WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png pthread pthread-stubs stdc++ xcb -WANTLIB += xcb-render xcb-shm z ffi +WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama \ + Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig \ + freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \ + gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 \ + harfbuzz icudata icule icuuc m pango-1.0 pangocairo-1.0 \ + pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs \ + stdc++ xcb xcb-render xcb-shm z LIB_DEPENDS= x11/gtk+2 RUN_DEPENDS= devel/desktop-file-utils \ devel/vte \ x11/gtk+2,-guic +LIBTOOL_FLAGS = --tag=disable-static + CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --enable-static -pre-configure: - @perl -pi -e 's:\@GMSGFMT\@:${LOCALBASE}/bin/msgfmt:' \ - ${WRKSRC}/po/Makefile.in.in +post-install: + rm -f ${PREFIX}/lib/geany/*.la .include diff --git a/devel/geany/distinfo b/devel/geany/distinfo index 478f6828079..9f90b7d69e6 100644 --- a/devel/geany/distinfo +++ b/devel/geany/distinfo @@ -1,5 +1,2 @@ -MD5 (geany-0.20.tar.bz2) = O9FSp6OircKDOpJF4jDaPQ== -RMD160 (geany-0.20.tar.bz2) = hfTDNxFEmUL6sCHCuMI5bc7fQmw= -SHA1 (geany-0.20.tar.bz2) = 643RX6+CgbNG0G6jIxrzecinWOA= -SHA256 (geany-0.20.tar.bz2) = Wa4GXFqwB+6n3T8t9soM3mGzJs4taqLVtE9VVP0olb0= -SIZE (geany-0.20.tar.bz2) = 3010953 +SHA256 (geany-1.23.tar.bz2) = zdSncmlIA8g3rlnlb3vcL6uhdFCTFyEfUi59Jd/L6LA= +SIZE (geany-1.23.tar.bz2) = 3622917 diff --git a/devel/geany/patches/patch-doc_Makefile_in b/devel/geany/patches/patch-doc_Makefile_in index dff89af32b1..7316a09fd8a 100644 --- a/devel/geany/patches/patch-doc_Makefile_in +++ b/devel/geany/patches/patch-doc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.4 2011/07/01 11:28:02 jasper Exp $ ---- doc/Makefile.in.orig Wed Jan 5 18:10:17 2011 -+++ doc/Makefile.in Fri Jul 1 09:27:55 2011 -@@ -467,12 +467,6 @@ install-data-local: +$OpenBSD: patch-doc_Makefile_in,v 1.5 2013/04/08 22:28:04 fgsch Exp $ +--- doc/Makefile.in.orig Sun Mar 10 14:26:23 2013 ++++ doc/Makefile.in Wed Mar 27 14:05:52 2013 +@@ -575,12 +575,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) @@ -12,5 +12,5 @@ $OpenBSD: patch-doc_Makefile_in,v 1.4 2011/07/01 11:28:02 jasper Exp $ - $(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. diff --git a/devel/geany/pkg/PLIST b/devel/geany/pkg/PLIST index f880d712eb6..10c5ef4bd79 100644 --- a/devel/geany/pkg/PLIST +++ b/devel/geany/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.18 2012/06/15 08:32:14 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.19 2013/04/08 22:28:04 fgsch Exp $ @pkgpath devel/geany,vte @bin bin/geany include/geany/ +include/geany/build.h include/geany/document.h include/geany/editor.h include/geany/encodings.h @@ -37,23 +38,11 @@ include/geany/toolbar.h include/geany/ui_utils.h include/geany/utils.h lib/geany/ -@comment lib/geany/classbuilder.a -@comment lib/geany/classbuilder.la lib/geany/classbuilder.so -@comment lib/geany/export.a -@comment lib/geany/export.la lib/geany/export.so -@comment lib/geany/filebrowser.a -@comment lib/geany/filebrowser.la lib/geany/filebrowser.so -@comment lib/geany/htmlchars.a -@comment lib/geany/htmlchars.la lib/geany/htmlchars.so -@comment lib/geany/saveactions.a -@comment lib/geany/saveactions.la lib/geany/saveactions.so -@comment lib/geany/splitwindow.a -@comment lib/geany/splitwindow.la lib/geany/splitwindow.so lib/pkgconfig/geany.pc @man man/man1/geany.1 @@ -74,12 +63,14 @@ 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_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_interface_interface.png +share/doc/geany/html/images/pref_dialog_interface_notebook.png +share/doc/geany/html/images/pref_dialog_interface_toolbar.png share/doc/geany/html/images/pref_dialog_keys.png share/doc/geany/html/images/pref_dialog_printing.png share/doc/geany/html/images/pref_dialog_templ.png -share/doc/geany/html/images/pref_dialog_toolbar.png share/doc/geany/html/images/pref_dialog_tools.png +share/doc/geany/html/images/pref_dialog_various.png share/doc/geany/html/images/pref_dialog_vte.png share/doc/geany/html/images/replace_dialog.png share/doc/geany/html/index.html @@ -90,14 +81,20 @@ share/geany/c99.tags share/geany/colorschemes/ share/geany/colorschemes/alt.conf share/geany/filetype_extensions.conf +share/geany/filetypes.Cython.conf share/geany/filetypes.Genie.conf +share/geany/filetypes.Go.conf +share/geany/filetypes.Scala.conf +share/geany/filetypes.abaqus share/geany/filetypes.abc share/geany/filetypes.actionscript share/geany/filetypes.ada +share/geany/filetypes.asciidoc share/geany/filetypes.asm share/geany/filetypes.c share/geany/filetypes.caml share/geany/filetypes.cmake +share/geany/filetypes.cobol share/geany/filetypes.common share/geany/filetypes.conf share/geany/filetypes.cpp @@ -125,6 +122,7 @@ share/geany/filetypes.makefile share/geany/filetypes.markdown share/geany/filetypes.matlab share/geany/filetypes.nsis +share/geany/filetypes.objectivec share/geany/filetypes.pascal share/geany/filetypes.perl share/geany/filetypes.php @@ -142,6 +140,8 @@ share/geany/filetypes.verilog share/geany/filetypes.vhdl share/geany/filetypes.xml share/geany/filetypes.yaml +share/geany/geany.glade +share/geany/geany.gtkrc share/geany/html_entities.tags share/geany/pascal.tags share/geany/php.tags @@ -161,10 +161,30 @@ share/geany/templates/files/main.cxx share/geany/templates/files/main.d share/geany/templates/files/main.java share/geany/templates/files/main.py +share/geany/templates/files/main.vala share/geany/templates/files/program.pas share/geany/templates/function share/geany/templates/gpl share/geany/ui_toolbar.xml +share/icons/Tango/ +share/icons/Tango/16x16/ +share/icons/Tango/16x16/actions/ +share/icons/Tango/16x16/actions/geany-save-all.png +share/icons/Tango/24x24/ +share/icons/Tango/24x24/actions/ +share/icons/Tango/24x24/actions/geany-save-all.png +share/icons/Tango/32x32/ +share/icons/Tango/32x32/actions/ +share/icons/Tango/32x32/actions/geany-save-all.png +share/icons/Tango/48x48/ +share/icons/Tango/48x48/actions/ +share/icons/Tango/48x48/actions/geany-save-all.png +share/icons/Tango/scalable/ +share/icons/Tango/scalable/actions/ +share/icons/Tango/scalable/actions/geany-save-all.svg +share/icons/hicolor/16x16/actions/geany-build.png +share/icons/hicolor/16x16/actions/geany-close-all.png +share/icons/hicolor/16x16/actions/geany-save-all.png share/icons/hicolor/16x16/apps/classviewer-class.png share/icons/hicolor/16x16/apps/classviewer-macro.png share/icons/hicolor/16x16/apps/classviewer-member.png @@ -174,8 +194,21 @@ share/icons/hicolor/16x16/apps/classviewer-other.png share/icons/hicolor/16x16/apps/classviewer-struct.png share/icons/hicolor/16x16/apps/classviewer-var.png share/icons/hicolor/16x16/apps/geany.png +share/icons/hicolor/24x24/actions/geany-build.png +share/icons/hicolor/24x24/actions/geany-close-all.png +share/icons/hicolor/24x24/actions/geany-save-all.png +share/icons/hicolor/32x32/actions/geany-build.png +share/icons/hicolor/32x32/actions/geany-close-all.png +share/icons/hicolor/32x32/actions/geany-save-all.png +share/icons/hicolor/48x48/actions/geany-build.png +share/icons/hicolor/48x48/actions/geany-close-all.png +share/icons/hicolor/48x48/actions/geany-save-all.png share/icons/hicolor/48x48/apps/geany.png +share/icons/hicolor/scalable/actions/geany-build.svg +share/icons/hicolor/scalable/actions/geany-close-all.svg +share/icons/hicolor/scalable/actions/geany-save-all.svg share/icons/hicolor/scalable/apps/geany.svg +share/locale/ar/LC_MESSAGES/geany.mo share/locale/ast/LC_MESSAGES/geany.mo share/locale/be/LC_MESSAGES/geany.mo share/locale/bg/LC_MESSAGES/geany.mo @@ -185,10 +218,16 @@ share/locale/de/LC_MESSAGES/geany.mo share/locale/el/LC_MESSAGES/geany.mo share/locale/en_GB/LC_MESSAGES/geany.mo share/locale/es/LC_MESSAGES/geany.mo +share/locale/et/LC_MESSAGES/geany.mo +share/locale/eu/LC_MESSAGES/geany.mo +share/locale/fa/LC_MESSAGES/geany.mo share/locale/fi/LC_MESSAGES/geany.mo share/locale/fr/LC_MESSAGES/geany.mo share/locale/gl/LC_MESSAGES/geany.mo +share/locale/he/LC_MESSAGES/geany.mo +share/locale/hi/LC_MESSAGES/geany.mo share/locale/hu/LC_MESSAGES/geany.mo +share/locale/id/LC_MESSAGES/geany.mo share/locale/it/LC_MESSAGES/geany.mo share/locale/ja/LC_MESSAGES/geany.mo share/locale/kk/LC_MESSAGES/geany.mo @@ -196,13 +235,18 @@ share/locale/ko/LC_MESSAGES/geany.mo share/locale/lb/ share/locale/lb/LC_MESSAGES/ share/locale/lb/LC_MESSAGES/geany.mo +share/locale/lt/LC_MESSAGES/geany.mo +share/locale/mn/LC_MESSAGES/geany.mo share/locale/nl/LC_MESSAGES/geany.mo +share/locale/nn/LC_MESSAGES/geany.mo share/locale/pl/LC_MESSAGES/geany.mo share/locale/pt/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/sk/LC_MESSAGES/geany.mo share/locale/sl/LC_MESSAGES/geany.mo +share/locale/sr/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