The DWM_CONF knob did nothing in a clean environment. This patch fixes this.
Responsible Changed From-To: freebsd-ports-bugs->nivit I will take it.
Hi, Please find attached an updated patch. Changes: * Fix DWM_CONF knob (and add PKGNAMESUFFIX when used). * New upstream version (3.3). * Small mastersite update. * pkg-descr: reworded and new WWW. Regards, Jeroen Schot diff -ruN dwm.orig/Makefile dwm/Makefile --- dwm.orig/Makefile Thu Jan 25 18:50:04 2007 +++ dwm/Makefile Tue Feb 6 20:21:18 2007 @@ -6,9 +6,9 @@ # PORTNAME= dwm -PORTVERSION= 3.2.2 +PORTVERSION= 3.3 CATEGORIES= x11-wm -MASTER_SITES= http://suckless.org/download/ \ +MASTER_SITES= http://www.suckless.org/download/ \ http://schot.a-eskwadraat.nl/files/ MAINTAINER= schot@a-eskwadraat.nl @@ -16,17 +16,22 @@ USE_XLIB= yes -pre-everything:: - @${ECHO} ================================================================== - @${ECHO} You may build dwm with your own config.h, just use DWM_CONF knob: - @${ECHO} make DWM_CONF=/path/to/dwm/config.h install clean - @${ECHO} ================================================================== +MAN1= dwm.1 +PLIST_FILES= bin/dwm .if defined(DWM_CONF) - @${CP} {$DWM_CONF} ${WRKSRC}/config.h +PKGNAMESUFFIX=-custom .endif -MAN1= dwm.1 -PLIST_FILES= bin/dwm +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-3.2 config.h-files no longer work." + +post-extract: +.if defined(DWM_CONF) + @${ECHO_MSG} "creating config.h from ${DWM_CONF}" + @${CP} ${DWM_CONF} ${WRKSRC}/config.h +.endif .include <bsd.port.mk> diff -ruN dwm.orig/distinfo dwm/distinfo --- dwm.orig/distinfo Thu Jan 25 18:50:04 2007 +++ dwm/distinfo Mon Feb 5 18:05:33 2007 @@ -1,3 +1,3 @@ -MD5 (dwm-3.2.2.tar.gz) = 14b9bbfc0d36117c135de5eaba50c880 -SHA256 (dwm-3.2.2.tar.gz) = dc7086619242fe1e661dcb27e850a2f431fcee8dbf246b46ea9d5d23784fd6cc -SIZE (dwm-3.2.2.tar.gz) = 17388 +MD5 (dwm-3.3.tar.gz) = 8095a0df3a8ea41129613473c00466a0 +SHA256 (dwm-3.3.tar.gz) = caffe5ce38c8575341296b7a3f05f2e8b64763da0f288c16951f97a386cc081c +SIZE (dwm-3.3.tar.gz) = 17450 diff -ruN dwm.orig/pkg-descr dwm/pkg-descr --- dwm.orig/pkg-descr Sun Nov 5 13:59:54 2006 +++ dwm/pkg-descr Tue Feb 6 20:23:57 2007 @@ -2,8 +2,8 @@ modes, much like ion, larswm and wmii. dwm however is much smaller, faster and simpler. -It consists of a single binary and configuration is done by editing the source -code, which makes it fast and secure. dwm reads from standard input to print -arbitrary status text such as the date and/or system load. +It consists of a single binary, configuration is done at compile-time by a +singe config.h file. dwm reads from standard input to print arbitrary status +text such as the date and/or system load. -WWW: http://dwm.suckless.org/ +WWW: http://www.suckless.org/wiki/dwm
nivit 2007-02-08 17:54:13 UTC FreeBSD ports repository Modified files: x11-wm/dwm Makefile distinfo pkg-descr x11-wm/dwm/files patch-config.mk Log: - Updated to 3.4 - Fixed DWM_CONF knob PR: ports/108602 Submitted by: Jeroen Schot <schot at a-eskwadraat.nl> (maintainer) Approved by: alexbl (mentor, implicit) Revision Changes Path 1.21 +15 -10 ports/x11-wm/dwm/Makefile 1.20 +3 -3 ports/x11-wm/dwm/distinfo 1.5 +7 -5 ports/x11-wm/dwm/files/patch-config.mk 1.4 +4 -4 ports/x11-wm/dwm/pkg-descr _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks!