2006-12-01 multimedia/bsdav: does not work. We need to import bktv patches from OpenBSD to make it work

2006-12-01 multimedia/pitivi: Installs files during "make all"
2006-12-01 misc/gnomesword: Configure fails

40 files changed, 3 insertions, 1107 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 87ba65ff9eed..4d08ce04b586 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -971,7 +971,6 @@ bruteforceblocker	ports/security/bruteforceblocker
 bsd-airtools	ports/net-mgmt/bsd-airtools
 bsd-splash-changer	ports/sysutils/bsd-splash-changer
 bsdadminscripts	ports/sysutils/bsdadminscripts
-bsdav		ports/multimedia/bsdav
 bsdbktr_tvtune	ports/multimedia/bsdbktr_tvtune
 bsdftpd-ssl	ports/ftp/bsdftpd-ssl
 bsdiff		ports/misc/bsdiff
@@ -3666,7 +3665,6 @@ gnomephotoprinter	ports/print/gnomephotoprinter
 gnomepm		ports/finance/gnomepm
 gnomermind	ports/games/gnomermind
 gnomesudoku	ports/games/gnomesudoku
-gnomesword	ports/misc/gnomesword
 gnometelnet	ports/net/gnometelnet
 gnomoradio	ports/audio/gnomoradio
 gnopernicus	ports/accessibility/gnopernicus
@@ -11579,7 +11577,6 @@ pipsv700	ports/print/pipsv700
 pipsv700-cups	ports/print/pipsv700-cups
 pircbot		ports/irc/pircbot
 pisg		ports/irc/pisg
-pitivi		ports/multimedia/pitivi
 pivot-weblog	ports/www/pivot-weblog
 pixelize	ports/graphics/pixelize
 pixen		ports/graphics/pixen
diff --git a/MOVED b/MOVED
index a67338723022..78a4c12af6a8 100644
--- a/MOVED
+++ b/MOVED
@@ -2643,3 +2643,6 @@ audio/autools||2007-01-05|Has expired: is unfetchable and the project homepage d
 www/mediawiki13||2007-01-05|Removed: No longer supported, please upgrade your wiki installation
 www/mediawiki15||2007-01-05|Removed: No longer supported, please upgrade your wiki installation
 ftp/gwget||2007-01-05|Has expired: fails to install
+multimedia/bsdav||2007-01-05|Has expired: does not work. We need to import bktv patches from OpenBSD to make it work
+multimedia/pitivi||2007-01-05|Has expired: Installs files during "make all"
+misc/gnomesword||2007-01-05|Has expired: Configure fails
diff --git a/misc/Makefile b/misc/Makefile
index 1a0b95564385..90a5b34cba42 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -126,7 +126,6 @@
     SUBDIR += gnome-osd
     SUBDIR += gnome-user-docs
     SUBDIR += gnomehier
-    SUBDIR += gnomesword
     SUBDIR += gnu-watch
     SUBDIR += gnuls
     SUBDIR += gnustep-examples
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
deleted file mode 100644
index 93cac6eea74a..000000000000
--- a/misc/gnomesword/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for: gnomesword
-# Date created:   Oct 26, 2002
-# Whom:           J Shoemaker <shoemaker@softhome.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomesword
-PORTVERSION=	2.1.1
-PORTREVISION=	6
-CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	dboudrot@yahoo.com
-COMMENT=	A bible interface utilizing the sword framework
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
-LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
-RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
-
-BROKEN=		Configure fails
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-USE_XLIB=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget gal2 gtkhtml3 intlhack
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|=share/pix|=share/gnome/pix|g ; \
-		 s|=share/app|=share/gnome/app|g' ${WRKSRC}/configure
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog INSTALL NEWS README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/misc/gnomesword/distinfo b/misc/gnomesword/distinfo
deleted file mode 100644
index 3553bab440d9..000000000000
--- a/misc/gnomesword/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnomesword-2.1.1.tar.gz) = 46b0c941e4f5780aaf8a72da87d0d045
-SHA256 (gnomesword-2.1.1.tar.gz) = f0e00199edd2871b67b32c1277ae44564ac3d33cf833e2f61a187456d9f175b4
-SIZE (gnomesword-2.1.1.tar.gz) = 1758480
diff --git a/misc/gnomesword/files/patch-Makefile.in b/misc/gnomesword/files/patch-Makefile.in
deleted file mode 100644
index b629c1eae92d..000000000000
--- a/misc/gnomesword/files/patch-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig	Wed Jul 14 23:34:10 2004
-+++ Makefile.in	Sat Aug 21 16:34:24 2004
-@@ -61,7 +61,7 @@
- 	install-recursive installcheck-recursive installdirs-recursive \
- 	pdf-recursive ps-recursive uninstall-info-recursive \
- 	uninstall-recursive
--am__installdirs = "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"
-+am__installdirs = "$(DESTDIR)$(gnomemenudir)"
- gnomemenuDATA_INSTALL = $(INSTALL_DATA)
- gnomesworddocDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(gnomemenu_DATA) $(gnomesworddoc_DATA)
-@@ -627,7 +627,7 @@
- all-am: Makefile $(DATA) config.h
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"; do \
-+	for dir in "$(DESTDIR)$(gnomemenudir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-recursive
-@@ -674,8 +674,7 @@
- 
- info-am:
- 
--install-data-am: install-data-local install-gnomemenuDATA \
--	install-gnomesworddocDATA
-+install-data-am: install-data-local install-gnomemenuDATA
- 
- install-exec-am:
- 
diff --git a/misc/gnomesword/files/patch-configure b/misc/gnomesword/files/patch-configure
deleted file mode 100644
index 57de0a0ae95a..000000000000
--- a/misc/gnomesword/files/patch-configure
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.orig	Wed Jul 14 09:34:14 2004
-+++ configure	Thu Feb 17 15:43:03 2005
-@@ -2033,35 +2033,35 @@
-      echo "*** to the full path to pkg-config."
-      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword" >&5
--echo $ECHO_N "checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword" >&5
-+echo $ECHO_N "checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword" ; then
-+        if $PKG_CONFIG --exists "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking GNOME_CFLAGS" >&5
- echo $ECHO_N "checking GNOME_CFLAGS... $ECHO_C" >&6
--            GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
-+            GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
-             echo "$as_me:$LINENO: result: $GNOME_CFLAGS" >&5
- echo "${ECHO_T}$GNOME_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GNOME_LIBS" >&5
- echo $ECHO_N "checking GNOME_LIBS... $ECHO_C" >&6
--            GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
-+            GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
-             echo "$as_me:$LINENO: result: $GNOME_LIBS" >&5
- echo "${ECHO_T}$GNOME_LIBS" >&6
-         else
-             GNOME_CFLAGS=""
-             GNOME_LIBS=""
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
--            GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
-+            GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
- 
-         fi
- 
- 
- 
-@@ -23854,13 +23854,13 @@
- fi
- 
- packagedatadir=share/${PACKAGE}
- packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
-+packagemenudir=share/gnome/applications
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
- PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
- 
diff --git a/misc/gnomesword/files/patch-src-backend-sword_main.diff b/misc/gnomesword/files/patch-src-backend-sword_main.diff
deleted file mode 100644
index 35e1cb29d547..000000000000
--- a/misc/gnomesword/files/patch-src-backend-sword_main.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/backend/sword_main.cc.orig	Thu Jul  1 15:45:30 2004
-+++ src/backend/sword_main.cc	Thu Jun  2 16:47:23 2005
-@@ -190,8 +190,8 @@
- 	VerseKey key;
- 	GList *retlist = NULL;
- 	char *book = NULL;
--	unsigned int bytes_read;
--	unsigned int bytes_written;
-+	gsize bytes_read;
-+	gsize bytes_written;
- 	GError *error;
- 	int i = 0, j = 0, x = 2;
- 	
diff --git a/misc/gnomesword/files/patch-src::gnome2::editor_menu.c b/misc/gnomesword/files/patch-src::gnome2::editor_menu.c
deleted file mode 100644
index 5ca9a49a6be1..000000000000
--- a/misc/gnomesword/files/patch-src::gnome2::editor_menu.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/gnome2/editor_menu.c.orig	Fri Apr  2 17:28:07 2004
-+++ src/gnome2/editor_menu.c	Mon Feb 14 15:08:42 2005
-@@ -29,11 +29,11 @@
- #include <gtkhtml/htmlform.h>
- #include <gtkhtml/htmlenums.h>
- #include <gtkhtml/htmlsettings.h>
- #include <gtkhtml/htmlcolor.h>
- #include <gtkhtml/htmlcolorset.h>
--#include <gtkhtml/htmllinktext.h>
-+//#include <gtkhtml/htmllinktext.h>
- #include <gtkhtml/htmlengine-edit.h>
- #include <gtkhtml/htmlengine-edit-fontstyle.h>
- #include <gtkhtml/htmlengine-edit-cut-and-paste.h>
- #include <gtkhtml/htmlselection.h>
- #include <gtkhtml/htmlengine-search.h>
-@@ -491,17 +491,33 @@
- 		target = strchr(url, '#');
- 		url_copy =
- 		    target ? g_strndup(url,
- 				       target - url) : g_strdup(url);
- 		new_link =
-+		    html_text_new(text,
-+				       GTK_HTML_FONT_STYLE_DEFAULT,
-+				       html_colorset_get_color(e->
-+							settings->
-+							color_set,
-+							HTMLLinkColor));
-+                new_link =
-+		    html_object_set_link(new_link,
-+				       html_colorset_get_color(e->
-+							settings->
-+							color_set,
-+							HTMLLinkColor),
-+				       url_copy, target);
-+/*
-+		new_link =
- 		    html_link_text_new(text,
- 				       GTK_HTML_FONT_STYLE_DEFAULT,
- 				       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);
- 	}
- }
diff --git a/misc/gnomesword/files/patch-src::gnome2::mod_mgr.c b/misc/gnomesword/files/patch-src::gnome2::mod_mgr.c
deleted file mode 100644
index 15d85dbfb7b7..000000000000
--- a/misc/gnomesword/files/patch-src::gnome2::mod_mgr.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gnome2/mod_mgr.c.orig	Sun Mar 28 04:39:23 2004
-+++ src/gnome2/mod_mgr.c	Sat Aug 21 15:56:12 2004
-@@ -1910,8 +1910,7 @@
- 
- 	GtkTreeModel *model;
- 	GError *error = NULL;
--	GtkTooltips *tooltips;
--	tooltips = gtk_tooltips_new();
-+	GtkTooltips *tooltips = gtk_tooltips_new();
- 	GString *str = g_string_new(NULL);
- 	GtkCellRenderer *renderer;
- 	GtkTreeViewColumn *column;
diff --git a/misc/gnomesword/files/patch-src::gnome2::note_editor.c b/misc/gnomesword/files/patch-src::gnome2::note_editor.c
deleted file mode 100644
index 298dd5532e6f..000000000000
--- a/misc/gnomesword/files/patch-src::gnome2::note_editor.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/gnome2/note_editor.c.orig	Thu May  6 19:10:00 2004
-+++ src/gnome2/note_editor.c	Mon Feb 14 15:12:22 2005
-@@ -29,11 +29,11 @@
- #include <gtkhtml/htmlform.h>
- #include <gtkhtml/htmlenums.h>
- #include <gtkhtml/htmlsettings.h>
- #include <gtkhtml/htmlcolor.h>
- #include <gtkhtml/htmlcolorset.h>
--#include <gtkhtml/htmllinktext.h>
-+//#include <gtkhtml/htmllinktext.h>
- #include <gtkhtml/htmlengine-edit.h>
- #include <gtkhtml/htmlengine-edit-fontstyle.h>
- #include <gtkhtml/htmlengine-edit-cut-and-paste.h>
- #include <gtkhtml/htmlselection.h>
- #include <gtkhtml/htmlengine-search.h>
-@@ -1185,17 +1185,33 @@
- 		target = strchr(url, '#');
- 		url_copy =
- 		    target ? g_strndup(url,
- 				       target - url) : g_strdup(url);
- 		new_link =
-+		    html_text_new(text,
-+				       GTK_HTML_FONT_STYLE_DEFAULT,
-+				       html_colorset_get_color(e->
-+							settings->
-+							color_set,
-+							HTMLLinkColor));
-+		new_link =
-+		    html_object_set_link(new_link,
-+				       html_colorset_get_color(e->
-+							settings->
-+							color_set,
-+							HTMLLinkColor),
-+				       url_copy, target);
-+/*
-+		new_link =
- 		    html_link_text_new(text,
- 				       GTK_HTML_FONT_STYLE_DEFAULT,
- 				       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);
- 	}
- }
diff --git a/misc/gnomesword/files/patch-src::gnome2::note_toolbar_style.c b/misc/gnomesword/files/patch-src::gnome2::note_toolbar_style.c
deleted file mode 100644
index 014a022c06c0..000000000000
--- a/misc/gnomesword/files/patch-src::gnome2::note_toolbar_style.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/gnome2/note_toolbar_style.c.orig	Thu Apr 22 14:12:43 2004
-+++ src/gnome2/note_toolbar_style.c	Mon Feb 14 15:20:54 2005
-@@ -469,11 +469,12 @@
- 			    DIALOG_DATA * d)
- {
- 	GSHTMLEditorControlData *cd = d->editor;
- 	color_combo_set_color(COLOR_COMBO(cd->combo),
- 			      &html_colorset_get_color_allocated
--			      (html->engine->painter,
-+			      (cd->html->engine->settings->color_set,
-+			       html->engine->painter,
- 			       HTMLTextColor)->color);
- 
- }
- 
- /******************************************************************************
diff --git a/misc/gnomesword/files/patch-src::gnome2::tabbed_browser.c b/misc/gnomesword/files/patch-src::gnome2::tabbed_browser.c
deleted file mode 100644
index 52dd1d8f7527..000000000000
--- a/misc/gnomesword/files/patch-src::gnome2::tabbed_browser.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gnome2/tabbed_browser.c.orig	Thu Jun 17 04:53:24 2004
-+++ src/gnome2/tabbed_browser.c	Sat Aug 21 15:59:13 2004
-@@ -664,11 +664,13 @@
-  */
- void gui_close_passage_tab(gint pagenum)
- {
-+	PASSAGE_TAB_INFO *pt;
-+
- 	if (-1 == pagenum)
- 		pagenum = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_main));
- 	if (1 == gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)))
- 		return;
--	PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum);
-+	pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum);
- 	passage_list = g_list_remove(passage_list, pt);
- 	if(pt->text_mod) g_free(pt->text_mod);
- 	if(pt->commentary_mod) g_free(pt->commentary_mod);
diff --git a/misc/gnomesword/files/patch-src::gnome2::toolbar_style.c b/misc/gnomesword/files/patch-src::gnome2::toolbar_style.c
deleted file mode 100644
index ae8c6cd1c6c3..000000000000
--- a/misc/gnomesword/files/patch-src::gnome2::toolbar_style.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/gnome2/toolbar_style.c.orig	Thu Apr 22 14:12:43 2004
-+++ src/gnome2/toolbar_style.c	Mon Feb 14 15:23:28 2005
-@@ -460,11 +460,12 @@
- static void set_color_combo(GtkHTML * html,
- 			    GSHTMLEditorControlData * cd)
- {
- 	color_combo_set_color(COLOR_COMBO(cd->combo),
- 			      &html_colorset_get_color_allocated
--			      (html->engine->painter,
-+			      (cd->html->engine->settings->color_set,
-+			       html->engine->painter,
- 			       HTMLTextColor)->color);
- 
- }
- 
- /******************************************************************************
diff --git a/misc/gnomesword/pkg-descr b/misc/gnomesword/pkg-descr
deleted file mode 100644
index b4df0ae732f5..000000000000
--- a/misc/gnomesword/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-The GnomeSword GUI is a frontend to the SWORD project.
-
-The SWORD Project is an effort to create an ever expanding software package
-for research and study of God and His Word. The SWORD Bible Framework allows
-easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc.
-Many frontends are build using this framework. An installed module set may be
-shared between any frontend using the framework.
-
-WWW: http://www.crosswire.org/
-
-// J Shoemaker <shoemaker@softhome.net>
diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist
deleted file mode 100644
index fbad65b19c46..000000000000
--- a/misc/gnomesword/pkg-plist
+++ /dev/null
@@ -1,72 +0,0 @@
-bin/gnomesword2
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/gnomesword.desktop
-share/gnome/help/gnomesword/C/figures/gnomesword_interface.png
-share/gnome/help/gnomesword/C/figures/gnomesword_interface_biblepane.png
-share/gnome/help/gnomesword/C/figures/gnomesword_interface_commentarypane.png
-share/gnome/help/gnomesword/C/figures/gnomesword_interface_sidepane.png
-share/gnome/help/gnomesword/C/figures/gnomesword_interface_toolbar.png
-share/gnome/help/gnomesword/C/figures/gnomesword_preferences_font_colors.png
-share/gnome/help/gnomesword/C/figures/gnomesword_preferences_general.png
-share/gnome/help/gnomesword/C/figures/gnomesword_preferences_sword_config.png
-share/gnome/help/gnomesword/C/figures/gnomesword_studypad.png
-share/gnome/help/gnomesword/C/gnomesword.xml
-share/gnome/help/gnomesword/C/legal.xml
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface_bible.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface_commentarypane.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface_shortcutbar.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface_toolbar.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_font_colors.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_misc_settings.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_sword_config.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_studypad.png
-share/gnome/help/gnomesword/fr/gnomesword.xml
-share/gnome/help/gnomesword/fr/legal.xml
-share/gnome/omf/gnomesword/gnomesword-C.omf
-share/gnome/omf/gnomesword/gnomesword-fr.omf
-share/gnome/pixmaps/gnomesword/about.png
-share/gnome/pixmaps/gnomesword/book-bl.png
-share/gnome/pixmaps/gnomesword/book-gold.png
-share/gnome/pixmaps/gnomesword/book-green.png
-share/gnome/pixmaps/gnomesword/book-un.png
-share/gnome/pixmaps/gnomesword/dlg-bl.png
-share/gnome/pixmaps/gnomesword/dlg-un.png
-share/gnome/pixmaps/gnomesword/dock.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmark-page.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmarks.png
-share/gnome/pixmaps/gnomesword/epiphany-secure.png
-share/gnome/pixmaps/gnomesword/epiphany-unsecure.png
-share/gnome/pixmaps/gnomesword/gs2-48x48.png
-share/gnome/pixmaps/gnomesword/logo.png
-share/gnome/pixmaps/gnomesword/new_tab_button.png
-share/gnome/pixmaps/gnomesword/splash.png
-share/gnome/pixmaps/gnomesword/sword.png
-share/gnome/pixmaps/gnomesword/sword3.png
-share/gnome/pixmaps/gnomesword/tt.png
-share/gnome/pixmaps/gnomesword/tt.xpm
-share/locale/de/LC_MESSAGES/gnomesword.mo
-share/locale/de_DE/LC_MESSAGES/gnomesword.mo
-share/locale/en_GB/LC_MESSAGES/gnomesword.mo
-share/locale/fr_FR/LC_MESSAGES/gnomesword.mo
-share/locale/ru/LC_MESSAGES/gnomesword.mo
-share/locale/uk/LC_MESSAGES/gnomesword.mo
-@dirrm share/gnome/pixmaps/gnomesword
-@dirrm share/gnome/omf/gnomesword
-@dirrm share/gnome/help/gnomesword/fr/figures
-@dirrm share/gnome/help/gnomesword/fr
-@dirrm share/gnome/help/gnomesword/C/figures
-@dirrm share/gnome/help/gnomesword/C
-@dirrm share/gnome/help/gnomesword
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
deleted file mode 100644
index 93cac6eea74a..000000000000
--- a/misc/xiphos/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for: gnomesword
-# Date created:   Oct 26, 2002
-# Whom:           J Shoemaker <shoemaker@softhome.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomesword
-PORTVERSION=	2.1.1
-PORTREVISION=	6
-CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	dboudrot@yahoo.com
-COMMENT=	A bible interface utilizing the sword framework
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
-LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
-RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
-
-BROKEN=		Configure fails
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-USE_XLIB=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget gal2 gtkhtml3 intlhack
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|=share/pix|=share/gnome/pix|g ; \
-		 s|=share/app|=share/gnome/app|g' ${WRKSRC}/configure
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog INSTALL NEWS README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo
deleted file mode 100644
index 3553bab440d9..000000000000
--- a/misc/xiphos/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnomesword-2.1.1.tar.gz) = 46b0c941e4f5780aaf8a72da87d0d045
-SHA256 (gnomesword-2.1.1.tar.gz) = f0e00199edd2871b67b32c1277ae44564ac3d33cf833e2f61a187456d9f175b4
-SIZE (gnomesword-2.1.1.tar.gz) = 1758480
diff --git a/misc/xiphos/files/patch-Makefile.in b/misc/xiphos/files/patch-Makefile.in
deleted file mode 100644
index b629c1eae92d..000000000000
--- a/misc/xiphos/files/patch-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig	Wed Jul 14 23:34:10 2004
-+++ Makefile.in	Sat Aug 21 16:34:24 2004
-@@ -61,7 +61,7 @@
- 	install-recursive installcheck-recursive installdirs-recursive \
- 	pdf-recursive ps-recursive uninstall-info-recursive \
- 	uninstall-recursive
--am__installdirs = "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"
-+am__installdirs = "$(DESTDIR)$(gnomemenudir)"
- gnomemenuDATA_INSTALL = $(INSTALL_DATA)
- gnomesworddocDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(gnomemenu_DATA) $(gnomesworddoc_DATA)
-@@ -627,7 +627,7 @@
- all-am: Makefile $(DATA) config.h
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"; do \
-+	for dir in "$(DESTDIR)$(gnomemenudir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-recursive
-@@ -674,8 +674,7 @@
- 
- info-am:
- 
--install-data-am: install-data-local install-gnomemenuDATA \
--	install-gnomesworddocDATA
-+install-data-am: install-data-local install-gnomemenuDATA
- 
- install-exec-am:
- 
diff --git a/misc/xiphos/files/patch-configure b/misc/xiphos/files/patch-configure
deleted file mode 100644
index 57de0a0ae95a..000000000000
--- a/misc/xiphos/files/patch-configure
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.orig	Wed Jul 14 09:34:14 2004
-+++ configure	Thu Feb 17 15:43:03 2005
-@@ -2033,35 +2033,35 @@
-      echo "*** to the full path to pkg-config."
-      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword" >&5
--echo $ECHO_N "checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword" >&5
-+echo $ECHO_N "checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword" ; then
-+        if $PKG_CONFIG --exists "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking GNOME_CFLAGS" >&5
- echo $ECHO_N "checking GNOME_CFLAGS... $ECHO_C" >&6
--            GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
-+            GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
-             echo "$as_me:$LINENO: result: $GNOME_CFLAGS" >&5
- echo "${ECHO_T}$GNOME_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GNOME_LIBS" >&5
- echo $ECHO_N "checking GNOME_LIBS... $ECHO_C" >&6
--            GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
-+            GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
-             echo "$as_me:$LINENO: result: $GNOME_LIBS" >&5
- echo "${ECHO_T}$GNOME_LIBS" >&6
-         else
-             GNOME_CFLAGS=""
-             GNOME_LIBS=""
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
--            GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
-+            GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
- 
-         fi
- 
- 
- 
-@@ -23854,13 +23854,13 @@
- fi
- 
- packagedatadir=share/${PACKAGE}
- packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
-+packagemenudir=share/gnome/applications
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
- PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
- 
diff --git a/misc/xiphos/files/patch-src-backend-sword_main.diff b/misc/xiphos/files/patch-src-backend-sword_main.diff
deleted file mode 100644
index 35e1cb29d547..000000000000
--- a/misc/xiphos/files/patch-src-backend-sword_main.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/backend/sword_main.cc.orig	Thu Jul  1 15:45:30 2004
-+++ src/backend/sword_main.cc	Thu Jun  2 16:47:23 2005
-@@ -190,8 +190,8 @@
- 	VerseKey key;
- 	GList *retlist = NULL;
- 	char *book = NULL;
--	unsigned int bytes_read;
--	unsigned int bytes_written;
-+	gsize bytes_read;
-+	gsize bytes_written;
- 	GError *error;
- 	int i = 0, j = 0, x = 2;
- 	
diff --git a/misc/xiphos/files/patch-src::gnome2::editor_menu.c b/misc/xiphos/files/patch-src::gnome2::editor_menu.c
deleted file mode 100644
index 5ca9a49a6be1..000000000000
--- a/misc/xiphos/files/patch-src::gnome2::editor_menu.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/gnome2/editor_menu.c.orig	Fri Apr  2 17:28:07 2004
-+++ src/gnome2/editor_menu.c	Mon Feb 14 15:08:42 2005
-@@ -29,11 +29,11 @@
- #include <gtkhtml/htmlform.h>
- #include <gtkhtml/htmlenums.h>
- #include <gtkhtml/htmlsettings.h>
- #include <gtkhtml/htmlcolor.h>
- #include <gtkhtml/htmlcolorset.h>
--#include <gtkhtml/htmllinktext.h>
-+//#include <gtkhtml/htmllinktext.h>
- #include <gtkhtml/htmlengine-edit.h>
- #include <gtkhtml/htmlengine-edit-fontstyle.h>
- #include <gtkhtml/htmlengine-edit-cut-and-paste.h>
- #include <gtkhtml/htmlselection.h>
- #include <gtkhtml/htmlengine-search.h>
-@@ -491,17 +491,33 @@
- 		target = strchr(url, '#');
- 		url_copy =
- 		    target ? g_strndup(url,
- 				       target - url) : g_strdup(url);
- 		new_link =
-+		    html_text_new(text,
-+				       GTK_HTML_FONT_STYLE_DEFAULT,
-+				       html_colorset_get_color(e->
-+							settings->
-+							color_set,
-+							HTMLLinkColor));
-+                new_link =
-+		    html_object_set_link(new_link,
-+				       html_colorset_get_color(e->
-+							settings->
-+							color_set,
-+							HTMLLinkColor),
-+				       url_copy, target);
-+/*
-+		new_link =
- 		    html_link_text_new(text,
- 				       GTK_HTML_FONT_STYLE_DEFAULT,
- 				       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);
- 	}
- }
diff --git a/misc/xiphos/files/patch-src::gnome2::mod_mgr.c b/misc/xiphos/files/patch-src::gnome2::mod_mgr.c
deleted file mode 100644
index 15d85dbfb7b7..000000000000
--- a/misc/xiphos/files/patch-src::gnome2::mod_mgr.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gnome2/mod_mgr.c.orig	Sun Mar 28 04:39:23 2004
-+++ src/gnome2/mod_mgr.c	Sat Aug 21 15:56:12 2004
-@@ -1910,8 +1910,7 @@
- 
- 	GtkTreeModel *model;
- 	GError *error = NULL;
--	GtkTooltips *tooltips;
--	tooltips = gtk_tooltips_new();
-+	GtkTooltips *tooltips = gtk_tooltips_new();
- 	GString *str = g_string_new(NULL);
- 	GtkCellRenderer *renderer;
- 	GtkTreeViewColumn *column;
diff --git a/misc/xiphos/files/patch-src::gnome2::note_editor.c b/misc/xiphos/files/patch-src::gnome2::note_editor.c
deleted file mode 100644
index 298dd5532e6f..000000000000
--- a/misc/xiphos/files/patch-src::gnome2::note_editor.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/gnome2/note_editor.c.orig	Thu May  6 19:10:00 2004
-+++ src/gnome2/note_editor.c	Mon Feb 14 15:12:22 2005
-@@ -29,11 +29,11 @@
- #include <gtkhtml/htmlform.h>
- #include <gtkhtml/htmlenums.h>
- #include <gtkhtml/htmlsettings.h>
- #include <gtkhtml/htmlcolor.h>
- #include <gtkhtml/htmlcolorset.h>
--#include <gtkhtml/htmllinktext.h>
-+//#include <gtkhtml/htmllinktext.h>
- #include <gtkhtml/htmlengine-edit.h>
- #include <gtkhtml/htmlengine-edit-fontstyle.h>
- #include <gtkhtml/htmlengine-edit-cut-and-paste.h>
- #include <gtkhtml/htmlselection.h>
- #include <gtkhtml/htmlengine-search.h>
-@@ -1185,17 +1185,33 @@
- 		target = strchr(url, '#');
- 		url_copy =
- 		    target ? g_strndup(url,
- 				       target - url) : g_strdup(url);
- 		new_link =
-+		    html_text_new(text,
-+				       GTK_HTML_FONT_STYLE_DEFAULT,
-+				       html_colorset_get_color(e->
-+							settings->
-+							color_set,
-+							HTMLLinkColor));
-+		new_link =
-+		    html_object_set_link(new_link,
-+				       html_colorset_get_color(e->
-+							settings->
-+							color_set,
-+							HTMLLinkColor),
-+				       url_copy, target);
-+/*
-+		new_link =
- 		    html_link_text_new(text,
- 				       GTK_HTML_FONT_STYLE_DEFAULT,
- 				       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);
- 	}
- }
diff --git a/misc/xiphos/files/patch-src::gnome2::note_toolbar_style.c b/misc/xiphos/files/patch-src::gnome2::note_toolbar_style.c
deleted file mode 100644
index 014a022c06c0..000000000000
--- a/misc/xiphos/files/patch-src::gnome2::note_toolbar_style.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/gnome2/note_toolbar_style.c.orig	Thu Apr 22 14:12:43 2004
-+++ src/gnome2/note_toolbar_style.c	Mon Feb 14 15:20:54 2005
-@@ -469,11 +469,12 @@
- 			    DIALOG_DATA * d)
- {
- 	GSHTMLEditorControlData *cd = d->editor;
- 	color_combo_set_color(COLOR_COMBO(cd->combo),
- 			      &html_colorset_get_color_allocated
--			      (html->engine->painter,
-+			      (cd->html->engine->settings->color_set,
-+			       html->engine->painter,
- 			       HTMLTextColor)->color);
- 
- }
- 
- /******************************************************************************
diff --git a/misc/xiphos/files/patch-src::gnome2::tabbed_browser.c b/misc/xiphos/files/patch-src::gnome2::tabbed_browser.c
deleted file mode 100644
index 52dd1d8f7527..000000000000
--- a/misc/xiphos/files/patch-src::gnome2::tabbed_browser.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gnome2/tabbed_browser.c.orig	Thu Jun 17 04:53:24 2004
-+++ src/gnome2/tabbed_browser.c	Sat Aug 21 15:59:13 2004
-@@ -664,11 +664,13 @@
-  */
- void gui_close_passage_tab(gint pagenum)
- {
-+	PASSAGE_TAB_INFO *pt;
-+
- 	if (-1 == pagenum)
- 		pagenum = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_main));
- 	if (1 == gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)))
- 		return;
--	PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum);
-+	pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum);
- 	passage_list = g_list_remove(passage_list, pt);
- 	if(pt->text_mod) g_free(pt->text_mod);
- 	if(pt->commentary_mod) g_free(pt->commentary_mod);
diff --git a/misc/xiphos/files/patch-src::gnome2::toolbar_style.c b/misc/xiphos/files/patch-src::gnome2::toolbar_style.c
deleted file mode 100644
index ae8c6cd1c6c3..000000000000
--- a/misc/xiphos/files/patch-src::gnome2::toolbar_style.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/gnome2/toolbar_style.c.orig	Thu Apr 22 14:12:43 2004
-+++ src/gnome2/toolbar_style.c	Mon Feb 14 15:23:28 2005
-@@ -460,11 +460,12 @@
- static void set_color_combo(GtkHTML * html,
- 			    GSHTMLEditorControlData * cd)
- {
- 	color_combo_set_color(COLOR_COMBO(cd->combo),
- 			      &html_colorset_get_color_allocated
--			      (html->engine->painter,
-+			      (cd->html->engine->settings->color_set,
-+			       html->engine->painter,
- 			       HTMLTextColor)->color);
- 
- }
- 
- /******************************************************************************
diff --git a/misc/xiphos/pkg-descr b/misc/xiphos/pkg-descr
deleted file mode 100644
index b4df0ae732f5..000000000000
--- a/misc/xiphos/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-The GnomeSword GUI is a frontend to the SWORD project.
-
-The SWORD Project is an effort to create an ever expanding software package
-for research and study of God and His Word. The SWORD Bible Framework allows
-easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc.
-Many frontends are build using this framework. An installed module set may be
-shared between any frontend using the framework.
-
-WWW: http://www.crosswire.org/
-
-// J Shoemaker <shoemaker@softhome.net>
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
deleted file mode 100644
index fbad65b19c46..000000000000
--- a/misc/xiphos/pkg-plist
+++ /dev/null
@@ -1,72 +0,0 @@
-bin/gnomesword2
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/gnomesword.desktop
-share/gnome/help/gnomesword/C/figures/gnomesword_interface.png
-share/gnome/help/gnomesword/C/figures/gnomesword_interface_biblepane.png
-share/gnome/help/gnomesword/C/figures/gnomesword_interface_commentarypane.png
-share/gnome/help/gnomesword/C/figures/gnomesword_interface_sidepane.png
-share/gnome/help/gnomesword/C/figures/gnomesword_interface_toolbar.png
-share/gnome/help/gnomesword/C/figures/gnomesword_preferences_font_colors.png
-share/gnome/help/gnomesword/C/figures/gnomesword_preferences_general.png
-share/gnome/help/gnomesword/C/figures/gnomesword_preferences_sword_config.png
-share/gnome/help/gnomesword/C/figures/gnomesword_studypad.png
-share/gnome/help/gnomesword/C/gnomesword.xml
-share/gnome/help/gnomesword/C/legal.xml
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface_bible.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface_commentarypane.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface_shortcutbar.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_interface_toolbar.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_font_colors.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_misc_settings.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_sword_config.png
-share/gnome/help/gnomesword/fr/figures/gnomesword_studypad.png
-share/gnome/help/gnomesword/fr/gnomesword.xml
-share/gnome/help/gnomesword/fr/legal.xml
-share/gnome/omf/gnomesword/gnomesword-C.omf
-share/gnome/omf/gnomesword/gnomesword-fr.omf
-share/gnome/pixmaps/gnomesword/about.png
-share/gnome/pixmaps/gnomesword/book-bl.png
-share/gnome/pixmaps/gnomesword/book-gold.png
-share/gnome/pixmaps/gnomesword/book-green.png
-share/gnome/pixmaps/gnomesword/book-un.png
-share/gnome/pixmaps/gnomesword/dlg-bl.png
-share/gnome/pixmaps/gnomesword/dlg-un.png
-share/gnome/pixmaps/gnomesword/dock.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmark-page.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmarks.png
-share/gnome/pixmaps/gnomesword/epiphany-secure.png
-share/gnome/pixmaps/gnomesword/epiphany-unsecure.png
-share/gnome/pixmaps/gnomesword/gs2-48x48.png
-share/gnome/pixmaps/gnomesword/logo.png
-share/gnome/pixmaps/gnomesword/new_tab_button.png
-share/gnome/pixmaps/gnomesword/splash.png
-share/gnome/pixmaps/gnomesword/sword.png
-share/gnome/pixmaps/gnomesword/sword3.png
-share/gnome/pixmaps/gnomesword/tt.png
-share/gnome/pixmaps/gnomesword/tt.xpm
-share/locale/de/LC_MESSAGES/gnomesword.mo
-share/locale/de_DE/LC_MESSAGES/gnomesword.mo
-share/locale/en_GB/LC_MESSAGES/gnomesword.mo
-share/locale/fr_FR/LC_MESSAGES/gnomesword.mo
-share/locale/ru/LC_MESSAGES/gnomesword.mo
-share/locale/uk/LC_MESSAGES/gnomesword.mo
-@dirrm share/gnome/pixmaps/gnomesword
-@dirrm share/gnome/omf/gnomesword
-@dirrm share/gnome/help/gnomesword/fr/figures
-@dirrm share/gnome/help/gnomesword/fr
-@dirrm share/gnome/help/gnomesword/C/figures
-@dirrm share/gnome/help/gnomesword/C
-@dirrm share/gnome/help/gnomesword
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 6b622f0ff126..a02d1dd75be5 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -13,7 +13,6 @@
     SUBDIR += beep-media-player
     SUBDIR += bmp-extra-plugins
     SUBDIR += bmpx
-    SUBDIR += bsdav
     SUBDIR += bsdbktr_tvtune
     SUBDIR += camserv
     SUBDIR += castpodder
@@ -180,7 +179,6 @@
     SUBDIR += p5-Subtitles
     SUBDIR += p5-Video-Info
     SUBDIR += p5-Video-OpenQuicktime
-    SUBDIR += pitivi
     SUBDIR += podcatcher
     SUBDIR += poe
     SUBDIR += ppm2fli
diff --git a/multimedia/bsdav/Makefile b/multimedia/bsdav/Makefile
deleted file mode 100644
index ff7ecf25c7cb..000000000000
--- a/multimedia/bsdav/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:   bsdav
-# Date created:        2005-11-04
-# Whom:                Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
-#
-# $FreeBSD$
-# $Id: Makefile,v 1.8 2005/11/19 23:21:24 itetcu Rel $
-#
-
-PORTNAME=	bsdav
-PORTVERSION=	1.3
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.jakemsr.com/bsdav/ \
-		http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
-
-MAINTAINER=	itetcu@people.tecnik93.com
-COMMENT=	BSD native set of programs for audio and video reading and writing
-
-IGNORE=		does not work. We need to import bktv patches from OpenBSD to make it work
-DEPRECATED=	${IGNORE}
-EXPIRATION_DATE=2006-12-01
-
-INSTALLS_SHLIB=	yes
-
-MAN1=		audiorec.1 bktrrec.1 bsdavdemux.1 bsdavrec.1 btv.1 tunerctl.1
-MAN5=		bsdav.5
-PORTDOCS=	README
-
-OPTIONS=	X11 "Build and install player progs (brings X libs)" on
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_X11)
-USE_XLIB=	yes
-MAN1+=		avplay.1 bktrplay.1 bsdavplay.1
-PLIST_SUB+=	X11=""
-.else
-MAKE_ENV+=	NO_X11=true
-PLIST_SUB+=	X11="@comment "
-.endif
-
-.if !( defined(NO_PORTDOCS) || defined(NOPORTDOCS) )
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/multimedia/bsdav/distinfo b/multimedia/bsdav/distinfo
deleted file mode 100644
index 87f574ef39a0..000000000000
--- a/multimedia/bsdav/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (bsdav-1.3.tar.gz) = 61b3bc2383f444432aa11594bde0c279
-SHA256 (bsdav-1.3.tar.gz) = e3fe0c84ca11ad321e28407ebade6896daa2e0682e78c1524e6ed3ce1283196c
-SIZE (bsdav-1.3.tar.gz) = 43367
diff --git a/multimedia/bsdav/files/patch-Makefile b/multimedia/bsdav/files/patch-Makefile
deleted file mode 100644
index 194aebcd21cf..000000000000
--- a/multimedia/bsdav/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.dist	Sat Nov  5 00:06:42 2005
-+++ Makefile	Sat Nov  5 00:27:42 2005
-@@ -171,13 +171,13 @@
- .for i in ${SCRIPTS}
- 	install -c -o ${BINOWN} -g ${BINGRP} -m 555 ${i} ${PREFIX}/bin
- .endfor
--	mkdir -p ${PREFIX}/man/cat1
-+	mkdir -p ${PREFIX}/man/man1
- .for i in ${MAN1S}
--	install -c -o ${MANOWN} -g ${MANGRP} -m 444 ${i} ${PREFIX}/man/cat1
-+	install -c -o ${MANOWN} -g ${MANGRP} -m 444 ${i} ${PREFIX}/man/man1/${i:S/.0$/.1/}
- .endfor
--	mkdir -p ${PREFIX}/man/cat5
-+	mkdir -p ${PREFIX}/man/man5
- .for i in ${MAN5S}
--	install -c -o ${MANOWN} -g ${MANGRP} -m 444 ${i} ${PREFIX}/man/cat5
-+	install -c -o ${MANOWN} -g ${MANGRP} -m 444 ${i} ${PREFIX}/man/man5/${i:S/.0$/.5/}
- .endfor
- 
- 
diff --git a/multimedia/bsdav/files/patch-btv b/multimedia/bsdav/files/patch-btv
deleted file mode 100644
index 9031927078d1..000000000000
--- a/multimedia/bsdav/files/patch-btv
+++ /dev/null
@@ -1,26 +0,0 @@
---- btv.dist	Thu Aug 11 08:37:38 2005
-+++ btv	Sat Nov  5 22:44:15 2005
-@@ -20,7 +20,7 @@
- : ${CHANSET=nabcst}
- 
- 
--function usage
-+usage()
- {
- 	echo "Usage: tv [-vm] [-c channel] [-d directory] [-n norm]"
- 	echo "          [-r command]"
-@@ -34,8 +34,13 @@
- V=""
- RET=0
- 
-+args=`getopt c:d:mn:r:v $*`
-+if [ $? -ne 0 ]
-+then
-+	usage
-+fi
-+set -- ${args}
- 
--set -- `getopt c:d:mn:r:v $*` || usage
- 
- for i
- do
diff --git a/multimedia/bsdav/pkg-descr b/multimedia/bsdav/pkg-descr
deleted file mode 100644
index 30d0289f9a40..000000000000
--- a/multimedia/bsdav/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-The bsdav package is a set of programs for audio and video reading and writing.
-The programs use BSD native devices and the source code is free-as-in-BSD
-licensed as well.The bsdav package also includes a general purpose library,
-libbsdav, for both accessing audio(4) and bktr(4) devices, and simple data
-operations. While one of the goals of the bsdav project is simplicity, another
-goal is to make A/V processing on *BSD systems "easily" accessible. So to ease
-the storage and synchronization of both audio and video streams, bsdav has it's
-own, very simple, A/V container format. Hopefully the bsdav programs are
-written understandably and correclty enough that they may help others
-understand how to use audio(4) and bktr(4).
-
-bsdav consists of:
-        audiorec - record raw audio streams from audio(4) to file
-        bktrrec - record raw video streams from bktr(4) to file
-        avplay - play raw audio and/or raw video streams
-        bktrplay - display video from bktr(4) via Xv(3X)
-        tunerctl - manipulate bktr(4) tuner devices
-        bsdavrec - records audio and/or video in bsdav(5) streams
-        bsdavplay - play audio and/or video in bsdav(5) streams
-        bsdavdemux - extract audio and/or video from bsdav(5) streams
-        btv - shell script frontend for the above programs
-        libbsdav - general purpose *BSD A/V library
diff --git a/multimedia/bsdav/pkg-plist b/multimedia/bsdav/pkg-plist
deleted file mode 100644
index be8b883f4cdb..000000000000
--- a/multimedia/bsdav/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/audiorec
-%%X11%%bin/avplay
-%%X11%%bin/bktrplay
-bin/bktrrec
-bin/bsdavdemux
-%%X11%%bin/bsdavplay
-bin/bsdavrec
-bin/btv
-bin/tunerctl
-include/bsdav.h
-lib/libbsdav.a
-lib/libbsdav.so
-lib/libbsdav.so.1
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
deleted file mode 100644
index 7bf5b2cd11cb..000000000000
--- a/multimedia/pitivi/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	PiTiVi
-# Date created:				20 Dec 2004
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/multimedia/pitivi/Makefile,v 1.8 2006/04/26 19:31:01 ahze Exp $
-
-PORTNAME=	pitivi
-PORTVERSION=	0.10.0
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gstreamer based non-linear audio/video editor
-
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnometarget pygtk2 pkgconfig pygnome2
-USE_GSTREAMER=	gnonlin
-USE_PYTHON=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-docs-build
-USE_LDCONFIG=	yes
-
-.include <bsd.port.pre.mk>
-
-BROKEN=	Installs files during "make all"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
-.if ${ARCH} != "i386"
-BROKEN=		"Configure fails on !i386"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/python|${LOCALBASE}/bin/python|g' \
-		${WRKSRC}/bin/pitivi.in
-	@${REINPLACE_CMD} -e 's|0.1.9|0.1.10|g' \
-		${WRKSRC}/pitivi/ui/mainwindow.py
-
-.include <bsd.port.post.mk>
diff --git a/multimedia/pitivi/distinfo b/multimedia/pitivi/distinfo
deleted file mode 100644
index 7a7f57efcc75..000000000000
--- a/multimedia/pitivi/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pitivi-0.10.0.tar.bz2) = a03b026d0784659905519f59e7abd4e1
-SHA256 (pitivi-0.10.0.tar.bz2) = 73b0d9bf0bc6ff4dc4cbfa4eda3d3e5e2c6154b3d3ec7753650c1982fcf08ad3
-SIZE (pitivi-0.10.0.tar.bz2) = 268532
diff --git a/multimedia/pitivi/pkg-descr b/multimedia/pitivi/pkg-descr
deleted file mode 100644
index 7b34b3dc0dbd..000000000000
--- a/multimedia/pitivi/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-PiTiVi relies on the GStreamer multimedia framework and the accompanying
-plugins to handle the various medias and their transformation. PiTiVi being
-a novelty usage of GStreamer, there are some problems with plugins not 
-handling completely/correctly the GStreamer API. These problems are in 
-the process of being corrected.
-
-This means that it is not guaranteed that all codecs, containers or effects
-work properly with PiTiVi.
-
-WWW: http://www.pitivi.org
diff --git a/multimedia/pitivi/pkg-plist b/multimedia/pitivi/pkg-plist
deleted file mode 100644
index 7e2ac53b290d..000000000000
--- a/multimedia/pitivi/pkg-plist
+++ /dev/null
@@ -1,124 +0,0 @@
-bin/pitivi
-lib/pitivi/python/pitivi/__init__.py
-lib/pitivi/python/pitivi/__init__.pyc
-lib/pitivi/python/pitivi/__init__.pyo
-lib/pitivi/python/pitivi/bin.py
-lib/pitivi/python/pitivi/bin.pyc
-lib/pitivi/python/pitivi/bin.pyo
-lib/pitivi/python/pitivi/check.py
-lib/pitivi/python/pitivi/check.pyc
-lib/pitivi/python/pitivi/check.pyo
-lib/pitivi/python/pitivi/configure.py
-lib/pitivi/python/pitivi/configure.pyc
-lib/pitivi/python/pitivi/configure.pyo
-lib/pitivi/python/pitivi/discoverer.py
-lib/pitivi/python/pitivi/discoverer.pyc
-lib/pitivi/python/pitivi/discoverer.pyo
-lib/pitivi/python/pitivi/dnd.py
-lib/pitivi/python/pitivi/dnd.pyc
-lib/pitivi/python/pitivi/dnd.pyo
-lib/pitivi/python/pitivi/effects.py
-lib/pitivi/python/pitivi/effects.pyc
-lib/pitivi/python/pitivi/effects.pyo
-lib/pitivi/python/pitivi/instance.py
-lib/pitivi/python/pitivi/instance.pyc
-lib/pitivi/python/pitivi/instance.pyo
-lib/pitivi/python/pitivi/objectfactory.py
-lib/pitivi/python/pitivi/objectfactory.pyc
-lib/pitivi/python/pitivi/objectfactory.pyo
-lib/pitivi/python/pitivi/pitivi.py
-lib/pitivi/python/pitivi/pitivi.pyc
-lib/pitivi/python/pitivi/pitivi.pyo
-lib/pitivi/python/pitivi/playground.py
-lib/pitivi/python/pitivi/playground.pyc
-lib/pitivi/python/pitivi/playground.pyo
-lib/pitivi/python/pitivi/project.py
-lib/pitivi/python/pitivi/project.pyc
-lib/pitivi/python/pitivi/project.pyo
-lib/pitivi/python/pitivi/settings.py
-lib/pitivi/python/pitivi/settings.pyc
-lib/pitivi/python/pitivi/settings.pyo
-lib/pitivi/python/pitivi/sourcelist.py
-lib/pitivi/python/pitivi/sourcelist.pyc
-lib/pitivi/python/pitivi/sourcelist.pyo
-lib/pitivi/python/pitivi/timeline.py
-lib/pitivi/python/pitivi/timeline.pyc
-lib/pitivi/python/pitivi/timeline.pyo
-lib/pitivi/python/pitivi/ui/__init__.py
-lib/pitivi/python/pitivi/ui/__init__.pyc
-lib/pitivi/python/pitivi/ui/__init__.pyo
-lib/pitivi/python/pitivi/ui/actions.xml
-lib/pitivi/python/pitivi/ui/complexinterface.py
-lib/pitivi/python/pitivi/ui/complexinterface.pyc
-lib/pitivi/python/pitivi/ui/complexinterface.pyo
-lib/pitivi/python/pitivi/ui/complexlayer.py
-lib/pitivi/python/pitivi/ui/complexlayer.pyc
-lib/pitivi/python/pitivi/ui/complexlayer.pyo
-lib/pitivi/python/pitivi/ui/complexsource.py
-lib/pitivi/python/pitivi/ui/complexsource.pyc
-lib/pitivi/python/pitivi/ui/complexsource.pyo
-lib/pitivi/python/pitivi/ui/complextimeline.py
-lib/pitivi/python/pitivi/ui/complextimeline.pyc
-lib/pitivi/python/pitivi/ui/complextimeline.pyo
-lib/pitivi/python/pitivi/ui/discoverererrordialog.glade
-lib/pitivi/python/pitivi/ui/elementsettingsdialog.glade
-lib/pitivi/python/pitivi/ui/encodingdialog.glade
-lib/pitivi/python/pitivi/ui/exportsettingswidget.glade
-lib/pitivi/python/pitivi/ui/exportsettingswidget.py
-lib/pitivi/python/pitivi/ui/exportsettingswidget.pyc
-lib/pitivi/python/pitivi/ui/exportsettingswidget.pyo
-lib/pitivi/python/pitivi/ui/glade.py
-lib/pitivi/python/pitivi/ui/glade.pyc
-lib/pitivi/python/pitivi/ui/glade.pyo
-lib/pitivi/python/pitivi/ui/gstwidget.py
-lib/pitivi/python/pitivi/ui/gstwidget.pyc
-lib/pitivi/python/pitivi/ui/gstwidget.pyo
-lib/pitivi/python/pitivi/ui/infolayer.py
-lib/pitivi/python/pitivi/ui/infolayer.pyc
-lib/pitivi/python/pitivi/ui/infolayer.pyo
-lib/pitivi/python/pitivi/ui/layerwidgets.py
-lib/pitivi/python/pitivi/ui/layerwidgets.pyc
-lib/pitivi/python/pitivi/ui/layerwidgets.pyo
-lib/pitivi/python/pitivi/ui/mainwindow.py
-lib/pitivi/python/pitivi/ui/mainwindow.pyc
-lib/pitivi/python/pitivi/ui/mainwindow.pyo
-lib/pitivi/python/pitivi/ui/plumber.py
-lib/pitivi/python/pitivi/ui/plumber.pyc
-lib/pitivi/python/pitivi/ui/plumber.pyo
-lib/pitivi/python/pitivi/ui/projectsettings.glade
-lib/pitivi/python/pitivi/ui/projectsettings.py
-lib/pitivi/python/pitivi/ui/projectsettings.pyc
-lib/pitivi/python/pitivi/ui/projectsettings.pyo
-lib/pitivi/python/pitivi/ui/ruler.py
-lib/pitivi/python/pitivi/ui/ruler.pyc
-lib/pitivi/python/pitivi/ui/ruler.pyo
-lib/pitivi/python/pitivi/ui/sourcefactories.py
-lib/pitivi/python/pitivi/ui/sourcefactories.pyc
-lib/pitivi/python/pitivi/ui/sourcefactories.pyo
-lib/pitivi/python/pitivi/ui/timeline.py
-lib/pitivi/python/pitivi/ui/timeline.pyc
-lib/pitivi/python/pitivi/ui/timeline.pyo
-lib/pitivi/python/pitivi/ui/timelineobjects.py
-lib/pitivi/python/pitivi/ui/timelineobjects.pyc
-lib/pitivi/python/pitivi/ui/timelineobjects.pyo
-lib/pitivi/python/pitivi/ui/tracklayer.py
-lib/pitivi/python/pitivi/ui/tracklayer.pyc
-lib/pitivi/python/pitivi/ui/tracklayer.pyo
-lib/pitivi/python/pitivi/ui/viewer.py
-lib/pitivi/python/pitivi/ui/viewer.pyc
-lib/pitivi/python/pitivi/ui/viewer.pyo
-lib/pitivi/python/pitivi/utils.py
-lib/pitivi/python/pitivi/utils.pyc
-lib/pitivi/python/pitivi/utils.pyo
-share/applications/pitivi.desktop
-%%DATADIR%%/pixmaps/pitivi-file.png
-%%DATADIR%%/pixmaps/pitivi-sound.png
-%%DATADIR%%/pixmaps/pitivi-video.png
-share/pixmaps/pitivi.png
-@dirrmtry share/pixmaps
-@dirrm %%DATADIR%%/pixmaps
-@dirrm share/pitivi
-@dirrm lib/pitivi/python/pitivi/ui
-@dirrm lib/pitivi/python/pitivi
-@dirrm lib/pitivi/python
-@dirrm lib/pitivi