Merge branch 'master' of git+ssh://openadk.org/git/openadk

2 files changed, 75 insertions, 0 deletions

diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile
new file mode 100644
index 000000000..1dabdf9d5
--- /dev/null
+++ b/package/evilwm/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		evilwm
+PKG_VERSION:=		1.0.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8fd9256c635cce2289b648a01d54202c
+PKG_DESCR:=		A minimalist window manager for the X Window System
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		libx11 libxext
+PKG_BUILDDEP+=		libX11 libXext
+PKG_URL:=		http://www.6809.org.uk/evilwm/
+PKG_SITES:=		http://www.6809.org.uk/evilwm/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,EVILWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+MAKE_FLAGS+=		XROOT="$(STAGING_DIR)/usr"
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_EVILWM)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/evilwm $(IDIR_EVILWM)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile
new file mode 100644
index 000000000..d45dcee52
--- /dev/null
+++ b/package/evilwm/patches/patch-Makefile
@@ -0,0 +1,46 @@
+do not strip by install
+--- evilwm-1.0.1.orig/Makefile	2009-03-30 12:37:06.000000000 +0200
++++ evilwm-1.0.1/Makefile	2010-01-27 08:14:46.000000000 +0100
+@@ -1,11 +1,11 @@
+ # If you don't use CC 
+-CC       = gcc
++CC       ?= gcc
+ 
+ # Edit this line if you don't want evilwm to install under /usr.
+ # Note that $(DESTDIR) is used by the Debian build process.
+ prefix = $(DESTDIR)/usr
+ 
+-XROOT    = /usr/X11R6
++XROOT    ?= /usr/X11R6
+ INCLUDES = -I$(XROOT)/include
+ LDPATH   = -L$(XROOT)/lib
+ LIBS     = -lX11
+@@ -35,8 +35,8 @@ LIBS    += -lXext
+ # Be sure that libXrandr is in your library search directory (e.g., under
+ # Solaris, it is in /usr/X11R6/lib, so can be built against with the default
+ # XPATH above, but won't necessarily be in the library search path).
+-DEFINES += -DRANDR
+-LIBS    += -lXrandr
++#DEFINES += -DRANDR
++#LIBS    += -lXrandr
+ 
+ # Uncomment for mouse support.  You probably want this.
+ DEFINES += -DMOUSE
+@@ -71,7 +71,7 @@ distname = evilwm-$(version)
+ #DEFINES += -DXDEBUG  # show some X calls
+ 
+ DEFINES += -DVERSION=\"$(version)\" $(DEBIAN)
+-CFLAGS  += $(INCLUDES) $(DEFINES) -Os -Wall
++CFLAGS  += $(INCLUDES) $(DEFINES) -Wall
+ #CFLAGS  += $(INCLUDES) $(DEFINES) -g -Wall
+ CFLAGS  += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls
+ LDFLAGS += $(LDPATH) $(LIBS)
+@@ -93,7 +93,7 @@ evilwm: $(OBJS)
+ install: evilwm
+ 	if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi
+ 	mkdir -p $(prefix)/bin $(prefix)/share/man/man1
+-	install -s evilwm $(prefix)/bin
++	install evilwm $(prefix)/bin
+ 	install evilwm.1 $(prefix)/share/man/man1
+ 	#gzip -9 $(prefix)/share/man/man1/evilwm.1
+