aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/gedit2/Makefile17
-rw-r--r--editors/gedit2/distinfo2
-rw-r--r--editors/gedit2/pkg-descr28
-rw-r--r--editors/gedit2/pkg-plist219
-rw-r--r--editors/ghex2/Makefile10
-rw-r--r--editors/ghex2/distinfo2
-rw-r--r--editors/ghex2/files/patch-configure10
-rw-r--r--editors/ghex2/files/patch-src_ui.c11
-rw-r--r--editors/ghex2/pkg-plist118
9 files changed, 262 insertions, 155 deletions
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index c7aa77b91271..29665770ba14 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,29 +6,30 @@
#
PORTNAME= gedit2
-PORTVERSION= 2.2.2
+PORTVERSION= 2.4.0
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
DISTNAME= gedit-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A small but powerful text editor for Gnome 2.0 Desktop Environment
+COMMENT= A small but powerful text editor for Gnome 2 Desktop Environment
LIB_DEPENDS= pspell.15:${PORTSDIR}/textproc/aspell
-WRKSRC= ${WRKDIR}/gedit-${PORTVERSION}
-
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
+INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeprintui eel2
+USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeprintui libgnomeui \
+ eel2 gtksourceview
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB= VERSION="2.4"
-MAN1= gedit.1
+MAN1= gedit.1
.include <bsd.port.mk>
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 24950bbd96e5..5681a0d38dd6 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gedit-2.2.2.tar.bz2) = 9cd866f6e331fb3e5c65ed8200d9d154
+MD5 (gnome2/gedit-2.4.0.tar.bz2) = 0d8039773fd2f533bec4c9653854a4de
diff --git a/editors/gedit2/pkg-descr b/editors/gedit2/pkg-descr
index 6016fb0dbcf7..3ccfe39b038f 100644
--- a/editors/gedit2/pkg-descr
+++ b/editors/gedit2/pkg-descr
@@ -2,20 +2,20 @@ gEdit is a text editor for X using the GTK+ and GNOME libraries.
It is being developed by Alex Roberts, Evan Lawrence and Chris Lahey
(among others).
-This version is quite a neat text editor, it contains the following
+gEdit is quite a neat text editor. It contains the following
features:
- * Opening/Saving/Creating of files;
- * File Revert;
- * Cut/Copy/Paste and Select All text;
- * Complete integration with the GNOME Environment, including GnomeMDI;
- * Search and Replace;
- * Global search;
- * A complete preferences interface;
- * Dynamically loading fonts;
- * Splitscreen Mode;
- * Printing support;
- * Configurable Plugins system;
- * Configurable window sizing;
- * Unlimited Undo/Redo.
+ * Opening/Saving/Creating files
+ * File Revert
+ * Cut/Copy/Paste and Select All text
+ * Complete integration with the GNOME Environment, including GnomeMDI
+ * Search and Replace
+ * Global search
+ * A complete preferences interface
+ * Dynamically loading fonts
+ * Splitscreen Mode
+ * Printing support
+ * Configurable Plugins system
+ * Configurable window sizing
+ * Unlimited Undo/Redo
WWW: http://gedit.sourceforge.net/
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index c7753de587fa..ca311d5789dd 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -7,11 +7,11 @@ etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent/%gconf.
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/encodings/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page/%gconf.xml
@@ -26,11 +26,11 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page/%gconf.xml
@@ -39,14 +39,35 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents/%gconf.
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar/%gconf.xml
etc/gconf/schemas/gedit.schemas
-lib/gedit-2/plugins/ascii.gedit-plugin
-lib/gedit-2/plugins/cvschangelog.gedit-plugin
-lib/gedit-2/plugins/diff.gedit-plugin
+include/gedit-%%VERSION%%/gedit/bonobo-mdi-child.h
+include/gedit-%%VERSION%%/gedit/bonobo-mdi.h
+include/gedit-%%VERSION%%/gedit/gedit-convert.h
+include/gedit-%%VERSION%%/gedit/gedit-debug.h
+include/gedit-%%VERSION%%/gedit/gedit-document.h
+include/gedit-%%VERSION%%/gedit/gedit-encodings.h
+include/gedit-%%VERSION%%/gedit/gedit-file.h
+include/gedit-%%VERSION%%/gedit/gedit-mdi-child.h
+include/gedit-%%VERSION%%/gedit/gedit-mdi.h
+include/gedit-%%VERSION%%/gedit/gedit-menus.h
+include/gedit-%%VERSION%%/gedit/gedit-metadata-manager.h
+include/gedit-%%VERSION%%/gedit/gedit-output-window.h
+include/gedit-%%VERSION%%/gedit/gedit-plugin.h
+include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h
+include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h
+include/gedit-%%VERSION%%/gedit/gedit-print.h
+include/gedit-%%VERSION%%/gedit/gedit-recent.h
+include/gedit-%%VERSION%%/gedit/gedit-utils.h
+include/gedit-%%VERSION%%/gedit/gedit-view.h
+include/gedit-%%VERSION%%/gedit/gedit2.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-item.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-model.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-util.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-bonobo.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h
+lib/bonobo/libgedit-control.so
lib/gedit-2/plugins/docinfo.gedit-plugin
lib/gedit-2/plugins/indent.gedit-plugin
-lib/gedit-2/plugins/libasciitable.so
-lib/gedit-2/plugins/libcvschangelog.so
-lib/gedit-2/plugins/libdiff.so
lib/gedit-2/plugins/libdocinfo.so
lib/gedit-2/plugins/libindent.so
lib/gedit-2/plugins/libsample.so
@@ -62,15 +83,15 @@ lib/gedit-2/plugins/spell.gedit-plugin
lib/gedit-2/plugins/taglist.gedit-plugin
lib/gedit-2/plugins/time.gedit-plugin
libdata/bonobo/servers/GNOME_Gedit.server
+libdata/pkgconfig/gedit-%%VERSION%%.pc
share/gnome/application-registry/gedit.applications
share/gnome/applications/gedit.desktop
-share/gnome/gedit-2/glade/asciitable.glade2
-share/gnome/gedit-2/glade/diff.glade2
share/gnome/gedit-2/glade/docinfo.glade2
share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2
share/gnome/gedit-2/glade/gedit-preferences.glade2
share/gnome/gedit-2/glade/goto-line.glade2
share/gnome/gedit-2/glade/languages-dialog.glade2
+share/gnome/gedit-2/glade/page-setup-dialog.glade2
share/gnome/gedit-2/glade/plugin-manager.glade2
share/gnome/gedit-2/glade/program-location-dialog.glade2
share/gnome/gedit-2/glade/replace.glade2
@@ -83,116 +104,121 @@ share/gnome/gedit-2/taglist/HTML.tags
share/gnome/gedit-2/taglist/Latex.tags
share/gnome/gedit-2/taglist/XSLT.tags
share/gnome/gedit-2/ui/gedit-ui.xml
+share/gnome/gnome-2.0/ui/gedit-viewer-ui.xml
share/gnome/help/gedit/C/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/C/figures/gedit_window.png
share/gnome/help/gedit/C/gedit.xml
share/gnome/help/gedit/C/legal.xml
-share/gnome/help/gedit/de/legal.xml
share/gnome/help/gedit/de/gedit.xml
-share/gnome/help/gedit/es/legal.xml
+share/gnome/help/gedit/de/legal.xml
share/gnome/help/gedit/es/gedit.xml
-share/gnome/help/gedit/fr/legal.xml
+share/gnome/help/gedit/es/legal.xml
share/gnome/help/gedit/fr/gedit.xml
-share/gnome/help/gedit/it/legal.xml
+share/gnome/help/gedit/fr/legal.xml
share/gnome/help/gedit/it/gedit.xml
-share/gnome/help/gedit/sv/legal.xml
-share/gnome/help/gedit/sv/gedit.xml
-share/gnome/help/gedit/ja/legal.xml
+share/gnome/help/gedit/it/legal.xml
share/gnome/help/gedit/ja/gedit.xml
-share/gnome/help/gedit/ko/legal.xml
+share/gnome/help/gedit/ja/legal.xml
share/gnome/help/gedit/ko/gedit.xml
+share/gnome/help/gedit/ko/legal.xml
share/gnome/help/gedit/ro/figures/gedit_window.png
share/gnome/help/gedit/ro/gedit.xml
share/gnome/help/gedit/ro/legal.xml
-share/gnome/help/gedit/zh_CN/legal.xml
+share/gnome/help/gedit/sv/gedit.xml
+share/gnome/help/gedit/sv/legal.xml
share/gnome/help/gedit/zh_CN/gedit.xml
-share/gnome/help/gedit/zh_TW/legal.xml
+share/gnome/help/gedit/zh_CN/legal.xml
share/gnome/help/gedit/zh_TW/gedit.xml
+share/gnome/help/gedit/zh_TW/legal.xml
share/gnome/idl/GNOME_Gedit.idl
share/gnome/mime-info/gedit.keys
share/gnome/omf/gedit/gedit-C.omf
-share/gnome/omf/gedit/gedit-de.omf
-share/gnome/omf/gedit/gedit-es.omf
-share/gnome/omf/gedit/gedit-fr.omf
-share/gnome/omf/gedit/gedit-it.omf
-share/gnome/omf/gedit/gedit-sv.omf
-share/gnome/omf/gedit/gedit-ja.omf
-share/gnome/omf/gedit/gedit-ko.omf
-share/gnome/omf/gedit/gedit-ro.omf
-share/gnome/omf/gedit/gedit-zh_CN.omf
-share/gnome/omf/gedit/gedit-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-de.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-es.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ro.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/gedit-icon.png
share/gnome/pixmaps/gedit-logo.png
share/gnome/pixmaps/gedit-plugin-manager.png
-share/locale/am/LC_MESSAGES/gedit-2.2.mo
-share/locale/ar/LC_MESSAGES/gedit-2.2.mo
-share/locale/az/LC_MESSAGES/gedit-2.2.mo
-share/locale/be/LC_MESSAGES/gedit-2.2.mo
-share/locale/bg/LC_MESSAGES/gedit-2.2.mo
-share/locale/ca/LC_MESSAGES/gedit-2.2.mo
-share/locale/cs/LC_MESSAGES/gedit-2.2.mo
-share/locale/da/LC_MESSAGES/gedit-2.2.mo
-share/locale/de/LC_MESSAGES/gedit-2.2.mo
-share/locale/el/LC_MESSAGES/gedit-2.2.mo
-share/locale/es/LC_MESSAGES/gedit-2.2.mo
-share/locale/et/LC_MESSAGES/gedit-2.2.mo
-share/locale/eu/LC_MESSAGES/gedit-2.2.mo
-share/locale/fa/LC_MESSAGES/gedit-2.2.mo
-share/locale/fi/LC_MESSAGES/gedit-2.2.mo
-share/locale/fr/LC_MESSAGES/gedit-2.2.mo
-share/locale/ga/LC_MESSAGES/gedit-2.2.mo
-share/locale/gl/LC_MESSAGES/gedit-2.2.mo
-share/locale/he/LC_MESSAGES/gedit-2.2.mo
-share/locale/hi/LC_MESSAGES/gedit-2.2.mo
-share/locale/hu/LC_MESSAGES/gedit-2.2.mo
-share/locale/it/LC_MESSAGES/gedit-2.2.mo
-share/locale/ja/LC_MESSAGES/gedit-2.2.mo
-share/locale/kn/LC_MESSAGES/gedit-2.2.mo
-share/locale/ko/LC_MESSAGES/gedit-2.2.mo
-share/locale/lt/LC_MESSAGES/gedit-2.2.mo
-share/locale/lv/LC_MESSAGES/gedit-2.2.mo
-share/locale/mk/LC_MESSAGES/gedit-2.2.mo
-share/locale/ml/LC_MESSAGES/gedit-2.2.mo
-share/locale/mn/LC_MESSAGES/gedit-2.2.mo
-share/locale/ms/LC_MESSAGES/gedit-2.2.mo
-share/locale/nl/LC_MESSAGES/gedit-2.2.mo
-share/locale/nn/LC_MESSAGES/gedit-2.2.mo
-share/locale/no/LC_MESSAGES/gedit-2.2.mo
-share/locale/pl/LC_MESSAGES/gedit-2.2.mo
-share/locale/pt/LC_MESSAGES/gedit-2.2.mo
-share/locale/pt_BR/LC_MESSAGES/gedit-2.2.mo
-share/locale/ro/LC_MESSAGES/gedit-2.2.mo
-share/locale/ru/LC_MESSAGES/gedit-2.2.mo
-share/locale/sk/LC_MESSAGES/gedit-2.2.mo
-share/locale/sl/LC_MESSAGES/gedit-2.2.mo
-share/locale/sr/LC_MESSAGES/gedit-2.2.mo
-share/locale/sr@Latn/LC_MESSAGES/gedit-2.2.mo
-share/locale/sv/LC_MESSAGES/gedit-2.2.mo
-share/locale/ta/LC_MESSAGES/gedit-2.2.mo
-share/locale/th/LC_MESSAGES/gedit-2.2.mo
-share/locale/tr/LC_MESSAGES/gedit-2.2.mo
-share/locale/uk/LC_MESSAGES/gedit-2.2.mo
-share/locale/vi/LC_MESSAGES/gedit-2.2.mo
-share/locale/wa/LC_MESSAGES/gedit-2.2.mo
-share/locale/zh_CN/LC_MESSAGES/gedit-2.2.mo
-share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
+share/locale/am/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ne/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo
@dirrm share/gnome/omf/gedit
@dirrm share/gnome/help/gedit/zh_TW
@dirrm share/gnome/help/gedit/zh_CN
+@dirrm share/gnome/help/gedit/sv
@dirrm share/gnome/help/gedit/ro/figures
@dirrm share/gnome/help/gedit/ro
-@dirrm share/gnome/help/gedit/sv
@dirrm share/gnome/help/gedit/ko
@dirrm share/gnome/help/gedit/ja
@dirrm share/gnome/help/gedit/it
@@ -206,6 +232,9 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
@dirrm share/gnome/gedit-2
@dirrm lib/gedit-2/plugins
@dirrm lib/gedit-2
+@dirrm include/gedit-%%VERSION%%/gedit/recent-files
+@dirrm include/gedit-%%VERSION%%/gedit
+@dirrm include/gedit-%%VERSION%%
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents
@@ -213,12 +242,12 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent
@@ -232,26 +261,26 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print
+@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/encodings
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index 6f1c8d1c8a82..7e5171fb2843 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= ghex2
-PORTVERSION= 2.2.1
-PORTREVISION= 2
+PORTVERSION= 2.4.0.1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,10 +19,11 @@ COMMENT= GNOME 2 hex editor
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack gail libgnomeprintui libgnomeui
USE_LIBTOOL= yes
-USE_REINPLACE= yes
+INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/editors/ghex2/distinfo b/editors/ghex2/distinfo
index 0c47977b9234..ed1ab7a182c1 100644
--- a/editors/ghex2/distinfo
+++ b/editors/ghex2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ghex-2.2.1.tar.bz2) = a10ef7db355d2c7790b5d999d0b3087a
+MD5 (gnome2/ghex-2.4.0.1.tar.bz2) = 2add675fa3d8d61e71616d49bb7d861e
diff --git a/editors/ghex2/files/patch-configure b/editors/ghex2/files/patch-configure
new file mode 100644
index 000000000000..f195f07b43c6
--- /dev/null
+++ b/editors/ghex2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Wed Dec 11 18:31:51 2002
++++ configure Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/editors/ghex2/files/patch-src_ui.c b/editors/ghex2/files/patch-src_ui.c
deleted file mode 100644
index b79543ead137..000000000000
--- a/editors/ghex2/files/patch-src_ui.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ui.c.orig Fri Jul 18 20:25:58 2003
-+++ src/ui.c Fri Jul 18 20:26:34 2003
-@@ -875,7 +875,7 @@
- g_return_if_fail (msg != NULL);
- va_start(args, msg);
- real_msg = g_strdup_vprintf(msg, args);
-- va_end(msg);
-+ va_end(args);
- info_dlg = gtk_message_dialog_new (
- GTK_WINDOW (win),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/editors/ghex2/pkg-plist b/editors/ghex2/pkg-plist
index 7f1081dc9d31..e0080d42706e 100644
--- a/editors/ghex2/pkg-plist
+++ b/editors/ghex2/pkg-plist
@@ -2,34 +2,84 @@ bin/ghex2
etc/gconf/gconf.xml.defaults/apps/ghex2/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/ghex2/%gconf.xml
etc/gconf/schemas/ghex2.schemas
+include/gtkhex/accessiblegtkhex.h
+include/gtkhex/accessiblegtkhexfactory.h
+include/gtkhex/gtkhex.h
+include/gtkhex/hex-document.h
+lib/libgtkhex.a
+lib/libgtkhex.so
+lib/libgtkhex.so.0
+libdata/pkgconfig/gtkhex.pc
share/gnome/applications/ghex.desktop
share/gnome/gnome-2.0/ui/ghex-ui.xml
-share/gnome/help/ghex2/ja/ghex2.sgml
-share/gnome/help/ghex2/ja/ghexconverter.png
-share/gnome/help/ghex2/ja/ghexdisplaypref.png
-share/gnome/help/ghex2/ja/ghexfind.png
-share/gnome/help/ghex2/ja/ghexfindreplace.png
-share/gnome/help/ghex2/ja/ghexfullwindow.png
-share/gnome/help/ghex2/ja/ghexmdiprefs.png
-share/gnome/help/ghex2/ja/ghexmenubar.png
-share/gnome/help/ghex2/ja/ghexmenues.html
-share/gnome/help/ghex2/ja/ghexprefedit.png
-share/gnome/help/ghex2/ja/ghexprintprefs.png
-share/gnome/help/ghex2/ja/index.html
-share/gnome/help/ghex2/ja/topic.dat
-share/gnome/help/ghex2/ja/usage.html
share/gnome/help/ghex2/C/figures/ghex_window_empty.png
share/gnome/help/ghex2/C/figures/ghex_window_open.png
share/gnome/help/ghex2/C/ghex2.xml
share/gnome/help/ghex2/C/legal.xml
share/gnome/help/ghex2/C/topic.dat
+share/gnome/help/ghex2/de/figures/ghex_window_empty.png
+share/gnome/help/ghex2/de/figures/ghex_window_open.png
+share/gnome/help/ghex2/de/ghex2.xml
+share/gnome/help/ghex2/de/legal.xml
+share/gnome/help/ghex2/es/figures/ghex_window_empty.png
+share/gnome/help/ghex2/es/figures/ghex_window_open.png
+share/gnome/help/ghex2/es/ghex2.xml
+share/gnome/help/ghex2/es/legal.xml
+share/gnome/help/ghex2/es/topic.dat
+share/gnome/help/ghex2/fr/figures/ghex_window_empty.png
+share/gnome/help/ghex2/fr/figures/ghex_window_open.png
+share/gnome/help/ghex2/fr/ghex2.xml
+share/gnome/help/ghex2/fr/legal.xml
+share/gnome/help/ghex2/it/figures/ghex_window_empty.png
+share/gnome/help/ghex2/it/figures/ghex_window_open.png
+share/gnome/help/ghex2/it/ghex2.xml
+share/gnome/help/ghex2/it/legal.xml
+share/gnome/help/ghex2/ja/figures/ghex_window_empty.png
+share/gnome/help/ghex2/ja/figures/ghex_window_open.png
+share/gnome/help/ghex2/ja/ghex2.xml
+share/gnome/help/ghex2/ja/legal.xml
+share/gnome/help/ghex2/ja/topic.dat
+share/gnome/help/ghex2/ko/figures/ghex_window_empty.png
+share/gnome/help/ghex2/ko/figures/ghex_window_open.png
+share/gnome/help/ghex2/ko/ghex2.xml
+share/gnome/help/ghex2/ko/legal.xml
+share/gnome/help/ghex2/sv/figures/ghex_window_empty.png
+share/gnome/help/ghex2/sv/figures/ghex_window_open.png
+share/gnome/help/ghex2/sv/ghex2.xml
+share/gnome/help/ghex2/sv/legal.xml
+share/gnome/help/ghex2/sv/topic.dat
+share/gnome/help/ghex2/zh_CN/figures/ghex_window_empty.png
+share/gnome/help/ghex2/zh_CN/figures/ghex_window_open.png
+share/gnome/help/ghex2/zh_CN/ghex2.xml
+share/gnome/help/ghex2/zh_CN/legal.xml
+share/gnome/help/ghex2/zh_TW/figures/ghex_window_empty.png
+share/gnome/help/ghex2/zh_TW/figures/ghex_window_open.png
+share/gnome/help/ghex2/zh_TW/ghex2.xml
+share/gnome/help/ghex2/zh_TW/legal.xml
share/gnome/omf/ghex/ghex-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/ghex/ghex-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/ghex/ghex2-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/gnome-ghex.png
-share/locale/az/LC_MESSAGES/ghex-2.0.mo
share/locale/am/LC_MESSAGES/ghex-2.0.mo
+share/locale/az/LC_MESSAGES/ghex-2.0.mo
+share/locale/be/LC_MESSAGES/ghex-2.0.mo
share/locale/bg/LC_MESSAGES/ghex-2.0.mo
share/locale/ca/LC_MESSAGES/ghex-2.0.mo
share/locale/cs/LC_MESSAGES/ghex-2.0.mo
@@ -49,6 +99,7 @@ share/locale/hu/LC_MESSAGES/ghex-2.0.mo
share/locale/it/LC_MESSAGES/ghex-2.0.mo
share/locale/ja/LC_MESSAGES/ghex-2.0.mo
share/locale/ko/LC_MESSAGES/ghex-2.0.mo
+share/locale/ml/LC_MESSAGES/ghex-2.0.mo
share/locale/ms/LC_MESSAGES/ghex-2.0.mo
share/locale/nl/LC_MESSAGES/ghex-2.0.mo
share/locale/nn/LC_MESSAGES/ghex-2.0.mo
@@ -60,6 +111,8 @@ share/locale/ro/LC_MESSAGES/ghex-2.0.mo
share/locale/ru/LC_MESSAGES/ghex-2.0.mo
share/locale/sk/LC_MESSAGES/ghex-2.0.mo
share/locale/sl/LC_MESSAGES/ghex-2.0.mo
+share/locale/sr/LC_MESSAGES/ghex-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/ghex-2.0.mo
share/locale/sv/LC_MESSAGES/ghex-2.0.mo
share/locale/tr/LC_MESSAGES/ghex-2.0.mo
share/locale/uk/LC_MESSAGES/ghex-2.0.mo
@@ -68,12 +121,37 @@ share/locale/wa/LC_MESSAGES/ghex-2.0.mo
share/locale/zh_CN/LC_MESSAGES/ghex-2.0.mo
share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo
@dirrm share/gnome/omf/ghex
+@dirrm share/gnome/help/ghex2/zh_TW/figures
+@dirrm share/gnome/help/ghex2/zh_TW
+@dirrm share/gnome/help/ghex2/zh_CN/figures
+@dirrm share/gnome/help/ghex2/zh_CN
+@dirrm share/gnome/help/ghex2/sv/figures
+@dirrm share/gnome/help/ghex2/sv
+@dirrm share/gnome/help/ghex2/ko/figures
+@dirrm share/gnome/help/ghex2/ko
+@dirrm share/gnome/help/ghex2/ja/figures
+@dirrm share/gnome/help/ghex2/ja
+@dirrm share/gnome/help/ghex2/it/figures
+@dirrm share/gnome/help/ghex2/it
+@dirrm share/gnome/help/ghex2/fr/figures
+@dirrm share/gnome/help/ghex2/fr
+@dirrm share/gnome/help/ghex2/es/figures
+@dirrm share/gnome/help/ghex2/es
+@dirrm share/gnome/help/ghex2/de/figures
+@dirrm share/gnome/help/ghex2/de
@dirrm share/gnome/help/ghex2/C/figures
@dirrm share/gnome/help/ghex2/C
-@dirrm share/gnome/help/ghex2/ja/stylesheet-images
-@dirrm share/gnome/help/ghex2/ja
@dirrm share/gnome/help/ghex2
+@dirrm include/gtkhex
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ghex2
@dirrm etc/gconf/gconf.xml.defaults/apps/ghex2
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-zh_TW.omf 2>/dev/null || /usr/bin/true