4 files changed, 38 insertions, 9 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 290268fc1c80..b9704e61d0c9 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTVERSION=	0.7.9
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,9 +21,6 @@ USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/home/david/jhbuilt/share|${LOCALBASE}/share|' ${WRKSRC}/intltool-merge.in
-
 post-install:
 	${MKDIR} ${PREFIX}/share/gnome/${PORTNAME}/help
 	${LN} -sf ${PREFIX}/share/gnome/help/${PORTNAME} ${PREFIX}/share/gnome/${PORTNAME}/help/${PORTNAME}
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index 13f4014e92c7..a1b1e7a2cd3d 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1 +1 @@
-MD5 (conglomerate-0.7.8.tar.gz) = 22ca1070b17d1438da155fb5e0c2af58
+MD5 (conglomerate-0.7.9.tar.gz) = fb5355763a53c1ed59dc02dd14e0fac6
diff --git a/editors/conglomerate/files/patch-configure b/editors/conglomerate/files/patch-configure
index f195f07b43c6..b2ca39f6e4d4 100644
--- a/editors/conglomerate/files/patch-configure
+++ b/editors/conglomerate/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
+--- configure.orig	Mon Jan  5 04:13:36 2004
++++ configure	Mon Jan  5 04:17:09 2004
+@@ -8502,6 +8502,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,19 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -10535,15 +10536,6 @@
+   GTKDOC=false
+ fi
+ 
+-# Check whether --enable-gtk-doc or --disable-gtk-doc was given.
+-if test "${enable_gtk_doc+set}" = set; then
+-  enableval="$enable_gtk_doc"
+-  enable_gtk_doc="$enableval"
+-else
+-  enable_gtk_doc=yes
+-fi;
+-
+-    enable_gtk_doc=yes
+ 
+ 
+ 
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index d57bd17e6b3e..0543f19241ff 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,4 +1,11 @@
 bin/conglomerate
+etc/gconf/gconf.xml.defaults/apps/conglomerate/plugins/templates/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/conglomerate/plugins/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/conglomerate/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins/templates/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/%gconf.xml
+etc/gconf/schemas/conglomerate.schemas
 share/doc/conglomerate/ch01.html
 share/doc/conglomerate/ch02.html
 share/doc/conglomerate/ch03.html
@@ -38,6 +45,7 @@ share/gnome/conglomerate/glade/docbook-common-properties.glade
 share/gnome/conglomerate/glade/docbook-orderedlist-properties.glade
 share/gnome/conglomerate/glade/docbook-ulink-properties.glade
 share/gnome/conglomerate/glade/string_selection_dialog.glade
+share/gnome/conglomerate/help/conglomerate
 share/gnome/conglomerate/pixmaps/conglomerate-icon-32.png
 share/gnome/conglomerate/pixmaps/cong-address-16.png
 share/gnome/conglomerate/pixmaps/cong-answer-16.png
@@ -72,6 +80,7 @@ share/gnome/conglomerate/pixmaps/cong-tip-48.png
 share/gnome/conglomerate/pixmaps/cong-title-16.png
 share/gnome/conglomerate/pixmaps/cong-warning-48.png
 share/gnome/conglomerate/pixmaps/cong-wrapper-16.png
+share/gnome/conglomerate/stylesheets/selection-to-text.xsl
 share/gnome/conglomerate/templates/dispspec.xml
 share/gnome/conglomerate/templates/html.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
@@ -112,6 +121,14 @@ share/locale/sv/LC_MESSAGES/conglomerate.mo
 @dirrm share/gnome/conglomerate/dtd
 @dirrm share/gnome/conglomerate/examples
 @dirrm share/gnome/conglomerate/glade
+@dirrm share/gnome/conglomerate/help
 @dirrm share/gnome/conglomerate/pixmaps
+@dirrm share/gnome/conglomerate/stylesheets
 @dirrm share/gnome/conglomerate/templates
 @dirrm share/gnome/conglomerate
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins/templates
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate
+@dirrm etc/gconf/gconf.xml.defaults/apps/conglomerate/plugins/templates
+@dirrm etc/gconf/gconf.xml.defaults/apps/conglomerate/plugins
+@dirrm etc/gconf/gconf.xml.defaults/apps/conglomerate