[csw-devel] SF.net SVN: gar:[21587] csw/mgar/pkg

[wahwah at users.sourceforge.net]

Revision: 21587
          http://gar.svn.sourceforge.net/gar/?rev=21587&view=rev
Author:   wahwah
Date:     2013-07-30 22:38:03 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
dmenu/trunk: it builds.

Added Paths:
-----------
    csw/mgar/pkg/dmenu/
    csw/mgar/pkg/dmenu/Makefile
    csw/mgar/pkg/dmenu/branches/
    csw/mgar/pkg/dmenu/tags/
    csw/mgar/pkg/dmenu/trunk/
    csw/mgar/pkg/dmenu/trunk/Makefile
    csw/mgar/pkg/dmenu/trunk/checksums
    csw/mgar/pkg/dmenu/trunk/files/
    csw/mgar/pkg/dmenu/trunk/files/0001-Assorted-changes-to-make-it-compile.patch

Added: csw/mgar/pkg/dmenu/Makefile
===================================================================
--- csw/mgar/pkg/dmenu/Makefile	                        (rev 0)
+++ csw/mgar/pkg/dmenu/Makefile	2013-07-30 22:38:03 UTC (rev 21587)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/dmenu/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/dmenu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dmenu/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/dmenu/trunk/Makefile	2013-07-30 22:38:03 UTC (rev 21587)
@@ -0,0 +1,35 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = dmenu
+VERSION = 4.5
+GARTYPE = v2
+
+DESCRIPTION = Dynamic menu for X, originally designed for dwm
+
+MASTER_SITES = http://dl.suckless.org/tools/
+DISTFILES  = $(DISTNAME).tar.gz
+VENDOR_URL = http://tools.suckless.org/dmenu/
+
+PATCHFILES += 0001-Assorted-changes-to-make-it-compile.patch
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = dmenu
+INSTALL_SCRIPTS = dmenu
+TEST_SCRIPTS =
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+GARCOMPILER = GNU
+
+include gar/category.mk
+
+
+build-dmenu:
+	cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) gmake
+	$(MAKECOOKIE)
+
+install-dmenu:
+	cd $(WORKSRC) &&  /usr/bin/env -i $(INSTALL_ENV) gmake install
+	$(MAKECOOKIE)
+


Property changes on: csw/mgar/pkg/dmenu/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/dmenu/trunk/checksums
===================================================================
--- csw/mgar/pkg/dmenu/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/dmenu/trunk/checksums	2013-07-30 22:38:03 UTC (rev 21587)
@@ -0,0 +1 @@
+9c46169ed703732ec52ed946c27d84b4  dmenu-4.5.tar.gz

Added: csw/mgar/pkg/dmenu/trunk/files/0001-Assorted-changes-to-make-it-compile.patch
===================================================================
--- csw/mgar/pkg/dmenu/trunk/files/0001-Assorted-changes-to-make-it-compile.patch	                        (rev 0)
+++ csw/mgar/pkg/dmenu/trunk/files/0001-Assorted-changes-to-make-it-compile.patch	2013-07-30 22:38:03 UTC (rev 21587)
@@ -0,0 +1,87 @@
+From 60a35b1739bbb86e149aca4ed523db6fcc4c00b9 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 31 Jul 2013 00:36:24 +0200
+Subject: [PATCH] Assorted changes to make it compile
+
+---
+ Makefile  |  9 +++------
+ config.mk | 13 +++++++------
+ dmenu.c   |  2 ++
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c127f6a..a8ab397 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,15 @@ options:
+ 	@echo "CC       = ${CC}"
+ 
+ .c.o:
+-	@echo CC -c $<
+-	@${CC} -c $< ${CFLAGS}
++	${CC} -c $< ${CFLAGS}
+ 
+ ${OBJ}: config.mk draw.h
+ 
+ dmenu: dmenu.o draw.o
+-	@echo CC -o $@
+-	@${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
++	${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
+ 
+ stest: stest.o
+-	@echo CC -o $@
+-	@${CC} -o $@ stest.o ${LDFLAGS}
++	${CC} -o $@ stest.o ${LDFLAGS}
+ 
+ clean:
+ 	@echo cleaning
+diff --git a/config.mk b/config.mk
+index 92a5e63..3161d1c 100644
+--- a/config.mk
++++ b/config.mk
+@@ -2,11 +2,11 @@
+ VERSION = 4.5
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /opt/csw
+ MANPREFIX = ${PREFIX}/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = /usr/openwin/share/include
++X11LIB = /usr/openwin/lib
+ 
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS  = -lXinerama
+@@ -17,10 +17,11 @@ INCS = -I${X11INC}
+ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
+ 
+ # flags
+-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++# CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
++CFLAGS   = -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+ LDFLAGS  = -s ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
++CC = gcc
+diff --git a/dmenu.c b/dmenu.c
+index 4ea95f8..cac3c58 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -12,6 +12,8 @@
+ #include <X11/extensions/Xinerama.h>
+ #endif
+ #include "draw.h"
++#include <sys/ddi.h>
++#include <X11/keysym.h>
+ 
+ #define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
+                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
+-- 
+1.8.3.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.