svn commit: r306896 - in head/x11/yelp: . files

[Koop Mast]

Author: kwm
Date: Sat Nov  3 02:34:41 2012
New Revision: 306896
URL: http://svn.freebsd.org/changeset/ports/306896

Log:
  De-libxul yelp. Use a webkit based sourceball found in gentoo portage. Which
  was made by the OpenSuse people. This allows gnome2 to be packaged again. I
  planned to do this update after 9.1 was released but I completely forgot about
  packages for the release [1].
  
  While here update Makefile header, remove shlib versions and update CONFLICT
  for the gnome3 version when that arrives.
  
  Reminded by:    mandree@ [1]
  Obtained from:  gnome stage area
  Feature safe:	yes

Deleted:
  head/x11/yelp/files/patch-src_yelp-gecko-utils.cpp
  head/x11/yelp/files/patch-src_yelp-window.c
Modified:
  head/x11/yelp/Makefile
  head/x11/yelp/distinfo

Modified: head/x11/yelp/Makefile
==============================================================================
--- head/x11/yelp/Makefile	Sat Nov  3 01:03:59 2012	(r306895)
+++ head/x11/yelp/Makefile	Sat Nov  3 02:34:41 2012	(r306896)
@@ -1,28 +1,25 @@
-# New ports collection makefile for:	yelp
-# Date created:				18 May 2002
-# Whom:					Maxim Sobolev <sobomax at FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/x11/yelp/Makefile,v 1.164 2010/10/18 13:37:34 kwm Exp $
-#
+#   $MCom: ports/x11/yelp/Makefile,v 1.171 2012/10/01 16:19:07 kwm Exp $
 
 PORTNAME=	yelp
 PORTVERSION=	2.30.2
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	x11 gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	LOCAL/kwm
+DISTNAME=	${PORTNAME}-webkit-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	A help browser for the GNOME 2 desktop
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-    		rarian.0:${PORTSDIR}/textproc/rarian
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		startup-notification-1:${PORTSDIR}/x11/startup-notification \
+		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \
+		rarian:${PORTSDIR}/textproc/rarian
 
-CONFLICTS=	yelp-2.31.*
+CONFLICTS=	yelp-3.[0-9]*
 
-USE_GECKO=	libxul19
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_XORG=	ice
@@ -32,8 +29,6 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-gecko=${GECKO:S/19//} \
-		--with-gecko-home=${LOCALBASE}/lib/${GECKO:S/19//}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GCONF_SCHEMAS=	yelp.schemas

Modified: head/x11/yelp/distinfo
==============================================================================
--- head/x11/yelp/distinfo	Sat Nov  3 01:03:59 2012	(r306895)
+++ head/x11/yelp/distinfo	Sat Nov  3 02:34:41 2012	(r306896)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/yelp-2.30.2.tar.bz2) = 5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165
-SIZE (gnome2/yelp-2.30.2.tar.bz2) = 1159521
+SHA256 (gnome2/yelp-webkit-2.30.2.tar.bz2) = 8c49dffecdc07dfe1e1b03f6ec3c32c523650802b6aebaf0b232aaa1af5e9f88
+SIZE (gnome2/yelp-webkit-2.30.2.tar.bz2) = 1125815