Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
x11-wm/wmanager: Update version 0.2.1=>0.3.1
- Pet portclippy - Adoppt port Changelog: https://devel.ringlet.net/x11/wmanager/
- Loading branch information
Showing
7 changed files
with
72 additions
and
173 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.