ports/85882: Update port: x11/wmbutton to 0.6.1

[KATO Tsuguru]

>Number:         85882
>Category:       ports
>Synopsis:       Update port: x11/wmbutton to 0.6.1
>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:   Thu Sep 08 17:10:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p12 i386
>Organization:
>Environment:
>Description:
- Update to version 0.6.1

New file:
files/pkg-message.in

Remove file:
files/patch-Makefile

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/wmbutton/Makefile x11/wmbutton/Makefile
--- /usr/ports/x11/wmbutton/Makefile	Mon Dec 15 18:28:23 2003
+++ x11/wmbutton/Makefile	Wed Sep  7 00:10:49 2005
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	wmbutton
-PORTVERSION=	0.4
+PORTVERSION=	0.6.1
 CATEGORIES=	x11 windowmaker
-MASTER_SITES=	http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	jim
+MASTER_SITES=	http://greek0.net/~greek0/wmbutton/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A dockapp that displays 9 buttons to run apps of your choice
@@ -18,20 +16,28 @@
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
+SUB_FILES=	pkg-message
+
+PLIST_FILES=	bin/wmbutton %%EXAMPLESDIR%%/dot.wmbutton
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README
+.endif
+
 do-build:
-	@(cd ${WRKSRC} && make)
+	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} \
+		-I${X11BASE}/include/X11 -I${X11BASE}/include \
+		wmb_libs.c wmbutton.c -o wmbutton \
+		-L${X11BASE}/lib -lXpm -lXext -lX11
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/wmbutton ${PREFIX}/bin
-
-post-install:
-	@${ECHO} "===>   Installing .wmbutton as ${PREFIX}/share/examples/wmbutton/wmbutton"
-	@${ECHO} "===>   Modify if you wish and copy to ~/.wmbutton"
-	@${MKDIR} ${PREFIX}/share/examples/wmbutton && ${CHMOD} a+rx ${PREFIX}/share/examples/wmbutton
-	@${INSTALL_DATA} ${WRKSRC}/.wmbutton ${PREFIX}/share/examples/wmbutton/wmbutton
-	@${ECHO} "===>   Installing README in ${PREFIX}/share/doc/wmbutton"
-	@${ECHO} "===>   Please read it for usage instructions"
-	@${MKDIR} ${PREFIX}/share/doc/wmbutton && ${CHMOD} a+rx ${PREFIX}/share/doc/wmbutton
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmbutton
+	${INSTALL_PROGRAM} ${WRKSRC}/wmbutton ${PREFIX}/bin/wmbutton
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/.wmbutton ${EXAMPLESDIR}/dot.wmbutton
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
+.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11/wmbutton/distinfo x11/wmbutton/distinfo
--- /usr/ports/x11/wmbutton/distinfo	Fri Jan 30 14:55:31 2004
+++ x11/wmbutton/distinfo	Wed Sep  7 00:11:21 2005
@@ -1,2 +1,2 @@
-MD5 (wmbutton-0.4.tar.gz) = 77b24ab49acfb667116d518d4bb99990
-SIZE (wmbutton-0.4.tar.gz) = 30351
+MD5 (wmbutton-0.6.1.tar.gz) = b4e8d35709252306739ccc1a2a826c08
+SIZE (wmbutton-0.6.1.tar.gz) = 48404
diff -urN /usr/ports/x11/wmbutton/files/patch-aa x11/wmbutton/files/patch-aa
--- /usr/ports/x11/wmbutton/files/patch-aa	Sun Apr 11 21:53:10 1999
+++ x11/wmbutton/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- Makefile.orig	Sat Apr 10 16:49:04 1999
-+++ Makefile	Sat Apr 10 16:51:43 1999
-@@ -1,15 +1,15 @@
--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/X11 -I${LOCALBASE}/include -I/${X11BASE}/include
-+LIBINC =-L${X11BASE}/lib -L${LOCALBASE}/lib
- LIBS = -lX11 -lXpm -lXext
- 
- TARGET = wmbutton
- OBJECTS = wmbutton.o readln.o
- 
- .c.o:
--	gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
-+	${CC} ${CFLAGS} -c -Wall ${INCLUDES} ${CFLAGS} $< -o $*.o
- 
- ${TARGET}: ${OBJECTS}
--	gcc -O2 -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
-+	${CC} ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
- 
- clean::
- 	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff -urN /usr/ports/x11/wmbutton/files/pkg-message.in x11/wmbutton/files/pkg-message.in
--- /usr/ports/x11/wmbutton/files/pkg-message.in	Thu Jan  1 09:00:00 1970
+++ x11/wmbutton/files/pkg-message.in	Wed Sep  7 00:04:11 2005
@@ -0,0 +1,4 @@
+*******************************************************************************
+Installing .wmbutton as %%PREFIX%%/share/examples/wmbutton/dot.wmbutton
+Modify if you wish and copy to ~/.wmbutton
+*******************************************************************************
diff -urN /usr/ports/x11/wmbutton/pkg-descr x11/wmbutton/pkg-descr
--- /usr/ports/x11/wmbutton/pkg-descr	Thu Feb 17 11:43:03 2000
+++ x11/wmbutton/pkg-descr	Tue Sep  6 23:51:38 2005
@@ -4,6 +4,6 @@
 type it in a shell command, wmbutton can run it.  It is based on wmcp,
 by Ben Cohen.
 
-WWW: http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/other.html#wmbutton
+WWW: http://greek0.net/~greek0/wmbutton/
 
 - Jim <jim at FreeBSD.org>
diff -urN /usr/ports/x11/wmbutton/pkg-plist x11/wmbutton/pkg-plist
--- /usr/ports/x11/wmbutton/pkg-plist	Sun Apr 11 21:53:10 1999
+++ x11/wmbutton/pkg-plist	Thu Jan  1 09:00:00 1970
@@ -1,5 +0,0 @@
-bin/wmbutton
-share/examples/wmbutton/wmbutton
-share/doc/wmbutton/README
- at dirrm share/examples/wmbutton
- at dirrm share/doc/wmbutton
>Release-Note:
>Audit-Trail:
>Unformatted: