* Update to 0.7.8 which fixes build with GtkHTML-1.1

* Set maintainer to ports@ since the previous maintainer is no longer
  maintaining this port

12 files changed, 168 insertions, 38 deletions

diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index c8e8962dc724..4c17512daf38 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=		gnomesword
-PORTVERSION=		0.7.5
-PORTREVISION=		1
+PORTVERSION=		0.7.8
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		shoemaker@softhome.net
-COMMENT=	A bible interface utilizing the sword framework
+MAINTAINER=		ports@freebsd.org
+COMMENT=		A bible interface utilizing the sword framework
 
 LIB_DEPENDS=		sword.1:${PORTSDIR}/misc/sword
 BUILD_DEPENDS=		aspell:${PORTSDIR}/textproc/aspell
@@ -26,9 +25,6 @@ GNU_CONFIGURE=		yes
 
 DOC_FILES=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
-post-configure:
-	${ECHO} "#define PACKAGE_PIXMAPS_DIR \"${PREFIX}/share/gnome/pixmaps/gnomesword\"">> ${WRKSRC}/config.h
-
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/misc/gnomesword/distinfo b/misc/gnomesword/distinfo
index cd542889d3ad..524bf19f2579 100644
--- a/misc/gnomesword/distinfo
+++ b/misc/gnomesword/distinfo
@@ -1 +1 @@
-MD5 (gnomesword-0.7.5.tar.gz) = 674d410cc64ef76c570ed657e521c7aa
+MD5 (gnomesword-0.7.8.tar.gz) = 18952dda9a437c1f8f04151c128a2f3a
diff --git a/misc/gnomesword/files/patch-Makefile.in b/misc/gnomesword/files/patch-Makefile.in
index afbae2ab5af3..ea6e97fcf042 100644
--- a/misc/gnomesword/files/patch-Makefile.in
+++ b/misc/gnomesword/files/patch-Makefile.in
@@ -1,18 +1,27 @@
---- Makefile.in.orig	Wed Oct 16 11:05:14 2002
-+++ Makefile.in	Wed Oct 16 11:06:31 2002
-@@ -136,13 +136,13 @@
+--- 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
  
  gnomesworddocdir = $(prefix)/doc/gnomesword
--gnomesworddoc_DATA =   	   README 	    COPYING 	    AUTHORS 	    ChangeLog 	    INSTALL 	    NEWS 	    TODO
-+gnomesworddoc_DATA =   	  # README 	    COPYING 	    AUTHORS 	    ChangeLog 	    INSTALL 	    NEWS 	    TODO
+-gnomesworddoc_DATA = \
+- 	   README\
+-	    COPYING\
+-	    AUTHORS\
+-	    ChangeLog\
+-	    INSTALL\
+-	    NEWS\
+-	    TODO
++gnomesworddoc_DATA = 
  
+ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -155,7 +148,7 @@
  CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = 
--DATA =  $(gnomesworddoc_DATA)
-+DATA =  # $(gnomesworddoc_DATA)
+ CONFIG_CLEAN_FILES = intl/Makefile
+ DIST_SOURCES =
+-DATA = $(gnomesworddoc_DATA)
++DATA = # $(gnomesworddoc_DATA)
  
- DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
- INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
+ 
+ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
diff --git a/misc/gnomesword/files/patch-configure b/misc/gnomesword/files/patch-configure
new file mode 100644
index 000000000000..e9323f3b5252
--- /dev/null
+++ b/misc/gnomesword/files/patch-configure
@@ -0,0 +1,28 @@
+--- 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-src_Makefile.in b/misc/gnomesword/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..4b37f359d9a6
--- /dev/null
+++ b/misc/gnomesword/files/patch-src_Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	Fri Feb 28 17:24:26 2003
++++ src/Makefile.in	Fri Feb 28 17:24:48 2003
+@@ -144,6 +144,7 @@
+     $(PIXBUF_CFLAGS) \
+     $(SWORD_CPPFLAGS) \
+     $(PACKAGE_CFLAGS) \
++    $(GNOME_APP_CFLAGS) \
+     -I/usr/include/gnome-1.0/
+ 
+ 
diff --git a/misc/gnomesword/files/patch-src_gs_editor.c b/misc/gnomesword/files/patch-src_gs_editor.c
new file mode 100644
index 000000000000..6bfe1c65d935
--- /dev/null
+++ b/misc/gnomesword/files/patch-src_gs_editor.c
@@ -0,0 +1,22 @@
+--- src/gs_editor.c.orig	Fri Feb 28 17:32:42 2003
++++ src/gs_editor.c	Fri Feb 28 17:33:19 2003
+@@ -1252,6 +1252,10 @@
+ 		   GSHTMLEditorControlData * ecd)
+ {
+ 	gchar buf[256], *target = "";
++#ifdef USE_GTKHTML1
++	const gchar *url;
++	const gchar *text;
++#endif
+ 	
+ 	HTMLEngine *e = ecd->html->engine;	
+ 	if (strlen(linkmod))
+@@ -1260,8 +1264,6 @@
+ 		sprintf(buf, "passage=%s", linkref);
+ 	
+ #ifdef USE_GTKHTML1
+-	const gchar *url;
+-	const gchar *text;
+ 	url = buf;
+ 	text = linkref;
+ 	if (url && text && *url && *text) {
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index c8e8962dc724..4c17512daf38 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=		gnomesword
-PORTVERSION=		0.7.5
-PORTREVISION=		1
+PORTVERSION=		0.7.8
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		shoemaker@softhome.net
-COMMENT=	A bible interface utilizing the sword framework
+MAINTAINER=		ports@freebsd.org
+COMMENT=		A bible interface utilizing the sword framework
 
 LIB_DEPENDS=		sword.1:${PORTSDIR}/misc/sword
 BUILD_DEPENDS=		aspell:${PORTSDIR}/textproc/aspell
@@ -26,9 +25,6 @@ GNU_CONFIGURE=		yes
 
 DOC_FILES=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
-post-configure:
-	${ECHO} "#define PACKAGE_PIXMAPS_DIR \"${PREFIX}/share/gnome/pixmaps/gnomesword\"">> ${WRKSRC}/config.h
-
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo
index cd542889d3ad..524bf19f2579 100644
--- a/misc/xiphos/distinfo
+++ b/misc/xiphos/distinfo
@@ -1 +1 @@
-MD5 (gnomesword-0.7.5.tar.gz) = 674d410cc64ef76c570ed657e521c7aa
+MD5 (gnomesword-0.7.8.tar.gz) = 18952dda9a437c1f8f04151c128a2f3a
diff --git a/misc/xiphos/files/patch-Makefile.in b/misc/xiphos/files/patch-Makefile.in
index afbae2ab5af3..ea6e97fcf042 100644
--- a/misc/xiphos/files/patch-Makefile.in
+++ b/misc/xiphos/files/patch-Makefile.in
@@ -1,18 +1,27 @@
---- Makefile.in.orig	Wed Oct 16 11:05:14 2002
-+++ Makefile.in	Wed Oct 16 11:06:31 2002
-@@ -136,13 +136,13 @@
+--- 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
  
  gnomesworddocdir = $(prefix)/doc/gnomesword
--gnomesworddoc_DATA =   	   README 	    COPYING 	    AUTHORS 	    ChangeLog 	    INSTALL 	    NEWS 	    TODO
-+gnomesworddoc_DATA =   	  # README 	    COPYING 	    AUTHORS 	    ChangeLog 	    INSTALL 	    NEWS 	    TODO
+-gnomesworddoc_DATA = \
+- 	   README\
+-	    COPYING\
+-	    AUTHORS\
+-	    ChangeLog\
+-	    INSTALL\
+-	    NEWS\
+-	    TODO
++gnomesworddoc_DATA = 
  
+ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -155,7 +148,7 @@
  CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = 
--DATA =  $(gnomesworddoc_DATA)
-+DATA =  # $(gnomesworddoc_DATA)
+ CONFIG_CLEAN_FILES = intl/Makefile
+ DIST_SOURCES =
+-DATA = $(gnomesworddoc_DATA)
++DATA = # $(gnomesworddoc_DATA)
  
- DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
- INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
+ 
+ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
diff --git a/misc/xiphos/files/patch-configure b/misc/xiphos/files/patch-configure
new file mode 100644
index 000000000000..e9323f3b5252
--- /dev/null
+++ b/misc/xiphos/files/patch-configure
@@ -0,0 +1,28 @@
+--- 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-src_Makefile.in b/misc/xiphos/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..4b37f359d9a6
--- /dev/null
+++ b/misc/xiphos/files/patch-src_Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	Fri Feb 28 17:24:26 2003
++++ src/Makefile.in	Fri Feb 28 17:24:48 2003
+@@ -144,6 +144,7 @@
+     $(PIXBUF_CFLAGS) \
+     $(SWORD_CPPFLAGS) \
+     $(PACKAGE_CFLAGS) \
++    $(GNOME_APP_CFLAGS) \
+     -I/usr/include/gnome-1.0/
+ 
+ 
diff --git a/misc/xiphos/files/patch-src_gs_editor.c b/misc/xiphos/files/patch-src_gs_editor.c
new file mode 100644
index 000000000000..6bfe1c65d935
--- /dev/null
+++ b/misc/xiphos/files/patch-src_gs_editor.c
@@ -0,0 +1,22 @@
+--- src/gs_editor.c.orig	Fri Feb 28 17:32:42 2003
++++ src/gs_editor.c	Fri Feb 28 17:33:19 2003
+@@ -1252,6 +1252,10 @@
+ 		   GSHTMLEditorControlData * ecd)
+ {
+ 	gchar buf[256], *target = "";
++#ifdef USE_GTKHTML1
++	const gchar *url;
++	const gchar *text;
++#endif
+ 	
+ 	HTMLEngine *e = ecd->html->engine;	
+ 	if (strlen(linkmod))
+@@ -1260,8 +1264,6 @@
+ 		sprintf(buf, "passage=%s", linkref);
+ 	
+ #ifdef USE_GTKHTML1
+-	const gchar *url;
+-	const gchar *text;
+ 	url = buf;
+ 	text = linkref;
+ 	if (url && text && *url && *text) {