Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Aug 2012 21:23:57 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jgh@FreeBSD.org
Subject:   ports/170755: [MAINTAINER] misc/xdg-menu: Makefile changed, OptionsNG, deleted script in Makefile
Message-ID:  <20120818192400.9280B1065673@hub.freebsd.org>
Resent-Message-ID: <201208181930.q7IJU8cl090025@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         170755
>Category:       ports
>Synopsis:       [MAINTAINER] misc/xdg-menu: Makefile changed, OptionsNG, deleted script in Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 18 19:30:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:

Makefile changed:

Changed all to ${PORTNAME}


OptionsNG

.if !${PORT_OPTIONS:MROX}


Added file(s):
- files/xdg-menu.in

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- xdg-menu-1.5_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/misc/xdg-menu/Makefile ./Makefile
--- /usr/ports/misc/xdg-menu/Makefile	2012-05-18 06:40:24.000000000 +0200
+++ ./Makefile	2012-08-18 21:16:30.000000000 +0200
@@ -5,12 +5,12 @@
 # $FreeBSD: ports/misc/xdg-menu/Makefile,v 1.1 2012/05/18 04:40:24 miwi Exp $
 #
 
-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 @@
 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 @@
 
 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 -ruN --exclude=CVS /usr/ports/misc/xdg-menu/files/xdg-menu.in ./files/xdg-menu.in
--- /usr/ports/misc/xdg-menu/files/xdg-menu.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/xdg-menu.in	2012-08-18 20:26:48.000000000 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "XDG-Menu: Starting up..."
+cd "%%DATADIR%%"
+./AppRun
--- xdg-menu-1.5_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120818192400.9280B1065673>