From cb9f616c8f56b6e8ceab10cfd9290fb37c7693b3 Mon Sep 17 00:00:00 2001
From: Michael Scheidell <scheidell@FreeBSD.org>
Date: Thu, 23 Aug 2012 09:12:26 +0000
Subject: [PATCH] - Makefile changed - OptionsNG - Removed script from Makefile

PR:		ports/170755
Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)
---
 misc/xdg-menu/Makefile          | 20 +++++++++++---------
 misc/xdg-menu/files/xdg-menu.in |  7 +++++++
 2 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 misc/xdg-menu/files/xdg-menu.in

diff --git a/misc/xdg-menu/Makefile b/misc/xdg-menu/Makefile
index c0d76ea2b184..17d787b26f59 100644
--- a/misc/xdg-menu/Makefile
+++ b/misc/xdg-menu/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	menu
+PORTNAME=	xdg-menu
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	SF/xdg-menu/xdg-menu/${PORTVERSION}
-PKGNAMEPREFIX=	xdg-
-DISTNAME=	XDG-Menu-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+DISTNAME=	XDG-Menu-${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nemysis@gmx.ch
@@ -30,11 +30,14 @@ USE_PYTHON=	yes
 ALL_TARGET=
 NO_BUILD=	yes
 
-OPTIONS=	ROX	"Enable ROX panel applet support" no
+OPTIONS_DEFINE=	ROX
+ROX_DESC=	Enable ROX panel applet support
+
+SUB_FILES=	${PORTNAME}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_ROX)
+.if !${PORT_OPTIONS:MROX}
 post-patch:
 	@${REINPLACE_CMD} -i '' '/if not rox.confirm/,/sys.exit/s/^/#/' ${WRKSRC}/AppRun
 	@${ECHO_MSG}
@@ -45,9 +48,8 @@ post-patch:
 
 do-install:
 # Scripts
-	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
-		./AppRun\n" > ${WRKDIR}/xdg-menu.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/xdg-menu.sh ${PREFIX}/bin/xdg-menu
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+
 # Executable and Data
 	${MKDIR} ${DATADIR}
 	@cd ${WRKSRC} && ${FIND} . | ${CPIO} -pdmu ${DATADIR}
diff --git a/misc/xdg-menu/files/xdg-menu.in b/misc/xdg-menu/files/xdg-menu.in
new file mode 100644
index 000000000000..c485e187cafa
--- /dev/null
+++ b/misc/xdg-menu/files/xdg-menu.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "XDG-Menu: Starting up..."
+cd "%%DATADIR%%"
+./AppRun