- Update to 1.9.1

- Change maintainership.

PR:           56591
Submitted by: Pav Lucistnik <pav@oook.cz>

5 files changed, 17 insertions, 89 deletions

diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index a010c68b6462..6311587cee0c 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -6,27 +6,19 @@
 #
 
 PORTNAME=	peacock
-PORTVERSION=	0.4
+PORTVERSION=	1.9.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pav@oook.cz
 COMMENT=	A GUI-based HTML Editor for GTK+/GNOME
 
-USE_REINPLACE=	yes
+LIB_DEPENDS=	gtkhtml-3.0.3:${PORTSDIR}/www/gtkhtml3
+
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOME=	gnomeprefix gnomehack libgnomeui gtksourceview
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\$$(datadir)/gnome/|$$(datadir)/|g ; \
-		 s|\$$(datadir)/locale|$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/www/peacock/distinfo b/www/peacock/distinfo
index 42b697e4f388..b17e00e8a586 100644
--- a/www/peacock/distinfo
+++ b/www/peacock/distinfo
@@ -1 +1 @@
-MD5 (peacock-0.4.tar.gz) = 7d8220a5d084c031786f9db521d77feb
+MD5 (peacock-1.9.1.tar.gz) = 85283f1c5f6e271ed7f977b18d7504b0
diff --git a/www/peacock/files/patch-src:Makefile.in b/www/peacock/files/patch-src:Makefile.in
deleted file mode 100644
index dce3bd13a323..000000000000
--- a/www/peacock/files/patch-src:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Wed Dec 19 22:46:13 2001
-+++ src/Makefile.in	Thu Dec 20 01:34:57 2001
-@@ -113,7 +113,7 @@
- 
- SUBDIRS = dialogs
- 
--INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/intl 	$(GTKHTML_CFLAGS)	$(GNOME_INCLUDEDIR)
- 
- 
- bin_PROGRAMS = peacock
diff --git a/www/peacock/pkg-descr b/www/peacock/pkg-descr
index ae377fb09dd2..bc58ea711245 100644
--- a/www/peacock/pkg-descr
+++ b/www/peacock/pkg-descr
@@ -1,9 +1,5 @@
-Peacock is a GUI-based HTML Editor for GTK+/GNOME.
-Its still in its infancy. Very, very alpha.
-The version number speaks for itself.  Its not a WYSIWYG HTML Editor.
-Its like Homesite for Win32 (or much closer to home), Bluefish for GTK+.
-You have to type your HTML yourself. But there are these 'HTML Toolbars'
-which allow easy and quick entry of commonly used tags, thus saving you
-time and keystrokes. 
+Peacock is a GUI-based HTML Editor for GNOME 2. It is a WYSIWYG HTML
+editor, using GtkHTML control known from Evolution.  It supports most
+of HTML 4.0 standards, templates for documents, styles and images.
 
 http://peacock.sourceforge.net/
diff --git a/www/peacock/pkg-plist b/www/peacock/pkg-plist
index a55ef9d30eb3..cf58da995534 100644
--- a/www/peacock/pkg-plist
+++ b/www/peacock/pkg-plist
@@ -1,57 +1,8 @@
-bin/peacock
-share/gnome/apps/Development/peacock.desktop
-share/gnome/help/peacock/C/authors.html
-share/gnome/help/peacock/C/bugs.html
-share/gnome/help/peacock/C/docbook.css
-share/gnome/help/peacock/C/features.html
-share/gnome/help/peacock/C/peacock.html
-share/gnome/help/peacock/C/topic.dat
-share/gnome/help/peacock/C/x34.html
-share/gnome/peacock/glade/dialogs-html.glade
-share/gnome/peacock/glade/dialogs-html.glade.h
-share/gnome/pixmaps/peacock/anchor.xpm
-share/gnome/pixmaps/peacock/br.xpm
-share/gnome/pixmaps/peacock/font_base.xpm
-share/gnome/pixmaps/peacock/font_em.xpm
-share/gnome/pixmaps/peacock/font_kbd.xpm
-share/gnome/pixmaps/peacock/font_minus.xpm
-share/gnome/pixmaps/peacock/font_plus.xpm
-share/gnome/pixmaps/peacock/font_pre.xpm
-share/gnome/pixmaps/peacock/font_sub.xpm
-share/gnome/pixmaps/peacock/font_sup.xpm
-share/gnome/pixmaps/peacock/font_tt.xpm
-share/gnome/pixmaps/peacock/form_chkbtn.xpm
-share/gnome/pixmaps/peacock/form_entry.xpm
-share/gnome/pixmaps/peacock/form_form.xpm
-share/gnome/pixmaps/peacock/form_options.xpm
-share/gnome/pixmaps/peacock/form_rdbtn.xpm
-share/gnome/pixmaps/peacock/form_text.xpm
-share/gnome/pixmaps/peacock/h1.xpm
-share/gnome/pixmaps/peacock/h2.xpm
-share/gnome/pixmaps/peacock/h3.xpm
-share/gnome/pixmaps/peacock/h4.xpm
-share/gnome/pixmaps/peacock/h5.xpm
-share/gnome/pixmaps/peacock/h6.xpm
-share/gnome/pixmaps/peacock/help.xpm
-share/gnome/pixmaps/peacock/hr.xpm
-share/gnome/pixmaps/peacock/image.xpm
-share/gnome/pixmaps/peacock/list_dd.xpm
-share/gnome/pixmaps/peacock/list_dir.xpm
-share/gnome/pixmaps/peacock/list_dl.xpm
-share/gnome/pixmaps/peacock/list_dt.xpm
-share/gnome/pixmaps/peacock/list_li.xpm
-share/gnome/pixmaps/peacock/list_menu.xpm
-share/gnome/pixmaps/peacock/list_ol.xpm
-share/gnome/pixmaps/peacock/list_ul.xpm
-share/gnome/pixmaps/peacock/nbsp.xpm
-share/gnome/pixmaps/peacock/paragraph.xpm
-share/gnome/pixmaps/peacock/table_table.xpm
-share/gnome/pixmaps/peacock/table_td.xpm
-share/gnome/pixmaps/peacock/table_th.xpm
-share/gnome/pixmaps/peacock/table_tr.xpm
-@dirrm share/gnome/pixmaps/peacock
-@dirrm share/gnome/peacock/glade
-@dirrm share/gnome/peacock
-@dirrm share/gnome/help/peacock/C/images
-@dirrm share/gnome/help/peacock/C
-@dirrm share/gnome/help/peacock
+bin/peacock-2
+share/gnome/peacock-2/glade/dialogs.glade
+share/gnome/peacock-2/pixmaps/peacock-logo.png
+share/gnome/peacock-2/ui/peacock-ui.xml
+@dirrm share/gnome/peacock-2/ui
+@dirrm share/gnome/peacock-2/pixmaps
+@dirrm share/gnome/peacock-2/glade
+@dirrm share/gnome/peacock-2