From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 21 13:30:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 018A41065685 for ; Sat, 21 Jun 2008 13:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CCF9D8FC1E for ; Sat, 21 Jun 2008 13:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m5LDU2gD059382 for ; Sat, 21 Jun 2008 13:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m5LDU2PB059377; Sat, 21 Jun 2008 13:30:02 GMT (envelope-from gnats) Resent-Date: Sat, 21 Jun 2008 13:30:02 GMT Resent-Message-Id: <200806211330.m5LDU2PB059377@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeroen Schot Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23DAC10656AB for ; Sat, 21 Jun 2008 13:20:42 +0000 (UTC) (envelope-from schot@a-eskwadraat.nl) Received: from a-eskwadraat.nl (a-eskwadraat.nl [131.211.39.72]) by mx1.freebsd.org (Postfix) with ESMTP id DA3BD8FC1D for ; Sat, 21 Jun 2008 13:20:41 +0000 (UTC) (envelope-from schot@a-eskwadraat.nl) Received: from peter.localdomain ([10.14.0.12] helo=shine) by a-eskwadraat.nl with esmtp (Exim 4.63) (envelope-from ) id 1KA2bU-0003V9-Nv for FreeBSD-gnats-submit@freebsd.org; Sat, 21 Jun 2008 14:54:04 +0200 Received: from shine (localhost [127.0.0.1]) by shine (Postfix) with ESMTP id 9E4F38AA5 for ; Sat, 21 Jun 2008 14:54:02 +0200 (CEST) Received: (from schot@localhost) by shine (8.14.2/8.14.2/Submit) id m5LCs2ao073436; Sat, 21 Jun 2008 14:54:02 +0200 (CEST) (envelope-from schot) Message-Id: <200806211254.m5LCs2ao073436@shine> Date: Sat, 21 Jun 2008 14:54:02 +0200 (CEST) From: Jeroen Schot To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/124832: Update port: x11-wm/dwm to 5.0.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jeroen Schot List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 13:30:03 -0000 >Number: 124832 >Category: ports >Synopsis: Update port: x11-wm/dwm to 5.0.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 21 13:30:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Jeroen Schot >Release: FreeBSD 7.0-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD shine 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #4: Tue Apr 29 18:54:18 CEST 2008 schot@shine:/usr/obj/usr/src/sys/MACBOOK i386 >Description: Attached diff updates the port of x11-wm/dwm from 4.9 to 5.0.1. >How-To-Repeat: >Fix: diff -ruN dwm.orig/Makefile dwm/Makefile --- dwm.orig/Makefile 2008-04-05 20:13:21.000000000 +0200 +++ dwm/Makefile 2008-06-21 14:48:10.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= dwm -PORTVERSION= 4.9 +PORTVERSION= 5.0.1 CATEGORIES= x11-wm MASTER_SITES= http://www.suckless.org/download/ \ http://schot.a-eskwadraat.nl/files/ @@ -16,7 +16,7 @@ RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu -USE_XORG= x11 +USE_XORG= x11 xinerama MAN1= dwm.1 PLIST_FILES= bin/dwm @@ -25,7 +25,7 @@ pre-everything:: @${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:" @${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean" - @${ECHO_MSG} "Note: Pre-4.9 config.h-files no longer work." + @${ECHO_MSG} "Note: Pre-5.0 config.h-files no longer work." post-extract: .if defined(DWM_CONF) diff -ruN dwm.orig/distinfo dwm/distinfo --- dwm.orig/distinfo 2008-04-05 20:13:21.000000000 +0200 +++ dwm/distinfo 2008-06-21 14:46:33.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (dwm-4.9.tar.gz) = cf72c6a72e6c35c132b5db4faf3fb358 -SHA256 (dwm-4.9.tar.gz) = 3f4f595e7845cedce1696668adf0a8ade2fc8a72d4c32d53de35a7c5d900790d -SIZE (dwm-4.9.tar.gz) = 18132 +MD5 (dwm-5.0.1.tar.gz) = 27d91d886c9ba1aad4b09178e2653ee0 +SHA256 (dwm-5.0.1.tar.gz) = f39e2b62d75b79489c535dc3cfcd6ea2b9c412857448519f29a4eed7af2f33a3 +SIZE (dwm-5.0.1.tar.gz) = 17954 diff -ruN dwm.orig/files/patch-config.mk dwm/files/patch-config.mk --- dwm.orig/files/patch-config.mk 2008-04-19 19:55:49.000000000 +0200 +++ dwm/files/patch-config.mk 2008-06-20 11:19:29.000000000 +0200 @@ -1,6 +1,6 @@ ---- config.mk.orig 2008-04-03 22:57:01.000000000 +0200 -+++ config.mk 2008-04-04 12:05:19.000000000 +0200 -@@ -4,19 +4,19 @@ +--- config.mk.orig 2008-06-18 23:08:29.000000000 +0200 ++++ config.mk 2008-06-20 10:39:37.000000000 +0200 +@@ -4,11 +4,11 @@ # Customize below to fit your system # paths @@ -14,21 +14,18 @@ +X11INC = $(LOCALBASE)/include +X11LIB = $(LOCALBASE)/lib - # includes and libs - INCS = -I. -I/usr/include -I${X11INC} - LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 + # Xinerama, comment if you don't want it + XINERAMALIBS = -L${X11LIB} -lXinerama +@@ -19,9 +19,9 @@ + LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} # flags --CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" +-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -LDFLAGS = -s ${LIBS} -+CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\" ++CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ++CFLAGS+= ${INCS} ${CPPFLAGS} +LDFLAGS+= ${LIBS} - #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = -g ${LIBS} -@@ -25,4 +25,4 @@ - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC?= cc + # Solaris + #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" >Release-Note: >Audit-Trail: >Unformatted: