Submitted by: "KATO Tsuguru" <tkato@prontomail.ne.jp>

Update to version 4.0

5 files changed, 25 insertions, 36 deletions

diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 48794169cdcd..3ac38f6fa74b 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -1,23 +1,26 @@
 # New ports collection makefile for:	wm2
-# Version required:	3.0
+# Version required:	4.0
 # Date created:		16 February 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	wm2-3
-PKGNAME=	wm2-3.0
+DISTNAME=	wm2-4
+PKGNAME=	wm2-4.0
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.netcomuk.co.uk/~cannam/
+MASTER_SITES=	http://www.all-day-breakfast.com/wm2/
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/wm2
 ALL_TARGET=	depend wm2
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/wm2
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wm2
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wm2/distinfo b/x11-wm/wm2/distinfo
index 99589b894a7c..f1f33dfe6dce 100644
--- a/x11-wm/wm2/distinfo
+++ b/x11-wm/wm2/distinfo
@@ -1 +1 @@
-MD5 (wm2-3.tar.gz) = 1acbcdfa912fa62ab28b8da36c9d3fcb
+MD5 (wm2-4.tar.gz) = 3b1d6da47a00c06436891669261bd651
diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa
index 9cd6f07f2cf6..cd93cca6a47e 100644
--- a/x11-wm/wm2/files/patch-aa
+++ b/x11-wm/wm2/files/patch-aa
@@ -1,27 +1,27 @@
---- Makefile.orig	Thu Jan 16 06:20:29 1997
-+++ Makefile	Sat Oct  3 20:01:54 1998
-@@ -1,10 +1,13 @@
+--- Makefile.orig	Fri Mar 21 20:12:30 1997
++++ Makefile	Wed Sep 22 23:55:40 1999
+@@ -1,9 +1,12 @@
  
- # if you want pixmaps you'll need Xpm, so add -lXpm to the next line
 -LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
-+LIBS	=  -L$(X11BASE)/lib -lXext -lX11 -lXmu -lm
++LIBS	=  -L$(PREFIX)/lib -lXext -lX11 -lXmu -lm
 +.if $(PORTOBJFORMAT) == "elf"
-+LIBS	+= -Wl,-rpath,$(X11BASE)/lib
++LIBS	+= -Wl,-rpath,$(PREFIX)/lib
 +.endif
  
- CC	= gcc
- CCC	= gcc
+-CC	= gcc
+-CCC	= gcc
 -CFLAGS	= -O2
-+CFLAGS	+= -O2 -I$(X11BASE)/include
- OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o listimpl.o
++CC	?= gcc
++CCC	= $(CC)
++CFLAGS	+= -I$(PREFIX)/include
+ OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
  
  .c.o:
-@@ -14,7 +17,7 @@
+@@ -13,7 +16,6 @@
  	$(CCC) -c $(CFLAGS) $<
  
  wm2:	$(OBJECTS)
 -	mv -f wm2 wm2.old >& /dev/null || true
-+	mv -f wm2 wm2.old 2> /dev/null || true
  	$(CCC) -o wm2 $(OBJECTS) $(LIBS)
  
  depend:
diff --git a/x11-wm/wm2/pkg-descr b/x11-wm/wm2/pkg-descr
index b0b0df0eef30..f88caccb5d0e 100644
--- a/x11-wm/wm2/pkg-descr
+++ b/x11-wm/wm2/pkg-descr
@@ -1,20 +1,4 @@
 wm2 -- a window manager
 =======================
 
-wm2 is a window manager for X.  It provides an unusual style of window
-decoration and as little functionality as I feel comfortable with in a
-window manager.  wm2 is not configurable, except by editing the source
-and recompiling the code, and is really intended for people who don't
-particularly want their window manager to be too friendly.
-
-wm2 provides:
-
-  -- Decorative frames for your windows.
-
-  -- The ability to move, resize, hide and restore windows.
-
-  -- No icons.
-
-  -- No configurable root menus, buttons or mouse or keyboard bindings.
-
-  -- No virtual desktop, toolbars or integrated applications.
+WWW: http://www.all-day-breakfast.com/wm2/
diff --git a/x11-wm/wm2/pkg-plist b/x11-wm/wm2/pkg-plist
index c44b67f9e6f1..86af8cd1cf76 100644
--- a/x11-wm/wm2/pkg-plist
+++ b/x11-wm/wm2/pkg-plist
@@ -1 +1,3 @@
 bin/wm2
+share/doc/wm2/README
+@dirrm share/doc/wm2