ports/66919: [PATCH] x11-wm/wmx: update to 6pl1, distsite fix

[Roman Neuhauser]

>Number:         66919
>Category:       ports
>Synopsis:       [PATCH] x11-wm/wmx: update to 6pl1, distsite fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 19 17:50:20 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Roman Neuhauser
>Release:        FreeBSD 4.9-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD isis.wad.cz 4.9-RELEASE-p2 FreeBSD 4.9-RELEASE-p2 #3: Sun Mar 7 02:11:16 CET 2004 root at isis.wad.cz:/usr/obj/usr/src/sys/FREEPUPPY2_6 i386


	
>Description:
I've only confirmed the software builds and runs on this 4.9 box,
this PR could use attention from someone who actually uses wmx...

maintainer cc'd

>How-To-Repeat:
	
>Fix:

	

--- x11-wm::wmx-6pl1.patch begins here ---
Index: x11-wm/wmx/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/wmx/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- x11-wm/wmx/Makefile	21 Feb 2003 14:19:11 -0000	1.12
+++ x11-wm/wmx/Makefile	20 May 2004 00:38:00 -0000
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	wmx
-PORTVERSION=	5.6
+PORTVERSION=	6.p1
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://ftp.42.org/pub/wmx/ \
-		http://www.all-day-breakfast.com/wmx/
-DISTNAME=	${PORTNAME}-5sec6
+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
Index: x11-wm/wmx/distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-wm/wmx/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- x11-wm/wmx/distinfo	31 Mar 2004 03:12:58 -0000	1.3
+++ x11-wm/wmx/distinfo	20 May 2004 00:01:24 -0000
@@ -1,2 +1,2 @@
-MD5 (wmx-5sec6.tar.gz) = 6b231759d4ff3f35964f466764b98bfd
-SIZE (wmx-5sec6.tar.gz) = 71539
+MD5 (wmx-6pl1.tar.gz) = 212297d70acef90bbc9dac254de39cb8
+SIZE (wmx-6pl1.tar.gz) = 90209
Index: x11-wm/wmx/pkg-descr
===================================================================
RCS file: /home/ncvs/ports/x11-wm/wmx/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- x11-wm/wmx/pkg-descr	18 May 2000 11:56:06 -0000	1.2
+++ x11-wm/wmx/pkg-descr	20 May 2004 00:37:44 -0000
@@ -8,4 +8,4 @@
 imaginable.  wmx is, however, still not configurable except by editing
 the source and recompiling the code.
 
-WWW: http://www.42.org/~sec/wmx/
+WWW: http://www.all-day-breakfast.com/wmx/
Index: x11-wm/wmx/files/patch-ae
===================================================================
RCS file: /home/ncvs/ports/x11-wm/wmx/files/patch-ae,v
retrieving revision 1.1
diff -u -r1.1 patch-ae
--- x11-wm/wmx/files/patch-ae	6 Jun 1999 16:22:04 -0000	1.1
+++ x11-wm/wmx/files/patch-ae	20 May 2004 00:27:21 -0000
@@ -1,11 +1,22 @@
---- Config.h.orig	Wed Jan 13 19:28:43 1999
-+++ Config.h	Wed May  5 14:05:01 1999
-@@ -86,7 +86,7 @@
+--- Config.h.orig	Mon Apr 23 17:48:31 2001
++++ Config.h	Thu May 20 02:26:43 2004
+@@ -75,8 +75,8 @@
+ 
+ // What to run to get a new window (from the "New" menu option)
+ #define CONFIG_NEW_WINDOW_LABEL "New"
+-//#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+-#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
++#define CONFIG_NEW_WINDOW_COMMAND "xterm"
++//#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
+ #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
+ // or, for example,
+ //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
+@@ -91,7 +91,7 @@
  // middle-button menu
  #define CONFIG_COMMAND_MENU       ".wmx"
  // only used if COMMAND_MENU is not found; ignored if invalid directory:
 -#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/local/lib/wmx/menu"
-+#define CONFIG_SYSTEM_COMMAND_MENU	"%%PREFIX%%/lib/wmx/menu"
- 
- // Focus possibilities.
- // 
++#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/X11R6/lib/wmx/menu"
+ // append screennumber to COMMAND_MENU directory;
+ // use non screen style as fallback
+ #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
--- x11-wm::wmx-6pl1.patch ends here ---


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