From owner-svn-ports-all@FreeBSD.ORG Mon Mar 25 08:19:09 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 75C1AD54; Mon, 25 Mar 2013 08:19:09 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4E810628; Mon, 25 Mar 2013 08:19:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2P8J8kt031620; Mon, 25 Mar 2013 08:19:08 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2P8J8fa031618; Mon, 25 Mar 2013 08:19:08 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201303250819.r2P8J8fa031618@svn.freebsd.org> From: Boris Samorodov Date: Mon, 25 Mar 2013 08:19:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315201 - head/multimedia/xmms 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: Mon, 25 Mar 2013 08:19:09 -0000 Author: bsam Date: Mon Mar 25 08:19:08 2013 New Revision: 315201 URL: http://svnweb.freebsd.org/changeset/ports/315201 Log: . make use of the ports infrastructure to create the desktop file; . update the desktop file database at install/deinstall time. PR: ports/154352 Submitted by: bsam (me) Approved by: Chris Petrik (maintainer) Modified: head/multimedia/xmms/Makefile head/multimedia/xmms/pkg-plist Modified: head/multimedia/xmms/Makefile ============================================================================== --- head/multimedia/xmms/Makefile Mon Mar 25 08:02:47 2013 (r315200) +++ head/multimedia/xmms/Makefile Mon Mar 25 08:19:08 2013 (r315201) @@ -3,7 +3,7 @@ PORTNAME= xmms PORTVERSION= 1.2.11 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES+= multimedia audio ipv6 MASTER_SITES= http://www.xmms.org/files/1.2.x/ \ http://legacy.xmms2.org/ \ @@ -15,7 +15,7 @@ COMMENT?= X Multimedia System -- An audi USE_BZIP2= yes USE_GL= gl -USE_GNOME= gtk12 gnomehack +USE_GNOME= desktopfileutils gtk12 gnomehack USE_GMAKE= yes USE_GETTEXT= yes USE_ICONV= yes @@ -155,7 +155,6 @@ post-patch: .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 | \ @@ -164,7 +163,8 @@ post-configure: 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 @${CAT} ${PKGMESSAGE} .include Modified: head/multimedia/xmms/pkg-plist ============================================================================== --- head/multimedia/xmms/pkg-plist Mon Mar 25 08:02:47 2013 (r315200) +++ head/multimedia/xmms/pkg-plist Mon Mar 25 08:19:08 2013 (r315201) @@ -98,3 +98,5 @@ share/locale/zh_TW/LC_MESSAGES/xmms.mo @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