From owner-svn-ports-all@FreeBSD.ORG Sat Nov 3 02:34:42 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F1CE35A7; Sat, 3 Nov 2012 02:34:41 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B94AE8FC08; Sat, 3 Nov 2012 02:34:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA32YfdY059635; Sat, 3 Nov 2012 02:34:41 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA32Yf3E059632; Sat, 3 Nov 2012 02:34:41 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201211030234.qA32Yf3E059632@svn.freebsd.org> From: Koop Mast Date: Sat, 3 Nov 2012 02:34:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306896 - in head/x11/yelp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2012 02:34:42 -0000 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 -# +# Created by: Maxim Sobolev # $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@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