freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11-wm/wmanager: Update version 0.2.1=>0.3.1

Browse Source 
- Pet portclippy
- Adoppt port

Changelog: https://devel.ringlet.net/x11/wmanager/
This commit is contained in:
Muhammad Moinur Rahman
2023-12-17 13:34:16 +01:00
parent bbd158f62d
commit 136f67e2ba
7 changed files with 72 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11-wm/wmanager/Makefile
+9 -10
View File
@@ -1,23 +1,22 @@
PORTNAME= wmanager
PORTVERSION= 0.2.1
PORTREVISION= 15
PORTVERSION= 0.3.1
CATEGORIES= x11-wm
MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MASTER_SITES= https://devel.ringlet.net/files/x11/wmanager/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bofh@FreeBSD.org
COMMENT= X11 window manager selector
WWW= https://devel.ringlet.net/files/x11/wmanager/
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \
libfontconfig.so:x11-fonts/fontconfig
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES= gl gmake pkgconfig tar:xz xorg
USE_GL= gl glu
USE_XORG= x11 xcursor xext xfixes xft xinerama xrender
USES= gl gmake xorg
USE_XORG= x11 xext
USE_GL= gl
OPTIONS_DEFINE= ADDONS DOCS EXAMPLES
OPTIONS_DEFAULT=ADDONS
x11-wm/wmanager/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1476707858
SHA256 (wmanager_0.2.1.orig.tar.gz) = 7974aa6bb15e4c0e8dcac42055a865e6151b920cd6aa2658ffa70ce33edf446c
SIZE (wmanager_0.2.1.orig.tar.gz) = 25734
TIMESTAMP = 1702805458
SHA256 (wmanager-0.3.1.tar.xz) = e594aaf8647c4475e3c9c1b3bf7cf978b4f031212c3e04e4dbd63ea978814f05
SIZE (wmanager-0.3.1.tar.xz) = 23408
x11-wm/wmanager/files/patch-Makefile
+50 -64
View File
@@ -1,81 +1,67 @@
--- Makefile.orig 1999-11-14 15:29:24 UTC
--- Makefile.orig 2023-12-17 12:04:10 UTC
+++ Makefile
@@ -28,39 +28,39 @@
@@ -22,16 +22,16 @@ MAKEFLAGS = --print-directory
# make settings
SHELL = /bin/sh
MAKEFLAGS = --print-directory
-PREFIX ?= /usr
-X11BASE ?= /usr
+PREFIX ?= /usr/local
+LOCALBASE ?= /usr/local
+X11BASE ?= /usr/local
+# base settings
+bindir = $(PREFIX)/bin
+incdir = ./inc
+srcdir = ./src
+fltkinc = $(LOCALBASE)/include
+x11lib = $(LOCALBASE)/lib
# base settings
bindir = ${PREFIX}/bin
mandir = ${PREFIX}/share/man/man
incdir = ./inc
srcdir = ./src
-fltkinc = ${X11BASE}/include
-x11lib = ${X11BASE}/lib
+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 ?=
FLTK_CONFIG ?= fltk-config --use-gl
FLTK_CXX := $(shell ${FLTK_CONFIG} --cxx)
@@ -44,12 +44,13 @@ CXXFLAGS_DBG ?=
CXXFLAGS_OPT ?= -O2 -fno-strict-aliasing -pipe
#CXXFLAGS_DBG ?= -g -DDEBUG
CXXFLAGS_DBG ?=
-CXXFLAGS ?= ${CXXFLAGS_DBG} ${CXXFLAGS_OPT}
-CXXFLAGS += ${CXXFLAGS_WARN} -I${incdir} ${FLTK_CXXFLAGS}
+CXXFLAGS ?= ${CXXFLAGS_WARN} ${CXXFLAGS_DBG} ${CXXFLAGS_OPT}
+CXXFLAGS += -I${fltkinc} -I${incdir} ${PTHREAD_CFLAGS}
+CXXFLAGS += ${CXXFLAGS_WARN} -I${incdir} ${FLTK_CXXFLAGS} ${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}
LD = ${CXX}
-LDFLAGS ?= ${FLTK_LDFLAGS}
+LDFLAGS += ${FLTK_LDFLAGS} -lGL
+LDDIRS = -L$(x11lib)
# install settings
-INSTALL = /usr/bin/install
-INSTALL_FLAGS = --strip
+INSTALL ?= install
+STRIP ?= -s
BINOWN ?= root
@@ -84,7 +85,7 @@ MISC = HISTORY README COPYING INSTALL TAGS FAQ LICENSE
SRC = Interface.cc WManager.cc wmanager.cc
MISC = HISTORY README COPYING INSTALL TAGS FAQ LICENSE NEWS TODO Makefile \
.wmanagerrc .xinitrc
-OBJ = $(patsubst %.cc,%.o,$(SRC))
+OBJ = $(patsubst %.cc,%.o,$(SRC))
PROG = wmanager
MAN1 = ${srcdir}/${PROG}.1
MAN1Z = ${MAN1}.gz
@@ -103,7 +104,7 @@ ${PROG}: ${OBJ}
all: ${PROG} ${MAN1Z} ${LOOP1Z} ${UPD1Z}
${PROG}: ${OBJ}
- ${LD} -o $@ $^ ${LDFLAGS}
+ ${LD} -o $@ $^ ${LDFLAGS}
# documentation tool
DOCTOOL = perceps
DOCTOOL_FLAGS = -a -b -f -h -m -r
${MAN1Z}: ${MAN1}
${GZIP} ${GZIP_N} ${GZIP_C} ${MAN1} > $@ || (${RM} $@; false)
@@ -125,7 +126,7 @@ install: all
${MKDIR} ${DESTDIR}${bindir}
${INSTALL_PROGRAM} ${PROG} ${DESTDIR}${bindir}/
${INSTALL_SCRIPT} ${LOOP} ${UPD} ${DESTDIR}${bindir}/
-
+
${MKDIR} ${DESTDIR}${mandir}1
${INSTALL_DATA} ${MAN1Z} ${LOOP1Z} ${UPD1Z} ${DESTDIR}${mandir}1/
-# 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 @@ 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 @@ static: $(OBJ)
$(LD) -o wmanager $^ $(LDDIRS) $(LDFLAGS) -static
install: wmanager
- $(INSTALL) $< $(bindir)/$<
+ $(INSTALL) $(STRIP) $< ${DESTDIR}$(bindir)/$<
clean:
@rm -f $(OBJ) wmanager
x11-wm/wmanager/files/patch-inc__WManager.H
-24
View File
@@ -1,24 +0,0 @@
--- 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
x11-wm/wmanager/files/patch-src_Interface.cc
+10
View File
@@ -0,0 +1,10 @@
--- src/Interface.cc.orig 2022-08-09 13:38:49 UTC
+++ src/Interface.cc
@@ -27,6 +27,7 @@
// PROJECT INCLUDES ////////////////////////////////
#include "Interface.H" // class definition
+using namespace std;
// LOCAL INCLUDES /////////////////////////////////////////////////////////////
#include <FL/Fl.H>
x11-wm/wmanager/files/patch-src__Interface.cc
-31
View File
@@ -1,31 +0,0 @@
--- src/Interface.cc.orig 1999-11-16 18:25:42 UTC
+++ src/Interface.cc
@@ -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()
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
}
x11-wm/wmanager/files/patch-src__WManager.cc
-41
View File
@@ -1,41 +0,0 @@
--- src/WManager.cc.orig 1999-11-14 15:28:36 UTC
+++ src/WManager.cc
@@ -24,8 +24,12 @@
// SYSTEM INCLUDES /////////////////////////////////
#include <string> // standard string class
#include <fstream> // file streams
+#include <cstdlib> // 'exit'
#include <cstring> // only for 'strtok'
+#include <iostream>
#include <pwd.h> // for home directory
+#include <unistd.h>
+#include <sys/types.h>
// PROJECT INCLUDES ////////////////////////////////
@@ -36,6 +40,7 @@
// LOCAL INCLUDES //////////////////////////////////
#include <FL/fl_message.H> // message window
+using namespace std;
// constructor
WManager::WManager()
@@ -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 @@ 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;