From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 9 Oct 2017 18:53:29 +0100
Subject: reinit the tree, so we can have metadata

---
 x11-plugins/wmacpi/files/1.34-acpi.patch           | 17 ++++++
 x11-plugins/wmacpi/files/1.34-apm.patch            | 17 ++++++
 .../wmacpi/files/wmacpi-2.2_rc1-makefile.patch     | 71 ++++++++++++++++++++++
 x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch | 47 ++++++++++++++
 4 files changed, 152 insertions(+)
 create mode 100644 x11-plugins/wmacpi/files/1.34-acpi.patch
 create mode 100644 x11-plugins/wmacpi/files/1.34-apm.patch
 create mode 100644 x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
 create mode 100644 x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch

(limited to 'x11-plugins/wmacpi/files')

diff --git a/x11-plugins/wmacpi/files/1.34-acpi.patch b/x11-plugins/wmacpi/files/1.34-acpi.patch
new file mode 100644
index 000000000000..76a94e57f77e
--- /dev/null
+++ b/x11-plugins/wmacpi/files/1.34-acpi.patch
@@ -0,0 +1,17 @@
+--- Makefile.orig	2003-09-04 13:00:48.784055072 -0400
++++ Makefile	2003-09-04 13:03:41.399813488 -0400
+@@ -11,11 +11,11 @@
+ #OPT	= -pg -g -DPRO -DACPI
+ 
+ CC	= gcc
+-CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include
++CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include -DACPI
+ LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
+ 
+-SRCS	= wmacpi.c libapm.c libacpi.c
+-OBJS	= wmacpi.o libapm.o libacpi.o
++SRCS	= wmacpi.c libacpi.c
++OBJS	= wmacpi.o libacpi.o
+ 
+ all:	wmacpi
+ 
diff --git a/x11-plugins/wmacpi/files/1.34-apm.patch b/x11-plugins/wmacpi/files/1.34-apm.patch
new file mode 100644
index 000000000000..6b640b781b13
--- /dev/null
+++ b/x11-plugins/wmacpi/files/1.34-apm.patch
@@ -0,0 +1,17 @@
+--- Makefile.orig	2003-09-04 13:00:48.784055072 -0400
++++ Makefile	2003-09-04 13:04:23.297444080 -0400
+@@ -11,11 +11,11 @@
+ #OPT	= -pg -g -DPRO -DACPI
+ 
+ CC	= gcc
+-CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include
++CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include -DAPM
+ LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
+ 
+-SRCS	= wmacpi.c libapm.c libacpi.c
+-OBJS	= wmacpi.o libapm.o libacpi.o
++SRCS	= wmacpi.c libapm.c
++OBJS	= wmacpi.o libapm.o
+ 
+ all:	wmacpi
+ 
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
new file mode 100644
index 000000000000..af142fd574ee
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
@@ -0,0 +1,71 @@
+--- Makefile.orig	2007-07-13 17:26:30.000000000 +0200
++++ Makefile	2008-01-28 16:36:41.000000000 +0100
+@@ -13,8 +13,8 @@
+ #OPT	= -pg -g
+ 
+ CC	:= gcc
+-CFLAGS	:= $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
+-LDFLAGS := $(OPT) -lX11 -ldockapp
++CFLAGS	:= $(OPT) -Wall -W -g -ansi -I/usr/include
++LDFLAGS += -lX11 -ldockapp
+ 
+ WMSRC	:= wmacpi.c libacpi.c
+ HEADERS := libacpi.h wmacpi.h
+@@ -22,11 +22,12 @@
+ doc_targets := wmacpi.1
+ 
+ ifdef BUILD_CLI
+-targets += acpi
+-doc_targets += acpi.1
++targets += acpi-batt-status
++doc_targets += acpi-batt-status.1
+ endif
+ 
+-PREFIX := /usr/local
++PREFIX := /usr
++MANDIR	:= $(PREFIX)/share/man
+ 
+ all: $(targets)
+ 
+@@ -34,20 +35,20 @@
+ WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
+ 
+ # include per-file dependencies
+--include $(WMOBJ:.o=.d)
++#-include $(WMOBJ:.o=.d)
+ 
+ wmacpi:	$(WMOBJ)
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . . 
+ ifdef BUILD_CLI
+-CLSRC := acpi.c libacpi.c
++CLSRC := acpi-batt-status.c libacpi.c
+ CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
+--include $(CLOBJ:.o=.d)
++#-include $(CLOBJ:.o=.d)
+ 
+-acpi: $(CLOBJ)
+-	$(CC) $(LDFLAGS) -o $@ $^
++acpi-batt-status: $(CLOBJ)
++	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ endif
+ 
+ # build per-file dependencies - note that -MM may not be supported
+@@ -62,10 +63,10 @@
+ 	rm -f *.d $(targets)
+ 
+ install: $(targets)
+-	install -d $(PREFIX)/bin/
+-	install -pc $(targets) $(PREFIX)/bin/
+-	install -d $(PREFIX)/man/man1/
+-	install -pc $(doc_targets) $(PREFIX)/man/man1/
++	install -d $(DESTDIR)$(PREFIX)/bin/
++	install -pc $(targets) $(DESTDIR)$(PREFIX)/bin/
++	install -d $(DESTDIR)$(MANDIR)/man1/
++	install -p -m 0644 $(doc_targets) $(DESTDIR)$(MANDIR)/man1/
+ 
+ tags:
+ 	etags $(WMSRC) $(CLSRC) $(HEADERS)
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
new file mode 100644
index 000000000000..d1ec49689060
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
@@ -0,0 +1,47 @@
+--- Makefile.orig	2015-01-12 11:27:07.396319323 +0100
++++ Makefile	2015-01-12 11:29:21.531298827 +0100
+@@ -13,8 +13,8 @@
+ #OPT	= -pg -g
+ 
+ CC	:= gcc
+-CFLAGS	+= $(OPT) -Wall -W -g -ansi
+-LDFLAGS += $(OPT) -lX11 -ldockapp
++CFLAGS	:= -Wall -W -g -ansi
++LIBS := -lX11 -ldockapp
+ 
+ WMSRC	:= wmacpi.c libacpi.c
+ HEADERS := libacpi.h wmacpi.h
+@@ -26,7 +26,7 @@
+ doc_targets += wmacpi-cli.1
+ endif
+ 
+-PREFIX := /usr/local
++PREFIX := /usr
+ 
+ all: $(targets)
+ 
+@@ -37,7 +37,7 @@
+ -include $(WMOBJ:.o=.d)
+ 
+ wmacpi:	$(WMOBJ)
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . .
+@@ -47,13 +47,13 @@
+ -include $(CLOBJ:.o=.d)
+ 
+ wmacpi-cli: $(CLOBJ)
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ endif
+ 
+ # build per-file dependencies - note that -MM may not be supported
+ # in gcc versions older than 2.95.4, but most likely is.
+ %.d: %.c
+-	gcc -MM $(CFLAGS) $< > $@
++	$(CC) -MM $(CFLAGS) $< > $@
+ 
+ clean:
+ 	rm -f TAGS *.o *~ trace *.out *.bb *.bbg
-- 
cgit v1.2.3