svn commit: r399968 - in head/x11-wm: . wmx wmx/files wmx/scripts

[Alexey Dokuchaev]

Author: danfe
Date: Thu Oct 22 12:16:39 2015
New Revision: 399968
URL: https://svnweb.freebsd.org/changeset/ports/399968

Log:
  Resurrect `x11-wm/wmx' port removed by kris@ on Feb 18, 2005.  It is still
  well alive, with the latest version released last year.  Submitter assumes
  maintainership.
  
  PR:	199977 (modified)

Added:
  head/x11-wm/wmx/
     - copied from r129233, head/x11-wm/wmx/
Deleted:
  head/x11-wm/wmx/files/
  head/x11-wm/wmx/pkg-plist
  head/x11-wm/wmx/scripts/
Modified:
  head/x11-wm/Makefile
  head/x11-wm/wmx/Makefile   (contents, props changed)
  head/x11-wm/wmx/distinfo   (contents, props changed)
  head/x11-wm/wmx/pkg-descr   (contents, props changed)

Modified: head/x11-wm/Makefile
==============================================================================
--- head/x11-wm/Makefile	Thu Oct 22 11:56:31 2015	(r399967)
+++ head/x11-wm/Makefile	Thu Oct 22 12:16:39 2015	(r399968)
@@ -134,6 +134,7 @@
     SUBDIR += wmii
     SUBDIR += wmii-devel
     SUBDIR += wmname
+    SUBDIR += wmx
     SUBDIR += xcompmgr
     SUBDIR += xfce4
     SUBDIR += xfce4-desktop

Modified: head/x11-wm/wmx/Makefile
==============================================================================
--- head/x11-wm/wmx/Makefile	Fri Feb 18 23:37:53 2005	(r129233)
+++ head/x11-wm/wmx/Makefile	Thu Oct 22 12:16:39 2015	(r399968)
@@ -1,34 +1,44 @@
-# New ports collection makefile for:	wmx
-# Date created:		11. Jan 1998
-# Whom:			Stefan Zehl <sec at 42.org>
-#
+# Created by: Stefan Zehl <sec at 42.org>
 # $FreeBSD$
-#
 
 PORTNAME=	wmx
-PORTVERSION=	6.p1
+PORTVERSION=	8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.all-day-breakfast.com/wmx/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pl/}
 
-MAINTAINER=	sec at 42.org
-COMMENT=	Extended version of wm2 - A simple window manager for X
+MAINTAINER=	kwhite at site.uottawa.ca
+COMMENT=	Simple window manager based on wm2
 
-IGNORE=		contains a severe bug, which will be fixed by the maintainer
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	"${IGNORE}"
-
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
+USE_XORG=	ice sm x11 xcomposite xext xft xpm
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/lib/X11/wmx/menu
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/wmx
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmx
-	${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx
+PLIST_FILES=	bin/wmx
+PORTDOCS=	README README.contrib
+
+OPTIONS_DEFINE=	ALT_L XTERM DOCS
+OPTIONS_DEFAULT=	XTERM
+
+ALT_L_DESC=	Use ALT_L key for ALT function instead of Windows_L
+XTERM_DESC=	Use xterm(1) as default NEW window command
+
+.include <bsd.port.options.mk>
+
+post-patch:
+.if ${PORT_OPTIONS:MXTERM}
+	@${REINPLACE_CMD} -e '/CONFIG_NEW_WINDOW_COMMAND/ \
+		s/x-terminal-emulator/xterm/' ${WRKSRC}/Config.h
+.endif
+.if ${PORT_OPTIONS:MALT_L}
+	@${REINPLACE_CMD} -e '/CONFIG_ALT_KEY/s/XK_Super_L/XK_Alt_L/' \
+		${WRKSRC}/Config.h
 .endif
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wmx ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>

Modified: head/x11-wm/wmx/distinfo
==============================================================================
--- head/x11-wm/wmx/distinfo	Fri Feb 18 23:37:53 2005	(r129233)
+++ head/x11-wm/wmx/distinfo	Thu Oct 22 12:16:39 2015	(r399968)
@@ -1,2 +1,2 @@
-MD5 (wmx-6pl1.tar.gz) = 212297d70acef90bbc9dac254de39cb8
-SIZE (wmx-6pl1.tar.gz) = 90209
+SHA256 (wmx-8.tar.gz) = 7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
+SIZE (wmx-8.tar.gz) = 140329

Modified: head/x11-wm/wmx/pkg-descr
==============================================================================
--- head/x11-wm/wmx/pkg-descr	Fri Feb 18 23:37:53 2005	(r129233)
+++ head/x11-wm/wmx/pkg-descr	Thu Oct 22 12:16:39 2015	(r399968)
@@ -1,10 +1,7 @@
-wmx -- another window manager
-=============================
-
 wmx is another window manager for X.  It is based on wm2 and provides
 a similarly unusual style of window decoration; but in place of wm2's
 minimal functionality, it offers many of the features of more
-conventional managers in the most simplistic implementations
+conventional managers, often in the most simplistic implementations
 imaginable.  wmx is, however, still not configurable except by editing
 the source and recompiling the code.