Upgrade to version 4.0.

Work done by Leonardo Taccari in pkgsrc-wip.

Thanks Leo!
This commit is contained in:
ahoka 2009-06-14 22:48:51 +00:00
parent e2944b3eae
commit 487b3be93d
5 changed files with 36 additions and 55 deletions

View file

@ -1,3 +1,3 @@
dmenu is a generic menu for X, originally designed for wm/dwm, now used by
wm/wmii. It manages huge amounts (up to 10.000 and more) of user defined
menu items efficiently.
dynamic menu is a generic menu for X, originally designed for dwm (wm/dwm).
It manages huge amounts (up to 10.000 and more) of user defined menu items
efficiently.

View file

@ -1,16 +1,34 @@
# $NetBSD: Makefile,v 1.3 2009/03/05 09:26:18 ghen Exp $
# $NetBSD: Makefile,v 1.4 2009/06/14 22:48:51 ahoka Exp $
#
DISTNAME= dmenu-3.9
CATEGORIES= x11
MASTER_SITES= http://code.suckless.org/dl/tools/
DISTNAME= dmenu-4.0
CATEGORIES= x11
MASTER_SITES= http://code.suckless.org/dl/tools/
MAINTAINER= ghen@NetBSD.org
HOMEPAGE= http://www.suckless.org/wiki/tools/xlib
COMMENT= Dymanic menu for wmii
MAINTAINER= leot1990@users.sourceforge.net
HOMEPAGE= http://tools.suckless.org/dmenu
COMMENT= Dymanic menu for X
LICENSE= mit
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/xineramaproto/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
NO_CONFIGURE= yes
# Adjust config.mk
SUBST_CLASSES+= makefile
SUBST_STAGE.makefile= pre-build
SUBST_MESSAGE.makefile= Fixing config.mk
SUBST_FILES.makefile= config.mk
SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
SUBST_SED.makefile+= -e 's,share/man,${PKGMANDIR},g'
SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},'
SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
.include "options.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2008/04/04 20:28:05 ghen Exp $
@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:48:51 ahoka Exp $
bin/dmenu
bin/dmenu_path
bin/dmenu_run

View file

@ -1,6 +1,5 @@
$NetBSD: distinfo,v 1.3 2009/03/05 09:26:18 ghen Exp $
$NetBSD: distinfo,v 1.4 2009/06/14 22:48:51 ahoka Exp $
SHA1 (dmenu-3.9.tar.gz) = 9575cf9225de45ae3eb180aaddff2f5e5a662942
RMD160 (dmenu-3.9.tar.gz) = 76dae0e752f9ae9d24d15568aaf80ec927301414
Size (dmenu-3.9.tar.gz) = 8582 bytes
SHA1 (patch-aa) = 99626aa65ab51da724372882b97f6c0ed4594701
SHA1 (dmenu-4.0.tar.gz) = 6fb1ff6e414d5ef33d2f627b0ec563eaac19fbd8
RMD160 (dmenu-4.0.tar.gz) = 9292c516397b578a753b1ba6a87ce68135a465b6
Size (dmenu-4.0.tar.gz) = 8576 bytes

View file

@ -1,36 +0,0 @@
$NetBSD: patch-aa,v 1.2 2009/03/05 09:26:18 ghen Exp $
--- config.mk.orig 2008-09-09 21:45:00.000000000 +0200
+++ config.mk
@@ -4,11 +4,10 @@ VERSION = 3.9
# Customize below to fit your system
# paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+MANPREFIX = ${PREFIX}/${PKGMANDIR}
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
+X11INC = ${X11BASE}/include
+X11LIB = ${X11BASE}/lib
# Xinerama, comment if you don't want it
XINERAMALIBS = -L${X11LIB} -lXinerama
@@ -16,12 +15,12 @@ XINERAMAFLAGS = -DXINERAMA
# includes and libs
INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
+LIBS = -lc -L${X11LIB} ${COMPILER_RPATH_FLAG}${X11LIB}${X11LIB} -lX11
# flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
+LDFLAGS += -s ${LIBS} ${XINERAMALIBS}
# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"