Date: Fri, 7 Mar 2008 16:59:47 +0200 From: Andris Raugulis <ar@null.lv> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/121469: [PATCH]: devel/geany: update to 0.13 Message-ID: <20080307145947.GA70170@felikss.viss.lv> Resent-Message-ID: <200803071520.m27FK3oT016735@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121469
>Category: ports
>Synopsis: [PATCH]: devel/geany: update to 0.13
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 07 15:20:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Andris Raugulis
>Release: FreeBSD 7.0-RELEASE i386
>Organization:
>Environment:
- Tested by myself both in FreeBSD 6.3-STABLE and FreeBSD 7.0-RELEASE.
>Description:
- Update to 0.13, some highlights:
o Project session file support
o File Browser sidebar plugin, VCdiff plugin and Autosave plugin
o Plugin Manager dialog to enable/disable plugins
o Configurable keybindings for Cut, Copy and Paste
o native GTK printing support on Unix-like systems
o New translations: Japanese, Ukrainian and Greek, many updated
translations
- Use GNU make
- Use GNU regex (gnu/regex.h, -lgnuregex)
- Taking maintainership (last time when I submitted PR to devel/geany,
it got commited only after maintainer timeout - 2 months)
>How-To-Repeat:
>Fix:
--- freebsd.ports.devel.geany-0.11.to.devel.geany-0.13.patch begins here ---
diff -ruN geany.orig/Makefile geany/Makefile
--- geany.orig/Makefile 2008-03-05 20:33:57.000000000 +0200
+++ geany/Makefile 2008-03-07 16:35:52.000000000 +0200
@@ -6,19 +6,21 @@
#
PORTNAME= geany
-PORTVERSION= 0.11
+PORTVERSION= 0.13
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= MrL0Lz@gmail.com
+MAINTAINER= ar@null.lv
COMMENT= A fast and lightweight GTK+ IDE
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
+USE_GMAKE= yes
USE_GNOME= gtk20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
OPTIONS= VTE "Enable Virtual Terminal Emulation support" on \
NLS "Enable Native Language support" on
@@ -27,6 +29,12 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} > 502010
+GNU_REGEX_H= gnu/regex.h
+.else
+GNU_REGEX_H= gnuregex.h
+.endif
+
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
@@ -44,6 +52,9 @@
post-patch:
@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}|' ${WRKSRC}/scintilla/Makefile.in
+.for file in tagmanager/lregex.c src/encodings.c
+ @${REINPLACE_CMD} -e 's|<regex\.h>|<${GNU_REGEX_H}>|g' ${WRKSRC}/${file}
+.endfor
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
.endif
diff -ruN geany.orig/distinfo geany/distinfo
--- geany.orig/distinfo 2008-03-05 20:33:57.000000000 +0200
+++ geany/distinfo 2008-03-05 20:48:51.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (geany-0.11.tar.bz2) = 1a0a679f4107d8c584d4e173d400f87c
-SHA256 (geany-0.11.tar.bz2) = 760060b252aae6e7b49f8c43cef4b8525394fbbc39bb4f28dba46eb4e57fc7fb
-SIZE (geany-0.11.tar.bz2) = 1742993
+MD5 (geany-0.13.tar.bz2) = 0dc4f30b5ee9132f136fd3e7e4f02e0c
+SHA256 (geany-0.13.tar.bz2) = cf75505392ea81f256a380a4c249d15325c290fabac95b4584b0f66af432a9a1
+SIZE (geany-0.13.tar.bz2) = 2052311
diff -ruN geany.orig/pkg-plist geany/pkg-plist
--- geany.orig/pkg-plist 2008-03-05 20:33:57.000000000 +0200
+++ geany/pkg-plist 2008-03-05 23:32:34.000000000 +0200
@@ -1,6 +1,25 @@
bin/geany
+lib/geany/autosave.la
+lib/geany/autosave.so
+lib/geany/classbuilder.la
+lib/geany/classbuilder.so
+lib/geany/export.la
+lib/geany/export.so
+lib/geany/filebrowser.la
+lib/geany/filebrowser.so
+lib/geany/htmlchars.la
+lib/geany/htmlchars.so
+lib/geany/vcdiff.la
+lib/geany/vcdiff.so
share/applications/geany.desktop
-share/pixmaps/geany.ico
+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/pixmaps/geany.png
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -9,47 +28,15 @@
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/html/apa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apbs02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apbs03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apcs02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apcs03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apd.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apds02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/apds03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ape.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch01s04.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch02s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch02s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s04.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s05.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s06.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s07.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s08.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s09.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s10.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s12.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch04.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch04s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch04s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/geany.css
%%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/find_in_files_dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_display.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_files.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_interface.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_keys.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_printing.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_toolbar.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.png
@@ -65,13 +52,16 @@
%%DATADIR%%/filetypes.common
%%DATADIR%%/filetypes.conf
%%DATADIR%%/filetypes.cpp
+%%DATADIR%%/filetypes.cs
%%DATADIR%%/filetypes.css
%%DATADIR%%/filetypes.d
%%DATADIR%%/filetypes.diff
%%DATADIR%%/filetypes.docbook
%%DATADIR%%/filetypes.ferite
%%DATADIR%%/filetypes.fortran
+%%DATADIR%%/filetypes.freebasic
%%DATADIR%%/filetypes.haskell
+%%DATADIR%%/filetypes.haxe
%%DATADIR%%/filetypes.html
%%DATADIR%%/filetypes.java
%%DATADIR%%/filetypes.javascript
@@ -83,6 +73,7 @@
%%DATADIR%%/filetypes.perl
%%DATADIR%%/filetypes.php
%%DATADIR%%/filetypes.python
+%%DATADIR%%/filetypes.restructuredtext
%%DATADIR%%/filetypes.ruby
%%DATADIR%%/filetypes.sh
%%DATADIR%%/filetypes.sql
@@ -94,23 +85,30 @@
%%DATADIR%%/latex.tags
%%DATADIR%%/pascal.tags
%%DATADIR%%/php.tags
+%%DATADIR%%/snippets.conf
%%NLS%%share/locale/be/LC_MESSAGES/geany.mo
%%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
%%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
%%NLS%%share/locale/cs/LC_MESSAGES/geany.mo
%%NLS%%share/locale/de/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/el/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/geany.mo
%%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/hu/LC_MESSAGES/geany.mo
%%NLS%%share/locale/it/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/geany.mo
%%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/ru/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/geany.mo
%%NLS%%share/locale/vi/LC_MESSAGES/geany.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/geany.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/geany.mo
+@dirrm lib/geany
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
--- freebsd.ports.devel.geany-0.11.to.devel.geany-0.13.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?20080307145947.GA70170>