From owner-svn-ports-all@FreeBSD.ORG  Thu Aug 23 09:12:26 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BCA0D106564A;
	Thu, 23 Aug 2012 09:12:26 +0000 (UTC)
	(envelope-from scheidell@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8DD2F8FC0C;
	Thu, 23 Aug 2012 09:12:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7N9CQIO094090;
	Thu, 23 Aug 2012 09:12:26 GMT
	(envelope-from scheidell@svn.freebsd.org)
Received: (from scheidell@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7N9CQMI094087;
	Thu, 23 Aug 2012 09:12:26 GMT
	(envelope-from scheidell@svn.freebsd.org)
Message-Id: <201208230912.q7N9CQMI094087@svn.freebsd.org>
From: Michael Scheidell <scheidell@FreeBSD.org>
Date: Thu, 23 Aug 2012 09:12:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302986 - in head/misc/xdg-menu: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2012 09:12:26 -0000

Author: scheidell
Date: Thu Aug 23 09:12:26 2012
New Revision: 302986
URL: http://svn.freebsd.org/changeset/ports/302986

Log:
  - Makefile changed
  - OptionsNG
  - Removed script from Makefile
  
  PR:		ports/170755
  Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)

Added:
  head/misc/xdg-menu/files/
  head/misc/xdg-menu/files/xdg-menu.in   (contents, props changed)
Modified:
  head/misc/xdg-menu/Makefile   (contents, props changed)

Modified: head/misc/xdg-menu/Makefile
==============================================================================
--- head/misc/xdg-menu/Makefile	Thu Aug 23 09:08:52 2012	(r302985)
+++ head/misc/xdg-menu/Makefile	Thu Aug 23 09:12:26 2012	(r302986)
@@ -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}

Added: head/misc/xdg-menu/files/xdg-menu.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/xdg-menu/files/xdg-menu.in	Thu Aug 23 09:12:26 2012	(r302986)
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "XDG-Menu: Starting up..."
+cd "%%DATADIR%%"
+./AppRun