On Mon, Apr 18, 2016 at 08:32:46PM +0200, Christopher Zimmermann wrote: > I have a finished herbstluftwm port upgrade, too. > You can remove the BUILD_DEPENDS and the CC=egcc in MAKE_FLAGS since the > gcc4 module takes care of them. Just use += for assignments to > LIB_DEPENDS and RUN_DEPENDS so you don't overwrite the assignments > made by the gcc4 module.
Thanks for the suggestions, it's fixed in a new diff below. It's weird btw. Their entire code base is basically C with a few C++11 things mixed in there. > I could remove intl, m and pthread from WANTLIB, after adding > devel/gettext to MODULES. > naddy@ wishes to remove the devel/gettext module [1] and thus I cleaned up herbstluftwm while I am at it. > a fixed RUN_DEPENDS is overkill. You may mention dmenu in a MESSAGE, if > you want to. I don't think it is necessary. > You are right, it isn't. It is covered well enough in herbstluftwm's FAQ on their homepage. Regards, Florian [1] https://marc.info/?l=openbsd-ports&m=145917613914938 Index: Makefile =================================================================== RCS file: /cvs/ports/x11/herbstluftwm/Makefile,v retrieving revision 1.4 diff -u -p -u -r1.4 Makefile --- Makefile 25 Aug 2015 13:18:28 -0000 1.4 +++ Makefile 18 Apr 2016 20:22:58 -0000 @@ -1,29 +1,33 @@ # $OpenBSD: Makefile,v 1.4 2015/08/25 13:18:28 sthen Exp $ COMMENT = manual tiling window manager -DISTNAME = herbstluftwm-0.6.2 +DISTNAME = herbstluftwm-0.7.0 CATEGORIES = x11 -REVISION = 1 HOMEPAGE = http://herbstluftwm.org/ +MAINTAINER = Florian Stinglmayr <flor...@n0la.org> + # BSD PERMIT_PACKAGE_CDROM = Yes -WANTLIB += X11 Xext Xinerama c glib-2.0 pthread +WANTLIB += X11 Xext Xinerama c estdc++ glib-2.0 intl m pthread MASTER_SITES = http://herbstluftwm.org/tarballs/ -MODULES = devel/gettext +MODULES = gcc4 + +MODGCC4_LANGS= c++ +MODGCC4_ARCHS= * -LIB_DEPENDS = devel/glib2 +LIB_DEPENDS += devel/glib2 -RUN_DEPENDS = devel/desktop-file-utils \ +RUN_DEPENDS += devel/desktop-file-utils \ shells/bash \ x11/dzen2,-gadgets USE_GMAKE = Yes -MAKE_FLAGS = CC="${CC}" LDFLAGS= VERBOSE= COLOR=0 +MAKE_FLAGS = LDFLAGS= VERBOSE= COLOR=0 BASEDIR = ${PREFIX}/share/examples/herbstluftwm FAKE_FLAGS = SYSCONFDIR="${BASEDIR}" \ @@ -33,9 +37,5 @@ FAKE_FLAGS = SYSCONFDIR="${BASEDIR}" \ XSESSIONSDIR="${PREFIX}/share/applications" NO_TEST = Yes - -post-patch: - perl -pi -e "s,^#!/bin/bash,#!${LOCALBASE}/bin/bash," \ - `grep -Rl /bin/bash ${WRKSRC}/*` .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/herbstluftwm/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- distinfo 5 Apr 2014 05:42:07 -0000 1.2 +++ distinfo 18 Apr 2016 20:22:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (herbstluftwm-0.6.2.tar.gz) = qJ9cOXrufxqjs53VO8Z+KCZ58C8cC/PDPEGmCOIX8Kw= -SIZE (herbstluftwm-0.6.2.tar.gz) = 224191 +SHA256 (herbstluftwm-0.7.0.tar.gz) = fi/8MLeRFAcjCl7rYeBEzqeFV5mRB9NyvC28PYLQric= +SIZE (herbstluftwm-0.7.0.tar.gz) = 247469 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/herbstluftwm/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -r1.2 PLIST --- pkg/PLIST 5 Apr 2014 05:42:07 -0000 1.2 +++ pkg/PLIST 18 Apr 2016 20:22:58 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2014/04/05 05:42:07 bcallah Exp $ +@bin bin/dmenu_run_hlwm @bin bin/herbstclient @bin bin/herbstluftwm @man man/man1/herbstclient.1 @@ -7,9 +8,9 @@ share/applications/herbstluftwm.desktop share/doc/herbstluftwm/ share/doc/herbstluftwm/BUGS +share/doc/herbstluftwm/INSTALL share/doc/herbstluftwm/LICENSE share/doc/herbstluftwm/NEWS -share/doc/herbstluftwm/README share/doc/herbstluftwm/herbstclient.html share/doc/herbstluftwm/herbstluftwm-tutorial.html share/doc/herbstluftwm/herbstluftwm.html @@ -29,9 +30,12 @@ share/examples/herbstluftwm/keychain.sh share/examples/herbstluftwm/lasttag.sh share/examples/herbstluftwm/layout.sh share/examples/herbstluftwm/loadstate.sh +share/examples/herbstluftwm/maximize.sh share/examples/herbstluftwm/q3terminal.sh share/examples/herbstluftwm/savestate.sh share/examples/herbstluftwm/scratchpad.sh +share/examples/herbstluftwm/toggledualhead.sh +share/examples/herbstluftwm/windowmenu.sh share/examples/herbstluftwm/wselect.sh share/examples/herbstluftwm/xdg/ share/examples/herbstluftwm/xdg/herbstluftwm/
