Index: head/x11-wm/wmanager/Makefile =================================================================== --- head/x11-wm/wmanager/Makefile (revision 425714) +++ head/x11-wm/wmanager/Makefile (revision 425715) @@ -1,41 +1,48 @@ # Created by: Will Andrews # $FreeBSD$ PORTNAME= wmanager PORTVERSION= 0.2.1 PORTREVISION= 13 CATEGORIES= x11-wm MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_${PORTVERSION}.orig MAINTAINER= ports@FreeBSD.org COMMENT= X11 window manager selector +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libfltk.so:x11-toolkits/fltk WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -PKGMESSAGE= ${WRKDIR}/pkg-message - USES= gmake USE_XORG= x11 xext USE_GL= gl +PKGMESSAGE= ${WRKDIR}/pkg-message + OPTIONS_DEFINE= ADDONS DOCS EXAMPLES OPTIONS_DEFAULT=ADDONS -ADDONS_DESC= Install the helper scripts and manpages OPTIONS_SUB= yes -ADDONS_RUNDEPENDS= wmanager-loop:x11-wm/wmanager-addons +ADDONS_DESC= Install the helper scripts and manpages +ADDONS_RUN_DEPENDS= wmanager-loop:x11-wm/wmanager-addons do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${STAGEDIR}${PREFIX}/bin + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in FAQ HISTORY INSTALL NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${STAGEDIR}${EXAMPLESDIR}/wmanagerrc_sample ${INSTALL_DATA} ${WRKSRC}/.xinitrc ${STAGEDIR}${EXAMPLESDIR}/xinitrc_sample .include Index: head/x11-wm/wmanager/distinfo =================================================================== --- head/x11-wm/wmanager/distinfo (revision 425714) +++ head/x11-wm/wmanager/distinfo (revision 425715) @@ -1,2 +1,3 @@ +TIMESTAMP = 1476707858 SHA256 (wmanager_0.2.1.orig.tar.gz) = 7974aa6bb15e4c0e8dcac42055a865e6151b920cd6aa2658ffa70ce33edf446c SIZE (wmanager_0.2.1.orig.tar.gz) = 25734 Index: head/x11-wm/wmanager/files/patch-Makefile =================================================================== --- head/x11-wm/wmanager/files/patch-Makefile (revision 425714) +++ head/x11-wm/wmanager/files/patch-Makefile (revision 425715) @@ -1,82 +1,81 @@ -diff -urN -urN -x .svn ../vendor/wmanager/Makefile ./Makefile ---- ../vendor/wmanager/Makefile 2007-12-11 12:42:04.000000000 +0200 -+++ ./Makefile 2008-05-21 18:21:47.000000000 +0300 +--- Makefile.orig 1999-11-14 15:29:24 UTC ++++ Makefile @@ -28,39 +28,39 @@ # make settings SHELL = /bin/sh MAKEFLAGS = --print-directory +PREFIX ?= /usr/local +LOCALBASE ?= /usr/local +# base settings +bindir = $(PREFIX)/bin +incdir = ./inc +srcdir = ./src +fltkinc = $(LOCALBASE)/include +x11lib = $(LOCALBASE)/lib # compiler settings -CXX = g++ -CXXFLAGS = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3 - +CXX ?= g++ +CXXFLAGS_WARN ?= -Wall -W +CXXFLAGS_OPT ?= -O2 -fno-strict-aliasing -pipe +#CXXFLAGS_DBG ?= -g -DDEBUG +CXXFLAGS_DBG ?= +CXXFLAGS ?= ${CXXFLAGS_WARN} ${CXXFLAGS_DBG} ${CXXFLAGS_OPT} +CXXFLAGS += -I${fltkinc} -I${incdir} ${PTHREAD_CFLAGS} # linker settings -LD = g++ -LDFLAGS = -lfltk -lXext -lX11 -lm -LDDIRS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib - +LD = $(CXX) +LDFLAGS += -lGL -lfltk -lXext -lX11 -lm ${PTHREAD_LIBS} +LDDIRS = -L$(x11lib) # install settings -INSTALL = /usr/bin/install -INSTALL_FLAGS = --strip +INSTALL ?= install +STRIP ?= -s # documentation tool DOCTOOL = perceps DOCTOOL_FLAGS = -a -b -f -h -m -r -# base locations -prefix = /usr/local -exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin - - -# include files and sources -incdir = ./inc -srcdir = ./src - - # documentational files for developer docdir = ./doc templates = $(docdir)/templates -@@ -82,8 +82,7 @@ +@@ -82,8 +82,7 @@ OBJ = $(patsubst %.cc,%.o,$(SRC)) # project version VERSION = 0.1.1 - -all: wmanager TAGS +all: wmanager wmanager: $(OBJ) $(LD) -o $@ $^ $(LDDIRS) $(LDFLAGS) -@@ -92,7 +91,7 @@ +@@ -92,7 +91,7 @@ static: $(OBJ) $(LD) -o wmanager $^ $(LDDIRS) $(LDFLAGS) -static install: wmanager - $(INSTALL) $< $(bindir)/$< + $(INSTALL) $(STRIP) $< ${DESTDIR}$(bindir)/$< clean: @rm -f $(OBJ) wmanager Index: head/x11-wm/wmanager/files/patch-inc__WManager.H =================================================================== --- head/x11-wm/wmanager/files/patch-inc__WManager.H (revision 425714) +++ head/x11-wm/wmanager/files/patch-inc__WManager.H (revision 425715) @@ -1,25 +1,24 @@ -diff -urN -urN -x .svn ../vendor/wmanager/inc/WManager.H ./inc/WManager.H ---- ../vendor/wmanager/inc/WManager.H 2007-12-11 12:42:04.000000000 +0200 -+++ ./inc/WManager.H 2007-12-17 16:00:13.000000000 +0200 -@@ -80,17 +80,17 @@ +--- inc/WManager.H.orig 1999-11-14 15:28:36 UTC ++++ inc/WManager.H +@@ -80,17 +80,17 @@ public: private: Interface* _Interface; - string* _ConfigurationFilename; + std::string* _ConfigurationFilename; void - _ParseConfigurationFile(ifstream* filestream); + _ParseConfigurationFile(std::ifstream* filestream); void _TokenizeAndAddToBrowser(char* entry); char* - _CutString(char* str, - char* sub); + _CutString(const char* str, + const char* sub); }; #endif // WManager_H Index: head/x11-wm/wmanager/files/patch-src__Interface.cc =================================================================== --- head/x11-wm/wmanager/files/patch-src__Interface.cc (revision 425714) +++ head/x11-wm/wmanager/files/patch-src__Interface.cc (revision 425715) @@ -1,31 +1,31 @@ ---- src/Interface.cc.orig Wed Nov 17 03:25:42 1999 -+++ src/Interface.cc Sun Nov 2 02:38:20 2003 +--- src/Interface.cc.orig 1999-11-16 18:25:42 UTC ++++ src/Interface.cc @@ -23,6 +23,7 @@ // SYSTEM INCLUDES ////////////////////////////////// #include // standard io interface +#include // PROJECT INCLUDES //////////////////////////////// @@ -37,6 +38,7 @@ #include #include +using namespace std; // logo image static unsigned char *image_mt[] = { -@@ -130,10 +132,12 @@ +@@ -130,10 +132,12 @@ Interface::Interface() 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 } Index: head/x11-wm/wmanager/files/patch-src__WManager.cc =================================================================== --- head/x11-wm/wmanager/files/patch-src__WManager.cc (revision 425714) +++ head/x11-wm/wmanager/files/patch-src__WManager.cc (revision 425715) @@ -1,42 +1,41 @@ -diff -urN -urN -x .svn ../vendor/wmanager/src/WManager.cc ./src/WManager.cc ---- ../vendor/wmanager/src/WManager.cc 2007-12-11 12:42:04.000000000 +0200 -+++ ./src/WManager.cc 2007-12-17 16:09:16.000000000 +0200 +--- src/WManager.cc.orig 1999-11-14 15:28:36 UTC ++++ src/WManager.cc @@ -24,8 +24,12 @@ // SYSTEM INCLUDES ///////////////////////////////// #include // standard string class #include // file streams +#include // 'exit' #include // only for 'strtok' +#include #include // for home directory +#include +#include // PROJECT INCLUDES //////////////////////////////// @@ -36,6 +40,7 @@ // LOCAL INCLUDES ////////////////////////////////// #include // message window +using namespace std; // constructor WManager::WManager() -@@ -302,7 +307,7 @@ +@@ -302,7 +307,7 @@ WManager::_TokenizeAndAddToBrowser(char* } else { fl_alert("Error near %s while parsing configuration file %s!" "Try to read on...", - name->c_str(), _ConfigurationFilename); + name->c_str(), _ConfigurationFilename->c_str()); } // end if } // end if } -@@ -310,7 +315,7 @@ +@@ -310,7 +315,7 @@ WManager::_TokenizeAndAddToBrowser(char* // cut rest from the beginning of str char* -WManager::_CutString(char* str, char* rest) +WManager::_CutString(const char* str, const char* rest) { int i = 0; int n = 0;