From nobody@FreeBSD.org  Fri Sep 21 10:13:58 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BCE6C1065673
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 21 Sep 2012 10:13:58 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id A86F28FC1C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 21 Sep 2012 10:13:58 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8LADws1038275
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 21 Sep 2012 10:13:58 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q8LADw9O038274;
	Fri, 21 Sep 2012 10:13:58 GMT
	(envelope-from nobody)
Message-Id: <201209211013.q8LADw9O038274@red.freebsd.org>
Date: Fri, 21 Sep 2012 10:13:58 GMT
From: Max Brazhnikov <makc@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: devel/geany: update to 1.22
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: ar@null.lv

>Number:         171846
>Category:       ports
>Synopsis:       devel/geany: update to 1.22
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 21 10:20:00 UTC 2012
>Closed-Date:    Sat Oct 06 18:23:44 UTC 2012
>Last-Modified:  Sat Oct 06 18:23:44 UTC 2012
>Originator:     Max Brazhnikov
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
>Description:
Update to 1.22
Convert to new options framework
Take maintainership
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 304602)
+++ Makefile	(working copy)
@@ -1,17 +1,12 @@
-# New ports collection Makefile for:	geany
-# Date Created:				15 Jan 06
-# Whom:					Remington Lang <MrL0Lz@gmail.com>
-#
+# Created by: Remington Lang <MrL0Lz@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	geany
-PORTVERSION=	0.21
-PORTREVISION=	1
+PORTVERSION=	1.22
 CATEGORIES=	devel editors
 MASTER_SITES=	http://download.geany.org/ SF
 
-MAINTAINER=	ar@null.lv
+MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A fast and lightweight GTK+ IDE
 
 LICENSE=	GPLv2
@@ -21,17 +16,20 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20
+USE_PKGCONFIG=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
-		NLS	"Enable Native Language support"		on
+OPTIONS_DEFINE=	VTE NLS
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+VTE_DESC=	Virtual Terminal Emulation support
 
 MAN1=		geany.1
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -39,7 +37,7 @@
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_VTE)
+.if ${PORT_OPTIONS:MVTE}
 USE_GNOME+=	vte
 CONFIGURE_ARGS+=--enable-vte
 .else
@@ -47,15 +45,11 @@
 .endif
 
 post-patch:
-.if defined(NOPORTDOCS)
+.if !${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 .endif
-.if defined(WITHOUT_NLS)
+.if !${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in
 .endif
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications/
-	${INSTALL_MAN} ${WRKSRC}/doc/geany.1 ${MAN1PREFIX}/man/man1
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 304602)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (geany-0.21.tar.bz2) = cc0609d4c4d3bd8cf772bc4994d51cb1f79a12da5a82f2335a381293c5123a8c
-SIZE (geany-0.21.tar.bz2) = 3109890
+SHA256 (geany-1.22.tar.bz2) = 901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e
+SIZE (geany-1.22.tar.bz2) = 3198289
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 304602)
+++ pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/geany
+include/geany/build.h
 include/geany/document.h
 include/geany/editor.h
 include/geany/encodings.h
@@ -118,6 +119,7 @@
 %%DATADIR%%/filetypes.markdown
 %%DATADIR%%/filetypes.matlab
 %%DATADIR%%/filetypes.nsis
+%%DATADIR%%/filetypes.objectivec
 %%DATADIR%%/filetypes.pascal
 %%DATADIR%%/filetypes.perl
 %%DATADIR%%/filetypes.php
@@ -135,6 +137,7 @@
 %%DATADIR%%/filetypes.vhdl
 %%DATADIR%%/filetypes.xml
 %%DATADIR%%/filetypes.yaml
+%%DATADIR%%/geany.glade
 %%DATADIR%%/html_entities.tags
 %%DATADIR%%/pascal.tags
 %%DATADIR%%/php.tags
@@ -168,6 +171,7 @@
 share/icons/hicolor/16x16/apps/geany.png
 share/icons/hicolor/48x48/apps/geany.png
 share/icons/hicolor/scalable/apps/geany.svg
+%%NLS%%share/locale/ar/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/be/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
@@ -182,17 +186,22 @@
 %%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/id/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/it/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/lb/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/mn/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/nn/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/ro/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/geany.mo


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Sep 21 10:20:12 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: ar@null.lv
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/171846: devel/geany: update to 1.22
Date: Fri, 21 Sep 2012 10:20:09 UT

 Maintainer of devel/geany,
 
 Please note that PR ports/171846 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/171846
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Fri Sep 21 21:25:52 UTC 2012 
Responsible-Changed-Why:  
my PR. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171846: commit references a PR
Date: Sat,  6 Oct 2012 18:11:16 +0000 (UTC)

 Author: makc
 Date: Sat Oct  6 18:10:53 2012
 New Revision: 305392
 URL: http://svn.freebsd.org/changeset/ports/305392
 
 Log:
   - Update to 1.22
   - Convert to new options framework
   - Mark MAKE_JOBS_SAFE
   - Take maintainership
   
   PR:		ports/171846,
   		ports/172152 [1]
   Submitted by:	Eric Turgeon <ericturgeon.bsd at gmail.com> [1]
   Approved by:	maintainer timeouts (2 weeks for ports/171846)
 
 Modified:
   head/devel/geany/Makefile   (contents, props changed)
   head/devel/geany/distinfo   (contents, props changed)
   head/devel/geany/pkg-plist   (contents, props changed)
 
 Modified: head/devel/geany/Makefile
 ==============================================================================
 --- head/devel/geany/Makefile	Sat Oct  6 17:45:13 2012	(r305391)
 +++ head/devel/geany/Makefile	Sat Oct  6 18:10:53 2012	(r305392)
 @@ -1,18 +1,13 @@
 -# New ports collection Makefile for:	geany
 -# Date Created:				15 Jan 06
 -# Whom:					Remington Lang <MrL0Lz@gmail.com>
 -#
 +# Created by: Remington Lang <MrL0Lz@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	geany
 -PORTVERSION=	0.21
 -PORTREVISION=	1
 +PORTVERSION=	1.22
  CATEGORIES=	devel editors
  MASTER_SITES=	http://download.geany.org/ SF
  
 -MAINTAINER=	ar@null.lv
 -COMMENT=	A fast and lightweight GTK+ IDE
 +MAINTAINER=	makc@FreeBSD.org
 +COMMENT=	Fast and lightweight GTK+ IDE
  
  LICENSE=	GPLv2
  
 @@ -21,17 +16,20 @@ INSTALLS_ICONS=	yes
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	gnomehack gtk20
 +USE_PKGCONFIG=	build
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
 +MAKE_JOBS_SAFE=	yes
  
 -OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
 -		NLS	"Enable Native Language support"		on
 +OPTIONS_DEFINE=	VTE NLS
 +OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 +VTE_DESC=	Embedded virtual terminal
  
  MAN1=		geany.1
  
  .include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_NLS)
 +.if ${PORT_OPTIONS:MNLS}
  USE_GETTEXT=	yes
  PLIST_SUB+=	NLS=""
  .else
 @@ -39,7 +37,7 @@ CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 -.if !defined(WITHOUT_VTE)
 +.if ${PORT_OPTIONS:MVTE}
  USE_GNOME+=	vte
  CONFIGURE_ARGS+=--enable-vte
  .else
 @@ -47,15 +45,11 @@ CONFIGURE_ARGS+=--disable-vte
  .endif
  
  post-patch:
 -.if defined(NOPORTDOCS)
 +.if !${PORT_OPTIONS:MDOCS}
  	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
  .endif
 -.if defined(WITHOUT_NLS)
 +.if !${PORT_OPTIONS:MNLS}
  	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in
  .endif
  
 -post-install:
 -	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications/
 -	${INSTALL_MAN} ${WRKSRC}/doc/geany.1 ${MAN1PREFIX}/man/man1
 -
  .include <bsd.port.mk>
 
 Modified: head/devel/geany/distinfo
 ==============================================================================
 --- head/devel/geany/distinfo	Sat Oct  6 17:45:13 2012	(r305391)
 +++ head/devel/geany/distinfo	Sat Oct  6 18:10:53 2012	(r305392)
 @@ -1,2 +1,2 @@
 -SHA256 (geany-0.21.tar.bz2) = cc0609d4c4d3bd8cf772bc4994d51cb1f79a12da5a82f2335a381293c5123a8c
 -SIZE (geany-0.21.tar.bz2) = 3109890
 +SHA256 (geany-1.22.tar.bz2) = 901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e
 +SIZE (geany-1.22.tar.bz2) = 3198289
 
 Modified: head/devel/geany/pkg-plist
 ==============================================================================
 --- head/devel/geany/pkg-plist	Sat Oct  6 17:45:13 2012	(r305391)
 +++ head/devel/geany/pkg-plist	Sat Oct  6 18:10:53 2012	(r305392)
 @@ -1,4 +1,5 @@
  bin/geany
 +include/geany/build.h
  include/geany/document.h
  include/geany/editor.h
  include/geany/encodings.h
 @@ -118,6 +119,7 @@ share/applications/geany.desktop
  %%DATADIR%%/filetypes.markdown
  %%DATADIR%%/filetypes.matlab
  %%DATADIR%%/filetypes.nsis
 +%%DATADIR%%/filetypes.objectivec
  %%DATADIR%%/filetypes.pascal
  %%DATADIR%%/filetypes.perl
  %%DATADIR%%/filetypes.php
 @@ -135,6 +137,7 @@ share/applications/geany.desktop
  %%DATADIR%%/filetypes.vhdl
  %%DATADIR%%/filetypes.xml
  %%DATADIR%%/filetypes.yaml
 +%%DATADIR%%/geany.glade
  %%DATADIR%%/html_entities.tags
  %%DATADIR%%/pascal.tags
  %%DATADIR%%/php.tags
 @@ -168,6 +171,7 @@ share/icons/hicolor/16x16/apps/classview
  share/icons/hicolor/16x16/apps/geany.png
  share/icons/hicolor/48x48/apps/geany.png
  share/icons/hicolor/scalable/apps/geany.svg
 +%%NLS%%share/locale/ar/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/ast/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/be/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
 @@ -182,17 +186,22 @@ share/icons/hicolor/scalable/apps/geany.
  %%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/id/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/it/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/kk/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/ko/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/lb/LC_MESSAGES/geany.mo
 +%%NLS%%share/locale/lt/LC_MESSAGES/geany.mo
 +%%NLS%%share/locale/mn/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/nl/LC_MESSAGES/geany.mo
 +%%NLS%%share/locale/nn/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/ro/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
 +%%NLS%%share/locale/sk/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/sl/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/sv/LC_MESSAGES/geany.mo
  %%NLS%%share/locale/tr/LC_MESSAGES/geany.mo
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->open 
State-Changed-By: makc 
State-Changed-When: Sat Oct 6 18:23:03 UTC 2012 
State-Changed-Why:  
maintainer timeout 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171846 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Sat Oct 6 18:23:40 UTC 2012 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171846 
>Unformatted:
