ports/171847: devel/geany: update to 1.22

[Max Brazhnikov]

>Number:         171847
>Category:       ports
>Synopsis:       devel/geany: update to 1.22
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 21 10:20:01 UTC 2012
>Closed-Date:
>Last-Modified:
>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 at gmail.com>
-#
+# Created by: Remington Lang <MrL0Lz at 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 at null.lv
+MAINTAINER=	makc at 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:
>Unformatted: