update to 0.12 (which is a major update, too many changes to list here),

from Ulrich Etile per PM

5 files changed, 76 insertions, 48 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 9d9dfae4650..d75cf8b5541 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2007/03/12 22:52:21 rmind Exp $
+# $NetBSD: Makefile,v 1.6 2007/12/07 21:33:31 drochner Exp $
 
-DISTNAME=	geany-0.10.2
+DISTNAME=	geany-0.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=geany/}
 
@@ -9,11 +9,27 @@ HOMEPAGE=	http://geany.uvena.de/
 COMMENT=	Geany integrated development environment (IDE)
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config msgfmt
-USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config msgfmt gmake perl:run
+USE_LANGUAGES=		c c++
+USE_DIRS+=		xdg-1.1
+
+CONFIGURE_ARGS+=	--enable-plugins
+CONFIGURE_ARGS+=	--enable-vte
+CONFIGURE_ARGS+=	--enable-socket
+
 MAKE_FLAGS+=		CCLD=${CXX:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "sunpro"
+CONFIGURE_ARGS+=	CC=sunpro
 BUILDLINK_TRANSFORM+=	rm:-lstdc++
+.else
+CONFIGURE_ARGS+=	CC=gcc
+.endif
 
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/geany/PLIST b/devel/geany/PLIST
index 469ee334693..8ae6d5a40bf 100644
--- a/devel/geany/PLIST
+++ b/devel/geany/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2007/03/12 22:52:21 rmind Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/12/07 21:33:31 drochner Exp $
 bin/geany
+lib/geany/classbuilder.la
+lib/geany/export.la
+lib/geany/htmlchars.la
 man/man1/geany.1
 share/applications/geany.desktop
 share/doc/geany/AUTHORS
@@ -9,31 +12,6 @@ share/doc/geany/NEWS
 share/doc/geany/README
 share/doc/geany/ScintillaLicense.txt
 share/doc/geany/TODO
-share/doc/geany/html/apa.html
-share/doc/geany/html/apb.html
-share/doc/geany/html/apbs02.html
-share/doc/geany/html/apbs03.html
-share/doc/geany/html/apc.html
-share/doc/geany/html/ch01.html
-share/doc/geany/html/ch01s02.html
-share/doc/geany/html/ch01s03.html
-share/doc/geany/html/ch01s04.html
-share/doc/geany/html/ch02.html
-share/doc/geany/html/ch02s02.html
-share/doc/geany/html/ch02s03.html
-share/doc/geany/html/ch03.html
-share/doc/geany/html/ch03s02.html
-share/doc/geany/html/ch03s03.html
-share/doc/geany/html/ch03s04.html
-share/doc/geany/html/ch03s05.html
-share/doc/geany/html/ch03s06.html
-share/doc/geany/html/ch03s07.html
-share/doc/geany/html/ch03s08.html
-share/doc/geany/html/ch03s09.html
-share/doc/geany/html/ch04.html
-share/doc/geany/html/ch04s02.html
-share/doc/geany/html/ch04s03.html
-share/doc/geany/html/geany.css
 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_edit.png
@@ -49,6 +27,7 @@ share/doc/geany/html/images/replace_dialog.png
 share/doc/geany/html/index.html
 share/doc/geany/manual.txt
 share/geany/GPL-2
+share/geany/autocomplete.conf
 share/geany/filetype_extensions.conf
 share/geany/filetypes.asm
 share/geany/filetypes.c
@@ -56,15 +35,21 @@ share/geany/filetypes.caml
 share/geany/filetypes.common
 share/geany/filetypes.conf
 share/geany/filetypes.cpp
+share/geany/filetypes.cs
 share/geany/filetypes.css
 share/geany/filetypes.d
 share/geany/filetypes.diff
 share/geany/filetypes.docbook
 share/geany/filetypes.ferite
 share/geany/filetypes.fortran
+share/geany/filetypes.freebasic
+share/geany/filetypes.haskell
+share/geany/filetypes.haxe
 share/geany/filetypes.html
 share/geany/filetypes.java
+share/geany/filetypes.javascript
 share/geany/filetypes.latex
+share/geany/filetypes.lua
 share/geany/filetypes.makefile
 share/geany/filetypes.oms
 share/geany/filetypes.pascal
@@ -82,10 +67,20 @@ share/geany/html_entities.tags
 share/geany/latex.tags
 share/geany/pascal.tags
 share/geany/php.tags
+share/icons/hicolor/16x16/apps/classviewer-class.png
+share/icons/hicolor/16x16/apps/classviewer-macro.png
+share/icons/hicolor/16x16/apps/classviewer-member.png
+share/icons/hicolor/16x16/apps/classviewer-method.png
+share/icons/hicolor/16x16/apps/classviewer-namespace.png
+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/locale/be/LC_MESSAGES/geany.mo
+share/locale/bg/LC_MESSAGES/geany.mo
 share/locale/ca/LC_MESSAGES/geany.mo
 share/locale/cs/LC_MESSAGES/geany.mo
 share/locale/de/LC_MESSAGES/geany.mo
+share/locale/en_GB/LC_MESSAGES/geany.mo
 share/locale/es/LC_MESSAGES/geany.mo
 share/locale/fi/LC_MESSAGES/geany.mo
 share/locale/fr/LC_MESSAGES/geany.mo
@@ -100,9 +95,12 @@ share/locale/zh_CN/LC_MESSAGES/geany.mo
 share/locale/zh_TW/LC_MESSAGES/geany.mo
 share/pixmaps/geany.ico
 share/pixmaps/geany.png
-@dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/geany
 @dirrm share/doc/geany/html/images
 @dirrm share/doc/geany/html
 @dirrm share/doc/geany
-@dirrm share/applications
+@comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/geany
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index 83f0b3c9a25..786f66e321f 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/03/12 22:52:21 rmind Exp $
+$NetBSD: distinfo,v 1.4 2007/12/07 21:33:31 drochner Exp $
 
-SHA1 (geany-0.10.2.tar.gz) = 984776f8f0e5142b88c294b1093ef2c3d126a784
-RMD160 (geany-0.10.2.tar.gz) = 081f88b589052bc443a5e7e85c321d81275aa932
-Size (geany-0.10.2.tar.gz) = 2058704 bytes
-SHA1 (patch-aa) = b4a3d0b25c1687c2ce7f19b1354d8e100fd6cf53
+SHA1 (geany-0.12.tar.gz) = 5dcd16837e3bfeecbf91953992d2960cf4d80b84
+RMD160 (geany-0.12.tar.gz) = a92df2ff3247a3156399cc691fccb4bff3222d40
+Size (geany-0.12.tar.gz) = 2325651 bytes
+SHA1 (patch-aa) = fcd5c902aab3e9ac3b85382f26c98427f65d16a1
+SHA1 (patch-ab) = 99960a9a78d6a705e86a5a45bdf57d3e8c3bd3d3
diff --git a/devel/geany/patches/patch-aa b/devel/geany/patches/patch-aa
index 5137c08f9dc..86f61795bad 100644
--- a/devel/geany/patches/patch-aa
+++ b/devel/geany/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2007/02/08 00:25:13 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2007/12/07 21:33:32 drochner Exp $
 
---- src/Makefile.in.orig	2007-02-07 23:46:59.000000000 +0100
-+++ src/Makefile.in	2007-02-07 23:58:21.031979136 +0100
-@@ -247,7 +247,7 @@
- #AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields -g -O0
- @MINGW_TRUE@geany_LDFLAGS = -mwindows
- @MINGW_FALSE@INCLUDES = \
--@MINGW_FALSE@	-DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-+@MINGW_FALSE@	-DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
- @MINGW_FALSE@	-I../scintilla/include -I../tagmanager/include @PACKAGE_CFLAGS@
+--- configure.in.orig	2007-11-21 23:17:48.000000000 +0100
++++ configure.in	2007-11-21 23:18:13.000000000 +0100
+@@ -11,7 +11,7 @@
+ AC_MINIX
  
- @MINGW_TRUE@INCLUDES = -I../scintilla/include -I../tagmanager/include -DENABLE_NLS \
+ AC_PROG_CC
+-AM_CONDITIONAL(IS_COMPILER_GCC,test x$SSC == x)
++AM_CONDITIONAL(IS_COMPILER_GCC,test x$CC = xgcc)
+ 
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
diff --git a/devel/geany/patches/patch-ab b/devel/geany/patches/patch-ab
new file mode 100644
index 00000000000..8f4cd01478f
--- /dev/null
+++ b/devel/geany/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/12/07 21:33:32 drochner Exp $
+
+--- configure.orig	2007-10-10 16:55:51.000000000 +0200
++++ configure
+@@ -5165,7 +5165,7 @@ else
+ fi
+ 
+ 
+- if test x$SSC == x; then
++ if test x$CC = xgcc; then
+   IS_COMPILER_GCC_TRUE=
+   IS_COMPILER_GCC_FALSE='#'
+ else