From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 23 01:30:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D14B16A60D for ; Tue, 23 May 2006 01:30:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71BA543D4C for ; Tue, 23 May 2006 01:30:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4N1UMHH092420 for ; Tue, 23 May 2006 01:30:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4N1UMvq092419; Tue, 23 May 2006 01:30:22 GMT (envelope-from gnats) Resent-Date: Tue, 23 May 2006 01:30:22 GMT Resent-Message-Id: <200605230130.k4N1UMvq092419@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Eric P. Scott" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6239516A5DB for ; Tue, 23 May 2006 01:27:02 +0000 (UTC) (envelope-from eps@anna.ana.com) Received: from anna.ana.com (anna.ana.com [207.7.142.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id EED0843D5C for ; Tue, 23 May 2006 01:27:00 +0000 (GMT) (envelope-from eps@anna.ana.com) Received: from anna.ana.com (localhost [127.0.0.1]) by anna.ana.com (8.13.5/8.13.5) with ESMTP id k4N1TqKI006714 for ; Mon, 22 May 2006 18:29:53 -0700 (PDT) Received: (from eps@localhost) by anna.ana.com (8.13.5/8.13.5/Submit) id k4N1Tq4Z006713; Mon, 22 May 2006 18:29:52 -0700 (PDT) Message-Id: <200605230129.k4N1Tq4Z006713@anna.ana.com> Date: Mon, 22 May 2006 18:29:52 -0700 (PDT) From: "Eric P. Scott" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/97669: upgrade net-im/linux-ymessenger to 1.0.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Eric P. Scott" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 May 2006 01:30:23 -0000 >Number: 97669 >Category: ports >Synopsis: upgrade net-im/linux-ymessenger to 1.0.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue May 23 01:30:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Eric P. Scott >Release: FreeBSD 6.1-RELEASE i386 >Organization: ana-systems, Inc. >Environment: System: FreeBSD tools 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:32:43 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: Since net-im/ymessenger is currently marked BROKEN, I figured I'd have better luck with net-im/linux-ymessenger. The proposed diff that follows: + upgrades linux-ymessenger from 1.0.4 to 1.0.6 + merges in the 1.0.6_1 executable + works around a preferences corruption bug that can cause ymessenger to crash on startup To do: determine if any prerequisite tests are missing from the Makefile. Other issues: this port depends on graphics/linux-gdk-pixbuf, which is marked as conflicting with x11-toolkits/linux-gtk2. The latter is used by things like multimedia/linux-realplayer and print/acroread7. Manually installing just the shared libraries from the linux-gdk-pixbuf-0.22.0.12.fc2_1.tbz package seems to allow both to coexist. (Hopefully, someone will come up with a better solution.) >How-To-Repeat: >Fix: --- net-im/linux-ymessenger/Makefile.orig Tue Nov 8 23:48:14 2005 +++ net-im/linux-ymessenger/Makefile Mon May 22 17:49:21 2006 @@ -2,16 +2,17 @@ # Date created: 23 December 2003 # Whom: Seth Kingsley # -# $FreeBSD: ports/net-im/linux-ymessenger/Makefile,v 1.7 2005/11/09 07:48:14 pav Exp $ +# $FreeBSD$ # PORTNAME= ymessenger -PORTVERSION= 1.0.4.1 +PORTVERSION= 1.0.6.1 CATEGORIES= net-im -MASTER_SITES= http://download.yahoo.com/dl/unix/ +MASTER_SITES= http://public.yahoo.com/%7Emmk/ PKGNAMEPREFIX= linux- -DISTNAME= rh${BASEVERSION:C/([^\.])\..*/\1/}.${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${MACHINE_ARCH} -EXTRACT_SUFX= .rpm +DISTNAME= rh9.${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${MACHINE_ARCH} +DISTFILES= ${DISTNAME}.rpm ymessenger.bin +EXTRACT_ONLY= ${DISTNAME}.rpm MAINTAINER= sethk@meowfishies.com COMMENT= An RPM of Yahoo! Messenger instant messaging client @@ -27,9 +28,6 @@ STRIP= NO_FILTER_SHLIBS=yes -# Set the version of linux_base -BASEVERSION?= 7.1 - SHARE_FILES= yahoo_gnome.png yahoo_kde.xpm ymessenger.desktop\ ymessenger.kdelnk @@ -39,9 +37,12 @@ @for rpm in ${EXTRACT_ONLY}; do\ (cd ${WRKDIR} &&\ rpm2cpio.pl ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE}/$$rpm |\ - ${CPIO} --quiet -id);\ + ${CPIO} --quiet -idm);\ done +pre-patch: + ${CP} -fp ${DISTDIR}/ymessenger.bin ${WRKDIR}/opt/ymessenger/bin + post-patch: ${SED} -e 's:%%PREFIX%%:${PREFIX}:g' ${FILESDIR}/linux-ymessenger.sh >\ ${WRKDIR}/linux-ymessenger.sh @@ -57,7 +58,7 @@ ${INSTALL_SCRIPT} ${WRKDIR}/linux-ymessenger.sh\ ${PREFIX}/bin/linux-ymessenger @${MKDIR} ${PREFIX}/lib/linux-ymessenger - ${INSTALL_DATA} ${WRKDIR}/opt/ymessenger/lib/libgtkhtml.so.6\ + ${INSTALL_DATA} ${WRKDIR}/opt/ymessenger/lib/libgtkhtml.so.0\ ${PREFIX}/lib/linux-ymessenger .include --- net-im/linux-ymessenger/distinfo.orig Tue Jan 31 17:02:00 2006 +++ net-im/linux-ymessenger/distinfo Mon May 22 17:31:01 2006 @@ -1,3 +1,6 @@ -MD5 (rh7.ymessenger-1.0.4-1.i386.rpm) = 8d6ebad8eee0260ef9f53a535ced5f68 -SHA256 (rh7.ymessenger-1.0.4-1.i386.rpm) = 2c549f288daff070c0ae5e58f65ff8197028c12b007b8641496fafbc3a763481 -SIZE (rh7.ymessenger-1.0.4-1.i386.rpm) = 966719 +MD5 (rh9.ymessenger-1.0.6-1.i386.rpm) = 1a2e515ad9512ba49dd4bc63e5b0ed6d +SHA256 (rh9.ymessenger-1.0.6-1.i386.rpm) = ec516782bb131fa14e5261a8d004df868f7d21a710c0298cd3b6322f67a1956d +SIZE (rh9.ymessenger-1.0.6-1.i386.rpm) = 723165 +MD5 (ymessenger.bin) = b0dfd6d467406981b2f82c2534941e27 +SHA256 (ymessenger.bin) = fac21fbb30b6c273a4764bd4e20d609ed873b7c3978b32751e0855e03aff0220 +SIZE (ymessenger.bin) = 2025244 --- net-im/linux-ymessenger/files/linux-ymessenger.sh.orig Thu Dec 25 12:41:29 2003 +++ net-im/linux-ymessenger/files/linux-ymessenger.sh Mon May 22 16:01:23 2006 @@ -1,4 +1,7 @@ #!/bin/sh +if [ -w $HOME/.ymessenger/preferences ]; then + /usr/bin/grep -q '^PrimaryIdentity $' $HOME/.ymessenger/preferences&&/usr/bin/sed -i '' -e '/^PrimaryIdentity $/s/$/ ""/' $HOME/.ymessenger/preferences +fi export LD_LIBRARY_PATH=%%PREFIX%%/lib/linux-ymessenger cd %%PREFIX%%/libexec/linux-ymessenger ./ymessenger.bin $* --- net-im/linux-ymessenger/pkg-plist.orig Thu Dec 25 12:41:29 2003 +++ net-im/linux-ymessenger/pkg-plist Mon May 22 15:08:29 2006 @@ -4,6 +4,6 @@ libexec/linux-ymessenger/ymessenger.kdelnk libexec/linux-ymessenger/ymessenger.bin bin/linux-ymessenger -lib/linux-ymessenger/libgtkhtml.so.6 +lib/linux-ymessenger/libgtkhtml.so.0 @dirrm libexec/linux-ymessenger @dirrm lib/linux-ymessenger >Release-Note: >Audit-Trail: >Unformatted: