svn commit: r333133 - head/misc/xdg-menu

[Rusmir Dusko]

Author: nemysis
Date: Thu Nov  7 16:13:47 2013
New Revision: 333133
URL: http://svnweb.freebsd.org/changeset/ports/333133

Log:
  - Change master sites
  - Change maintainer email to @FreeBSD.org
  - Support STAGEDIR
  
  Approved by:	pawel / wg (mentors, implicit)

Modified:
  head/misc/xdg-menu/Makefile
  head/misc/xdg-menu/pkg-plist

Modified: head/misc/xdg-menu/Makefile
==============================================================================
--- head/misc/xdg-menu/Makefile	Thu Nov  7 16:06:22 2013	(r333132)
+++ head/misc/xdg-menu/Makefile	Thu Nov  7 16:13:47 2013	(r333133)
@@ -6,13 +6,13 @@ PORTVERSION=	1.5
 PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
-		SF/nemysisfreebsdp/:icons
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
 DISTFILES=	XDG-Menu-${DISTVERSION}.tgz \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	python
 EXTRACT_ONLY=	XDG-Menu-${DISTVERSION}.tgz
 
-MAINTAINER=	nemysis at gmx.ch
+MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	ROX panel applet that displays an applications menu button
 
 LICENSE=	GPLv2
@@ -37,7 +37,6 @@ ROX_DESC=	Enable ROX panel applet suppor
 
 SUB_FILES=	${PORTNAME}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -56,20 +55,15 @@ do-build:
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
-	${MKDIR} ${DATADIR}
-	@(cd ${WRKSRC} && ${CP} -r Messages .DirIcon AppInfo.xml AppRun AppletRun \
-		Options.xml Messages python *.py *.pyc *.pyo ${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${CP} -r Messages .DirIcon AppInfo.xml AppRun AppletRun \
+		Options.xml Messages python *.py *.pyc *.pyo ${STAGEDIR}${DATADIR})
 
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/Help/|} ${DOCSDIR}
-.endif
-
-post-install:
-	@-update-desktop-database
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/Help/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/misc/xdg-menu/pkg-plist
==============================================================================
--- head/misc/xdg-menu/pkg-plist	Thu Nov  7 16:06:22 2013	(r333132)
+++ head/misc/xdg-menu/pkg-plist	Thu Nov  7 16:13:47 2013	(r333133)
@@ -46,5 +46,3 @@ share/pixmaps/xdg-menu.png
 @dirrm apps/XDG-Menu/Messages
 @dirrm apps/XDG-Menu
 @dirrmtry apps
- at exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true