Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (de7d743124ebc4ba4d4a37b322fc48044ab07147)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pieter Lenaerts <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (de7d743124ebc4ba4d4a37b322fc48044ab07147)
  • Date: Sat, 9 Dec 2006 10:04:57 -0600

GIT changes to master grimoire by Pieter Lenaerts <e-type AT sourcemage.org>:

dev/null |binary
windowmanagers/aewm/DETAILS | 2 -
windowmanagers/aewm/HISTORY | 5 +++
windowmanagers/aewm/PRE_BUILD | 9 +++--
windowmanagers/aewm/aewm-1.3.10.tar.bz2.sig |binary
windowmanagers/aewm/aewm-1.3.8.tar.bz2.sig | 0
windowmanagers/aewm/aewm_Makefile.patch | 8 +++++
windowmanagers/aewm/aewm_Makefiles.patch | 43
----------------------------
8 files changed, 20 insertions(+), 47 deletions(-)

New commits:
commit de7d743124ebc4ba4d4a37b322fc48044ab07147
Author: Pieter Lenaerts <e-type AT sourcemage.org>
Commit: Pieter Lenaerts <e-type AT sourcemage.org>

aewm: updated + install_root support

diff --git a/windowmanagers/aewm/DETAILS b/windowmanagers/aewm/DETAILS
index 8b33aaa..6bca966 100755
--- a/windowmanagers/aewm/DETAILS
+++ b/windowmanagers/aewm/DETAILS
@@ -1,5 +1,5 @@
SPELL=aewm
- VERSION=1.3.8
+ VERSION=1.3.10
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.red-bean.com/~decklin/$SPELL/$SOURCE
diff --git a/windowmanagers/aewm/HISTORY b/windowmanagers/aewm/HISTORY
index d476c33..49da6f1 100644
--- a/windowmanagers/aewm/HISTORY
+++ b/windowmanagers/aewm/HISTORY
@@ -1,3 +1,8 @@
+2006-12-09 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: updated to 1.3.10
+ * PRE_BUILD: added sedit line to support ${INSTALL_ROOT}
+ * makefile patch updated
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/windowmanagers/aewm/PRE_BUILD b/windowmanagers/aewm/PRE_BUILD
index cd2f76a..d064713 100755
--- a/windowmanagers/aewm/PRE_BUILD
+++ b/windowmanagers/aewm/PRE_BUILD
@@ -1,3 +1,6 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/aewm_Makefiles.patch
+default_pre_build
&&
+cd ${SOURCE_DIRECTORY}
&&
+patch ${SOURCE_DIRECTORY}/src/Makefile <
\
+ ${SPELL_DIRECTORY}/aewm_Makefile.patch
&&
+sedit "s/^DESTDIR\ =/DESTDIR\ =\ ${INSTALL_ROOT}/g"
\
+ ${SOURCE_DIRECTORY}/src/Makefile
diff --git a/windowmanagers/aewm/aewm-1.3.10.tar.bz2.sig
b/windowmanagers/aewm/aewm-1.3.10.tar.bz2.sig
new file mode 100644
index 0000000..a009453
Binary files /dev/null and b/windowmanagers/aewm/aewm-1.3.10.tar.bz2.sig
differ
diff --git a/windowmanagers/aewm/aewm-1.3.8.tar.bz2.sig
b/windowmanagers/aewm/aewm-1.3.8.tar.bz2.sig
deleted file mode 100644
index 605d8c4..0000000
Binary files a/windowmanagers/aewm/aewm-1.3.8.tar.bz2.sig and /dev/null differ
diff --git a/windowmanagers/aewm/aewm_Makefile.patch
b/windowmanagers/aewm/aewm_Makefile.patch
new file mode 100644
index 0000000..8628443
--- /dev/null
+++ b/windowmanagers/aewm/aewm_Makefile.patch
@@ -0,0 +1,8 @@
+23,25c23,25
+< BINDIR = $(DESTDIR)$(XROOT)/bin
+< MANDIR = $(DESTDIR)$(XROOT)/man/man1
+< CFGDIR = $(DESTDIR)/etc/X11/aewm
+---
+> BINDIR = $(DESTDIR)/usr/bin
+> MANDIR = $(DESTDIR)/usr/share/man/man1
+> CFGDIR = $(DESTDIR)/etc/aewm
diff --git a/windowmanagers/aewm/aewm_Makefiles.patch
b/windowmanagers/aewm/aewm_Makefiles.patch
deleted file mode 100644
index ddc4c40..0000000
--- a/windowmanagers/aewm/aewm_Makefiles.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urNp aewm-1.3.8.orig/clients/Makefile aewm-1.3.8/clients/Makefile
---- aewm-1.3.8.orig/clients/Makefile 2006-06-22 09:31:27.000000000 +0200
-+++ aewm-1.3.8/clients/Makefile 2006-06-22 09:39:35.000000000 +0200
-@@ -7,10 +7,10 @@ CFLAGS = -g -O2 -Wall
-
- AELIBDIR = ../lib
- MYLIBDIR = lib
--XROOT = /usr/X11R6
--BINDIR = $(DESTDIR)$(XROOT)/bin
--MANDIR = $(DESTDIR)$(XROOT)/man/man1
--CFGDIR = $(DESTDIR)/etc/X11/aewm
-+XROOT = $(DESTDIR)/usr/X11R6
-+BINDIR = $(DESTDIR)/usr/bin
-+MANDIR = $(DESTDIR)/usr/share/man/man1
-+CFGDIR = $(DESTDIR)/etc/aewm
-
- INCLUDES = -I$(AELIBDIR) -I$(MYLIBDIR)
- X11PATH = -I$(XROOT)/include
-diff -urNp aewm-1.3.8.orig/Makefile aewm-1.3.8/Makefile
---- aewm-1.3.8.orig/Makefile 2006-06-22 09:31:27.000000000 +0200
-+++ aewm-1.3.8/Makefile 2006-06-22 09:42:16.000000000 +0200
-@@ -3,7 +3,7 @@
- # This program is free software; see LICENSE for details.
-
- # Set this to the location of your X11 installation.
--XROOT = /usr/X11R6
-+XROOT = $(DESTDIR)/usr/X11R6
-
- # Uncomment this to add Xft support (requires X.Org or XFree86 >= 4.0.2).
- #DEFINES += -DXFT
-@@ -24,9 +24,9 @@ CC = gcc
- CFLAGS = -g -O2 -Wall
-
- MYLIBDIR = lib
--BINDIR = $(DESTDIR)$(XROOT)/bin
--MANDIR = $(DESTDIR)$(XROOT)/man/man1
--CFGDIR = $(DESTDIR)/etc/X11/aewm
-+BINDIR = $(DESTDIR)/usr/bin
-+MANDIR = $(DESTDIR)/usr/share/man/man1
-+CFGDIR = $(DESTDIR)/etc/aewm
- INCLUDES = -I$(MYLIBDIR) -I$(XROOT)/include $(EXTRA_INC)
- LDPATH = -L$(XROOT)/lib
- LIBS = -lX11 $(EXTRA_LIBS)



  • [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (de7d743124ebc4ba4d4a37b322fc48044ab07147), Pieter Lenaerts, 12/09/2006

Archive powered by MHonArc 2.6.24.

Top of Page