diff options
-rw-r--r-- | editors/Makefile | 3 | ||||
-rw-r--r-- | editors/conglomerate/DESCR | 6 | ||||
-rw-r--r-- | editors/conglomerate/Makefile | 45 | ||||
-rw-r--r-- | editors/conglomerate/PLIST | 295 | ||||
-rw-r--r-- | editors/conglomerate/distinfo | 10 | ||||
-rw-r--r-- | editors/conglomerate/patches/patch-aa | 13 | ||||
-rw-r--r-- | editors/conglomerate/patches/patch-src_cong-editor-line-iter-simple_c | 31 | ||||
-rw-r--r-- | editors/conglomerate/patches/patch-src_cong-editor-line-iter-span-wrapper_c | 31 | ||||
-rw-r--r-- | editors/conglomerate/patches/patch-src_cong-language.c | 13 |
9 files changed, 1 insertions, 446 deletions
diff --git a/editors/Makefile b/editors/Makefile index ab00bfd650f..d31fe58739c 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.190 2019/08/18 08:24:35 fcambus Exp $ +# $NetBSD: Makefile,v 1.191 2019/09/14 19:33:32 nia Exp $ # COMMENT= Editors @@ -17,7 +17,6 @@ SUBDIR+= ce-doc SUBDIR+= ce-x11 SUBDIR+= codeblocks SUBDIR+= codelite -SUBDIR+= conglomerate SUBDIR+= cooledit SUBDIR+= dasher SUBDIR+= deforaos-editor diff --git a/editors/conglomerate/DESCR b/editors/conglomerate/DESCR deleted file mode 100644 index 95d343bc1e1..00000000000 --- a/editors/conglomerate/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -Conglomerate is a project to create a complete structured information -authoring, management, archival, revision control and transformation system. -Conglomerate uses XML semantics and powerful graphical editing, coupled with -a centralised storage model and a flexible transformation language to create -an environment which is easy to use, produces high-quality structured output -and lets the user target several output media with a single source document. diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile deleted file mode 100644 index f95f3613088..00000000000 --- a/editors/conglomerate/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# $NetBSD: Makefile,v 1.113 2019/08/11 13:20:53 wiz Exp $ -# - -DISTNAME= conglomerate-0.9.1 -PKGREVISION= 63 -CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conglomerate/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.conglomerate.org/ -COMMENT= XML editor for GNOME2 -LICENSE= gnu-gpl-v2 - -DEPENDS+= docbook-xsl>=1.64.1:../../textproc/docbook-xsl -DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml - -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= gmake intltool msgfmt perl pkg-config -USE_PKGLOCALEDIR= yes - -CONFIGURE_ARGS+= --enable-printing -CONFIGURE_ARGS+= --disable-gtk-doc -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc - -GCONF_SCHEMAS= conglomerate.schemas - -.include "../../devel/GConf/schemas.mk" -.include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/libbonoboui/buildlink3.mk" -.include "../../devel/libglade/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" -.include "../../print/libgnomeprint/buildlink3.mk" -.include "../../print/libgnomeprintui/buildlink3.mk" -.include "../../textproc/enchant2/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../textproc/libxslt/buildlink3.mk" -.include "../../mk/omf-scrollkeeper.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/gtksourceview/buildlink3.mk" - -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/editors/conglomerate/PLIST b/editors/conglomerate/PLIST deleted file mode 100644 index 3edaa78bf33..00000000000 --- a/editors/conglomerate/PLIST +++ /dev/null @@ -1,295 +0,0 @@ -@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:50:21 joerg Exp $ -bin/conglomerate -share/application-registry/conglomerate.applications -share/applications/conglomerate.desktop -share/conglomerate/css/docbook.css -share/conglomerate/dispspecs/cnxml.xds -share/conglomerate/dispspecs/dispspec.xds -share/conglomerate/dispspecs/docbook.xds -share/conglomerate/dispspecs/forrest-document.xds -share/conglomerate/dispspecs/kernel-traffic-newsletter.xds -share/conglomerate/dispspecs/opml.xds -share/conglomerate/dispspecs/readme.xds -share/conglomerate/dispspecs/relax-ng.xds -share/conglomerate/dispspecs/release.xds -share/conglomerate/dispspecs/teixlite.xds -share/conglomerate/dispspecs/website-layout.xds -share/conglomerate/dispspecs/website-webpage.xds -share/conglomerate/dispspecs/xhtml1-strict.xds -share/conglomerate/dispspecs/xsl.xds -share/conglomerate/dtd/release.dtd -share/conglomerate/dtd/xds.dtd -share/conglomerate/examples/cnxml.xml -share/conglomerate/examples/error-proposal.xml -share/conglomerate/examples/file-roller.xml -share/conglomerate/examples/i18n.xml -share/conglomerate/examples/nmtoken.xml -share/conglomerate/examples/readme.xml -share/conglomerate/examples/test-docbook.xml -share/conglomerate/examples/test-entities.xml -share/conglomerate/examples/test-table.xml -share/conglomerate/examples/test-table3.xml -share/conglomerate/glade/cong-file-import.glade -share/conglomerate/glade/cong-file-properties.glade -share/conglomerate/glade/cong-find-replace.glade -share/conglomerate/glade/cong-preferences.glade -share/conglomerate/glade/custom-element.glade -share/conglomerate/glade/docbook-common-properties.glade -share/conglomerate/glade/docbook-orderedlist-properties.glade -share/conglomerate/glade/docbook-ulink-properties.glade -share/conglomerate/glade/plugin-arbitrary.glade -share/conglomerate/glade/plugin-random.glade -share/conglomerate/glade/string_selection_dialog.glade -share/conglomerate/stylesheets/selection-to-text.xsl -share/conglomerate/templates/dispspec-template.xds -share/conglomerate/templates/dispspec.xml -share/conglomerate/templates/html.xml -share/doc/conglomerate/CongAttributeEditor.html -share/doc/conglomerate/CongAttributeEditorCDATA.html -share/doc/conglomerate/CongAttributeEditorENUMERATION.html -share/doc/conglomerate/CongAttributeEditorLang.html -share/doc/conglomerate/CongAttributeWrapper.html -share/doc/conglomerate/CongAttributeWrapperCheckButton.html -share/doc/conglomerate/CongAttributeWrapperRadioButton.html -share/doc/conglomerate/CongCommand.html -share/doc/conglomerate/CongCommandHistory.html -share/doc/conglomerate/CongDocument.html -share/doc/conglomerate/CongDocumentTraversal.html -share/doc/conglomerate/CongEditorArea.html -share/doc/conglomerate/CongEditorAreaBin.html -share/doc/conglomerate/CongEditorAreaBorder.html -share/doc/conglomerate/CongEditorAreaComposer.html -share/doc/conglomerate/CongEditorAreaContainer.html -share/doc/conglomerate/CongEditorAreaEntityDecl.html -share/doc/conglomerate/CongEditorAreaEntityRef.html -share/doc/conglomerate/CongEditorAreaExpander.html -share/doc/conglomerate/CongEditorAreaLabelled.html -share/doc/conglomerate/CongEditorAreaLine.html -share/doc/conglomerate/CongEditorAreaListitem.html -share/doc/conglomerate/CongEditorAreaParagraph.html -share/doc/conglomerate/CongEditorAreaPixbuf.html -share/doc/conglomerate/CongEditorAreaSpacer.html -share/doc/conglomerate/CongEditorAreaSpanTag.html -share/doc/conglomerate/CongEditorAreaStructural.html -share/doc/conglomerate/CongEditorAreaStructuralTag.html -share/doc/conglomerate/CongEditorAreaText.html -share/doc/conglomerate/CongEditorAreaTextComment.html -share/doc/conglomerate/CongEditorAreaTextFragment.html -share/doc/conglomerate/CongEditorAreaUnderline.html -share/doc/conglomerate/CongEditorAreaUnknownTag.html -share/doc/conglomerate/CongEditorNode.html -share/doc/conglomerate/CongEditorNodeElement.html -share/doc/conglomerate/CongEditorNodeElementListitem.html -share/doc/conglomerate/CongEditorNodeElementParagraph.html -share/doc/conglomerate/CongEditorWidget3.html -share/doc/conglomerate/CongModification.html -share/doc/conglomerate/CongModificationCursorChange.html -share/doc/conglomerate/CongModificationSelectionChange.html -share/doc/conglomerate/CongModificationSetDtdPtr.html -share/doc/conglomerate/CongNodeModification.html -share/doc/conglomerate/CongNodeModificationAddAfter.html -share/doc/conglomerate/CongNodeModificationAddBefore.html -share/doc/conglomerate/CongNodeModificationMakeOrphan.html -share/doc/conglomerate/CongNodeModificationRemoveAttribute.html -share/doc/conglomerate/CongNodeModificationSetAttribute.html -share/doc/conglomerate/CongNodeModificationSetParent.html -share/doc/conglomerate/CongNodeModificationSetText.html -share/doc/conglomerate/CongPlugin.html -share/doc/conglomerate/CongService.html -share/doc/conglomerate/CongServiceDocTool.html -share/doc/conglomerate/CongServiceDocumentFactory.html -share/doc/conglomerate/CongServiceEditorNodeFactory.html -share/doc/conglomerate/CongServiceExporter.html -share/doc/conglomerate/CongServiceImporter.html -share/doc/conglomerate/CongServiceNodePropertyDialog.html -share/doc/conglomerate/CongServiceNodeTool.html -share/doc/conglomerate/CongServiceTool.html -share/doc/conglomerate/CongTraversalNode.html -share/doc/conglomerate/CongXPathExpression.html -share/doc/conglomerate/ch01.html -share/doc/conglomerate/ch02.html -share/doc/conglomerate/class-hierarchy.html -share/doc/conglomerate/class-overview.html -share/doc/conglomerate/conglomerate-CongApp.html -share/doc/conglomerate/conglomerate-CongDispspec.html -share/doc/conglomerate/conglomerate-CongDispspecElement.html -share/doc/conglomerate/conglomerate-CongDispspecRegistry.html -share/doc/conglomerate/conglomerate-CongEditorNodeComment.html -share/doc/conglomerate/conglomerate-CongEditorNodeDocument.html -share/doc/conglomerate/conglomerate-CongEditorNodeDtd.html -share/doc/conglomerate/conglomerate-CongEditorNodeElementAdmonition.html -share/doc/conglomerate/conglomerate-CongEditorNodeElementSpan.html -share/doc/conglomerate/conglomerate-CongEditorNodeElementStructural.html -share/doc/conglomerate/conglomerate-CongEditorNodeElementUnknown.html -share/doc/conglomerate/conglomerate-CongEditorNodeEntityDecl.html -share/doc/conglomerate/conglomerate-CongEditorNodeEntityRef.html -share/doc/conglomerate/conglomerate-CongEditorNodeText.html -share/doc/conglomerate/conglomerate-CongEditorNodeUnimplemented.html -share/doc/conglomerate/conglomerate-CongLocation.html -share/doc/conglomerate/conglomerate-CongObject.html -share/doc/conglomerate/conglomerate-CongPluginManager.html -share/doc/conglomerate/conglomerate-CongRange.html -share/doc/conglomerate/conglomerate-CongSelection.html -share/doc/conglomerate/conglomerate-CongServicePrintMethod.html -share/doc/conglomerate/conglomerate-DTD-Handling.html -share/doc/conglomerate/conglomerate-Utility-functions.html -share/doc/conglomerate/conglomerate-XML-Nodes.html -share/doc/conglomerate/conglomerate-cong-dialog.html -share/doc/conglomerate/conglomerate-cong-edit-find-and-replace.html -share/doc/conglomerate/conglomerate-cong-eel-graphic-effects.html -share/doc/conglomerate/conglomerate-cong-eel.html -share/doc/conglomerate/conglomerate-cong-enum-mapping.html -share/doc/conglomerate/conglomerate-cong-error-dialog.html -share/doc/conglomerate/conglomerate-cong-fake-plugin-hooks.html -share/doc/conglomerate/conglomerate-cong-file-selection.html -share/doc/conglomerate/conglomerate-cong-font.html -share/doc/conglomerate/conglomerate-cong-glade.html -share/doc/conglomerate/conglomerate-cong-graph.html -share/doc/conglomerate/conglomerate-cong-marshal.html -share/doc/conglomerate/conglomerate-cong-overview-view.html -share/doc/conglomerate/conglomerate-cong-parser-error.html -share/doc/conglomerate/conglomerate-cong-primary-window.html -share/doc/conglomerate/conglomerate-cong-progress-checklist.html -share/doc/conglomerate/conglomerate-cong-text-cache.html -share/doc/conglomerate/conglomerate-cong-tree-view.html -share/doc/conglomerate/conglomerate-cong-ui-hooks.html -share/doc/conglomerate/conglomerate-cong-vfs.html -share/doc/conglomerate/conglomerate-cong-view.html -share/doc/conglomerate/conglomerate-global.html -share/doc/conglomerate/editor.html -share/doc/conglomerate/helper.html -share/doc/conglomerate/index.html -share/doc/conglomerate/index.sgml -share/doc/conglomerate/ix01.html -share/doc/conglomerate/misc.html -share/doc/conglomerate/plugins.html -share/doc/conglomerate/state.html -share/doc/conglomerate/views.html -share/doc/conglomerate/xml.html -share/gconf/schemas/conglomerate.schemas -share/gnome/help/conglomerate/C/cong_element_map_ref.xml -share/gnome/help/conglomerate/C/conglomerate.xml -share/gnome/help/conglomerate/C/conventions.xml -share/gnome/help/conglomerate/C/doc_type_support.xml -share/gnome/help/conglomerate/C/faq.xml -share/gnome/help/conglomerate/C/figures/caution.png -share/gnome/help/conglomerate/C/figures/cong_create_new_file_wiz1.png -share/gnome/help/conglomerate/C/figures/cong_create_new_file_wiz2.png -share/gnome/help/conglomerate/C/figures/cong_dump_xds_dialog.png -share/gnome/help/conglomerate/C/figures/cong_edit_xds_dialog.png -share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_overview.png -share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_popup_menu.png -share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_raw.png -share/gnome/help/conglomerate/C/figures/cong_editor_window.png -share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_area.png -share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_edit.png -share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_edit_collapse.png -share/gnome/help/conglomerate/C/figures/cong_editor_window_menubar.png -share/gnome/help/conglomerate/C/figures/cong_editor_window_statusbar.png -share/gnome/help/conglomerate/C/figures/cong_editor_window_titlebar.png -share/gnome/help/conglomerate/C/figures/cong_editor_window_toolbar.png -share/gnome/help/conglomerate/C/figures/cong_export_file_dialog.png -share/gnome/help/conglomerate/C/figures/cong_import_file_dialog.png -share/gnome/help/conglomerate/C/figures/cong_inline_menu.png -share/gnome/help/conglomerate/C/figures/cong_input_focus.png -share/gnome/help/conglomerate/C/figures/cong_open_dialog.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_add.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_add.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_adv.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_adv_add.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_reder.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_lang.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_rev.png -share/gnome/help/conglomerate/C/figures/cong_properties_dialog_scope.png -share/gnome/help/conglomerate/C/figures/cong_save_as_dialog.png -share/gnome/help/conglomerate/C/figures/cong_save_copy_dialog.png -share/gnome/help/conglomerate/C/figures/cong_start_window.png -share/gnome/help/conglomerate/C/figures/cong_validate_tool_dialog.png -share/gnome/help/conglomerate/C/figures/cong_view_source_menu.png -share/gnome/help/conglomerate/C/figures/cong_view_source_window.png -share/gnome/help/conglomerate/C/figures/conglomerate_logo.png -share/gnome/help/conglomerate/C/figures/important.png -share/gnome/help/conglomerate/C/figures/intro.png -share/gnome/help/conglomerate/C/figures/menu-properties.png -share/gnome/help/conglomerate/C/figures/new-doc-wizard.png -share/gnome/help/conglomerate/C/figures/new.png -share/gnome/help/conglomerate/C/figures/note.png -share/gnome/help/conglomerate/C/figures/properties-dialog.png -share/gnome/help/conglomerate/C/figures/quote.png -share/gnome/help/conglomerate/C/figures/tip.png -share/gnome/help/conglomerate/C/figures/warning.png -share/gnome/help/conglomerate/C/global.ent -share/gnome/help/conglomerate/C/glossary.xml -share/gnome/help/conglomerate/C/notice_fdl.xml -share/gnome/help/conglomerate/C/notice_gpl.xml -share/gnome/help/conglomerate/C/row_xml_lang_attrib.xml -share/gnome/help/conglomerate/C/tbl_element_attrib.xml -share/gnome/help/conglomerate/C/xds_dtd_def.xml -share/locale/az/LC_MESSAGES/conglomerate.mo -share/locale/ca/LC_MESSAGES/conglomerate.mo -share/locale/cs/LC_MESSAGES/conglomerate.mo -share/locale/da/LC_MESSAGES/conglomerate.mo -share/locale/de/LC_MESSAGES/conglomerate.mo -share/locale/el/LC_MESSAGES/conglomerate.mo -share/locale/en_CA/LC_MESSAGES/conglomerate.mo -share/locale/en_GB/LC_MESSAGES/conglomerate.mo -share/locale/es/LC_MESSAGES/conglomerate.mo -share/locale/fr/LC_MESSAGES/conglomerate.mo -share/locale/hr/LC_MESSAGES/conglomerate.mo -share/locale/ja/LC_MESSAGES/conglomerate.mo -share/locale/nl/LC_MESSAGES/conglomerate.mo -share/locale/no/LC_MESSAGES/conglomerate.mo -share/locale/pa/LC_MESSAGES/conglomerate.mo -share/locale/pl/LC_MESSAGES/conglomerate.mo -share/locale/pt/LC_MESSAGES/conglomerate.mo -share/locale/pt_BR/LC_MESSAGES/conglomerate.mo -share/locale/ru/LC_MESSAGES/conglomerate.mo -share/locale/rw/LC_MESSAGES/conglomerate.mo -share/locale/sq/LC_MESSAGES/conglomerate.mo -share/locale/sr/LC_MESSAGES/conglomerate.mo -share/locale/sr@Latn/LC_MESSAGES/conglomerate.mo -share/locale/sv/LC_MESSAGES/conglomerate.mo -share/locale/uk/LC_MESSAGES/conglomerate.mo -share/locale/zh_CN/LC_MESSAGES/conglomerate.mo -share/mime-info/conglomerate.keys -share/mime-info/conglomerate.mime -share/omf/conglomerate/conglomerate-C.omf -share/pixmaps/conglomerate-icon-16.png -share/pixmaps/conglomerate/cong-address-16.png -share/pixmaps/conglomerate/cong-answer-16.png -share/pixmaps/conglomerate/cong-author-16.png -share/pixmaps/conglomerate/cong-bibliography-16.png -share/pixmaps/conglomerate/cong-bulleted-list-16.png -share/pixmaps/conglomerate/cong-caution-48.png -share/pixmaps/conglomerate/cong-code-fragment-16.png -share/pixmaps/conglomerate/cong-comment-16.png -share/pixmaps/conglomerate/cong-definition-list-16.png -share/pixmaps/conglomerate/cong-docbook-article-16.png -share/pixmaps/conglomerate/cong-docbook-book-16.png -share/pixmaps/conglomerate/cong-docbook-set-16.png -share/pixmaps/conglomerate/cong-editor-16.png -share/pixmaps/conglomerate/cong-entry-16.png -share/pixmaps/conglomerate/cong-faq-16.png -share/pixmaps/conglomerate/cong-footnote-16.png -share/pixmaps/conglomerate/cong-history-16.png -share/pixmaps/conglomerate/cong-important-48.png -share/pixmaps/conglomerate/cong-indexterm-16.png -share/pixmaps/conglomerate/cong-list-16.png -share/pixmaps/conglomerate/cong-list-item-16.png -share/pixmaps/conglomerate/cong-metadata-16.png -share/pixmaps/conglomerate/cong-name-16.png -share/pixmaps/conglomerate/cong-note-48.png -share/pixmaps/conglomerate/cong-numbered-list-16.png -share/pixmaps/conglomerate/cong-paragraph-16.png -share/pixmaps/conglomerate/cong-publisher-16.png -share/pixmaps/conglomerate/cong-question-16.png -share/pixmaps/conglomerate/cong-subsection-16.png -share/pixmaps/conglomerate/cong-summary-16.png -share/pixmaps/conglomerate/cong-tip-48.png -share/pixmaps/conglomerate/cong-title-16.png -share/pixmaps/conglomerate/cong-uncomment-16.png -share/pixmaps/conglomerate/cong-warning-48.png -share/pixmaps/conglomerate/cong-wrapper-16.png -share/pixmaps/conglomerate/conglomerate-icon-32.png -share/pixmaps/conglomerate/conglomerate-logo.png diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo deleted file mode 100644 index ddd0f8f7192..00000000000 --- a/editors/conglomerate/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 03:32:14 agc Exp $ - -SHA1 (conglomerate-0.9.1.tar.gz) = 26174924865f095452c59b595f99a31737c9ece5 -RMD160 (conglomerate-0.9.1.tar.gz) = 255f80da8efd672f5ad7ac97d3f1bd6e640c254e -SHA512 (conglomerate-0.9.1.tar.gz) = 162c6d580d65c33db9dc3ba1178d6a9de1b08aa025d83edb9b5188313084474f83766f62485fbef1dbe4b9302fa7e94224fde10b99a490d0dfb6b34377bbb9e2 -Size (conglomerate-0.9.1.tar.gz) = 3291367 bytes -SHA1 (patch-aa) = 49275d1a9f81638e8eb945ff7c9732fc01bf0a08 -SHA1 (patch-src_cong-editor-line-iter-simple_c) = 0c77b7efb843a7eb44d77c54a5c1ae2eb26d19c9 -SHA1 (patch-src_cong-editor-line-iter-span-wrapper_c) = c87806a848f1179b169bfea84ea3465bf136a613 -SHA1 (patch-src_cong-language.c) = ee5d95d6dd0c0ae80dbc826fcfc44692654f19e0 diff --git a/editors/conglomerate/patches/patch-aa b/editors/conglomerate/patches/patch-aa deleted file mode 100644 index 77146edab05..00000000000 --- a/editors/conglomerate/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2005/02/14 21:32:10 jmmv Exp $ - ---- data/Makefile.in.orig 2005-02-14 18:04:43.000000000 +0100 -+++ data/Makefile.in -@@ -153,7 +153,7 @@ appdir = $(datadir)/application-registry - mimedir = $(datadir)/mime-info - mime_DATA = conglomerate.mime - --schemadir = $(sysconfdir)/gconf/schemas/ -+schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = conglomerate.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) - diff --git a/editors/conglomerate/patches/patch-src_cong-editor-line-iter-simple_c b/editors/conglomerate/patches/patch-src_cong-editor-line-iter-simple_c deleted file mode 100644 index bf40a161064..00000000000 --- a/editors/conglomerate/patches/patch-src_cong-editor-line-iter-simple_c +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_cong-editor-line-iter-simple_c,v 1.1 2012/05/07 18:59:39 dholland Exp $ - -Avoid symbol conflict with clone(2). - ---- src/cong-editor-line-iter-simple.c~ 2004-11-04 19:18:48.000000000 +0000 -+++ src/cong-editor-line-iter-simple.c -@@ -26,13 +26,13 @@ - #include "cong-editor-line-iter-simple.h" - - static CongEditorLineIter* --clone (CongEditorLineIter *line_iter); -+clone_ (CongEditorLineIter *line_iter); - - static CongEditorAreaLine* - get_line (CongEditorLineIter *line_iter); - - CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSimple, cong_editor_line_iter_simple, CONG_EDITOR_LINE_ITER_SIMPLE, CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, -- CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone; -+ CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone_; - CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = get_line;) - - CONG_DEFINE_EMPTY_DISPOSE(cong_editor_line_iter_simple) -@@ -58,7 +58,7 @@ cong_editor_line_iter_simple_new (CongEd - } - - static CongEditorLineIter* --clone (CongEditorLineIter *line_iter) -+clone_ (CongEditorLineIter *line_iter) - { - CongEditorLineIterSimple* simple_iter = CONG_EDITOR_LINE_ITER_SIMPLE (line_iter); - CongEditorLineIterSimple* new_iter; diff --git a/editors/conglomerate/patches/patch-src_cong-editor-line-iter-span-wrapper_c b/editors/conglomerate/patches/patch-src_cong-editor-line-iter-span-wrapper_c deleted file mode 100644 index 1a24b260ee2..00000000000 --- a/editors/conglomerate/patches/patch-src_cong-editor-line-iter-span-wrapper_c +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_cong-editor-line-iter-span-wrapper_c,v 1.1 2012/05/09 05:31:28 dholland Exp $ - -Avoid symbol conflict with clone(2). - ---- src/cong-editor-line-iter-span-wrapper.c~ 2004-11-04 19:18:48.000000000 +0000 -+++ src/cong-editor-line-iter-span-wrapper.c -@@ -26,13 +26,13 @@ - #include "cong-editor-line-iter-span-wrapper.h" - - static CongEditorLineIter* --clone (CongEditorLineIter *line_iter); -+clone_ (CongEditorLineIter *line_iter); - - static CongEditorAreaLine* - get_line (CongEditorLineIter *line_iter); - - CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSpanWrapper, cong_editor_line_iter_span_wrapper, CONG_EDITOR_LINE_ITER_SPAN_WRAPPER, CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, -- CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone; -+ CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone_; - CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = get_line;) - - /* Implementation of CongLineEditorIterSpanWrapper: */ -@@ -80,7 +80,7 @@ cong_editor_line_iter_span_wrapper_dispo - } - - static CongEditorLineIter* --clone (CongEditorLineIter *line_iter) -+clone_ (CongEditorLineIter *line_iter) - { - CongEditorLineIterSpanWrapper* span_wrapper_iter = CONG_EDITOR_LINE_ITER_SPAN_WRAPPER (line_iter); - CongEditorLineIterSpanWrapper* new_iter; diff --git a/editors/conglomerate/patches/patch-src_cong-language.c b/editors/conglomerate/patches/patch-src_cong-language.c deleted file mode 100644 index 68ebe97e752..00000000000 --- a/editors/conglomerate/patches/patch-src_cong-language.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_cong-language.c,v 1.1 2014/09/10 12:14:07 joerg Exp $ - ---- src/cong-language.c.orig 2014-09-09 18:53:09.000000000 +0000 -+++ src/cong-language.c -@@ -97,7 +97,7 @@ cong_per_language_set_data_for_lang (Con - { - g_return_if_fail (per_language); - -- return g_hash_table_insert (per_language->hash_table, -+ g_hash_table_insert (per_language->hash_table, - g_strdup (language), - data); - } |