cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.6.1

Browse Source
This commit is contained in:
wilfried 2006-10-19 07:35:02 +00:00
parent e91bf96e32
commit 655d3a2771
5 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/wmbutton/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2006/07/20 04:43:28 steven Exp $
# $OpenBSD: Makefile,v 1.16 2006/10/19 07:35:02 wilfried Exp $
COMMENT= 'wm-dockapp; application launching program'
DISTNAME= wmbutton-0.4
PKGNAME= ${DISTNAME}p0
DISTNAME= wmbutton-0.6.1
CATEGORIES= x11 x11/windowmaker
HOMEPAGE= http://greek0.net/~greek0/wmbutton/

8
x11/wmbutton/distinfo
View File

@ -1,4 +1,4 @@
MD5 (wmbutton-0.4.tar.gz) = 77b24ab49acfb667116d518d4bb99990
RMD160 (wmbutton-0.4.tar.gz) = f863308d18d04d6f32412c4632d4bd2ed831a3fc
SHA1 (wmbutton-0.4.tar.gz) = 5ddc5179fe5ade7d1feb63c361426f1dfbd79131
SIZE (wmbutton-0.4.tar.gz) = 30351
MD5 (wmbutton-0.6.1.tar.gz) = b4e8d35709252306739ccc1a2a826c08
RMD160 (wmbutton-0.6.1.tar.gz) = 1ed0d5170b7cba7a8a30144825bb2722959e97ea
SHA1 (wmbutton-0.6.1.tar.gz) = 4bbedb18dd8de1c644551cdc8cc151421d56f30c
SIZE (wmbutton-0.6.1.tar.gz) = 48404

23
x11/wmbutton/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/16 21:29:05 naddy Exp $
--- Makefile.orig Mon Mar 8 17:59:20 1999
+++ Makefile Tue Jan 16 18:10:47 2001
@@ -1,15 +1,17 @@
$OpenBSD: patch-Makefile,v 1.2 2006/10/19 07:35:02 wilfried Exp $
--- Makefile.orig Sun Jan 16 16:12:54 2005
+++ Makefile Thu Oct 19 09:16:56 2006
@@ -1,19 +1,17 @@
-INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
-LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
+INCLUDES =-I${X11BASE}/include
@ -9,17 +9,20 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/16 21:29:05 naddy Exp $
LIBS = -lX11 -lXpm -lXext
TARGET = wmbutton
OBJECTS = wmbutton.o readln.o
OBJECTS = wmbutton.o wmb_libs.o
-CFLAGS += -c -Wall -O2
+all: ${TARGET}
-all: ${TARGET} tags
-
.c.o:
- gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
+ ${CC} ${CFLAGS} -c ${INCLUDES} ${FLAGS} $< -o $*.o
- gcc ${CFLAGS} ${INCLUDES} $< -o $*.o
+ ${CC} ${CFLAGS} -c ${INCLUDES} $< -o $*.o
${TARGET}: ${OBJECTS}
- gcc -O2 -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
- gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
+ ${CC} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
+
+all:: ${TARGET}
clean::
for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done

31
x11/wmbutton/patches/patch-wmbutton_c
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-wmbutton_c,v 1.1.1.1 2001/01/16 21:29:05 naddy Exp $
--- wmbutton.c.orig Mon Mar 8 17:59:20 1999
+++ wmbutton.c Fri Jan 12 11:42:57 2001
@@ -24,11 +24,11 @@
* development of wmbutton. I'm listing them here partially as thanks for
* helping out, catching bugs in the code, etc.
***********************************************************************/
-#include <Xlib.h>
-#include <Xutil.h>
-#include <xpm.h>
-#include <extensions/shape.h>
-#include <keysym.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/xpm.h>
+#include <X11/extensions/shape.h>
+#include <X11/keysym.h>
#include <stdio.h>
#include <math.h>
#include <stdlib.h>
@@ -115,8 +115,8 @@ int main( int argc, char ** argv ) {
char Geometry_str[64] = "64x64+0+0";
char Display_str[64] = "";
- strcpy(configfile, getenv("HOME")); // Added by Casey Harkin, 3/6/99
- strcat(configfile, CONFFILENAME); // Fixed Bug - didn't look in home directory
+ strlcpy(configfile, getenv("HOME"), sizeof(configfile)); // Added by Casey Harkin, 3/6/99
+ strlcat(configfile, CONFFILENAME, sizeof(configfile)); // Fixed Bug - didn't look in home directory
// but startup directory
/* Parse Command Line Arguments */

20
x11/wmbutton/patches/patch-wmbutton_h Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-wmbutton_h,v 1.1 2006/10/19 07:35:02 wilfried Exp $
--- wmbutton.h.orig Fri Feb 11 20:56:09 2005
+++ wmbutton.h Thu Oct 19 09:11:53 2006
@@ -2,11 +2,11 @@
/* Last Modified 3/27/04 */
/****** Include Files ***************************************************/
-#include <Xlib.h>
-#include <Xutil.h>
-#include <xpm.h>
-#include <extensions/shape.h>
-#include <keysym.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/xpm.h>
+#include <X11/extensions/shape.h>
+#include <X11/keysym.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>