diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile index 6655eaec49c..ba2ec8e1f8d 100644 --- a/x11/dmenu/Makefile +++ b/x11/dmenu/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.6 2008/04/08 18:04:10 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2008/07/02 20:44:45 merdely Exp $ COMMENT= dynamic menu for X11 -DISTNAME= dmenu-3.6 +DISTNAME= dmenu-3.7 CATEGORIES= x11 HOMEPAGE= http://www.suckless.org/wiki/tools/xlib -MAINTAINER= Tobias Ulmer +MAINTAINER= Jim Razmus II # MIT/X PERMIT_PACKAGE_CDROM= Yes @@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 c +WANTLIB= X11 Xinerama c MASTER_SITES= http://www.suckless.org/download/ diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo index aa500802524..a60217b3c1e 100644 --- a/x11/dmenu/distinfo +++ b/x11/dmenu/distinfo @@ -1,5 +1,5 @@ -MD5 (dmenu-3.6.tar.gz) = 452OCnepKaK4C69E09xgGQ== -RMD160 (dmenu-3.6.tar.gz) = fStmCh1WMzikWX8j5IqbFnHueik= -SHA1 (dmenu-3.6.tar.gz) = lXDhYDGAdc/mpuln+cc9Gi0JfhU= -SHA256 (dmenu-3.6.tar.gz) = wBg8Thr6dpzfaiyYzTVL4jZ0QStrSD5xsiub1eTwe7c= -SIZE (dmenu-3.6.tar.gz) = 8508 +MD5 (dmenu-3.7.tar.gz) = 27bCDhRUxBSok/5DYbhGsg== +RMD160 (dmenu-3.7.tar.gz) = Lit4rMfAKO8NwNHPjG251C+kgZo= +SHA1 (dmenu-3.7.tar.gz) = TWQjOrpsBPY+eiO1wQ3HB7gi5BY= +SHA256 (dmenu-3.7.tar.gz) = YM67rl8fwdvZMMS0PwAMq5sKZFVPppztxt1dj8doqu4= +SIZE (dmenu-3.7.tar.gz) = 8478 diff --git a/x11/dmenu/patches/patch-config_mk b/x11/dmenu/patches/patch-config_mk index 4a36fe95765..dce7bbb41de 100644 --- a/x11/dmenu/patches/patch-config_mk +++ b/x11/dmenu/patches/patch-config_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-config_mk,v 1.4 2008/04/08 18:04:10 merdely Exp $ ---- config.mk.orig Thu Apr 3 22:56:07 2008 -+++ config.mk Mon Apr 7 23:51:43 2008 -@@ -4,19 +4,19 @@ VERSION = 3.6 +$OpenBSD: patch-config_mk,v 1.5 2008/07/02 20:44:45 merdely Exp $ +--- config.mk.orig Wed Jun 18 13:20:41 2008 ++++ config.mk Wed Jul 2 16:09:34 2008 +@@ -4,28 +4,28 @@ VERSION = 3.7 # Customize below to fit your system # paths @@ -15,22 +15,27 @@ $OpenBSD: patch-config_mk,v 1.4 2008/04/08 18:04:10 merdely Exp $ +X11INC = ${X11BASE}/include +X11LIB = ${X11BASE}/lib + # Xinerama, comment if you don't want it + XINERAMALIBS = -L${X11LIB} -lXinerama + XINERAMAFLAGS = -DXINERAMA + # includes and libs -INCS = -I. -I/usr/include -I${X11INC} --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 +-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} +INCS = -I${X11INC} -+LIBS = -L${X11LIB} -lX11 ++LIBS = -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}\" -+LDFLAGS = ${LIBS} - #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = -g ${LIBS} ++CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ++CFLAGS += ${INCS} ${CPPFLAGS} ++LDFLAGS += ${LIBS} -@@ -26,4 +26,4 @@ LDFLAGS = -s ${LIBS} - #CFLAGS += -xtarget=ultra + # Solaris + #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" + #LDFLAGS = ${LIBS} # compiler and linker -CC = cc diff --git a/x11/dmenu/pkg/PLIST b/x11/dmenu/pkg/PLIST index 01e1ad87562..0456f178d16 100644 --- a/x11/dmenu/pkg/PLIST +++ b/x11/dmenu/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.3 2008/04/08 18:04:10 merdely Exp $ -bin/dmenu +@comment $OpenBSD: PLIST,v 1.4 2008/07/02 20:44:46 merdely Exp $ +@bin bin/dmenu bin/dmenu_path bin/dmenu_run @man man/man1/dmenu.1