[97187] trunk/dports/x11/herbstluftwm
cal at macports.org
cal at macports.org
Wed Aug 29 06:35:28 PDT 2012
Revision: 97187
https://trac.macports.org/changeset/97187
Author: cal at macports.org
Date: 2012-08-29 06:35:27 -0700 (Wed, 29 Aug 2012)
Log Message:
-----------
herbstluftwm: update to 0.4
Modified Paths:
--------------
trunk/dports/x11/herbstluftwm/Portfile
trunk/dports/x11/herbstluftwm/files/config.patch
Removed Paths:
-------------
trunk/dports/x11/herbstluftwm/files/0001-Use-clock_get_time-on-systems-with-a-mach-kernel.patch
Modified: trunk/dports/x11/herbstluftwm/Portfile
===================================================================
--- trunk/dports/x11/herbstluftwm/Portfile 2012-08-29 13:25:54 UTC (rev 97186)
+++ trunk/dports/x11/herbstluftwm/Portfile 2012-08-29 13:35:27 UTC (rev 97187)
@@ -4,8 +4,7 @@
PortSystem 1.0
name herbstluftwm
-version 0.3
-revision 1
+version 0.4
categories x11 x11-wm
platforms darwin
license BSD
@@ -27,34 +26,38 @@
homepage http://wwwcip.cs.fau.de/~re06huxa/herbstluftwm/
master_sites ${homepage}/tarballs/
-checksums rmd160 056efcf0e2091b479f8b2a04eb3d7d1b72645cda \
- sha256 219ceb2066515a2cfb68430e86306071c25135771efb33168849334761caa8b0
+checksums rmd160 168ed80c27c3d8b47e49c39206ae925162130407 \
+ sha256 64aea843df07506d249219b9c756e123c2b200de264697615c0e2f23ba564ca8
livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex ${name}-(\[0-9\]+(\\.\[0-9\]+)*)\\${extract.suffix}
-patchfiles config.patch \
- 0001-Use-clock_get_time-on-systems-with-a-mach-kernel.patch
+patchfiles config.patch
depends_build bin:a2x:asciidoc \
port:pkgconfig
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
- port:xorg-libX11
+ port:xorg-libX11 \
+ port:xorg-libXinerama
# declare universal variant, so get_canonical_archflags works
variant universal {}
use_configure no
+build.env-append PKG_CONFIG_PATH=$prefix/lib/pkgconfig \
+ CFLAGS="-pedantic -Wall ${configure.cflags} [get_canonical_archflags]" \
+ LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
+
build.args-append CC=${configure.cc} \
LD=${configure.cc} \
- EXTRACFLAGS="${configure.cflags} [get_canonical_archflags]" \
- EXTRALDFLAGS="${configure.ldflags} [get_canonical_archflags]" \
- TPUT=true
+ COLOR=0 \
+ VERBOSE=
-destroot.args-append PREFIX=${destroot}${prefix} \
- ETCDIR=${destroot}${prefix}/etc/ \
- TPUT=true
+destroot.args-append PREFIX=${prefix} \
+ SYSCONFDIR=${prefix}/etc/ \
+ COLOR=0 \
+ VERBOSE=
Deleted: trunk/dports/x11/herbstluftwm/files/0001-Use-clock_get_time-on-systems-with-a-mach-kernel.patch
===================================================================
--- trunk/dports/x11/herbstluftwm/files/0001-Use-clock_get_time-on-systems-with-a-mach-kernel.patch 2012-08-29 13:25:54 UTC (rev 97186)
+++ trunk/dports/x11/herbstluftwm/files/0001-Use-clock_get_time-on-systems-with-a-mach-kernel.patch 2012-08-29 13:35:27 UTC (rev 97187)
@@ -1,100 +0,0 @@
-From bae6fa9479e079a04af752d3c52446ceebbdc3cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thorsten=20Wi=C3=9Fmann?= <edu at thorsten-wissmann.de>
-Date: Sun, 20 May 2012 15:58:01 +0200
-Subject: [PATCH] Use clock_get_time on systems with a mach-kernel
-
----
- src/rules.c | 9 ++-------
- src/utils.c | 28 ++++++++++++++++++++++++++++
- src/utils.h | 2 ++
- 4 Dateien geändert, 34 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-)
-
-diff --git src/rules.c src/rules.c
-index 04ccaf2..640c1da 100644
---- src/rules.c
-+++ src/rules.c
-@@ -11,7 +11,6 @@
- #include "ipc-protocol.h"
-
- #include <glib.h>
--#include <time.h>
- #include <string.h>
- #include <stdio.h>
- #include <sys/types.h>
-@@ -220,9 +219,7 @@ void consequence_destroy(HSConsequence* cons) {
- HSRule* rule_create() {
- HSRule* rule = g_new0(HSRule, 1);
- rule->once = false;
-- struct timespec t;
-- clock_gettime(CLOCK_MONOTONIC, &t);
-- rule->birth_time = t.tv_sec;
-+ rule->birth_time = get_monotonic_timestamp();
- return rule;
- }
-
-@@ -510,9 +507,7 @@ bool condition_pid(HSCondition* rule, HSClient* client) {
- }
-
- bool condition_maxage(HSCondition* rule, HSClient* client) {
-- struct timespec cur;
-- clock_gettime(CLOCK_MONOTONIC, &cur);
-- time_t diff = cur.tv_sec - g_current_rule_birth_time;
-+ time_t diff = get_monotonic_timestamp() - g_current_rule_birth_time;
- return (rule->value.integer >= diff);
- }
-
-diff --git src/utils.c src/utils.c
-index 171bd97..e7c7dee 100644
---- src/utils.c
-+++ src/utils.c
-@@ -18,6 +18,34 @@
- #include <glib.h>
-
-
-+
-+#include <time.h>
-+#include <sys/time.h>
-+
-+#ifdef __MACH__
-+#include <mach/clock.h>
-+#include <mach/mach.h>
-+#endif
-+
-+
-+
-+
-+time_t get_monotonic_timestamp() {
-+ struct timespec ts;
-+#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
-+ clock_serv_t cclock;
-+ mach_timespec_t mts;
-+ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
-+ clock_get_time(cclock, &mts);
-+ mach_port_deallocate(mach_task_self(), cclock);
-+ ts.tv_sec = mts.tv_sec;
-+ ts.tv_nsec = mts.tv_nsec;
-+#else
-+ clock_gettime(CLOCK_REALTIME, &ts);
-+#endif
-+ return ts.tv_sec;
-+}
-+
- /// print a printf-like message to stderr and exit
- // from dwm.c
- void die(const char *errstr, ...) {
-diff --git src/utils.h src/utils.h
-index f6c19ed..99412dc 100644
---- src/utils.h
-+++ src/utils.h
-@@ -41,6 +41,8 @@ bool string_to_bool(char* string, bool oldvalue);
-
- char* strlasttoken(char* str, char* delim);
-
-+time_t get_monotonic_timestamp();
-+
- // duplicates an argument-vector
- char** argv_duplicate(int argc, char** argv);
- // frees all entrys in argument-vector and then the vector itself
---
-1.7.10.2
-
Modified: trunk/dports/x11/herbstluftwm/files/config.patch
===================================================================
--- trunk/dports/x11/herbstluftwm/files/config.patch 2012-08-29 13:25:54 UTC (rev 97186)
+++ trunk/dports/x11/herbstluftwm/files/config.patch 2012-08-29 13:35:27 UTC (rev 97187)
@@ -10,19 +10,3 @@
INCS = -Isrc/ -I/usr/include -I${X11INC} `pkg-config --cflags glib-2.0`
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs glib-2.0`
-@@ -13,13 +13,13 @@
- # FLAGS
- LD = gcc
- CC = gcc
--CFLAGS = -g -std=c99 -pedantic -Wall ${INCS} -D _XOPEN_SOURCE=600
-+CFLAGS = -g -std=c99 -pedantic -Wall ${INCS} -D _XOPEN_SOURCE=600 ${EXTRACFLAGS}
- VERSIONFLAGS = \
- -D HERBSTLUFT_VERSION=$(VERSION) \
- -D HERBSTLUFT_VERSION_MAJOR=$(VERSION_MAJOR) \
- -D HERBSTLUFT_VERSION_MINOR=$(VERSION_MINOR)
- CFLAGS += $(VERSIONFLAGS)
--LDFLAGS = -g
-+LDFLAGS = -g ${EXTRALDFLAGS}
- INSTALLDIR = /
- PREFIX = $(INSTALLDIR)/usr/
- BINDIR = $(PREFIX)/bin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120829/23699a1e/attachment.html>
More information about the macports-changes
mailing list