diff options
22 files changed, 660 insertions, 324 deletions
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile index 9f0321f..04d2d0d 100644 --- a/misc/gnomesword/Makefile +++ b/misc/gnomesword/Makefile @@ -5,31 +5,32 @@ # $FreeBSD$ # -PORTNAME= gnomesword -PORTVERSION= 0.7.8 -PORTREVISION= 1 -CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +PORTNAME= gnomesword +PORTVERSION= 0.7.9 +CATEGORIES= misc gnome +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= ports@freebsd.org -COMMENT= A bible interface utilizing the sword framework +MAINTAINER= ports@FreBSD.org +COMMENT= A bible interface utilizing the sword framework -LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword -BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell +BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell +LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword +RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell -USE_GNOME= gal gnomehack gnomeprefix gtkhtml -USE_X_PREFIX= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes - -DOC_FILES= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO +USE_X_PREFIX= yes +USE_GNOME= gal gnomehack gnomeprefix gtkhtml +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DUSE_GTKHTML1" \ + LDFLAGS="-L${LOCALBASE}/lib" post-install: -.ifndef(NOPORTDOCS) +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.for file in AUTHORS ChangeLog INSTALL NEWS README TODO + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif diff --git a/misc/gnomesword/distinfo b/misc/gnomesword/distinfo index 524bf19..dfe3dfb 100644 --- a/misc/gnomesword/distinfo +++ b/misc/gnomesword/distinfo @@ -1 +1 @@ -MD5 (gnomesword-0.7.8.tar.gz) = 18952dda9a437c1f8f04151c128a2f3a +MD5 (gnomesword-0.7.9.tar.gz) = bbd3a6c83d9c0321d004275b4d775375 diff --git a/misc/gnomesword/files/patch-Makefile.in b/misc/gnomesword/files/patch-Makefile.in index ea6e97f..12a8810 100644 --- a/misc/gnomesword/files/patch-Makefile.in +++ b/misc/gnomesword/files/patch-Makefile.in @@ -1,27 +1,11 @@ ---- Makefile.in.orig Fri Feb 28 16:49:32 2003 -+++ Makefile.in Fri Feb 28 16:50:47 2003 -@@ -140,14 +140,7 @@ - EXTRA_DIST = gnomesword.desktop +--- Makefile.in.orig Tue Mar 25 22:35:58 2003 ++++ Makefile.in Sun May 4 08:12:53 2003 +@@ -388,7 +388,7 @@ + install-exec-am: + install-exec: install-exec-recursive - gnomesworddocdir = $(prefix)/doc/gnomesword --gnomesworddoc_DATA = \ -- README\ -- COPYING\ -- AUTHORS\ -- ChangeLog\ -- INSTALL\ -- NEWS\ -- TODO -+gnomesworddoc_DATA = +-install-data-am: install-gnomesworddocDATA install-data-local ++install-data-am: install-data-local + install-data: install-data-recursive - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -155,7 +148,7 @@ - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = intl/Makefile - DIST_SOURCES = --DATA = $(gnomesworddoc_DATA) -+DATA = # $(gnomesworddoc_DATA) - - - RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + install-am: all-am diff --git a/misc/gnomesword/files/patch-configure b/misc/gnomesword/files/patch-configure deleted file mode 100644 index e9323f3..0000000 --- a/misc/gnomesword/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.orig Sat Jan 11 16:54:15 2003 -+++ configure Fri Feb 28 17:38:01 2003 -@@ -7438,7 +7438,7 @@ - EOF - - cat >> confdefs.h <<EOF --#define PACKAGE_PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/pixmaps/${PACKAGE}" -+#define PACKAGE_PIXMAPS_DIR "${PREFIX}/share/gnome/pixmaps/gnomesword" - EOF - - cat >> confdefs.h <<EOF -@@ -8194,16 +8194,7 @@ - gtkhtml_ok="false" - echo $ac_n "checking for GtkHTML""... $ac_c" 1>&6 - echo "configure:8197: checking for GtkHTML" >&5 -- if gnome-config --libs gtkhtml > /dev/null 2>&1; then -- vers=`gnome-config --modversion gtkhtml` -- case $vers -- in -- gtkhtml-0.012345678) gtkhtml_ok=false ;; -- *) gtkhtml_ok=true ;; -- esac -- else - gtkhtml_ok=false -- fi - - if $gtkhtml_ok; then - echo "$ac_t""$vers found" 1>&6 diff --git a/misc/gnomesword/files/patch-po_Makefile.in.in b/misc/gnomesword/files/patch-po_Makefile.in.in new file mode 100644 index 0000000..38d246e --- /dev/null +++ b/misc/gnomesword/files/patch-po_Makefile.in.in @@ -0,0 +1,11 @@ +--- po/Makefile.in.in.orig Sun May 4 11:25:31 2003 ++++ po/Makefile.in.in Sun May 4 11:42:10 2003 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/misc/gnomesword/files/patch-po_bg.po b/misc/gnomesword/files/patch-po_bg.po new file mode 100644 index 0000000..8fcb4e6 --- /dev/null +++ b/misc/gnomesword/files/patch-po_bg.po @@ -0,0 +1,72 @@ +--- po/bg.po.orig Wed Dec 18 08:15:09 2002 ++++ po/bg.po Sun May 4 10:39:14 2003 +@@ -492,11 +492,6 @@ + msgstr "______)B_$)B____/______ ______" + + # src/gs_gui.c +-# src/gs_html_editor.c +-msgid "Copy" +-msgstr "________" +- +-# src/gs_gui.c + msgid "Copy highlighted text from main window" + msgstr "______)B_ $)B________)B__ _ $)B______)B_ $)B________ ____)B_" + +@@ -699,10 +694,6 @@ + msgstr "____)B_" + + # src/gs_html.c +-msgid "Show %s in main window" +-msgstr "______)B_ %s _ $)B______)B_ $)B________r" +- +-# src/gs_html.c + #, fuzzy + msgid "Go to Strongs %s" + msgstr "______ __ %s __ ______)B_" +@@ -712,11 +703,6 @@ + msgstr "____)B_ $)B__ %s" + + # src/gs_html_editor.c +-# src/gs_html_editor.c +-msgid "``%s'' has been modified. Do you wish to save it?" +-msgstr "____)B__$)B__ )B_ ,,%s''. $)B______)B_ $)B__ ____)B_$)B____ __ ____ ________)B_?" +- +-# src/gs_html_editor.c + msgid "-untitled-" + msgstr "-__)B_ $)B__)B_-" + +@@ -1011,21 +997,6 @@ + msgstr "__)B_! __$)B________ __________)B_, _ $)B____)B_ $)B__)B_ $)B______)B_ $)B________" + + # src/gs_preferences_dlg.c +-#, fuzzy +-msgid "Show Bible Texts notebook tabs" +-msgstr "______ ______)B_ $)B__ ________)B_" +- +-# src/gs_preferences_dlg.c +-#, fuzzy +-msgid "Show Commentary notebook tabs" +-msgstr "______ ______)B_ $)B__ __________)B_" +- +-# src/gs_preferences_dlg.c +-#, fuzzy +-msgid "Show Dict/Lex notebook tabs" +-msgstr "______ ______)B_ $)B__ ________)B_/$)B__________)B_" +- +-# src/gs_preferences_dlg.c + # src/gs_setup.c + #, fuzzy + msgid "Use Verse Style" +@@ -1111,12 +1082,6 @@ + # src/gs_setup.c + msgid "Commentary" + msgstr "________" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-# src/gs_shortcutbar.c x 2 +-msgid "Dict/Lex" +-msgstr "______/________" + + # src/gs_preferences_dlg.c + # src/gs_setup.c diff --git a/misc/gnomesword/files/patch-po_de.po b/misc/gnomesword/files/patch-po_de.po new file mode 100644 index 0000000..5b4b687 --- /dev/null +++ b/misc/gnomesword/files/patch-po_de.po @@ -0,0 +1,74 @@ +--- po/de.po.orig Sat May 4 22:32:48 2002 ++++ po/de.po Sun May 4 10:46:47 2003 +@@ -462,11 +462,6 @@ + msgstr "_Marken/Marken l__chen" + + # src/gs_gui.c +-# src/gs_html_editor.c +-msgid "Copy" +-msgstr "Kopieren" +- +-# src/gs_gui.c + msgid "Copy highlighted text from main window" + msgstr "Markierten Text aus Hauptfenster kopieren" + +@@ -658,10 +653,6 @@ + msgstr "Datei" + + # src/gs_html.c +-msgid "Show %s in main window" +-msgstr "Zeige %s im Hauptfenster" +- +-# src/gs_html.c + msgid "Go to Strongs %s" + msgstr "" + +@@ -670,11 +661,6 @@ + msgstr "Gehe zu %s" + + # src/gs_html_editor.c +-# src/gs_html_editor.c +-msgid "``%s'' has been modified. Do you wish to save it?" +-msgstr ",,%s'' wurde ver__dert. M__hten Sie es speichern?" +- +-# src/gs_html_editor.c + msgid "-untitled-" + msgstr "-namenlos-" + +@@ -955,23 +941,6 @@ + msgstr "Nein, benutze Vorgaben von letzter GnomeSword Sitzung" + + # src/gs_preferences_dlg.c +-msgid "Show Bible Texts notebook tabs" +-msgstr "Zeige Bibeltexte als Register" +- +-# src/gs_preferences_dlg.c +-msgid "Show Commentary notebook tabs" +-msgstr "Zeige Kommentare als Reiter" +- +-# src/gs_preferences_dlg.c +-msgid "Show Dict/Lex notebook tabs" +-msgstr "Zeige W__terb__her/Lexika als Reiter" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-msgid "Use Verse Style" +-msgstr "Benutze Versstil" +- +-# src/gs_preferences_dlg.c + msgid "Show Daily Devotion" + msgstr "Zeige Losung" + +@@ -1048,12 +1017,6 @@ + # src/gs_setup.c + msgid "Commentary" + msgstr "Kommentar" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-# src/gs_shortcutbar.c x 2 +-msgid "Dict/Lex" +-msgstr "W__terbuch/Lexikon" + + # src/gs_preferences_dlg.c + # src/gs_setup.c diff --git a/misc/gnomesword/files/patch-po_es.po b/misc/gnomesword/files/patch-po_es.po new file mode 100644 index 0000000..f75a104 --- /dev/null +++ b/misc/gnomesword/files/patch-po_es.po @@ -0,0 +1,69 @@ +--- po/es.po.orig Tue May 7 06:01:07 2002 ++++ po/es.po Sun May 4 11:13:14 2003 +@@ -454,11 +454,6 @@ + msgstr "_Marcas R__idas/Borrar Marcas R__idas" + + # src/gs_gui.c +-# src/gs_html_editor.c +-msgid "Copy" +-msgstr "Copiar" +- +-# src/gs_gui.c + msgid "Copy highlighted text from main window" + msgstr "Copiar el texto resaltado de la ventana principal" + +@@ -650,10 +645,6 @@ + msgstr "Archivo" + + # src/gs_html.c +-msgid "Show %s in main window" +-msgstr "Mostrar %s en la ventana principal" +- +-# src/gs_html.c + msgid "Go to Strongs %s" + msgstr "Ir a %s de Strong" + +@@ -662,11 +653,6 @@ + msgstr "Ir a %s" + + # src/gs_html_editor.c +-# src/gs_html_editor.c +-msgid "``%s'' has been modified. Do you wish to save it?" +-msgstr "``%s'' ha sido modificado. __Desea guardarlo?" +- +-# src/gs_html_editor.c + msgid "-untitled-" + msgstr "-sin t__ulo-" + +@@ -947,18 +933,6 @@ + msgstr "No, utilizar las opciones guardadas en la sesi__ anterior de GnomeSword" + + # src/gs_preferences_dlg.c +-msgid "Show Bible Texts notebook tabs" +-msgstr "Mostrar las lenguetas de los Textos B__licos" +- +-# src/gs_preferences_dlg.c +-msgid "Show Commentary notebook tabs" +-msgstr "Mostrar las lenguetas de los Comentarios" +- +-# src/gs_preferences_dlg.c +-msgid "Show Dict/Lex notebook tabs" +-msgstr "Mostrar las lenguetas de los Diccionarios/L__ica" +- +-# src/gs_preferences_dlg.c + # src/gs_setup.c + msgid "Use Verse Style" + msgstr "Usar Estilo de Versos" +@@ -1040,12 +1014,6 @@ + # src/gs_setup.c + msgid "Commentary" + msgstr "Comentario" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-# src/gs_shortcutbar.c x 2 +-msgid "Dict/Lex" +-msgstr "Diccionarios/Lexica" + + # src/gs_preferences_dlg.c + # src/gs_setup.c diff --git a/misc/gnomesword/files/patch-po_es_ES.po b/misc/gnomesword/files/patch-po_es_ES.po new file mode 100644 index 0000000..f9a76090 --- /dev/null +++ b/misc/gnomesword/files/patch-po_es_ES.po @@ -0,0 +1,69 @@ +--- po/es_ES.po.orig Tue May 7 06:01:07 2002 ++++ po/es_ES.po Sun May 4 11:16:34 2003 +@@ -454,11 +454,6 @@ + msgstr "_Marcas R__idas/Borrar Marcas R__idas" + + # src/gs_gui.c +-# src/gs_html_editor.c +-msgid "Copy" +-msgstr "Copiar" +- +-# src/gs_gui.c + msgid "Copy highlighted text from main window" + msgstr "Copiar el texto resaltado de la ventana principal" + +@@ -650,10 +645,6 @@ + msgstr "Fichero" + + # src/gs_html.c +-msgid "Show %s in main window" +-msgstr "Mostrar %s en la ventana principal" +- +-# src/gs_html.c + msgid "Go to Strongs %s" + msgstr "Ir a %s de Strong" + +@@ -662,11 +653,6 @@ + msgstr "Ir a %s" + + # src/gs_html_editor.c +-# src/gs_html_editor.c +-msgid "``%s'' has been modified. Do you wish to save it?" +-msgstr "``%s'' ha sido modificado. __Desea guardarlo?" +- +-# src/gs_html_editor.c + msgid "-untitled-" + msgstr "-sin t__ulo-" + +@@ -947,18 +933,6 @@ + msgstr "No, utilizar las opciones guardadas en la sesi__ anterior de GnomeSword" + + # src/gs_preferences_dlg.c +-msgid "Show Bible Texts notebook tabs" +-msgstr "Mostrar las lenguetas de los Textos B__licos" +- +-# src/gs_preferences_dlg.c +-msgid "Show Commentary notebook tabs" +-msgstr "Mostrar las lenguetas de los Comentarios" +- +-# src/gs_preferences_dlg.c +-msgid "Show Dict/Lex notebook tabs" +-msgstr "Mostrar las lenguetas de los Diccionarios/L__ica" +- +-# src/gs_preferences_dlg.c + # src/gs_setup.c + msgid "Use Verse Style" + msgstr "Usar Estilo de Versos" +@@ -1040,12 +1014,6 @@ + # src/gs_setup.c + msgid "Commentary" + msgstr "Comentario" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-# src/gs_shortcutbar.c x 2 +-msgid "Dict/Lex" +-msgstr "Diccionarios/Lexica" + + # src/gs_preferences_dlg.c + # src/gs_setup.c diff --git a/misc/gnomesword/files/patch-src_gs_editor.c b/misc/gnomesword/files/patch-src_gs_editor.c deleted file mode 100644 index 5485661..0000000 --- a/misc/gnomesword/files/patch-src_gs_editor.c +++ /dev/null @@ -1,89 +0,0 @@ ---- src/gs_editor.c 2003/01/12 00:35:43 1.7 -+++ src/gs_editor.c 2003/01/13 16:53:17 1.8 -@@ -52,7 +52,7 @@ - #include <gtkhtml/htmlcolor.h> - #include <gtkhtml/htmlcolorset.h> - #include <gtkhtml/htmllinktext.h> --#endif -+#endif - - #ifdef USE_SPELL - #include "spell.h" -@@ -392,7 +392,6 @@ - g_warning("file not writen"); - else - g_warning("file writen"); -- //g_warning(gstr->str); - - gtk_text_insert(GTK_TEXT(text), NULL, - &text->style->black, NULL, gstr->str, -1); -@@ -428,7 +427,6 @@ - GSHTMLEditorControlData * ecd) - { - ecd->changed = TRUE; -- //file_changed = TRUE; - updatestatusbar(ecd); - return 1; - } -@@ -511,7 +509,7 @@ - GtkWidget *create_editor(GtkWidget * htmlwidget, GtkWidget * vbox, - SETTINGS * s, GSHTMLEditorControlData * necd) - { -- GtkWidget * frame34, *scrolledwindow17; -+ GtkWidget *frame34, *scrolledwindow17; - - frame34 = gtk_frame_new(NULL); - gtk_widget_ref(frame34); -@@ -1251,22 +1249,25 @@ - set_link_to_module(gchar * linkref, gchar * linkmod, - GSHTMLEditorControlData * ecd) - { -- gchar buf[256], *target = ""; -+ const gchar *url; -+ const gchar *text; -+ gchar *target; -+ gchar *url_copy; -+ gchar buf[256]; -+ HTMLEngine *e; -+ HTMLObject *new_link; -+ -+ e = ecd->html->engine; - -- HTMLEngine *e = ecd->html->engine; - if (strlen(linkmod)) - sprintf(buf, "version=%s passage=%s", linkmod, linkref); - else - sprintf(buf, "passage=%s", linkref); -- -+ - #ifdef USE_GTKHTML1 -- const gchar *url; -- const gchar *text; - url = buf; - text = linkref; - if (url && text && *url && *text) { -- HTMLObject *new_link; -- gchar *url_copy; - target = strchr(url, '#'); - url_copy = - target ? g_strndup(url, -@@ -1274,14 +1275,17 @@ - new_link = - html_link_text_new(text, - GTK_HTML_FONT_STYLE_DEFAULT, -- html_colorset_get_color(e->settings->color_set, -- HTMLLinkColor), -+ html_colorset_get_color(e-> -+ settings-> -+ color_set, -+ HTMLLinkColor), - url_copy, target); - html_engine_paste_object(e, new_link, - g_utf8_strlen(text, -1)); - g_free(url_copy); - } - #else -+ target = ""; - html_engine_selection_push(e); - html_engine_insert_link(e, buf, target); - html_engine_selection_pop(e); diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist index f7fb468..ab1055f 100644 --- a/misc/gnomesword/pkg-plist +++ b/misc/gnomesword/pkg-plist @@ -1,6 +1,5 @@ bin/gnomesword %%PORTDOCS%%share/doc/gnomesword/AUTHORS -%%PORTDOCS%%share/doc/gnomesword/COPYING %%PORTDOCS%%share/doc/gnomesword/ChangeLog %%PORTDOCS%%share/doc/gnomesword/INSTALL %%PORTDOCS%%share/doc/gnomesword/NEWS @@ -28,6 +27,12 @@ share/gnome/pixmaps/gnomesword/sword.xpm share/gnome/pixmaps/gnomesword/sword2.xpm share/gnome/pixmaps/gnomesword/sword3.xpm share/gnome/pixmaps/gnomesword/yes.xpm +share/locale/bg/LC_MESSAGES/gnomesword.mo +share/locale/de/LC_MESSAGES/gnomesword.mo +share/locale/es/LC_MESSAGES/gnomesword.mo +share/locale/es_ES/LC_MESSAGES/gnomesword.mo +share/locale/fr/LC_MESSAGES/gnomesword.mo +share/locale/sk/LC_MESSAGES/gnomesword.mo @dirrm share/gnome/pixmaps/gnomesword @dirrm share/gnome/help/gnomesword/C @dirrm share/gnome/help/gnomesword diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile index 9f0321f..04d2d0d 100644 --- a/misc/xiphos/Makefile +++ b/misc/xiphos/Makefile @@ -5,31 +5,32 @@ # $FreeBSD$ # -PORTNAME= gnomesword -PORTVERSION= 0.7.8 -PORTREVISION= 1 -CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +PORTNAME= gnomesword +PORTVERSION= 0.7.9 +CATEGORIES= misc gnome +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= ports@freebsd.org -COMMENT= A bible interface utilizing the sword framework +MAINTAINER= ports@FreBSD.org +COMMENT= A bible interface utilizing the sword framework -LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword -BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell +BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell +LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword +RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell -USE_GNOME= gal gnomehack gnomeprefix gtkhtml -USE_X_PREFIX= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes - -DOC_FILES= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO +USE_X_PREFIX= yes +USE_GNOME= gal gnomehack gnomeprefix gtkhtml +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DUSE_GTKHTML1" \ + LDFLAGS="-L${LOCALBASE}/lib" post-install: -.ifndef(NOPORTDOCS) +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.for file in AUTHORS ChangeLog INSTALL NEWS README TODO + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo index 524bf19..dfe3dfb 100644 --- a/misc/xiphos/distinfo +++ b/misc/xiphos/distinfo @@ -1 +1 @@ -MD5 (gnomesword-0.7.8.tar.gz) = 18952dda9a437c1f8f04151c128a2f3a +MD5 (gnomesword-0.7.9.tar.gz) = bbd3a6c83d9c0321d004275b4d775375 diff --git a/misc/xiphos/files/patch-Makefile.in b/misc/xiphos/files/patch-Makefile.in index ea6e97f..12a8810 100644 --- a/misc/xiphos/files/patch-Makefile.in +++ b/misc/xiphos/files/patch-Makefile.in @@ -1,27 +1,11 @@ ---- Makefile.in.orig Fri Feb 28 16:49:32 2003 -+++ Makefile.in Fri Feb 28 16:50:47 2003 -@@ -140,14 +140,7 @@ - EXTRA_DIST = gnomesword.desktop +--- Makefile.in.orig Tue Mar 25 22:35:58 2003 ++++ Makefile.in Sun May 4 08:12:53 2003 +@@ -388,7 +388,7 @@ + install-exec-am: + install-exec: install-exec-recursive - gnomesworddocdir = $(prefix)/doc/gnomesword --gnomesworddoc_DATA = \ -- README\ -- COPYING\ -- AUTHORS\ -- ChangeLog\ -- INSTALL\ -- NEWS\ -- TODO -+gnomesworddoc_DATA = +-install-data-am: install-gnomesworddocDATA install-data-local ++install-data-am: install-data-local + install-data: install-data-recursive - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -155,7 +148,7 @@ - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = intl/Makefile - DIST_SOURCES = --DATA = $(gnomesworddoc_DATA) -+DATA = # $(gnomesworddoc_DATA) - - - RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + install-am: all-am diff --git a/misc/xiphos/files/patch-configure b/misc/xiphos/files/patch-configure deleted file mode 100644 index e9323f3..0000000 --- a/misc/xiphos/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.orig Sat Jan 11 16:54:15 2003 -+++ configure Fri Feb 28 17:38:01 2003 -@@ -7438,7 +7438,7 @@ - EOF - - cat >> confdefs.h <<EOF --#define PACKAGE_PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/pixmaps/${PACKAGE}" -+#define PACKAGE_PIXMAPS_DIR "${PREFIX}/share/gnome/pixmaps/gnomesword" - EOF - - cat >> confdefs.h <<EOF -@@ -8194,16 +8194,7 @@ - gtkhtml_ok="false" - echo $ac_n "checking for GtkHTML""... $ac_c" 1>&6 - echo "configure:8197: checking for GtkHTML" >&5 -- if gnome-config --libs gtkhtml > /dev/null 2>&1; then -- vers=`gnome-config --modversion gtkhtml` -- case $vers -- in -- gtkhtml-0.012345678) gtkhtml_ok=false ;; -- *) gtkhtml_ok=true ;; -- esac -- else - gtkhtml_ok=false -- fi - - if $gtkhtml_ok; then - echo "$ac_t""$vers found" 1>&6 diff --git a/misc/xiphos/files/patch-po_Makefile.in.in b/misc/xiphos/files/patch-po_Makefile.in.in new file mode 100644 index 0000000..38d246e --- /dev/null +++ b/misc/xiphos/files/patch-po_Makefile.in.in @@ -0,0 +1,11 @@ +--- po/Makefile.in.in.orig Sun May 4 11:25:31 2003 ++++ po/Makefile.in.in Sun May 4 11:42:10 2003 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/misc/xiphos/files/patch-po_bg.po b/misc/xiphos/files/patch-po_bg.po new file mode 100644 index 0000000..8fcb4e6 --- /dev/null +++ b/misc/xiphos/files/patch-po_bg.po @@ -0,0 +1,72 @@ +--- po/bg.po.orig Wed Dec 18 08:15:09 2002 ++++ po/bg.po Sun May 4 10:39:14 2003 +@@ -492,11 +492,6 @@ + msgstr "______)B_$)B____/______ ______" + + # src/gs_gui.c +-# src/gs_html_editor.c +-msgid "Copy" +-msgstr "________" +- +-# src/gs_gui.c + msgid "Copy highlighted text from main window" + msgstr "______)B_ $)B________)B__ _ $)B______)B_ $)B________ ____)B_" + +@@ -699,10 +694,6 @@ + msgstr "____)B_" + + # src/gs_html.c +-msgid "Show %s in main window" +-msgstr "______)B_ %s _ $)B______)B_ $)B________r" +- +-# src/gs_html.c + #, fuzzy + msgid "Go to Strongs %s" + msgstr "______ __ %s __ ______)B_" +@@ -712,11 +703,6 @@ + msgstr "____)B_ $)B__ %s" + + # src/gs_html_editor.c +-# src/gs_html_editor.c +-msgid "``%s'' has been modified. Do you wish to save it?" +-msgstr "____)B__$)B__ )B_ ,,%s''. $)B______)B_ $)B__ ____)B_$)B____ __ ____ ________)B_?" +- +-# src/gs_html_editor.c + msgid "-untitled-" + msgstr "-__)B_ $)B__)B_-" + +@@ -1011,21 +997,6 @@ + msgstr "__)B_! __$)B________ __________)B_, _ $)B____)B_ $)B__)B_ $)B______)B_ $)B________" + + # src/gs_preferences_dlg.c +-#, fuzzy +-msgid "Show Bible Texts notebook tabs" +-msgstr "______ ______)B_ $)B__ ________)B_" +- +-# src/gs_preferences_dlg.c +-#, fuzzy +-msgid "Show Commentary notebook tabs" +-msgstr "______ ______)B_ $)B__ __________)B_" +- +-# src/gs_preferences_dlg.c +-#, fuzzy +-msgid "Show Dict/Lex notebook tabs" +-msgstr "______ ______)B_ $)B__ ________)B_/$)B__________)B_" +- +-# src/gs_preferences_dlg.c + # src/gs_setup.c + #, fuzzy + msgid "Use Verse Style" +@@ -1111,12 +1082,6 @@ + # src/gs_setup.c + msgid "Commentary" + msgstr "________" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-# src/gs_shortcutbar.c x 2 +-msgid "Dict/Lex" +-msgstr "______/________" + + # src/gs_preferences_dlg.c + # src/gs_setup.c diff --git a/misc/xiphos/files/patch-po_de.po b/misc/xiphos/files/patch-po_de.po new file mode 100644 index 0000000..5b4b687 --- /dev/null +++ b/misc/xiphos/files/patch-po_de.po @@ -0,0 +1,74 @@ +--- po/de.po.orig Sat May 4 22:32:48 2002 ++++ po/de.po Sun May 4 10:46:47 2003 +@@ -462,11 +462,6 @@ + msgstr "_Marken/Marken l__chen" + + # src/gs_gui.c +-# src/gs_html_editor.c +-msgid "Copy" +-msgstr "Kopieren" +- +-# src/gs_gui.c + msgid "Copy highlighted text from main window" + msgstr "Markierten Text aus Hauptfenster kopieren" + +@@ -658,10 +653,6 @@ + msgstr "Datei" + + # src/gs_html.c +-msgid "Show %s in main window" +-msgstr "Zeige %s im Hauptfenster" +- +-# src/gs_html.c + msgid "Go to Strongs %s" + msgstr "" + +@@ -670,11 +661,6 @@ + msgstr "Gehe zu %s" + + # src/gs_html_editor.c +-# src/gs_html_editor.c +-msgid "``%s'' has been modified. Do you wish to save it?" +-msgstr ",,%s'' wurde ver__dert. M__hten Sie es speichern?" +- +-# src/gs_html_editor.c + msgid "-untitled-" + msgstr "-namenlos-" + +@@ -955,23 +941,6 @@ + msgstr "Nein, benutze Vorgaben von letzter GnomeSword Sitzung" + + # src/gs_preferences_dlg.c +-msgid "Show Bible Texts notebook tabs" +-msgstr "Zeige Bibeltexte als Register" +- +-# src/gs_preferences_dlg.c +-msgid "Show Commentary notebook tabs" +-msgstr "Zeige Kommentare als Reiter" +- +-# src/gs_preferences_dlg.c +-msgid "Show Dict/Lex notebook tabs" +-msgstr "Zeige W__terb__her/Lexika als Reiter" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-msgid "Use Verse Style" +-msgstr "Benutze Versstil" +- +-# src/gs_preferences_dlg.c + msgid "Show Daily Devotion" + msgstr "Zeige Losung" + +@@ -1048,12 +1017,6 @@ + # src/gs_setup.c + msgid "Commentary" + msgstr "Kommentar" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-# src/gs_shortcutbar.c x 2 +-msgid "Dict/Lex" +-msgstr "W__terbuch/Lexikon" + + # src/gs_preferences_dlg.c + # src/gs_setup.c diff --git a/misc/xiphos/files/patch-po_es.po b/misc/xiphos/files/patch-po_es.po new file mode 100644 index 0000000..f75a104 --- /dev/null +++ b/misc/xiphos/files/patch-po_es.po @@ -0,0 +1,69 @@ +--- po/es.po.orig Tue May 7 06:01:07 2002 ++++ po/es.po Sun May 4 11:13:14 2003 +@@ -454,11 +454,6 @@ + msgstr "_Marcas R__idas/Borrar Marcas R__idas" + + # src/gs_gui.c +-# src/gs_html_editor.c +-msgid "Copy" +-msgstr "Copiar" +- +-# src/gs_gui.c + msgid "Copy highlighted text from main window" + msgstr "Copiar el texto resaltado de la ventana principal" + +@@ -650,10 +645,6 @@ + msgstr "Archivo" + + # src/gs_html.c +-msgid "Show %s in main window" +-msgstr "Mostrar %s en la ventana principal" +- +-# src/gs_html.c + msgid "Go to Strongs %s" + msgstr "Ir a %s de Strong" + +@@ -662,11 +653,6 @@ + msgstr "Ir a %s" + + # src/gs_html_editor.c +-# src/gs_html_editor.c +-msgid "``%s'' has been modified. Do you wish to save it?" +-msgstr "``%s'' ha sido modificado. __Desea guardarlo?" +- +-# src/gs_html_editor.c + msgid "-untitled-" + msgstr "-sin t__ulo-" + +@@ -947,18 +933,6 @@ + msgstr "No, utilizar las opciones guardadas en la sesi__ anterior de GnomeSword" + + # src/gs_preferences_dlg.c +-msgid "Show Bible Texts notebook tabs" +-msgstr "Mostrar las lenguetas de los Textos B__licos" +- +-# src/gs_preferences_dlg.c +-msgid "Show Commentary notebook tabs" +-msgstr "Mostrar las lenguetas de los Comentarios" +- +-# src/gs_preferences_dlg.c +-msgid "Show Dict/Lex notebook tabs" +-msgstr "Mostrar las lenguetas de los Diccionarios/L__ica" +- +-# src/gs_preferences_dlg.c + # src/gs_setup.c + msgid "Use Verse Style" + msgstr "Usar Estilo de Versos" +@@ -1040,12 +1014,6 @@ + # src/gs_setup.c + msgid "Commentary" + msgstr "Comentario" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-# src/gs_shortcutbar.c x 2 +-msgid "Dict/Lex" +-msgstr "Diccionarios/Lexica" + + # src/gs_preferences_dlg.c + # src/gs_setup.c diff --git a/misc/xiphos/files/patch-po_es_ES.po b/misc/xiphos/files/patch-po_es_ES.po new file mode 100644 index 0000000..f9a76090 --- /dev/null +++ b/misc/xiphos/files/patch-po_es_ES.po @@ -0,0 +1,69 @@ +--- po/es_ES.po.orig Tue May 7 06:01:07 2002 ++++ po/es_ES.po Sun May 4 11:16:34 2003 +@@ -454,11 +454,6 @@ + msgstr "_Marcas R__idas/Borrar Marcas R__idas" + + # src/gs_gui.c +-# src/gs_html_editor.c +-msgid "Copy" +-msgstr "Copiar" +- +-# src/gs_gui.c + msgid "Copy highlighted text from main window" + msgstr "Copiar el texto resaltado de la ventana principal" + +@@ -650,10 +645,6 @@ + msgstr "Fichero" + + # src/gs_html.c +-msgid "Show %s in main window" +-msgstr "Mostrar %s en la ventana principal" +- +-# src/gs_html.c + msgid "Go to Strongs %s" + msgstr "Ir a %s de Strong" + +@@ -662,11 +653,6 @@ + msgstr "Ir a %s" + + # src/gs_html_editor.c +-# src/gs_html_editor.c +-msgid "``%s'' has been modified. Do you wish to save it?" +-msgstr "``%s'' ha sido modificado. __Desea guardarlo?" +- +-# src/gs_html_editor.c + msgid "-untitled-" + msgstr "-sin t__ulo-" + +@@ -947,18 +933,6 @@ + msgstr "No, utilizar las opciones guardadas en la sesi__ anterior de GnomeSword" + + # src/gs_preferences_dlg.c +-msgid "Show Bible Texts notebook tabs" +-msgstr "Mostrar las lenguetas de los Textos B__licos" +- +-# src/gs_preferences_dlg.c +-msgid "Show Commentary notebook tabs" +-msgstr "Mostrar las lenguetas de los Comentarios" +- +-# src/gs_preferences_dlg.c +-msgid "Show Dict/Lex notebook tabs" +-msgstr "Mostrar las lenguetas de los Diccionarios/L__ica" +- +-# src/gs_preferences_dlg.c + # src/gs_setup.c + msgid "Use Verse Style" + msgstr "Usar Estilo de Versos" +@@ -1040,12 +1014,6 @@ + # src/gs_setup.c + msgid "Commentary" + msgstr "Comentario" +- +-# src/gs_preferences_dlg.c +-# src/gs_setup.c +-# src/gs_shortcutbar.c x 2 +-msgid "Dict/Lex" +-msgstr "Diccionarios/Lexica" + + # src/gs_preferences_dlg.c + # src/gs_setup.c diff --git a/misc/xiphos/files/patch-src_gs_editor.c b/misc/xiphos/files/patch-src_gs_editor.c deleted file mode 100644 index 5485661..0000000 --- a/misc/xiphos/files/patch-src_gs_editor.c +++ /dev/null @@ -1,89 +0,0 @@ ---- src/gs_editor.c 2003/01/12 00:35:43 1.7 -+++ src/gs_editor.c 2003/01/13 16:53:17 1.8 -@@ -52,7 +52,7 @@ - #include <gtkhtml/htmlcolor.h> - #include <gtkhtml/htmlcolorset.h> - #include <gtkhtml/htmllinktext.h> --#endif -+#endif - - #ifdef USE_SPELL - #include "spell.h" -@@ -392,7 +392,6 @@ - g_warning("file not writen"); - else - g_warning("file writen"); -- //g_warning(gstr->str); - - gtk_text_insert(GTK_TEXT(text), NULL, - &text->style->black, NULL, gstr->str, -1); -@@ -428,7 +427,6 @@ - GSHTMLEditorControlData * ecd) - { - ecd->changed = TRUE; -- //file_changed = TRUE; - updatestatusbar(ecd); - return 1; - } -@@ -511,7 +509,7 @@ - GtkWidget *create_editor(GtkWidget * htmlwidget, GtkWidget * vbox, - SETTINGS * s, GSHTMLEditorControlData * necd) - { -- GtkWidget * frame34, *scrolledwindow17; -+ GtkWidget *frame34, *scrolledwindow17; - - frame34 = gtk_frame_new(NULL); - gtk_widget_ref(frame34); -@@ -1251,22 +1249,25 @@ - set_link_to_module(gchar * linkref, gchar * linkmod, - GSHTMLEditorControlData * ecd) - { -- gchar buf[256], *target = ""; -+ const gchar *url; -+ const gchar *text; -+ gchar *target; -+ gchar *url_copy; -+ gchar buf[256]; -+ HTMLEngine *e; -+ HTMLObject *new_link; -+ -+ e = ecd->html->engine; - -- HTMLEngine *e = ecd->html->engine; - if (strlen(linkmod)) - sprintf(buf, "version=%s passage=%s", linkmod, linkref); - else - sprintf(buf, "passage=%s", linkref); -- -+ - #ifdef USE_GTKHTML1 -- const gchar *url; -- const gchar *text; - url = buf; - text = linkref; - if (url && text && *url && *text) { -- HTMLObject *new_link; -- gchar *url_copy; - target = strchr(url, '#'); - url_copy = - target ? g_strndup(url, -@@ -1274,14 +1275,17 @@ - new_link = - html_link_text_new(text, - GTK_HTML_FONT_STYLE_DEFAULT, -- html_colorset_get_color(e->settings->color_set, -- HTMLLinkColor), -+ html_colorset_get_color(e-> -+ settings-> -+ color_set, -+ HTMLLinkColor), - url_copy, target); - html_engine_paste_object(e, new_link, - g_utf8_strlen(text, -1)); - g_free(url_copy); - } - #else -+ target = ""; - html_engine_selection_push(e); - html_engine_insert_link(e, buf, target); - html_engine_selection_pop(e); diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist index f7fb468..ab1055f 100644 --- a/misc/xiphos/pkg-plist +++ b/misc/xiphos/pkg-plist @@ -1,6 +1,5 @@ bin/gnomesword %%PORTDOCS%%share/doc/gnomesword/AUTHORS -%%PORTDOCS%%share/doc/gnomesword/COPYING %%PORTDOCS%%share/doc/gnomesword/ChangeLog %%PORTDOCS%%share/doc/gnomesword/INSTALL %%PORTDOCS%%share/doc/gnomesword/NEWS @@ -28,6 +27,12 @@ share/gnome/pixmaps/gnomesword/sword.xpm share/gnome/pixmaps/gnomesword/sword2.xpm share/gnome/pixmaps/gnomesword/sword3.xpm share/gnome/pixmaps/gnomesword/yes.xpm +share/locale/bg/LC_MESSAGES/gnomesword.mo +share/locale/de/LC_MESSAGES/gnomesword.mo +share/locale/es/LC_MESSAGES/gnomesword.mo +share/locale/es_ES/LC_MESSAGES/gnomesword.mo +share/locale/fr/LC_MESSAGES/gnomesword.mo +share/locale/sk/LC_MESSAGES/gnomesword.mo @dirrm share/gnome/pixmaps/gnomesword @dirrm share/gnome/help/gnomesword/C @dirrm share/gnome/help/gnomesword |
