From nobody@FreeBSD.org  Tue Sep 21 06:04:30 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5581E106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 21 Sep 2010 06:04:30 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 44FBF8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 21 Sep 2010 06:04:30 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o8L64T3C050248
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 21 Sep 2010 06:04:29 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o8L64TJ5050247;
	Tue, 21 Sep 2010 06:04:29 GMT
	(envelope-from nobody)
Message-Id: <201009210604.o8L64TJ5050247@www.freebsd.org>
Date: Tue, 21 Sep 2010 06:04:29 GMT
From: Aldis Berjoza <aldis@bsdroot.lv>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] devel/geany v0.19
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: ar@null.lv

>Number:         150770
>Category:       ports
>Synopsis:       [patch] devel/geany v0.19
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 21 06:10:05 UTC 2010
>Closed-Date:    Sat Oct 09 20:45:09 UTC 2010
>Last-Modified:  Sat Oct  9 20:50:01 UTC 2010
>Originator:     Aldis Berjoza
>Release:        
>Organization:
>Environment:
>Description:
Update geany to v0.19
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ur geany.bak/Makefile geany/Makefile
--- geany.bak/Makefile	2010-09-21 07:34:18.543462741 +0300
+++ geany/Makefile	2010-09-21 07:34:39.980623037 +0300
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.18
-PORTREVISION=	3
+PORTVERSION=	0.19
 CATEGORIES=	devel
 MASTER_SITES=	http://download.geany.org/ SF
 
diff -ur geany.bak/distinfo geany/distinfo
--- geany.bak/distinfo	2010-09-21 07:34:18.543462741 +0300
+++ geany/distinfo	2010-09-21 07:35:10.835725031 +0300
@@ -1,3 +1,3 @@
-MD5 (geany-0.18.tar.bz2) = d8e301f6933c828e2c36b3afdb3f4c34
-SHA256 (geany-0.18.tar.bz2) = 7cb387d394b58b9ee1119dc6770b437e4a4c9e72b591b0bd431e54558f51212d
-SIZE (geany-0.18.tar.bz2) = 2457351 
+MD5 (geany-0.19.tar.bz2) = 3f9ab0faea72b1c8e25fe50162c42f95
+SHA256 (geany-0.19.tar.bz2) = fc47423cfcaa89a3dac88b492940ee0e4e46566de416392075507dabb65a7e06
+SIZE (geany-0.19.tar.bz2) = 2871302
diff -ur geany.bak/pkg-plist geany/pkg-plist
--- geany.bak/pkg-plist	2010-09-21 07:34:18.543462741 +0300
+++ geany/pkg-plist	2010-09-21 08:00:37.909460492 +0300
@@ -1,5 +1,4 @@
 bin/geany
-include/geany/dialogs.h
 include/geany/document.h
 include/geany/editor.h
 include/geany/encodings.h
@@ -9,19 +8,16 @@
 include/geany/geanyplugin.h
 include/geany/highlighting.h
 include/geany/keybindings.h
-include/geany/main.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/stash.h
 include/geany/support.h
 include/geany/tagmanager/tm_file_entry.h
 include/geany/tagmanager/tm_project.h
@@ -68,12 +64,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/html/images/build_menu_commands_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_in_files_dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/main_window.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_completions.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_display.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_indentation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_features.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_indentation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_files.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen_misc.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen_startup.png
@@ -89,6 +87,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%DATADIR%%/GPL-2
 %%DATADIR%%/filetype_extensions.conf
+%%DATADIR%%/filetypes.Genie.conf
+%%DATADIR%%/filetypes.abc
 %%DATADIR%%/filetypes.actionscript
 %%DATADIR%%/filetypes.ada
 %%DATADIR%%/filetypes.asm
@@ -116,6 +116,7 @@
 %%DATADIR%%/filetypes.latex
 %%DATADIR%%/filetypes.lua
 %%DATADIR%%/filetypes.makefile
+%%DATADIR%%/filetypes.markdown
 %%DATADIR%%/filetypes.matlab
 %%DATADIR%%/filetypes.nsis
 %%DATADIR%%/filetypes.pascal
@@ -129,18 +130,29 @@
 %%DATADIR%%/filetypes.sh
 %%DATADIR%%/filetypes.sql
 %%DATADIR%%/filetypes.tcl
+%%DATADIR%%/filetypes.txt2tags
 %%DATADIR%%/filetypes.vala
+%%DATADIR%%/filetypes.verilog
 %%DATADIR%%/filetypes.vhdl
 %%DATADIR%%/filetypes.xml
 %%DATADIR%%/filetypes.yaml
 %%DATADIR%%/c99.tags
 %%DATADIR%%/html_entities.tags
-%%DATADIR%%/latex.tags
 %%DATADIR%%/pascal.tags
 %%DATADIR%%/php.tags
 %%DATADIR%%/python.tags
 %%DATADIR%%/snippets.conf
 %%DATADIR%%/ui_toolbar.xml
+%%DATADIR%%/templates/files/file.html
+%%DATADIR%%/templates/files/file.php
+%%DATADIR%%/templates/files/file.rb
+%%DATADIR%%/templates/files/file.tex
+%%DATADIR%%/templates/files/main.c
+%%DATADIR%%/templates/files/main.cxx
+%%DATADIR%%/templates/files/main.d
+%%DATADIR%%/templates/files/main.java
+%%DATADIR%%/templates/files/main.py
+%%DATADIR%%/templates/files/program.pas
 %%NLS%%share/locale/be/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
@@ -172,6 +184,8 @@
 %%NLS%%@dirrmtry share/locale/lb/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/lb
 @dirrm lib/geany
+@dirrm %%DATADIR%%/templates/files
+@dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
@@ -188,3 +202,4 @@
 @dirrm include/geany/tagmanager
 @dirrm include/geany/scintilla
 @dirrm include/geany
+


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Sep 21 06:10:09 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150770 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: ar@null.lv
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/150770: [patch] devel/geany v0.19
Date: Tue, 21 Sep 2010 06:10:08 UT

 Maintainer of devel/geany,
 
 Please note that PR ports/150770 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/150770
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: "Aldis Berjoza" <aldis@bsdroot.lv>
To: bug-followup@freebsd.org, aldis@bsdroot.lv
Cc:  
Subject: Re: ports/150770: [patch] devel/geany v0.19
Date: Tue, 21 Sep 2010 18:09:19 +0300

 ------------vvvE4djmuyFwXC93pZdeOQ
 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes
 Content-Transfer-Encoding: 7bit
 
 Attached patch for geany v0.18 to v0.19.1
 
 
 -- 
 Aldis Berjoza
 ------------vvvE4djmuyFwXC93pZdeOQ
 Content-Disposition: attachment; filename=geany.patch
 Content-Type: application/octet-stream; name=geany.patch
 Content-Transfer-Encoding: Base64
 
 ZGlmZiAtdSBnZWFueS5iYWsvTWFrZWZpbGUgZ2VhbnkvTWFrZWZpbGUKLS0tIGdl
 YW55LmJhay9NYWtlZmlsZQkyMDEwLTA5LTIxIDA3OjM0OjE4LjU0MzQ2Mjc0MSAr
 MDMwMAorKysgZ2VhbnkvTWFrZWZpbGUJMjAxMC0wOS0yMSAxNzozNjowMi4zNzM5
 MTE5ODIgKzAzMDAKQEAgLTYsOCArNiw3IEBACiAjCiAKIFBPUlROQU1FPQlnZWFu
 eQotUE9SVFZFUlNJT049CTAuMTgKLVBPUlRSRVZJU0lPTj0JMworUE9SVFZFUlNJ
 T049CTAuMTkuMQogQ0FURUdPUklFUz0JZGV2ZWwKIE1BU1RFUl9TSVRFUz0JaHR0
 cDovL2Rvd25sb2FkLmdlYW55Lm9yZy8gU0YKIApkaWZmIC11IGdlYW55LmJhay9k
 aXN0aW5mbyBnZWFueS9kaXN0aW5mbwotLS0gZ2VhbnkuYmFrL2Rpc3RpbmZvCTIw
 MTAtMDktMjEgMDc6MzQ6MTguNTQzNDYyNzQxICswMzAwCisrKyBnZWFueS9kaXN0
 aW5mbwkyMDEwLTA5LTIxIDE3OjM2OjIyLjQzOTkzMTA2MCArMDMwMApAQCAtMSwz
 ICsxLDMgQEAKLU1ENSAoZ2VhbnktMC4xOC50YXIuYnoyKSA9IGQ4ZTMwMWY2OTMz
 YzgyOGUyYzM2YjNhZmRiM2Y0YzM0Ci1TSEEyNTYgKGdlYW55LTAuMTgudGFyLmJ6
 MikgPSA3Y2IzODdkMzk0YjU4YjllZTExMTlkYzY3NzBiNDM3ZTRhNGM5ZTcyYjU5
 MWIwYmQ0MzFlNTQ1NThmNTEyMTJkCi1TSVpFIChnZWFueS0wLjE4LnRhci5iejIp
 ID0gMjQ1NzM1MSAKK01ENSAoZ2VhbnktMC4xOS4xLnRhci5iejIpID0gNWVkOTYy
 MzA4MWNlMmEyM2I5YTM0MjViMDQ4NmJiYTMKK1NIQTI1NiAoZ2VhbnktMC4xOS4x
 LnRhci5iejIpID0gODhhMTkyOTNhZWZjYzk1NGI5NmVjMmRmMGIxNzcwOWNjZGZi
 Y2IzMDNiMTFmMGU2ODUyYzM5MGNiMDk2ZDc1MQorU0laRSAoZ2VhbnktMC4xOS4x
 LnRhci5iejIpID0gMjkwODc1NQpkaWZmIC11IGdlYW55LmJhay9wa2ctcGxpc3Qg
 Z2VhbnkvcGtnLXBsaXN0Ci0tLSBnZWFueS5iYWsvcGtnLXBsaXN0CTIwMTAtMDkt
 MjEgMDc6MzQ6MTguNTQzNDYyNzQxICswMzAwCisrKyBnZWFueS9wa2ctcGxpc3QJ
 MjAxMC0wOS0yMSAxNzozODo1NC45MjczMjE1OTEgKzAzMDAKQEAgLTEsNSArMSw0
 IEBACiBiaW4vZ2VhbnkKLWluY2x1ZGUvZ2VhbnkvZGlhbG9ncy5oCiBpbmNsdWRl
 L2dlYW55L2RvY3VtZW50LmgKIGluY2x1ZGUvZ2VhbnkvZWRpdG9yLmgKIGluY2x1
 ZGUvZ2VhbnkvZW5jb2RpbmdzLmgKQEAgLTksMTkgKzgsMTYgQEAKIGluY2x1ZGUv
 Z2VhbnkvZ2VhbnlwbHVnaW4uaAogaW5jbHVkZS9nZWFueS9oaWdobGlnaHRpbmcu
 aAogaW5jbHVkZS9nZWFueS9rZXliaW5kaW5ncy5oCi1pbmNsdWRlL2dlYW55L21h
 aW4uaAogaW5jbHVkZS9nZWFueS9tc2d3aW5kb3cuaAogaW5jbHVkZS9nZWFueS9w
 bHVnaW5kYXRhLmgKLWluY2x1ZGUvZ2VhbnkvcGx1Z2lubWFjcm9zLmgKLWluY2x1
 ZGUvZ2VhbnkvcGx1Z2lucy5oCiBpbmNsdWRlL2dlYW55L3ByZWZzLmgKIGluY2x1
 ZGUvZ2VhbnkvcHJvamVjdC5oCiBpbmNsdWRlL2dlYW55L3NjaW50aWxsYS9TY2lM
 ZXhlci5oCiBpbmNsdWRlL2dlYW55L3NjaW50aWxsYS9TY2ludGlsbGEuaAogaW5j
 bHVkZS9nZWFueS9zY2ludGlsbGEvU2NpbnRpbGxhLmlmYWNlCiBpbmNsdWRlL2dl
 YW55L3NjaW50aWxsYS9TY2ludGlsbGFXaWRnZXQuaAotaW5jbHVkZS9nZWFueS9z
 Y2l3cmFwcGVycy5oCiBpbmNsdWRlL2dlYW55L3NlYXJjaC5oCitpbmNsdWRlL2dl
 YW55L3N0YXNoLmgKIGluY2x1ZGUvZ2Vhbnkvc3VwcG9ydC5oCiBpbmNsdWRlL2dl
 YW55L3RhZ21hbmFnZXIvdG1fZmlsZV9lbnRyeS5oCiBpbmNsdWRlL2dlYW55L3Rh
 Z21hbmFnZXIvdG1fcHJvamVjdC5oCkBAIC02OCwxMiArNjQsMTQgQEAKICUlUE9S
 VERPQ1MlJSUlRE9DU0RJUiUlL1NjaW50aWxsYUxpY2Vuc2UudHh0CiAlJVBPUlRE
 T0NTJSUlJURPQ1NESVIlJS9UT0RPCiAlJVBPUlRET0NTJSUlJURPQ1NESVIlJS9U
 SEFOS1MKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2h0bWwvaW1hZ2VzL2J1aWxk
 X21lbnVfY29tbWFuZHNfZGlhbG9nLnBuZwogJSVQT1JURE9DUyUlJSVET0NTRElS
 JSUvaHRtbC9pbWFnZXMvZmluZF9kaWFsb2cucG5nCiAlJVBPUlRET0NTJSUlJURP
 Q1NESVIlJS9odG1sL2ltYWdlcy9maW5kX2luX2ZpbGVzX2RpYWxvZy5wbmcKKyUl
 UE9SVERPQ1MlJSUlRE9DU0RJUiUlL2h0bWwvaW1hZ2VzL21haW5fd2luZG93LnBu
 ZwogJSVQT1JURE9DUyUlJSVET0NTRElSJSUvaHRtbC9pbWFnZXMvcHJlZl9kaWFs
 b2dfZWRpdF9jb21wbGV0aW9ucy5wbmcKICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUl
 L2h0bWwvaW1hZ2VzL3ByZWZfZGlhbG9nX2VkaXRfZGlzcGxheS5wbmcKLSUlUE9S
 VERPQ1MlJSUlRE9DU0RJUiUlL2h0bWwvaW1hZ2VzL3ByZWZfZGlhbG9nX2VkaXRf
 aW5kZW50YXRpb24ucG5nCiAlJVBPUlRET0NTJSUlJURPQ1NESVIlJS9odG1sL2lt
 YWdlcy9wcmVmX2RpYWxvZ19lZGl0X2ZlYXR1cmVzLnBuZworJSVQT1JURE9DUyUl
 JSVET0NTRElSJSUvaHRtbC9pbWFnZXMvcHJlZl9kaWFsb2dfZWRpdF9pbmRlbnRh
 dGlvbi5wbmcKICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2h0bWwvaW1hZ2VzL3By
 ZWZfZGlhbG9nX2ZpbGVzLnBuZwogJSVQT1JURE9DUyUlJSVET0NTRElSJSUvaHRt
 bC9pbWFnZXMvcHJlZl9kaWFsb2dfZ2VuX21pc2MucG5nCiAlJVBPUlRET0NTJSUl
 JURPQ1NESVIlJS9odG1sL2ltYWdlcy9wcmVmX2RpYWxvZ19nZW5fc3RhcnR1cC5w
 bmcKQEAgLTg5LDYgKzg3LDggQEAKICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL21h
 bnVhbC50eHQKICUlREFUQURJUiUlL0dQTC0yCiAlJURBVEFESVIlJS9maWxldHlw
 ZV9leHRlbnNpb25zLmNvbmYKKyUlREFUQURJUiUlL2ZpbGV0eXBlcy5HZW5pZS5j
 b25mCislJURBVEFESVIlJS9maWxldHlwZXMuYWJjCiAlJURBVEFESVIlJS9maWxl
 dHlwZXMuYWN0aW9uc2NyaXB0CiAlJURBVEFESVIlJS9maWxldHlwZXMuYWRhCiAl
 JURBVEFESVIlJS9maWxldHlwZXMuYXNtCkBAIC0xMTYsNiArMTE2LDcgQEAKICUl
 REFUQURJUiUlL2ZpbGV0eXBlcy5sYXRleAogJSVEQVRBRElSJSUvZmlsZXR5cGVz
 Lmx1YQogJSVEQVRBRElSJSUvZmlsZXR5cGVzLm1ha2VmaWxlCislJURBVEFESVIl
 JS9maWxldHlwZXMubWFya2Rvd24KICUlREFUQURJUiUlL2ZpbGV0eXBlcy5tYXRs
 YWIKICUlREFUQURJUiUlL2ZpbGV0eXBlcy5uc2lzCiAlJURBVEFESVIlJS9maWxl
 dHlwZXMucGFzY2FsCkBAIC0xMjksMTggKzEzMCwyOSBAQAogJSVEQVRBRElSJSUv
 ZmlsZXR5cGVzLnNoCiAlJURBVEFESVIlJS9maWxldHlwZXMuc3FsCiAlJURBVEFE
 SVIlJS9maWxldHlwZXMudGNsCislJURBVEFESVIlJS9maWxldHlwZXMudHh0MnRh
 Z3MKICUlREFUQURJUiUlL2ZpbGV0eXBlcy52YWxhCislJURBVEFESVIlJS9maWxl
 dHlwZXMudmVyaWxvZwogJSVEQVRBRElSJSUvZmlsZXR5cGVzLnZoZGwKICUlREFU
 QURJUiUlL2ZpbGV0eXBlcy54bWwKICUlREFUQURJUiUlL2ZpbGV0eXBlcy55YW1s
 CiAlJURBVEFESVIlJS9jOTkudGFncwogJSVEQVRBRElSJSUvaHRtbF9lbnRpdGll
 cy50YWdzCi0lJURBVEFESVIlJS9sYXRleC50YWdzCiAlJURBVEFESVIlJS9wYXNj
 YWwudGFncwogJSVEQVRBRElSJSUvcGhwLnRhZ3MKICUlREFUQURJUiUlL3B5dGhv
 bi50YWdzCiAlJURBVEFESVIlJS9zbmlwcGV0cy5jb25mCiAlJURBVEFESVIlJS91
 aV90b29sYmFyLnhtbAorJSVEQVRBRElSJSUvdGVtcGxhdGVzL2ZpbGVzL2ZpbGUu
 aHRtbAorJSVEQVRBRElSJSUvdGVtcGxhdGVzL2ZpbGVzL2ZpbGUucGhwCislJURB
 VEFESVIlJS90ZW1wbGF0ZXMvZmlsZXMvZmlsZS5yYgorJSVEQVRBRElSJSUvdGVt
 cGxhdGVzL2ZpbGVzL2ZpbGUudGV4CislJURBVEFESVIlJS90ZW1wbGF0ZXMvZmls
 ZXMvbWFpbi5jCislJURBVEFESVIlJS90ZW1wbGF0ZXMvZmlsZXMvbWFpbi5jeHgK
 KyUlREFUQURJUiUlL3RlbXBsYXRlcy9maWxlcy9tYWluLmQKKyUlREFUQURJUiUl
 L3RlbXBsYXRlcy9maWxlcy9tYWluLmphdmEKKyUlREFUQURJUiUlL3RlbXBsYXRl
 cy9maWxlcy9tYWluLnB5CislJURBVEFESVIlJS90ZW1wbGF0ZXMvZmlsZXMvcHJv
 Z3JhbS5wYXMKICUlTkxTJSVzaGFyZS9sb2NhbGUvYmUvTENfTUVTU0FHRVMvZ2Vh
 bnkubW8KICUlTkxTJSVzaGFyZS9sb2NhbGUvYmcvTENfTUVTU0FHRVMvZ2Vhbnku
 bW8KICUlTkxTJSVzaGFyZS9sb2NhbGUvY2EvTENfTUVTU0FHRVMvZ2VhbnkubW8K
 QEAgLTE3MSw3ICsxODMsOSBAQAogJSVOTFMlJXNoYXJlL2xvY2FsZS96aF9UVy9M
 Q19NRVNTQUdFUy9nZWFueS5tbwogJSVOTFMlJUBkaXJybXRyeSBzaGFyZS9sb2Nh
 bGUvbGIvTENfTUVTU0FHRVMKICUlTkxTJSVAZGlycm10cnkgc2hhcmUvbG9jYWxl
 L2xiCi1AZGlycm0gbGliL2dlYW55CitAZGlycm10cnkgbGliL2dlYW55CitAZGly
 cm0gJSVEQVRBRElSJSUvdGVtcGxhdGVzL2ZpbGVzCitAZGlycm0gJSVEQVRBRElS
 JSUvdGVtcGxhdGVzCiBAZGlycm0gJSVEQVRBRElSJSUKICUlUE9SVERPQ1MlJUBk
 aXJybSAlJURPQ1NESVIlJS9odG1sL2ltYWdlcwogJSVQT1JURE9DUyUlQGRpcnJt
 ICUlRE9DU0RJUiUlL2h0bWwKQEAgLTE4OCwzICsyMDIsNCBAQAogQGRpcnJtIGlu
 Y2x1ZGUvZ2VhbnkvdGFnbWFuYWdlcgogQGRpcnJtIGluY2x1ZGUvZ2Vhbnkvc2Np
 bnRpbGxhCiBAZGlycm0gaW5jbHVkZS9nZWFueQorCg==
 
 ------------vvvE4djmuyFwXC93pZdeOQ--
 

From: Andris Raugulis <ar@null.lv>
To: bug-followup@FreeBSD.org
Cc: aldis@bsdroot.lv
Subject: Re: ports/150770: [patch] devel/geany v0.19
Date: Sat, 25 Sep 2010 10:27:35 +0300

 1) pkg-plist is wrong:
 
    a) missing locales in plist
 
    b) dirrm -> dirrmtry of lib/geany is incorrect.
       this port creates it & this port should delete it.
 
    c) I'm removing @dirrmtry share/icons/*, because geany
       depends on gtk and gtk depends on hicolor-icon-theme,
       which handles them (icon directories) directly.
 
 P.S. bonus points, Aldis, for rearranging .png's alphabetically.
 
 
 2) rest (Makefile/distinfo) is fine; but I'm including
    my full patch anyway, at the bottom, inlined.
 
 
 3) this introduces problems with geany-plugins:
 
 geany-plugins needs update to 0.19+, because at it's current
 state (0.18) they won't compile against geany 0.19.1. As Aldis,
 initial patch sender, is maintainer of that port, he needs to
 update it to 0.19. 
 
 I heard from him that debug plugin is broken. If so, in my opinion, 
 geany-plugins needs update anyway plus sign that option as broken
 while we can figure out and fix that particular plugin, otherwise
 geany can't be updated without breaking geany-plugins.
 
 Thoughts, Aldis & Edwin?
 
 
 
 diff -ruN geany.orig/Makefile geany/Makefile
 --- geany.orig/Makefile	2010-09-25 08:20:55.000000000 +0300
 +++ geany/Makefile	2010-09-25 08:21:20.000000000 +0300
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	geany
 -PORTVERSION=	0.18
 -PORTREVISION=	3
 +PORTVERSION=	0.19.1
  CATEGORIES=	devel
  MASTER_SITES=	http://download.geany.org/ SF
  
 diff -ruN geany.orig/distinfo geany/distinfo
 --- geany.orig/distinfo	2010-09-25 08:20:55.000000000 +0300
 +++ geany/distinfo	2010-09-25 08:24:20.000000000 +0300
 @@ -1,3 +1,3 @@
 -MD5 (geany-0.18.tar.bz2) = d8e301f6933c828e2c36b3afdb3f4c34
 -SHA256 (geany-0.18.tar.bz2) = 7cb387d394b58b9ee1119dc6770b437e4a4c9e72b591b0bd431e54558f51212d
 -SIZE (geany-0.18.tar.bz2) = 2457351 
 +MD5 (geany-0.19.1.tar.bz2) = 5ed9623081ce2a23b9a3425b0486bba3 
 +SHA256 (geany-0.19.1.tar.bz2) = 88a19293aefcc954b96ec2df0b17709ccdfbcb303b11f0e6852c390cb096d751 
 +SIZE (geany-0.19.1.tar.bz2) = 2908755
 diff -ruN geany.orig/pkg-plist geany/pkg-plist
 --- geany.orig/pkg-plist	2010-09-25 08:20:55.000000000 +0300
 +++ geany/pkg-plist	2010-09-25 09:28:19.000000000 +0300
 @@ -1,5 +1,4 @@
  bin/geany
 -include/geany/dialogs.h
  include/geany/document.h
  include/geany/editor.h
  include/geany/encodings.h
 @@ -9,19 +8,16 @@
  include/geany/geanyplugin.h
  include/geany/highlighting.h
  include/geany/keybindings.h
 -include/geany/main.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/stash.h
  include/geany/support.h
  include/geany/tagmanager/tm_file_entry.h
  include/geany/tagmanager/tm_project.h
 @@ -68,12 +64,14 @@
  %%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
  %%PORTDOCS%%%%DOCSDIR%%/TODO
  %%PORTDOCS%%%%DOCSDIR%%/THANKS
 +%%PORTDOCS%%%%DOCSDIR%%/html/images/build_menu_commands_dialog.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/find_in_files_dialog.png
 +%%PORTDOCS%%%%DOCSDIR%%/html/images/main_window.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_completions.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_display.png
 -%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_indentation.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_features.png
 +%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_indentation.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_files.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen_misc.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen_startup.png
 @@ -89,6 +87,8 @@
  %%PORTDOCS%%%%DOCSDIR%%/manual.txt
  %%DATADIR%%/GPL-2
  %%DATADIR%%/filetype_extensions.conf
 +%%DATADIR%%/filetypes.Genie.conf
 +%%DATADIR%%/filetypes.abc
  %%DATADIR%%/filetypes.actionscript
  %%DATADIR%%/filetypes.ada
  %%DATADIR%%/filetypes.asm
 @@ -116,6 +116,7 @@
  %%DATADIR%%/filetypes.latex
  %%DATADIR%%/filetypes.lua
  %%DATADIR%%/filetypes.makefile
 +%%DATADIR%%/filetypes.markdown
  %%DATADIR%%/filetypes.matlab
  %%DATADIR%%/filetypes.nsis
  %%DATADIR%%/filetypes.pascal
 @@ -129,18 +130,30 @@
  %%DATADIR%%/filetypes.sh
  %%DATADIR%%/filetypes.sql
  %%DATADIR%%/filetypes.tcl
 +%%DATADIR%%/filetypes.txt2tags
  %%DATADIR%%/filetypes.vala
 +%%DATADIR%%/filetypes.verilog
  %%DATADIR%%/filetypes.vhdl
  %%DATADIR%%/filetypes.xml
  %%DATADIR%%/filetypes.yaml
  %%DATADIR%%/c99.tags
  %%DATADIR%%/html_entities.tags
 -%%DATADIR%%/latex.tags
  %%DATADIR%%/pascal.tags
  %%DATADIR%%/php.tags
  %%DATADIR%%/python.tags
  %%DATADIR%%/snippets.conf
  %%DATADIR%%/ui_toolbar.xml
 +%%DATADIR%%/templates/files/file.html
 +%%DATADIR%%/templates/files/file.php
 +%%DATADIR%%/templates/files/file.rb
 +%%DATADIR%%/templates/files/file.tex
 +%%DATADIR%%/templates/files/main.c
 +%%DATADIR%%/templates/files/main.cxx
 +%%DATADIR%%/templates/files/main.d
 +%%DATADIR%%/templates/files/main.java
 +%%DATADIR%%/templates/files/main.py
 +%%DATADIR%%/templates/files/program.pas
 +%%NLS%%share/locale/ast/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/be/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
 @@ -151,6 +164,7 @@
  %%NLS%%share/locale/es/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/fi/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/fr/LC_MESSAGES/geany.mo
 +%%NLS%%share/locale/gl/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/it/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/geany.mo
 @@ -158,8 +172,8 @@
  %%NLS%%share/locale/lb/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/nl/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/pl/LC_MESSAGES/geany.mo
 +%%NLS%%share/locale/pt/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/pt_BR/LC_MESSAGES/geany.mo
 -%%NLS%%share/locale/pt_PT/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/ro/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/sl/LC_MESSAGES/geany.mo
 @@ -172,18 +186,12 @@
  %%NLS%%@dirrmtry share/locale/lb/LC_MESSAGES
  %%NLS%%@dirrmtry share/locale/lb
  @dirrm lib/geany
 +@dirrm %%DATADIR%%/templates/files
 +@dirrm %%DATADIR%%/templates
  @dirrm %%DATADIR%%
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 -@dirrmtry share/icons/hicolor/scalable/apps
 -@dirrmtry share/icons/hicolor/scalable
 -@dirrmtry share/icons/hicolor/48x48/apps
 -@dirrmtry share/icons/hicolor/48x48
 -@dirrmtry share/icons/hicolor/16x16/apps
 -@dirrmtry share/icons/hicolor/16x16
 -@dirrmtry share/icons/hicolor
 -@dirrmtry share/icons
  @dirrmtry share/applications
  @dirrm include/geany/tagmanager
  @dirrm include/geany/scintilla

From: "Aldis Berjoza" <aldis@bsdroot.lv>
To: bug-followup@freebsd.org, "Andris Raugulis" <ar@null.lv>
Cc:  
Subject: Re: ports/150770: [patch] devel/geany v0.19
Date: Sat, 25 Sep 2010 12:35:11 +0300

 On Sat, 25 Sep 2010 10:27:35 +0300, Andris Raugulis <ar@null.lv> wrote:
 
 > P.S. bonus points, Aldis, for rearranging .png's alphabetically.
 
 Power of vim :)
 
 
 > 3) this introduces problems with geany-plugins:
 >
 > geany-plugins needs update to 0.19+, because at it's current
 > state (0.18) they won't compile against geany 0.19.1. As Aldis,
 > initial patch sender, is maintainer of that port, he needs to
 > update it to 0.19.
 >
 > I heard from him that debug plugin is broken. If so, in my opinion,
 > geany-plugins needs update anyway plus sign that option as broken
 > while we can figure out and fix that particular plugin, otherwise
 > geany can't be updated without breaking geany-plugins.
 >
 > Thoughts, Aldis & Edwin?
 
 I will send pr for geany-plugins in about hour.
 
 Also I'd like to suggest to edit category for geany (if you accept this I  
 will modify geany-plugins category as well)
 I suggest modifying categories to:
 CATEGORIES=     devel editors
 
 or even better
 CATEGORIES=     editors devel
 
 Which effectively moves geany to editors (after all it is an editor)
 
 What do you think?
 --
 Aldis Berjoza

From: Andris Raugulis <ar@null.lv>
To: bug-followup@freebsd.org
Cc: Aldis Berjoza <aldis@bsdroot.lv>
Subject: Re: ports/150770: [patch] devel/geany v0.19
Date: Sat, 25 Sep 2010 12:59:43 +0300

 > Also I'd like to suggest to edit category for geany (if you accept
 > this I will modify geany-plugins category as well)
 > I suggest modifying categories to:
 > CATEGORIES=     devel editors
 > 
 > or even better
 > CATEGORIES=     editors devel
 > 
 > Which effectively moves geany to editors (after all it is an editor)
 
 I definately second "editors" part, but I'm not sure about leaving
 "devel". SciTe (editors/scite) is based on Scintilla, same as Geany,
 and it has "editors gnome", which would be more appropriate.
 
 That's why I would like to hear what commiter has to say.
 

From: "Aldis Berjoza" <aldis@bsdroot.lv>
To: bug-followup@freebsd.org, "Andris Raugulis" <ar@null.lv>
Cc:  
Subject: Re: ports/150770: [patch] devel/geany v0.19
Date: Sat, 25 Sep 2010 13:52:31 +0300

 On Sat, 25 Sep 2010 12:35:11 +0300, Aldis Berjoza <aldis@bsdroot.lv> wrote:
 
 > On Sat, 25 Sep 2010 10:27:35 +0300, Andris Raugulis <ar@null.lv> wrote:
 >
 >> P.S. bonus points, Aldis, for rearranging .png's alphabetically.
 >
 > Power of vim :)
 >
 >
 >> 3) this introduces problems with geany-plugins:
 >>
 >> geany-plugins needs update to 0.19+, because at it's current
 >> state (0.18) they won't compile against geany 0.19.1. As Aldis,
 >> initial patch sender, is maintainer of that port, he needs to
 >> update it to 0.19.
 >>
 >> I heard from him that debug plugin is broken. If so, in my opinion,
 >> geany-plugins needs update anyway plus sign that option as broken
 >> while we can figure out and fix that particular plugin, otherwise
 >> geany can't be updated without breaking geany-plugins.
 >>
 >> Thoughts, Aldis & Edwin?
 >
 > I will send pr for geany-plugins in about hour.
 
 Done
 http://www.freebsd.org/cgi/query-pr.cgi?pr=150931
 
 pr not visible (yet)
 -- 
 Aldis Berjoza

From: Andris Raugulis <ar@null.lv>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/150770: [patch] devel/geany v0.19
Date: Mon, 4 Oct 2010 10:02:57 +0300

 Edwin, any feedback?
 
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Sat Oct 9 20:15:57 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150770 
State-Changed-From-To: feedback->closed 
State-Changed-By: makc 
State-Changed-When: Sat Oct 9 20:45:07 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150770 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150770: commit references a PR
Date: Sat,  9 Oct 2010 20:44:20 +0000 (UTC)

 makc        2010-10-09 20:44:13 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/geany          Makefile distinfo pkg-plist 
   Log:
   Update to 0.19.1
   
   PR:             ports/150770
   Submitted by:   Aldis Berjoza <aldis at bsdroot.lv>
   Reviewed by:    Andris Raugulis (maintainer)
   
   Revision  Changes    Path
   1.21      +2 -3      ports/devel/geany/Makefile
   1.12      +3 -3      ports/devel/geany/distinfo
   1.13      +24 -16    ports/devel/geany/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
