From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 3 15:00:14 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 307431065674 for ; Mon, 3 May 2010 15:00:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 06DB08FC20 for ; Mon, 3 May 2010 15:00:14 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o43F0D03035740 for ; Mon, 3 May 2010 15:00:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o43F0Db9035739; Mon, 3 May 2010 15:00:13 GMT (envelope-from gnats) Date: Mon, 3 May 2010 15:00:13 GMT Message-Id: <201005031500.o43F0Db9035739@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Jeroen Schot Cc: Subject: Re: ports/143951: [PATCH] Add support for Xft fonts to x11/dmenu 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: Mon, 03 May 2010 15:00:14 -0000 The following reply was made to PR ports/143951; it has been noted by GNATS. From: Jeroen Schot To: Ashish SHUKLA Cc: pav@FreeBSD.org, bug-followup@FreeBSD.org Subject: Re: ports/143951: [PATCH] Add support for Xft fonts to x11/dmenu Date: Mon, 3 May 2010 16:58:35 +0200 --6c2NcOVqGQ03X4Wi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, On Sun, Apr 04, 2010 at 07:44:14PM +0530, Ashish SHUKLA wrote: > This patch look cleaner and also comes with documentation :). I looked at it, > modified it a bit, and I can maintain this patch for FreeBSD. I'm also > attaching the updated diff file. Apart from the Xft support, it also corrects > few issues. So please review the diff carefully, and let me know of any > issues. This diff looks better. I've tested it on my FreeBSD 8.0 system without problems. Attached patch is a slightly modified version that may be committed. Notable changes: * Xft is off by default. * The patch is not included in the port tree, but at a PATCH_SITE: The same location of my dmenu sources MASTER_SITE mirror. Thanks for your work on this patch. Regards, -- Jeroen Schot --6c2NcOVqGQ03X4Wi Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="dmenu-port-xft.diff" diff -ruN dmenu.orig/Makefile dmenu/Makefile --- dmenu.orig/Makefile 2009-04-27 21:16:36.000000000 +0200 +++ dmenu/Makefile 2010-05-03 16:46:41.000000000 +0200 @@ -7,16 +7,34 @@ PORTNAME= dmenu PORTVERSION= 4.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://code.suckless.org/dl/tools/ \ http://schot.a-eskwadraat.nl/files/ +PATCH_SITES= http://schot.a-eskwadraat.nl/files/ MAINTAINER= schot@a-eskwadraat.nl COMMENT= X11 menu application (not only) for the dwm window manager +OPTIONS= XFT "XFT support" Off + USE_XORG= x11 xinerama MAN1= dmenu.1 PLIST_FILES= bin/dmenu bin/dmenu_path bin/dmenu_run +.include + +.if defined(WITH_XFT) +PATCHFILES+= ${PORTNAME}-${PORTVERSION}-xft.diff +PATCH_DIST_STRIP= -p1 +USE_XORG+= xft +.endif + +post-patch: + @${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} \ + -e "s,%%PREFIX%%,${PREFIX},g" \ + -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ + -e "s,%%MANPREFIX%%,${MANPREFIX}/man,g" + .include diff -ruN dmenu.orig/distinfo dmenu/distinfo --- dmenu.orig/distinfo 2009-04-27 21:16:36.000000000 +0200 +++ dmenu/distinfo 2010-05-03 16:38:11.000000000 +0200 @@ -1,3 +1,6 @@ MD5 (dmenu-4.0.tar.gz) = 66e761a653930cc8a21614ba9fedf903 SHA256 (dmenu-4.0.tar.gz) = c04508285e21a1fc055b76890ec47e9956d8edc4d460dbcac59f96f061b2e862 SIZE (dmenu-4.0.tar.gz) = 8576 +MD5 (dmenu-4.0-xft.diff) = e259bf32b4ff15d345581f934ba99e46 +SHA256 (dmenu-4.0-xft.diff) = d7bbc1883453ef2d1025111fec48831f453c586007349a13ba2ab4b54177fd15 +SIZE (dmenu-4.0-xft.diff) = 8596 diff -ruN dmenu.orig/files/patch-config.mk dmenu/files/patch-config.mk --- dmenu.orig/files/patch-config.mk 2009-04-27 21:16:36.000000000 +0200 +++ dmenu/files/patch-config.mk 2010-05-03 16:42:55.000000000 +0200 @@ -1,36 +1,13 @@ ---- config.mk.orig 2009-04-18 13:50:04.000000000 +0200 -+++ config.mk 2009-04-21 13:15:36.000000000 +0200 -@@ -4,11 +4,11 @@ +--- ./config.mk.orig 2010-04-04 18:37:12.000000000 +0530 ++++ ./config.mk 2010-04-04 18:37:36.000000000 +0530 +@@ -4,8 +4,8 @@ # Customize below to fit your system # paths -PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man -+PREFIX?= /usr/local -+MANPREFIX = ${PREFIX}/man ++PREFIX = %%PREFIX%% ++MANPREFIX = %%MANPREFIX%% --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = $(LOCALBASE)/include -+X11LIB = $(LOCALBASE)/lib - - # Xinerama, comment if you don't want it - XINERAMALIBS = -L${X11LIB} -lXinerama -@@ -19,13 +19,13 @@ - 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} --LDFLAGS = -s ${LIBS} -+CPPFLAGS+= -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -+CFLAGS+= -std=c99 ${INCS} ${CPPFLAGS} -+LDFLAGS+= ${LIBS} - - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC?= cc + X11INC = /usr/X11R6/include + X11LIB = /usr/X11R6/lib --6c2NcOVqGQ03X4Wi--