Date: Tue, 10 Oct 2006 12:51:58 +0000 (UTC) From: redchrom@gmail.com To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/104259: x11/dmenu up to 1.0 Message-ID: <20061010125158.20D842E0C3E@death.ispvds.com> Resent-Message-ID: <200610101300.k9AD0UaY026022@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104259 >Category: ports >Synopsis: x11/dmenu up to 1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 10 13:00:29 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stepan Zastupov (RedChrom) >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: ISPSystem >Environment: System: FreeBSD death.ispvds.com 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #1: Thu Oct 5 08:09:43 CEST 2006 root@dione.ispsystem.net:/root/src/sys/i386/compile/ISPSYSTEM i386 >Description: * Up to 1.0 * Added knob for inclusion of users's config.h (dmenu fully configurable by this file) >How-To-Repeat: Apply the patch >Fix: --- dmenu_patch.diff begins here --- diff -urN dmenu.orig/Makefile dmenu/Makefile --- dmenu.orig/Makefile Tue Oct 10 15:06:57 2006 +++ dmenu/Makefile Tue Oct 10 15:06:17 2006 @@ -6,7 +6,7 @@ # PORTNAME= dmenu -PORTVERSION= 0.9 +PORTVERSION= 1.0 CATEGORIES= x11 MASTER_SITES= http://10kloc.org/download/ \ http://schot.a-eskwadraat.nl/files/ @@ -15,6 +15,13 @@ COMMENT= X11 menu application (not only) for the dwm window manager USE_XLIB= yes + +pre-build: + @${CAT} ${PKGMESSAGE} + +.if defined(DMENU_CONF) +@${CP} ${DMENU_CONF} ${WRKSRC}/config.h +.endif MAN1= dmenu.1 PLIST_FILES= bin/dmenu diff -urN dmenu.orig/distinfo dmenu/distinfo --- dmenu.orig/distinfo Tue Oct 10 15:06:57 2006 +++ dmenu/distinfo Tue Oct 10 14:55:16 2006 @@ -1,3 +1,3 @@ -MD5 (dmenu-0.9.tar.gz) = 45c4d72eb6df2f9588f6ee7b41694a1d -SHA256 (dmenu-0.9.tar.gz) = b9ba3ef6e06419fdb932437d3cc6cb2dba8194a740f3cc3b5644e1c096427c47 -SIZE (dmenu-0.9.tar.gz) = 7261 +MD5 (dmenu-1.0.tar.gz) = c2f06c71c0cea9de1f6c8e6686f85e8e +SHA256 (dmenu-1.0.tar.gz) = 5c7a13928a6040dbb6c92fa0cbf17aa142b4d441d46a42e37ac1f0764986d038 +SIZE (dmenu-1.0.tar.gz) = 7282 diff -urN dmenu.orig/files/patch-config.mk dmenu/files/patch-config.mk --- dmenu.orig/files/patch-config.mk Tue Oct 10 15:06:57 2006 +++ dmenu/files/patch-config.mk Tue Oct 10 14:58:51 2006 @@ -1,18 +1,17 @@ ---- config.mk.orig Tue Aug 29 20:32:42 2006 -+++ config.mk Tue Aug 29 20:33:56 2006 -@@ -4,21 +4,21 @@ +--- config.mk.orig Wed Sep 20 15:45:31 2006 ++++ config.mk Tue Oct 10 14:58:22 2006 +@@ -4,22 +4,22 @@ # Customize below to fit your system # paths -PREFIX = /usr/local --MANPREFIX = ${PREFIX}/share/man +PREFIX ?= /usr/local -+MANPREFIX = ${PREFIX}/man + MANPREFIX = ${PREFIX}/man -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib -+X11INC = $(X11BASE)/include -+X11LIB = $(X11BASE)/lib ++X11INC = ${X11BASE}/include ++X11LIB = ${X11BASE}/lib # includes and libs INCS = -I. -I/usr/include -I${X11INC} @@ -20,11 +19,12 @@ # flags -CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -+CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\" ++CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" LDFLAGS = ${LIBS} #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" #LDFLAGS = -g ${LIBS} # compiler and linker -CC = cc -+CC?= cc ++CC ?= cc + LD = ${CC} diff -urN dmenu.orig/pkg-message dmenu/pkg-message --- dmenu.orig/pkg-message Thu Jan 1 08:00:00 1970 +++ dmenu/pkg-message Tue Oct 10 15:04:00 2006 @@ -0,0 +1,2 @@ +You may build dmenu with your own config.h, just use DMENU_CONF knob: +make -DDMENU_CONF=/path/to/dmenu/config.h install clean --- dmenu_patch.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061010125158.20D842E0C3E>