[Midnightbsd-cvs] mports: devel/geany: Update to .14, license

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 22 09:51:39 EDT 2008 

Log Message:
-----------
Update to .14, license

Modified Files:
--------------
    mports/devel/geany:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.2 -> r1.3)

Added Files:
-----------
    mports/devel/geany/files:
        patch-tagmaster-html.c (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/geany/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L devel/geany/pkg-plist -L devel/geany/pkg-plist -u -r1.2 -r1.3
--- devel/geany/pkg-plist
+++ devel/geany/pkg-plist
@@ -1,5 +1,59 @@
 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
+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
+libdata/pkgconfig/geany.pc
 share/applications/geany.desktop
+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
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -7,40 +61,20 @@
 %%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/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/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
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/replace_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%DATADIR%%/GPL-2
@@ -51,47 +85,69 @@
 %%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
 %%DATADIR%%/filetypes.latex
+%%DATADIR%%/filetypes.lua
 %%DATADIR%%/filetypes.makefile
 %%DATADIR%%/filetypes.oms
 %%DATADIR%%/filetypes.pascal
 %%DATADIR%%/filetypes.perl
 %%DATADIR%%/filetypes.php
 %%DATADIR%%/filetypes.python
+%%DATADIR%%/filetypes.restructuredtext
 %%DATADIR%%/filetypes.ruby
 %%DATADIR%%/filetypes.sh
 %%DATADIR%%/filetypes.sql
 %%DATADIR%%/filetypes.tcl
+%%DATADIR%%/filetypes.vhdl
 %%DATADIR%%/filetypes.xml
 %%DATADIR%%/global.tags
 %%DATADIR%%/html_entities.tags
 %%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/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
 %%NLS%%share/locale/vi/LC_MESSAGES/geany.mo
-share/pixmaps/geany.ico
-share/pixmaps/geany.png
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/geany.mo
+ at dirrm lib/geany
 @dirrm %%DATADIR%%
- at dirrm %%DOCSDIR%%/html/images
- at dirrm %%DOCSDIR%%/html
- at dirrm %%DOCSDIR%%
- at dirrmtry share/pixmaps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-
+ at dirrm include/geany/tagmanager
+ at dirrm include/geany/scintilla
+ at dirrm include/geany
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/geany/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/geany/Makefile -L devel/geany/Makefile -u -r1.1 -r1.2
--- devel/geany/Makefile
+++ devel/geany/Makefile
@@ -3,30 +3,35 @@
 # Whom:					Remington Lang <MrL0Lz at gmail.com>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/devel/geany/Makefile,v 1.3 2006/10/08 17:06:06 clsung Exp $
+# $FreeBSD: ports/devel/geany/Makefile,v 1.10 2008/06/06 13:21:12 edwin Exp $
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.10.2
+PORTVERSION=	0.14
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A fast and lightweight GTK+ IDE
+LICENSE=	gpl2
 
-USE_X_PREFIX=	no
-USE_BZIP2=	yes
 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 "With vte" On
+OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
+		NLS	"Enable Native Language support"		on
 
-MAN1=	geany.1
+MAN1=		geany.1
 
 .include <bsd.port.pre.mk>
 
+GNU_REGEX_H=	gnu/regex.h
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
@@ -35,15 +40,18 @@
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_VTE)
-CONFIGURE_ARGS+=--disable-vte
-.else
+.if !defined(WITHOUT_VTE)
 USE_GNOME+=	vte
 CONFIGURE_ARGS+=--enable-vte
+.else
+CONFIGURE_ARGS+=--disable-vte
 .endif
 
 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
@@ -51,7 +59,12 @@
 	@${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_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications/
+	${INSTALL_MAN} ${WRKSRC}/doc/geany.1 ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/geany/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/geany/distinfo -L devel/geany/distinfo -u -r1.1 -r1.2
--- devel/geany/distinfo
+++ devel/geany/distinfo
@@ -1,3 +1,3 @@
-MD5 (geany-0.10.2.tar.bz2) = 49bb265a9b8284de8692aff5628b961c
-SHA256 (geany-0.10.2.tar.bz2) = 4e62fa11be5d1ab6b96152ab133e60dedf64a49499e81ec5d8305a0adb7a2e7d
-SIZE (geany-0.10.2.tar.bz2) = 1589998
+MD5 (geany-0.14.tar.bz2) = c6c22c7f9feff81a15f5c8ece03b87c1
+SHA256 (geany-0.14.tar.bz2) = 619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
+SIZE (geany-0.14.tar.bz2) = 2120062
--- /dev/null
+++ devel/geany/files/patch-tagmaster-html.c
@@ -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"

More information about the Midnightbsd-cvs mailing list