Attachment #36832 for bug #58882

View | Details | Raw Unified | Return to bug 58882
Collapse All | Expand All




PORTNAME=	wmanager
PORTVERSION=	0.2.1
CATEGORIES=	x11-wm
MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
EXTRACT_SUFX=	-src.tar.bz2

MAINTAINER=	ports@FreeBSD.org
COMMENT=	X11 window manager selector

LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk

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)

	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample
.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)x11-wm/wmanager/distinfo (-1 / +1 lines)
1	MD5 (wmanager-0.2.1-src.tar.bz2) = 9cb3ee252d893d869af9c7079d1d8e31	1	MD5 (wmanager_0.2.1.orig.tar.gz) = 1f42d4b403eb979095882a9c26a39b5c

Lines 19-25 Link Here

(-)x11-wm/wmanager/files/patch-aa (-1 / +1 lines)
19	-CXXFLAGS = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3	19	-CXXFLAGS = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3
20	-	20	-
21	+CXX ?= g++	21	+CXX ?= g++
22	+CXXFLAGS+= -I$(fltkinc) -I$(incdir) -Wall -pedantic $(PTHREAD_CFLAGS) #-DDEBUG=1 -g3	22	+CXXFLAGS+= -I$(fltkinc) -I$(incdir) $(PTHREAD_CFLAGS) #-DDEBUG=1 -g3
23		23
24	# linker settings	24	# linker settings
25	-LD = g++	25	-LD = g++




--- 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()




--- 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);




--- 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
 }
 
 

Lines 1-5 Link Here

(-)x11-wm/wmanager/pkg-descr (-2 lines)
1	WManager is a windowmanager manager. Quite a tongue twister, eh?	1	WManager is a windowmanager manager. Quite a tongue twister, eh?
2	It "manages" your windowmanagers by letting you choose from your	2	It "manages" your windowmanagers by letting you choose from your
3	favorites on starting up X.	3	favorites on starting up X.
4
5	WWW: http://kassandra.techfak.uni-bielefeld.de/mtessmer/wmanager/

Return to bug 58882

Lines 8-35 Link Here

(-)x11-wm/wmanager/Makefile (-11 / +5 lines)
8	PORTNAME= wmanager	8	PORTNAME= wmanager
9	PORTVERSION= 0.2.1	9	PORTVERSION= 0.2.1
10	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
11	MASTER_SITES= ${MASTER_SITE_LOCAL}	11	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
12	MASTER_SITE_SUBDIR= trevor	12	DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
13	EXTRACT_SUFX= -src.tar.bz2
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= X11 window manager selector	15	COMMENT= X11 window manager selector
17		16
18	LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk	17	LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
19		18
20	USE_BZIP2= yes	19	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		20
21	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	MAKE_ENV= CXX="${CXX}" \	23	MAKE_ENV= CXX="${CXX}" \
24	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	24	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
25	PTHREAD_LIBS="${PTHREAD_LIBS}"	25	PTHREAD_LIBS="${PTHREAD_LIBS}"
26		26
27	.include <bsd.port.pre.mk>
28
29	.if ${OSVERSION} >= 500113
30	BROKEN= "Does not compile (bad C++ code)"
31	.endif
32
33	do-install:	27	do-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin	28	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin
35	.if !defined(NOPORTDOCS)	29	.if !defined(NOPORTDOCS)
Lines 42-45 Link Here
42	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample	36	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample
43	.endif	37	.endif
44		38
45	.include <bsd.port.post.mk>	39	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)x11-wm/wmanager/files/patch-ab (-3 / +13 lines)
1	--- src/WManager.cc Wed Sep 29 13:23:17 1999	1	--- src/WManager.cc.orig Mon Nov 15 00:28:36 1999
2	+++ src/WManager.cc.new Fri Nov 19 23:07:25 1999	2	+++ src/WManager.cc Sun Nov 2 02:45:05 2003
3	@@ -9,6 +9,8 @@	3	@@ -25,7 +25,10 @@
		4	#include <string> // standard string class
4	#include <fstream> // file streams	5	#include <fstream> // file streams
5	#include <cstring> // only for 'strtok'	6	#include <cstring> // only for 'strtok'
		7	+#include <iostream>
6	#include <pwd.h> // for home directory	8	#include <pwd.h> // for home directory
7	+#include <unistd.h>	9	+#include <unistd.h>
8	+#include <sys/types.h>	10	+#include <sys/types.h>
9		11
10		12
11	// PROJECT INCLUDES ////////////////////////////////	13	// PROJECT INCLUDES ////////////////////////////////
		14	@@ -36,6 +39,7 @@
		15	// LOCAL INCLUDES //////////////////////////////////
		16	#include <FL/fl_message.H> // message window
		17
		18	+using namespace std;
		19
		20	// constructor
		21	WManager::WManager()

Line 0 Link Here

(-)x11-wm/wmanager/files/patch-inc::WManager.H (+15 lines)
	1	--- inc/WManager.H.orig Mon Nov 15 00:28:36 1999
	2	+++ inc/WManager.H Sun Nov 2 02:38:20 2003
	3	@@ -80,10 +80,10 @@
	4
	5	private:
	6	Interface* _Interface;
	7	- string* _ConfigurationFilename;
	8	+ std::string* _ConfigurationFilename;
	9
	10	void
	11	- _ParseConfigurationFile(ifstream* filestream);
	12	+ _ParseConfigurationFile(std::ifstream* filestream);
	13
	14	void
	15	_TokenizeAndAddToBrowser(char* entry);

Line 0 Link Here

(-)x11-wm/wmanager/files/patch-src::Interface.cc (+31 lines)
	1	--- src/Interface.cc.orig Wed Nov 17 03:25:42 1999
	2	+++ src/Interface.cc Sun Nov 2 02:38:20 2003
	3	@@ -23,6 +23,7 @@
	4
	5	// SYSTEM INCLUDES //////////////////////////////////
	6	#include <iostream> // standard io interface
	7	+#include <cstring>
	8
	9
	10	// PROJECT INCLUDES ////////////////////////////////
	11	@@ -37,6 +38,7 @@
	12	#include <FL/Fl_Pixmap.H>
	13	#include <FL/fl_message.H>
	14
	15	+using namespace std;
	16
	17	// logo image
	18	static unsigned char *image_mt[] = {
	19	@@ -130,10 +132,12 @@
	20	Interface::~Interface()
	21	{
	22	delete _WMWindow;
	23	+#if 0 // Uncommented, so we don't segfault with fltk 1.1
	24	delete _ExitButton;
	25	delete _StartButton;
	26	delete _AboutButton;
	27	delete _ListBrowser;
	28	+#endif
	29	}
	30
	31