8 files changed, 77 insertions, 28 deletions

diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 5ead57071369..7ca343794c44 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -7,29 +7,24 @@
 
 PORTNAME=	wmanager
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	trevor
-EXTRACT_SUFX=	-src.tar.bz2
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 window manager selector
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-USE_BZIP2=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CXX="${CXX}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
@@ -42,4 +37,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/wmanager/distinfo b/x11-wm/wmanager/distinfo
index 5602d89ee748..a78b1d0922c3 100644
--- a/x11-wm/wmanager/distinfo
+++ b/x11-wm/wmanager/distinfo
@@ -1 +1 @@
-MD5 (wmanager-0.2.1-src.tar.bz2) = 9cb3ee252d893d869af9c7079d1d8e31
+MD5 (wmanager_0.2.1.orig.tar.gz) = 1f42d4b403eb979095882a9c26a39b5c
diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-aa
index ab890ad02ae8..2bf70a8b12cb 100644
--- a/x11-wm/wmanager/files/patch-aa
+++ b/x11-wm/wmanager/files/patch-aa
@@ -19,7 +19,7 @@ $FreeBSD$
 -CXXFLAGS  = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3
 -
 +CXX      ?= g++
-+CXXFLAGS+= -I$(fltkinc) -I$(incdir) -Wall -pedantic $(PTHREAD_CFLAGS) #-DDEBUG=1 -g3
++CXXFLAGS+= -I$(fltkinc) -I$(incdir) $(PTHREAD_CFLAGS) #-DDEBUG=1 -g3
  
  # linker settings
 -LD        = g++
diff --git a/x11-wm/wmanager/files/patch-ab b/x11-wm/wmanager/files/patch-ab
index 8add2b3987ed..d33d88b1aa75 100644
--- a/x11-wm/wmanager/files/patch-ab
+++ b/x11-wm/wmanager/files/patch-ab
@@ -1,11 +1,21 @@
---- src/WManager.cc	Wed Sep 29 13:23:17 1999
-+++ src/WManager.cc.new	Fri Nov 19 23:07:25 1999
-@@ -9,6 +9,8 @@
+--- src/WManager.cc.orig	Mon Nov 15 00:28:36 1999
++++ src/WManager.cc	Sun Nov  2 02:45:05 2003
+@@ -25,7 +25,10 @@
+ #include <string>                                 // standard string class
  #include <fstream>                                // file streams
  #include <cstring>                                // only for 'strtok'
++#include <iostream>
  #include <pwd.h>                                  // for home directory
 +#include <unistd.h>
 +#include <sys/types.h>
  
  
  // PROJECT INCLUDES ////////////////////////////////
+@@ -36,6 +39,7 @@
+ // LOCAL INCLUDES //////////////////////////////////
+ #include <FL/fl_message.H>                        // message window
+ 
++using namespace std;
+ 
+ // constructor
+ WManager::WManager()
diff --git a/x11-wm/wmanager/files/patch-inc::WManager.H b/x11-wm/wmanager/files/patch-inc::WManager.H
new file mode 100644
index 000000000000..a2e5df36c386
--- /dev/null
+++ b/x11-wm/wmanager/files/patch-inc::WManager.H
@@ -0,0 +1,15 @@
+--- inc/WManager.H.orig	Mon Nov 15 00:28:36 1999
++++ inc/WManager.H	Sun Nov  2 02:38:20 2003
+@@ -80,10 +80,10 @@
+   
+ private:
+   Interface* _Interface;
+-  string*    _ConfigurationFilename;
++  std::string*    _ConfigurationFilename;
+ 
+   void
+-  _ParseConfigurationFile(ifstream* filestream);
++  _ParseConfigurationFile(std::ifstream* filestream);
+ 
+   void
+   _TokenizeAndAddToBrowser(char* entry);
diff --git a/x11-wm/wmanager/files/patch-src::Interface.cc b/x11-wm/wmanager/files/patch-src::Interface.cc
new file mode 100644
index 000000000000..ed16135d60c8
--- /dev/null
+++ b/x11-wm/wmanager/files/patch-src::Interface.cc
@@ -0,0 +1,31 @@
+--- src/Interface.cc.orig	Wed Nov 17 03:25:42 1999
++++ src/Interface.cc	Sun Nov  2 02:38:20 2003
+@@ -23,6 +23,7 @@
+ 
+ // SYSTEM INCLUDES //////////////////////////////////
+ #include <iostream>                               // standard io interface
++#include <cstring>
+ 
+ 
+ // PROJECT INCLUDES ////////////////////////////////
+@@ -37,6 +38,7 @@
+ #include <FL/Fl_Pixmap.H>
+ #include <FL/fl_message.H>
+ 
++using namespace std;
+ 
+ // logo image
+ static unsigned char *image_mt[] = {
+@@ -130,10 +132,12 @@
+ Interface::~Interface()
+ {
+   delete _WMWindow;
++#if 0 // Uncommented, so we don't segfault with fltk 1.1
+   delete _ExitButton;
+   delete _StartButton;
+   delete _AboutButton;
+   delete _ListBrowser;
++#endif
+ }
+ 
+ 
diff --git a/x11-wm/wmanager/pkg-descr b/x11-wm/wmanager/pkg-descr
index 25f130964bcc..ac088e3b11eb 100644
--- a/x11-wm/wmanager/pkg-descr
+++ b/x11-wm/wmanager/pkg-descr
@@ -1,5 +1,3 @@
 WManager is a windowmanager manager. Quite a tongue twister, eh?
 It "manages" your windowmanagers by letting you choose from your
 favorites on starting up X.
-
-WWW: http://kassandra.techfak.uni-bielefeld.de/mtessmer/wmanager/
diff --git a/x11-wm/wmanager/pkg-plist b/x11-wm/wmanager/pkg-plist
index 431808f20122..ae20520e9ea3 100644
--- a/x11-wm/wmanager/pkg-plist
+++ b/x11-wm/wmanager/pkg-plist
@@ -1,11 +1,11 @@
 bin/wmanager
-%%PORTDOCS%%share/doc/wmanager/FAQ
-%%PORTDOCS%%share/doc/wmanager/HISTORY
-%%PORTDOCS%%share/doc/wmanager/INSTALL
-%%PORTDOCS%%share/doc/wmanager/NEWS
-%%PORTDOCS%%share/doc/wmanager/README
-%%PORTDOCS%%share/doc/wmanager/TODO
-%%PORTDOCS%%share/examples/wmanager/wmanagerrc_sample
-%%PORTDOCS%%share/examples/wmanager/xinitrc_sample
-%%PORTDOCS%%@dirrm share/examples/wmanager
-%%PORTDOCS%%@dirrm share/doc/wmanager
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%EXAMPLESDIR%%/wmanagerrc_sample
+%%PORTDOCS%%%%EXAMPLESDIR%%/xinitrc_sample
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%