From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 28 09:00:19 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BA9F1065670 for ; Fri, 28 Jan 2011 09:00:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 580B88FC0C for ; Fri, 28 Jan 2011 09:00:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p0S90JaS039935 for ; Fri, 28 Jan 2011 09:00:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p0S90JW6039917; Fri, 28 Jan 2011 09:00:19 GMT (envelope-from gnats) Resent-Date: Fri, 28 Jan 2011 09:00:19 GMT Resent-Message-Id: <201101280900.p0S90JW6039917@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, Boris Samorodov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 829181065698 for ; Fri, 28 Jan 2011 08:51:30 +0000 (UTC) (envelope-from bsam@bb.ipt.ru) Received: from bb.ipt.ru (bb.ipt.ru [194.62.233.89]) by mx1.freebsd.org (Postfix) with ESMTP id 00A758FC1A for ; Fri, 28 Jan 2011 08:51:29 +0000 (UTC) Received: from bb.ipt.ru (localhost [127.0.0.1]) by bb.ipt.ru (8.14.4/8.14.4) with ESMTP id p0S8pSVw025699 for ; Fri, 28 Jan 2011 11:51:28 +0300 (MSK) (envelope-from bsam@bb.ipt.ru) Received: (from bsam@localhost) by bb.ipt.ru (8.14.4/8.14.4/Submit) id p0S8pSVx025698; Fri, 28 Jan 2011 11:51:28 +0300 (MSK) (envelope-from bsam) Message-Id: <201101280851.p0S8pSVx025698@bb.ipt.ru> Date: Fri, 28 Jan 2011 11:51:28 +0300 (MSK) From: Boris Samorodov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/154352: [patch] multimedia/xmms: update using desktop and mime utils X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Boris Samorodov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2011 09:00:19 -0000 >Number: 154352 >Category: ports >Synopsis: [patch] multimedia/xmms: update using desktop and mime utils >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 28 09:00:18 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Boris Samorodov >Release: FreeBSD 9.0-CURRENT i386 >Organization: InPharmtech, Co. >Environment: System: FreeBSD bb.ipt.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #13 r217821: Wed Jan 26 12:57:44 UTC 2011 bsam@bb.ipt.ru:/usr/obj/usr/src/sys/BB i386 >Description: 1. Currently the port does not use existing infrastructure to deal with files/*.in files (no need to copy *.in files to WRKSRC since they are autocopyed to WRKSRC). 2. Currently the port does not use desktop and mime utils to register/unregister apropriate databases. >How-To-Repeat: >Fix: . use current ports infrastructure to deal with files/*.in; . let's use special tools to auto register/unregister desktop entries and mime types for ports and packages; . bump PORTREVISION. --- xmms.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/xmms/Makefile,v retrieving revision 1.116 diff -u -r1.116 Makefile --- Makefile 22 Jan 2011 01:22:16 -0000 1.116 +++ Makefile 28 Jan 2011 08:30:32 -0000 @@ -7,7 +7,7 @@ PORTNAME= xmms PORTVERSION= 1.2.11 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES+= multimedia audio ipv6 MASTER_SITES= http://www.xmms.org/files/1.2.x/ \ LOCAL/beech @@ -16,9 +16,11 @@ MAINTAINER?= stas@FreeBSD.org COMMENT?= X Multimedia System -- An audio player with Winamp GUI +RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info + USE_BZIP2= yes USE_GL= gl -USE_GNOME= gtk12 gnomehack +USE_GNOME= desktopfileutils gtk12 gnomehack USE_GMAKE= yes USE_GETTEXT= yes USE_ICONV= yes @@ -159,7 +161,6 @@ .if ${HAVE_GNOME:Mesound}=="" ${REINPLACE_CMD} -e '/AM_PATH_ESD/,/have_esd=no/d' ${WRKSRC}/configure.in .endif - @${CP} ${FILESDIR}/xmms.desktop.in ${WRKSRC}/xmms.desktop post-configure: @${FIND} ${WRKSRC} -name Makefile | \ @@ -168,7 +169,9 @@ post-install: @${INSTALL} -d ${PREFIX}/share/xmms/Skins @${INSTALL} -d ${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKSRC}/xmms.desktop ${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKDIR}/xmms.desktop ${PREFIX}/share/applications/ + -update-desktop-database + -update-mime-database ${PREFIX}/share/mime @${CAT} ${PKGMESSAGE} .include Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/xmms/pkg-plist,v retrieving revision 1.29 diff -u -r1.29 pkg-plist --- pkg-plist 2 Dec 2008 21:15:32 -0000 1.29 +++ pkg-plist 28 Jan 2011 08:30:32 -0000 @@ -98,3 +98,7 @@ @dirrm include/xmms @exec mkdir -p %D/share/xmms/Skins @unexec echo "If you are permanently removing xmms, do not forget to remove skin files left under %D/share/xmms/Skins. Use \`\`rm -Rf %D/share/xmms/Skins; rmdir %D/share/xmms''" | fmt +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime --- xmms.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: