Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Mar 2016 09:22:30 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411216 - in head/x11/deskmenu: . files
Message-ID:  <201603160922.u2G9MUrf002477@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed Mar 16 09:22:30 2016
New Revision: 411216
URL: https://svnweb.freebsd.org/changeset/ports/411216

Log:
  - Update to version 1.4.5, which is based on GTK+ 2.x now
  - Unbreak fetching: upstream are using Debian CDN officially
  - Stop demanding GNU make: builds fine with BSD make as well
  - Define LICENSE (GPLv2), install couple of docs and sample
    configuration file while here
  - Update port description text and project web address

Added:
  head/x11/deskmenu/files/patch-deskmenu.1   (contents, props changed)
Deleted:
  head/x11/deskmenu/files/patch-Makefile
Modified:
  head/x11/deskmenu/Makefile
  head/x11/deskmenu/distinfo
  head/x11/deskmenu/pkg-descr

Modified: head/x11/deskmenu/Makefile
==============================================================================
--- head/x11/deskmenu/Makefile	Wed Mar 16 09:22:28 2016	(r411215)
+++ head/x11/deskmenu/Makefile	Wed Mar 16 09:22:30 2016	(r411216)
@@ -2,21 +2,39 @@
 # $FreeBSD$
 
 PORTNAME=	deskmenu
-PORTVERSION=	1.3.0
-PORTREVISION=	5
+PORTVERSION=	1.4.5
 CATEGORIES=	x11
-MASTER_SITES=	http://matt.peterson.org/FreeBSD/ports/ \
-		http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/
+MASTER_SITES=	DEBIAN/pool/main/d/${PORTNAME} GENTOO
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	matt@peterson.org
 COMMENT=	X11 application launcher
 
-BROKEN=		Does not fetch
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-04-15
-PLIST_FILES=	bin/deskmenu
-USES=		gmake
-USE_GNOME=	gtk12
-USE_CSTD=	gnu89
+LICENSE=	GPLv2
+
+USES=		pkgconfig
+GNU_CONFIGURE=	yes
+USE_GNOME=	gtk20
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+PLIST_FILES=	bin/deskmenu man/man1/deskmenu.1.gz \
+		@sample\ etc/deskmenurc.sample
+PORTDOCS=	AUTHORS ChangeLog
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,-O2 -g ,,' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's,/etc/deskmenurc,${ETCDIR}rc,' \
+		${WRKSRC}/example_rc ${WRKSRC}/src/deskmenu.c
+	@${LN} -sf debian/changelog ${WRKSRC}/ChangeLog
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/example_rc ${STAGEDIR}${ETCDIR}rc.sample
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11/deskmenu/distinfo
==============================================================================
--- head/x11/deskmenu/distinfo	Wed Mar 16 09:22:28 2016	(r411215)
+++ head/x11/deskmenu/distinfo	Wed Mar 16 09:22:30 2016	(r411216)
@@ -1,2 +1,2 @@
-SHA256 (deskmenu-1.3.0.tar.gz) = 668ed19ff1bd52a486519b14e5b1ade97aaa785282922a8d0bf99b7e99422b03
-SIZE (deskmenu-1.3.0.tar.gz) = 12227
+SHA256 (deskmenu_1.4.5.tar.gz) = a875ee1f7771233575d2662c94223a331985cf532843852ece1fd73f6a6c63f6
+SIZE (deskmenu_1.4.5.tar.gz) = 127599

Added: head/x11/deskmenu/files/patch-deskmenu.1
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/deskmenu/files/patch-deskmenu.1	Wed Mar 16 09:22:30 2016	(r411216)
@@ -0,0 +1,31 @@
+--- deskmenu.1.orig	2010-02-14 16:09:36 UTC
++++ deskmenu.1
+@@ -17,9 +17,7 @@ You can use deskmenu for session managem
+ last line of your .xinitrc and using the \-\-quit command line
+ option, which adds a quit option to the menu.
+ .LP 
+-NOTE: Deskmenu will do nothing unless you have a ${HOME}/.deskmenurc file or a /etc/deskmenurc (/etc/deskmenurc.debian is automatically generated)
+-.br 
+-This manpage is specific to the debian package of deskmenu.
++NOTE: Deskmenu will do nothing unless you have a ${HOME}/.deskmenurc file or a /usr/local/etc/deskmenurc.
+ .br
+ \fBIMPORTANT NOTE:\fR
+ You have to set a keycode, when using this version of keylaunch, in your config file.
+@@ -60,7 +58,7 @@ deskmenu \-\-button=[1...5] \-\-file=/ho
+ .LP 
+ \fI${HOME}/.deskmenurc\fP
+ .br 
+-\fI/etc/deskmenurc.debian\fP
++\fI/usr/local/etc/deskmenurc\fP
+ .SH "RCFILE"
+ .LP .deskmenurc
+ .br 
+@@ -133,7 +131,7 @@ The current developer of Deskmenu.
+ This manpage was written for the Debian GNU/Linux package of
+ this program by 
+ Brandon L. Griffith <brandon@debian.org> 
+-because the origonal program did not include one. You are
++because the original program did not include one. You are
+ free to edit, translate, convert, or otherwise do anything
+ you wish with this manpage. This program was patched with a diff from Martin Hedenfalk <mhe@hjome.se> to allow submenu recursion.
+ Updated and added to the official deskmenu by

Modified: head/x11/deskmenu/pkg-descr
==============================================================================
--- head/x11/deskmenu/pkg-descr	Wed Mar 16 09:22:28 2016	(r411215)
+++ head/x11/deskmenu/pkg-descr	Wed Mar 16 09:22:30 2016	(r411216)
@@ -1,4 +1,6 @@
-DeskMenu is a root menu program which is activated by clicking the root window.
-This gtk+ program is complementary to the Oroborus window manager.
+DeskMenu is a root menu program which is activated by clicking the root
+window.  It is configured from a .deskmenurc file in user's home directory.
+DeskMenu is useful for window managers which do not provide a menu such as
+Oroborus.
 
-WWW: http://www.kensden.pwp.blueyonder.co.uk/Oroborus/
+WWW: http://www.oroborus.org/



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