Trivial update with patch simplications as done in x11/st; dmenu
continues to work for me on amd64.
jim@ has been inactive since 2014, so I'll take over MAINTAINER.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 10 May 2017 22:06:33 -0000 1.22
+++ Makefile 17 Mar 2018 13:57:45 -0000
@@ -1,24 +1,35 @@
# $OpenBSD: Makefile,v 1.22 2017/05/10 22:06:33 jung Exp $
COMMENT= dynamic menu for X11
-DISTNAME= dmenu-4.7
+
+V= 4.8
+DISTNAME= dmenu-${V}
CATEGORIES= x11
-HOMEPAGE= http://tools.suckless.org/dmenu
-MAINTAINER= Jim Razmus II <j...@openbsd.org>
+HOMEPAGE= https://tools.suckless.org/dmenu
+
+MAINTAINER= Klemens Nanni <k...@openbsd.org>
# MIT/X
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= X11 Xinerama c Xft fontconfig
+WANTLIB= X11 Xinerama Xft c fontconfig
-MASTER_SITES= http://dl.suckless.org/tools/
+MASTER_SITES= https://dl.suckless.org/tools/
RUN_DEPENDS= fonts/terminus-font
-FAKE_FLAGS= DESTDIR=""
+MAKE_ENV= LDFLAGS="${LDFLAGS}" \
+ X11INC=${X11BASE}/include \
+ X11LIB=${X11BASE}/lib
NO_TEST= Yes
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/{dmenu,stest} ${PREFIX}/bin/
+ ${INSTALL_SCRIPT} ${WRKSRC}/dmenu_{run,path} ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+ sed -i s/VERSION/${V}/g ${PREFIX}/man/man1/*.1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dmenu/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 10 May 2017 22:06:33 -0000 1.16
+++ distinfo 17 Mar 2018 13:57:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (dmenu-4.7.tar.gz) = p1Y1+NwsvCgN7suQatm3WUxcMWIOSgG6MNyDmEiB97k=
-SIZE (dmenu-4.7.tar.gz) = 15597
+SHA256 (dmenu-4.8.tar.gz) = /mFaXDYHBh4hBnAIYugqxiqfoeanrD1hapx2EGR222E=
+SIZE (dmenu-4.8.tar.gz) = 15658
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 10 May 2017 22:06:33 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.4 2017/05/10 22:06:33 jung Exp $
---- Makefile.orig Mon May 8 19:25:36 2017
-+++ Makefile Mon May 8 19:32:43 2017
-@@ -15,8 +15,7 @@ options:
- @echo "CC = ${CC}"
-
- .c.o:
-- @echo CC $<
-- @${CC} -c ${CFLAGS} $<
-+ ${CC} -c ${CFLAGS} $<
-
- config.h:
- @echo creating $@ from config.def.h
-@@ -25,12 +24,10 @@ config.h:
- ${OBJ}: arg.h config.h config.mk drw.h
-
- dmenu: dmenu.o drw.o util.o
-- @echo CC -o $@
-- @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
-+ ${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
-
- stest: stest.o
-- @echo CC -o $@
-- @${CC} -o $@ stest.o ${LDFLAGS}
-+ ${CC} -o $@ stest.o ${LDFLAGS}
-
- clean:
- @echo cleaning
-@@ -47,19 +44,14 @@ dist: clean
- @rm -rf dmenu-${VERSION}
-
- install: all
-- @echo installing executables to ${DESTDIR}${PREFIX}/bin
-- @mkdir -p ${DESTDIR}${PREFIX}/bin
-- @cp -f dmenu dmenu_path dmenu_run stest ${DESTDIR}${PREFIX}/bin
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/stest
-- @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
-- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-- @sed "s/VERSION/${VERSION}/g" < dmenu.1 >
${DESTDIR}${MANPREFIX}/man1/dmenu.1
-- @sed "s/VERSION/${VERSION}/g" < stest.1 >
${DESTDIR}${MANPREFIX}/man1/stest.1
-- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1
-+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+ ${BSD_INSTALL_PROGRAM} dmenu dmenu_path dmenu_run stest
${DESTDIR}${PREFIX}/bin
-+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+ sed "s/VERSION/${VERSION}/g" < dmenu.1 > dmenu.1.tmp
-+ sed "s/VERSION/${VERSION}/g" < stest.1 > stest.1.tmp
-+ mv dmenu.1.tmp dmenu.1
-+ mv stest.1.tmp stest.1
-+ ${BSD_INSTALL_MAN} dmenu.1 stest.1 ${DESTDIR}${MANPREFIX}/man1
-
- uninstall:
- @echo removing executables from ${DESTDIR}${PREFIX}/bin
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dmenu/patches/patch-config_mk,v
retrieving revision 1.12
diff -u -p -r1.12 patch-config_mk
--- patches/patch-config_mk 10 May 2017 22:06:33 -0000 1.12
+++ patches/patch-config_mk 17 Mar 2018 13:57:45 -0000
@@ -1,44 +1,24 @@
$OpenBSD: patch-config_mk,v 1.12 2017/05/10 22:06:33 jung Exp $
---- config.mk.orig Mon May 8 19:28:08 2017
-+++ config.mk Mon May 8 19:37:38 2017
-@@ -2,11 +2,11 @@
- VERSION = 4.7
-
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+#PREFIX = /usr/local
-+MANPREFIX = ${PREFIX}/man
-
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = ${X11BASE}/include
-+X11LIB = ${X11BASE}/lib
-
- # Xinerama, comment if you don't want it
- XINERAMALIBS = -lXinerama
-@@ -14,18 +14,18 @@ XINERAMAFLAGS = -DXINERAMA
-
- # freetype
+Index: config.mk
+--- config.mk.orig
++++ config.mk
+@@ -16,7 +16,7 @@ XINERAMAFLAGS = -DXINERAMA
FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+#FREETYPEINC = /usr/include/freetype2
+ FREETYPEINC = /usr/include/freetype2
# OpenBSD (uncomment)
-#FREETYPEINC = ${X11INC}/freetype2
+FREETYPEINC = ${X11INC}/freetype2
# includes and libs
INCS = -I${X11INC} -I${FREETYPEINC}
- LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+@@ -24,8 +24,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIB
# flags
--CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700
-D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700
-D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
-+CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS += ${LIBS}
++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS += -s ${LIBS}
# compiler and linker
--CC = cc
-+CC ?= cc
+ CC = cc
