[98939] trunk/dports/x11/herbstluftwm

[cal at macports.org]

Revision: 98939
          http://trac.macports.org//changeset/98939
Author:   cal at macports.org
Date:     2012-10-21 09:10:57 -0700 (Sun, 21 Oct 2012)
Log Message:
-----------
herbstluftwm: update to 0.4.1, remove patches included upstream

Modified Paths:
--------------
    trunk/dports/x11/herbstluftwm/Portfile

Removed Paths:
-------------
    trunk/dports/x11/herbstluftwm/files/patch-Makefile-separate-cppflags.diff
    trunk/dports/x11/herbstluftwm/files/patch-config.mk-separate-cppflags.diff

Modified: trunk/dports/x11/herbstluftwm/Portfile
===================================================================
--- trunk/dports/x11/herbstluftwm/Portfile	2012-10-21 16:05:01 UTC (rev 98938)
+++ trunk/dports/x11/herbstluftwm/Portfile	2012-10-21 16:10:57 UTC (rev 98939)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    herbstluftwm
-version                 0.4
+version                 0.4.1
 categories              x11 x11-wm
 platforms               darwin
 license                 BSD
@@ -19,23 +19,20 @@
     mkdir -p ~/.config/herbstluftwm
     cp ${prefix}/etc/xdg/herbstluftwm/autostart ~/.config/herbstluftwm/autostart
 To make herbstluftwm your default X11 window manager, create a file named
-herbstluftwm.sh in your ~/.xinitrc.d directory (creating it if it doesn't exist) with
-the following contents:
+herbstluftwm.sh in your ~/.xinitrc.d directory with the following contents:
     USERWM=${prefix}/bin/herbstluftwm"
 
 homepage                http://wwwcip.cs.fau.de/~re06huxa/herbstluftwm/
 master_sites            ${homepage}/tarballs/
 
-checksums               rmd160  168ed80c27c3d8b47e49c39206ae925162130407 \
-                        sha256  64aea843df07506d249219b9c756e123c2b200de264697615c0e2f23ba564ca8
+checksums               rmd160  99d1893a90cfc09cb5d27eb87080159376a99082 \
+                        sha256  d34f89a96a6834f2ecb2ea2786399323cb64a6eca96a66c22bda9867c9ddf6c3
 
 livecheck.type          regex
 livecheck.url           ${master_sites}
 livecheck.regex         ${name}-(\[0-9\]+(\\.\[0-9\]+)*)\\${extract.suffix}
 
-patchfiles              config.patch \
-                        patch-Makefile-separate-cppflags.diff \
-                        patch-config.mk-separate-cppflags.diff
+patchfiles              config.patch
 
 depends_build           bin:a2x:asciidoc \
                         port:pkgconfig

Deleted: trunk/dports/x11/herbstluftwm/files/patch-Makefile-separate-cppflags.diff
===================================================================
--- trunk/dports/x11/herbstluftwm/files/patch-Makefile-separate-cppflags.diff	2012-10-21 16:05:01 UTC (rev 98938)
+++ trunk/dports/x11/herbstluftwm/files/patch-Makefile-separate-cppflags.diff	2012-10-21 16:10:57 UTC (rev 98939)
@@ -1,19 +0,0 @@
---- Makefile.orig	2012-08-30 08:24:35.000000000 +0200
-+++ Makefile	2012-08-30 08:37:45.000000000 +0200
-@@ -34,12 +34,13 @@
- 
- %.o: %.c version.mk
- 	$(call colorecho,CC,$<)
--	$(VERBOSE) $(CC) -c $(CFLAGS) -o $@ $<
--	$(VERBOSE) $(CC) -c $(CFLAGS) -o $*.d -MT $@ -MM $<
-+	$(VERBOSE) $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+	$(VERBOSE) $(CC) -c $(CPPFLAGS) -o $*.d -MT $@ -MM $<
- 
- info:
- 	@echo Some Info:
--	@echo Compiling with: $(CC) -c $(CFLAGS) -o OUT INPUT
-+	@echo Preprocessing with: $(CC) -E $(CPPFLAGS)
-+	@echo Compiling with: $(CC) -c $(CPPFLAGS) $(CFLAGS) -o OUT INPUT
- 	@echo Linking with: $(LD) -o OUT $(LDFLAGS) INPUT
- 
- clean: cleandoc cleandeps

Deleted: trunk/dports/x11/herbstluftwm/files/patch-config.mk-separate-cppflags.diff
===================================================================
--- trunk/dports/x11/herbstluftwm/files/patch-config.mk-separate-cppflags.diff	2012-10-21 16:05:01 UTC (rev 98938)
+++ trunk/dports/x11/herbstluftwm/files/patch-config.mk-separate-cppflags.diff	2012-10-21 16:10:57 UTC (rev 98939)
@@ -1,23 +0,0 @@
---- config.mk.orig	2012-08-10 17:23:41.000000000 +0200
-+++ config.mk	2012-08-30 08:39:07.000000000 +0200
-@@ -17,15 +17,15 @@
- # FLAGS
- CC ?= gcc
- LD = $(CC)
--CFLAGS ?= -g -pedantic -Wall
--CFLAGS += -std=c99 ${INCS} -D _XOPEN_SOURCE=600
-+CFLAGS ?= -g
-+CFLAGS += -pedantic -Wall -std=c99
- VERSIONFLAGS = \
-     -D HERBSTLUFT_VERSION=$(VERSION) \
-     -D HERBSTLUFT_VERSION_MAJOR=$(VERSION_MAJOR) \
-     -D HERBSTLUFT_VERSION_MINOR=$(VERSION_MINOR)
--CFLAGS += $(VERSIONFLAGS)
--CFLAGS += $(XINERAMAFLAGS)
--CFLAGS += -D HERBSTLUFT_GLOBAL_AUTOSTART=\"$(CONFIGDIR)/autostart\"
-+CPPFLAGS ?=
-+CPPFLAGS += $(INCS) -D _XOPEN_SOURCE=600 $(VERSIONFLAGS) $(XINERAMAFLAGS)
-+CPPFLAGS += -D HERBSTLUFT_GLOBAL_AUTOSTART=\"$(CONFIGDIR)/autostart\"
- LDFLAGS ?= -g
- DESTDIR = /
- PREFIX = /usr/local
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121021/8aa88f0e/attachment.html>