[x11/openbox] fix build when SHELL=/usr/local/bin/tcsh

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[x11/openbox] fix build when SHELL=/usr/local/bin/tcsh

Matthieu Herrb-3
Hi,

While building ports as a regular user is discouraged, it's still
possible. I figured out that openbox doesn't build as myself since I'm
using /usr/local/bin/tcsh as my shell.

The failure is caused my the mkdir_p definition in the fake target. As
far as I can tell autoconf has been fixed some years ago to not call
install-sh directy but always add the proper shell incantation.

So I suggest to just remove the extra definition. Tested both as
myself and as pbuild (when starting the make as root).

While there I fixed WANTLIB and thus bumped the REVISION.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/openbox/Makefile,v
retrieving revision 1.84
diff -u -p -u -r1.84 Makefile
--- Makefile 18 Nov 2019 19:57:45 -0000 1.84
+++ Makefile 2 Aug 2020 07:37:06 -0000
@@ -3,7 +3,7 @@
 COMMENT = small, fast & usable window manager
 
 V = 3.6.1
-REVISION = 7
+REVISION = 8
 DISTNAME = openbox-${V}
 SHARED_LIBS += obrender 12.0 # 32.0
 SHARED_LIBS += obt 1.1 # 2.2
@@ -20,10 +20,11 @@ PERMIT_PACKAGE = Yes
 WANTLIB += ICE Imlib2 SM X11 X11-xcb Xau Xcursor Xext Xfixes Xft
 WANTLIB += Xinerama Xrandr Xrender c cairo cairo-gobject expat ffi
 WANTLIB += fontconfig freetype fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz iconv
+WANTLIB += gmodule-2.0 gobject-2.0 graphite2 harfbuzz iconv
 WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pangoxft-1.0 pcre pixman-1 png pthread rsvg-2
 WANTLIB += startup-notification-1 xcb xcb-render xcb-shm xcb-util xml2 z
+WANTLIB += ${COMPILER_LIBCXX}
 
 MASTER_SITES = ${HOMEPAGE}dist/openbox/
 
@@ -39,8 +40,7 @@ LIB_DEPENDS += devel/gettext,-runtime \
  x11/gnome/librsvg
 
 FAKE_FLAGS = sysconfdir="${PREFIX}/share/examples/openbox" \
- rcdir="${PREFIX}/share/examples/openbox" \
- mkdir_p="$${SHELL} ${WRKSRC}/install-sh -d"
+ rcdir="${PREFIX}/share/examples/openbox"
 
 API_V = ${V:R}
 SUBST_VARS = API_V

--
Matthieu Herrb

Reply | Threaded
Open this post in threaded view
|

Re: [x11/openbox] fix build when SHELL=/usr/local/bin/tcsh

Christian Weisgerber
Matthieu Herrb:

> While building ports as a regular user is discouraged, it's still
> possible. I figured out that openbox doesn't build as myself since I'm
> using /usr/local/bin/tcsh as my shell.

That use of ${SHELL} is definitely wrong.  I think it's a quoting
error and wasn't intended.

> The failure is caused my the mkdir_p definition in the fake target. As
> far as I can tell autoconf has been fixed some years ago to not call
> install-sh directy but always add the proper shell incantation.
>
> So I suggest to just remove the extra definition. Tested both as
> myself and as pbuild (when starting the make as root).
>
> While there I fixed WANTLIB and thus bumped the REVISION.

ok

--
Christian "naddy" Weisgerber                          [hidden email]