Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 May 2008 02:13:04 +0300
From:      Andris Raugulis <ar@null.lv>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/123377: [PATCH]: devel/geany: update to 0.14
Message-ID:  <20080503231304.GA39143@felikss.viss.lv>
Resent-Message-ID: <200805032330.m43NU2OG047127@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         123377
>Category:       ports
>Synopsis:       [PATCH]: devel/geany: update to 0.14
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 03 23:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Andris Raugulis
>Release:        FreeBSD 7.0-RELEASE i386
>Organization:
>Environment:
	
>Description:
- Update to 0.14, some highlights:
  o Add configurable plugin keybindings support.
  o Add a pkg-config file and install header files for external plugins.
  o Update PHP tags file to latest PHP API docs (including mysli functions)
  o Update Scintilla to version 1.76
  o Add (basic) column mode editing
  o Improve documentation and of course many bug fixes and improvements
  o New translations: Romanian, many updated translations 
- Add simple patch from SVN, without which Geany would crash

	
>How-To-Repeat:
	
>Fix:

	

--- freebsd.ports.devel.geany-0.13.to.devel.geany-0.14.patch begins here ---
diff -ruN geany.orig/Makefile geany/Makefile
--- geany.orig/Makefile	2008-03-18 02:35:22.000000000 +0200
+++ geany/Makefile	2008-05-04 01:43:52.000000000 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.13
+PORTVERSION=	0.14
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -61,6 +61,10 @@
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in
 .endif
 
+post-configure:
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications/
 	${INSTALL_MAN} ${WRKSRC}/doc/geany.1 ${MAN1PREFIX}/man/man1
diff -ruN geany.orig/distinfo geany/distinfo
--- geany.orig/distinfo	2008-03-18 02:35:22.000000000 +0200
+++ geany/distinfo	2008-04-26 03:05:29.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (geany-0.13.tar.bz2) = 0dc4f30b5ee9132f136fd3e7e4f02e0c
-SHA256 (geany-0.13.tar.bz2) = cf75505392ea81f256a380a4c249d15325c290fabac95b4584b0f66af432a9a1
-SIZE (geany-0.13.tar.bz2) = 2052311 
+MD5 (geany-0.14.tar.bz2) = c6c22c7f9feff81a15f5c8ece03b87c1
+SHA256 (geany-0.14.tar.bz2) = 619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
+SIZE (geany-0.14.tar.bz2) = 2120062
diff -ruN geany.orig/files/patch-tagmaster-html.c geany/files/patch-tagmaster-html.c
--- geany.orig/files/patch-tagmaster-html.c	1970-01-01 03:00:00.000000000 +0300
+++ geany/files/patch-tagmaster-html.c	2008-04-26 03:14:25.000000000 +0300
@@ -0,0 +1,11 @@
+--- tagmanager/html.c.orig	2008-04-26 03:13:29.000000000 +0300
++++ tagmanager/html.c	2008-04-26 03:13:42.000000000 +0300
+@@ -31,7 +31,7 @@
+ 
+ /* this matches simple heading without nested tags */
+ /** TODO combine both pattern to be able to match both heading styles */
+-#define INNER_HEADING "[ \t]*(.*+)[ \t]*"
++#define INNER_HEADING "[ \t]*(.+)[ \t]*"
+ 
+ 	addTagRegex (language,
+ 		"<a"
diff -ruN geany.orig/pkg-plist geany/pkg-plist
--- geany.orig/pkg-plist	2008-03-18 02:35:22.000000000 +0200
+++ geany/pkg-plist	2008-05-04 01:21:16.000000000 +0300
@@ -1,4 +1,36 @@
 bin/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/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/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/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/ui_utils.h
+include/geany/utils.h
 lib/geany/autosave.la
 lib/geany/autosave.so
 lib/geany/classbuilder.la
@@ -11,6 +43,7 @@
 lib/geany/htmlchars.so
 lib/geany/vcdiff.la
 lib/geany/vcdiff.so
+libdata/pkgconfig/geany.pc
 share/applications/geany.desktop
 share/icons/hicolor/16x16/apps/classviewer-class.png
 share/icons/hicolor/16x16/apps/classviewer-macro.png
@@ -102,6 +135,7 @@
 %%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/ro/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/geany.mo
@@ -114,3 +148,6 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
+@dirrm include/geany/tagmanager
+@dirrm include/geany/scintilla
+@dirrm include/geany
--- freebsd.ports.devel.geany-0.13.to.devel.geany-0.14.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080503231304.GA39143>