From owner-svn-ports-head@FreeBSD.ORG Mon Mar 18 02:31:53 2013 Return-Path: Delivered-To: svn-ports-head@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 2E027A55; Mon, 18 Mar 2013 02:31:53 +0000 (UTC) (envelope-from beech@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 2065FF05; Mon, 18 Mar 2013 02:31:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2I2VqLv053693; Mon, 18 Mar 2013 02:31:53 GMT (envelope-from beech@svn.freebsd.org) Received: (from beech@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2I2VqTv053688; Mon, 18 Mar 2013 02:31:52 GMT (envelope-from beech@svn.freebsd.org) Message-Id: <201303180231.r2I2VqTv053688@svn.freebsd.org> From: Beech Rintoul Date: Mon, 18 Mar 2013 02:31:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314520 - in head/misc/xdg-menu: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Mar 2013 02:31:53 -0000 Author: beech Date: Mon Mar 18 02:31:52 2013 New Revision: 314520 URL: http://svnweb.freebsd.org/changeset/ports/314520 Log: - Adjust RUN_DEPENDS - Add icons - Add desktop - Add build - Bump portrevision PR: ports/171617 Submitted by: nemysis (maintainer) Modified: head/misc/xdg-menu/Makefile head/misc/xdg-menu/distinfo (contents, props changed) head/misc/xdg-menu/files/xdg-menu.in head/misc/xdg-menu/pkg-plist (contents, props changed) Modified: head/misc/xdg-menu/Makefile ============================================================================== --- head/misc/xdg-menu/Makefile Mon Mar 18 02:27:12 2013 (r314519) +++ head/misc/xdg-menu/Makefile Mon Mar 18 02:31:52 2013 (r314520) @@ -1,34 +1,36 @@ -# New Ports collection makefile for: XDG-Menu -# Date created: 2012-05-07 -# Whom: nemysis@gmx.ch -# +# Created by: nemysis # $FreeBSD$ -# PORTNAME= xdg-menu PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} -DISTNAME= XDG-Menu-${DISTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ + SF/nemysisfreebsdp/:icons +DISTFILES= XDG-Menu-${DISTVERSION}.tgz \ + ${PORTNAME}.png:icons +DIST_SUBDIR= python +EXTRACT_ONLY= XDG-Menu-${DISTVERSION}.tgz MAINTAINER= nemysis@gmx.ch -COMMENT= A ROX panel applet that displays an applications menu button +COMMENT= ROX panel applet that displays an applications menu button LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \ - ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \ - ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \ + ${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus WRKSRC= ${WRKDIR}/XDG-Menu DATADIR= ${PREFIX}/apps/XDG-Menu -FETCH_ARGS?= -Fpr USE_PYTHON= yes -ALL_TARGET= -NO_BUILD= yes +INSTALLS_ICONS= yes + +PORTDOCS= * + +DESKTOP_ENTRIES="XDG-Menu" "${COMMENT}" ${PORTNAME} \ + "${PORTNAME}" "Application;System;" false OPTIONS_DEFINE= ROX ROX_DESC= Enable ROX panel applet support @@ -37,8 +39,10 @@ SUB_FILES= ${PORTNAME} .include -.if !${PORT_OPTIONS:MROX} post-patch: + @${REINPLACE_CMD} -i '' 's|/usr/lib|../../lib|' ${WRKSRC}/findrox.py + +.if ! ${PORT_OPTIONS:MROX} @${REINPLACE_CMD} -i '' '/if not rox.confirm/,/sys.exit/s/^/#/' ${WRKSRC}/AppRun @${ECHO_MSG} @${ECHO_MSG} "You have not enabled ROX panel applet support" @@ -46,12 +50,25 @@ post-patch: @${FIND} ${WRKSRC} -name "*.bak" -delete .endif +do-build: + @${PYTHON_CMD} -m compileall ${WRKSRC} + @${PYTHON_CMD} -O -m compileall ${WRKSRC} + do-install: -# Scripts - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/ -# Executable and Data ${MKDIR} ${DATADIR} - @cd ${WRKSRC} && ${FIND} . | ${CPIO} -pdmu ${DATADIR} + @(cd ${WRKSRC} && ${CP} -r Messages .DirIcon AppInfo.xml AppRun AppletRun \ + Options.xml Messages python *.py *.pyc *.pyo ${DATADIR}) + + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/ + +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/Help/|} ${DOCSDIR} +.endif + +post-install: + @-update-desktop-database .include Modified: head/misc/xdg-menu/distinfo ============================================================================== --- head/misc/xdg-menu/distinfo Mon Mar 18 02:27:12 2013 (r314519) +++ head/misc/xdg-menu/distinfo Mon Mar 18 02:31:52 2013 (r314520) @@ -1,2 +1,4 @@ -SHA256 (XDG-Menu-1.5.tgz) = 5cd62f3421032c4b619b80fde7e7cdc3230409489762e5c05ffd82d7c9c28478 -SIZE (XDG-Menu-1.5.tgz) = 32377 +SHA256 (python/XDG-Menu-1.5.tgz) = 5cd62f3421032c4b619b80fde7e7cdc3230409489762e5c05ffd82d7c9c28478 +SIZE (python/XDG-Menu-1.5.tgz) = 32377 +SHA256 (python/xdg-menu.png) = f6f3be4272ca446c3bdf7895556c879ab7a4eceaf2a985dabaf1ad2126a3a2e4 +SIZE (python/xdg-menu.png) = 5974 Modified: head/misc/xdg-menu/files/xdg-menu.in ============================================================================== --- head/misc/xdg-menu/files/xdg-menu.in Mon Mar 18 02:27:12 2013 (r314519) +++ head/misc/xdg-menu/files/xdg-menu.in Mon Mar 18 02:31:52 2013 (r314520) @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# -echo "XDG-Menu: Starting up..." cd "%%DATADIR%%" -./AppRun +exec ./AppRun Modified: head/misc/xdg-menu/pkg-plist ============================================================================== --- head/misc/xdg-menu/pkg-plist Mon Mar 18 02:27:12 2013 (r314519) +++ head/misc/xdg-menu/pkg-plist Mon Mar 18 02:31:52 2013 (r314520) @@ -2,34 +2,49 @@ apps/XDG-Menu/.DirIcon apps/XDG-Menu/AppInfo.xml apps/XDG-Menu/AppRun apps/XDG-Menu/AppletRun -apps/XDG-Menu/Help/COPYING -apps/XDG-Menu/Help/ChangeLog -apps/XDG-Menu/Help/README -apps/XDG-Menu/Help/README.ru -apps/XDG-Menu/Help/TODO -apps/XDG-Menu/Makefile apps/XDG-Menu/Messages/XDG-Menu.pot apps/XDG-Menu/Messages/it.gmo apps/XDG-Menu/Messages/it.po apps/XDG-Menu/Messages/opts2po.py +apps/XDG-Menu/Messages/opts2po.pyc +apps/XDG-Menu/Messages/opts2po.pyo apps/XDG-Menu/Messages/ru.gmo apps/XDG-Menu/Messages/ru.po apps/XDG-Menu/Messages/uk.gmo apps/XDG-Menu/Messages/uk.po apps/XDG-Menu/Options.xml apps/XDG-Menu/findrox.py +apps/XDG-Menu/findrox.pyc +apps/XDG-Menu/findrox.pyo apps/XDG-Menu/python/config.py +apps/XDG-Menu/python/config.pyc +apps/XDG-Menu/python/config.pyo apps/XDG-Menu/python/ctxmenu.py +apps/XDG-Menu/python/ctxmenu.pyc +apps/XDG-Menu/python/ctxmenu.pyo apps/XDG-Menu/python/dndsource.py +apps/XDG-Menu/python/dndsource.pyc +apps/XDG-Menu/python/dndsource.pyo apps/XDG-Menu/python/i18n.py +apps/XDG-Menu/python/i18n.pyc +apps/XDG-Menu/python/i18n.pyo apps/XDG-Menu/python/imagemenu.py +apps/XDG-Menu/python/imagemenu.pyc +apps/XDG-Menu/python/imagemenu.pyo apps/XDG-Menu/python/main.py +apps/XDG-Menu/python/main.pyc +apps/XDG-Menu/python/main.pyo apps/XDG-Menu/python/roxmenu.py +apps/XDG-Menu/python/roxmenu.pyc +apps/XDG-Menu/python/roxmenu.pyo apps/XDG-Menu/python/xdgmenu.py +apps/XDG-Menu/python/xdgmenu.pyc +apps/XDG-Menu/python/xdgmenu.pyo bin/xdg-menu -@dirrmtry share/applications +share/pixmaps/xdg-menu.png @dirrm apps/XDG-Menu/python @dirrm apps/XDG-Menu/Messages -@dirrm apps/XDG-Menu/Help @dirrm apps/XDG-Menu @dirrmtry apps +@exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true