Date: Sun, 4 Jan 2004 00:03:37 +2700 From: "Samy Al Bahra" <samy@kerneled.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/60872: Fix misc/wmcp on 5.X Message-ID: <1073163811@beastie.freebsd.local> Resent-Message-ID: <200401032110.i03LA8mV021463@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60872
>Category: ports
>Synopsis: Fix misc/wmcp on 5.X
>Confidential: no
>Severity: critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 03 13:10:08 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Samy Al Bahra
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
Kerneled
>Environment:
System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003 samy@beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386
>Description:
misc/wmcp does not build on 5.X machines
due to its usage of unterminated multiline
literals, now depreciated in gcc 3.X. The
following patch fixes this issue by properly
escaping these literals.
>How-To-Repeat:
Build with gcc 3.X.
>Fix:
--- wmcp.patch begins here ---
diff -ruN wmcp/Makefile /home/samy/tmp/wmcp/Makefile
--- wmcp/Makefile Wed Dec 17 18:13:11 2003
+++ /home/samy/tmp/wmcp/Makefile Sat Jan 3 17:14:06 2004
@@ -20,10 +20,4 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmcp ${PREFIX}/bin
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN= "Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN wmcp/files/patch-wmcp.c /home/samy/tmp/wmcp/files/patch-wmcp.c
--- wmcp/files/patch-wmcp.c Thu Jan 1 03:00:00 1970
+++ /home/samy/tmp/wmcp/files/patch-wmcp.c Sat Jan 3 17:16:38 2004
@@ -0,0 +1,73 @@
+--- wmcp.c.orig Sat Jan 3 17:14:42 2004
++++ wmcp.c Sat Jan 3 17:15:43 2004
+@@ -806,38 +806,38 @@
+ void show_usage()
+ {
+
+-fprintf(stderr,"
+-
+-%s
+-This software is GPL -- do as you wish with it.
+-
+-Origional Author:
+- Ben Cohen <buddog@aztec.asu.edu>
+-
+-Contributors:
+- Thomas Nemeth <tnemeth@multimania.com>
+- Craig Maloney <craig@ic.net>
+- Gert Beumer <Gert@scintilla.utwente.nl>
+-
+-
+-
+-usage: wmcp [-g geometry] [-d dpy] [-n workspaces] [-a alt key] [-v]
+- [-c] [-w i/n/w] [-s y/n] [-x #] [-y #] [-h]
+-
+-
+--g geometry: ie: 64x64+10+10
+--d dpy: Display. ie: 127.0.0.1:0.0
+--n workspaces: How many buttons to start with.
+--a alt key: integer 1-4 defining ModXMask (default 1 Mod1Mask).
+--w i/n/w: Window State: Iconic, Normal, Withdrawn (default Withdrawn)
+--s y/n: Shaped window: yes or no (default y)
+--c Sends CTRL + ALT + Key (default only sends ALT + key)
+--v Verbose. 0=off, 1=on (default 0)
+--x Number of buttons on the x-direction (1,2,3, or 4)
+--y Number of buttons in the y-direction (1,2,3, or 4)
+--h Help. This screen.
+-
+-
++fprintf(stderr,"\n\
++\n\
++%s\n\
++This software is GPL -- do as you wish with it.\n\
++\n\
++Origional Author:\n\
++ Ben Cohen <buddog@aztec.asu.edu>\n\
++\n\
++Contributors:\n\
++ Thomas Nemeth <tnemeth@multimania.com>\n\
++ Craig Maloney <craig@ic.net>\n\
++ Gert Beumer <Gert@scintilla.utwente.nl>\n\
++\n\
++\n\
++\n\
++usage: wmcp [-g geometry] [-d dpy] [-n workspaces] [-a alt key] [-v]\n\
++ [-c] [-w i/n/w] [-s y/n] [-x #] [-y #] [-h]\n\
++\n\
++\n\
++-g geometry: ie: 64x64+10+10\n\
++-d dpy: Display. ie: 127.0.0.1:0.0\n\
++-n workspaces: How many buttons to start with.\n\
++-a alt key: integer 1-4 defining ModXMask (default 1 Mod1Mask).\n\
++-w i/n/w: Window State: Iconic, Normal, Withdrawn (default Withdrawn)\n\
++-s y/n: Shaped window: yes or no (default y)\n\
++-c Sends CTRL + ALT + Key (default only sends ALT + key)\n\
++-v Verbose. 0=off, 1=on (default 0)\n\
++-x Number of buttons on the x-direction (1,2,3, or 4)\n\
++-y Number of buttons in the y-direction (1,2,3, or 4)\n\
++-h Help. This screen.\n\
++\n\
++\n\
+ ",VERSION);
+
+ exit(-1);
--- wmcp.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?1073163811>