Attachment 36832 Details for Bug 58882 – file.diff

[patch] file.diff

file.diff (text/plain), 5.14 KB, created by tkato on 2003-11-03 15:30:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-11-03 15:30:15 UTC

Size: 5.14 KB

patch

obsolete

>diff -urN /usr/ports/x11-wm/wmanager/Makefile x11-wm/wmanager/Makefile
>--- /usr/ports/x11-wm/wmanager/Makefile	Wed Oct 29 10:32:59 2003
>+++ x11-wm/wmanager/Makefile	Sun Nov  2 02:35:02 2003
>@@ -8,28 +8,22 @@
> PORTNAME=	wmanager
> PORTVERSION=	0.2.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 +36,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/x11-wm/wmanager/distinfo x11-wm/wmanager/distinfo
>--- /usr/ports/x11-wm/wmanager/distinfo	Fri Nov  1 22:12:31 2002
>+++ x11-wm/wmanager/distinfo	Sun Nov  2 02:36:15 2003
>@@ -1 +1 @@
>-MD5 (wmanager-0.2.1-src.tar.bz2) = 9cb3ee252d893d869af9c7079d1d8e31
>+MD5 (wmanager_0.2.1.orig.tar.gz) = 1f42d4b403eb979095882a9c26a39b5c
>diff -urN /usr/ports/x11-wm/wmanager/files/patch-aa x11-wm/wmanager/files/patch-aa
>--- /usr/ports/x11-wm/wmanager/files/patch-aa	Fri Nov  1 22:12:31 2002
>+++ x11-wm/wmanager/files/patch-aa	Sun Nov  2 02:42:50 2003
>@@ -19,7 +19,7 @@
> -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 -urN /usr/ports/x11-wm/wmanager/files/patch-ab x11-wm/wmanager/files/patch-ab
>--- /usr/ports/x11-wm/wmanager/files/patch-ab	Fri May 24 21:01:03 2002
>+++ x11-wm/wmanager/files/patch-ab	Sun Nov  2 02:45:15 2003
>@@ -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 -urN /usr/ports/x11-wm/wmanager/files/patch-inc::WManager.H x11-wm/wmanager/files/patch-inc::WManager.H
>--- /usr/ports/x11-wm/wmanager/files/patch-inc::WManager.H	Thu Jan  1 09:00:00 1970
>+++ x11-wm/wmanager/files/patch-inc::WManager.H	Sun Nov  2 02:38:41 2003
>@@ -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 -urN /usr/ports/x11-wm/wmanager/files/patch-src::Interface.cc x11-wm/wmanager/files/patch-src::Interface.cc
>--- /usr/ports/x11-wm/wmanager/files/patch-src::Interface.cc	Thu Jan  1 09:00:00 1970
>+++ x11-wm/wmanager/files/patch-src::Interface.cc	Sun Nov  2 02:45:59 2003
>@@ -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 -urN /usr/ports/x11-wm/wmanager/pkg-descr x11-wm/wmanager/pkg-descr
>--- /usr/ports/x11-wm/wmanager/pkg-descr	Fri May 24 21:01:02 2002
>+++ x11-wm/wmanager/pkg-descr	Sun Nov  2 09:52:37 2003
>@@ -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/

Actions: View | Diff

Attachments on bug 58882: 36832