[csw-devel] SF.net SVN: gar:[21597] csw/mgar/pkg/dmenu/trunk

[wahwah at users.sourceforge.net]

Revision: 21597
          http://gar.svn.sourceforge.net/gar/?rev=21597&view=rev
Author:   wahwah
Date:     2013-07-31 23:25:29 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
dmenu/trunk: Trying version 4.0

Modified Paths:
--------------
    csw/mgar/pkg/dmenu/trunk/Makefile
    csw/mgar/pkg/dmenu/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/dmenu/trunk/files/0001-Adapt-for-OpenCSW.patch

Modified: csw/mgar/pkg/dmenu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dmenu/trunk/Makefile	2013-07-31 15:33:51 UTC (rev 21596)
+++ csw/mgar/pkg/dmenu/trunk/Makefile	2013-07-31 23:25:29 UTC (rev 21597)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = dmenu
-VERSION = 4.5
+VERSION = 4.0
 GARTYPE = v2
 
 DESCRIPTION = Dynamic menu for X, originally designed for dwm
@@ -11,7 +11,7 @@
 DISTFILES  = $(DISTNAME).tar.gz
 VENDOR_URL = http://tools.suckless.org/dmenu/
 
-PATCHFILES += 0001-Assorted-changes-to-make-it-compile.patch
+PATCHFILES += 0001-Adapt-for-OpenCSW.patch
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = dmenu

Modified: csw/mgar/pkg/dmenu/trunk/checksums
===================================================================
--- csw/mgar/pkg/dmenu/trunk/checksums	2013-07-31 15:33:51 UTC (rev 21596)
+++ csw/mgar/pkg/dmenu/trunk/checksums	2013-07-31 23:25:29 UTC (rev 21597)
@@ -1 +1 @@
-9c46169ed703732ec52ed946c27d84b4  dmenu-4.5.tar.gz
+66e761a653930cc8a21614ba9fedf903  dmenu-4.0.tar.gz

Added: csw/mgar/pkg/dmenu/trunk/files/0001-Adapt-for-OpenCSW.patch
===================================================================
--- csw/mgar/pkg/dmenu/trunk/files/0001-Adapt-for-OpenCSW.patch	                        (rev 0)
+++ csw/mgar/pkg/dmenu/trunk/files/0001-Adapt-for-OpenCSW.patch	2013-07-31 23:25:29 UTC (rev 21597)
@@ -0,0 +1,48 @@
+From a97adf9e4c620440875a02282794f360641a8b19 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 1 Aug 2013 01:23:45 +0200
+Subject: [PATCH] Adapt for OpenCSW
+
+---
+ config.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/config.mk b/config.mk
+index f6a3652..29a0091 100644
+--- a/config.mk
++++ b/config.mk
+@@ -4,11 +4,11 @@ VERSION = 4.0
+ # Customize below to fit your system
+ 
+ # 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 = -L${X11LIB} -lXinerama
+@@ -19,8 +19,8 @@ INCS = -I. -I/usr/include -I${X11INC}
+ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
+ 
+ # flags
+-CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
++CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++CFLAGS = -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+ LDFLAGS = -s ${LIBS}
+ 
+ # Solaris
+@@ -28,4 +28,4 @@ LDFLAGS = -s ${LIBS}
+ #LDFLAGS = ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
++CC = gcc
+-- 
+1.8.3.1
+

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