diff options
| author | nia <nia@pkgsrc.org> | 2022-05-10 11:50:54 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-05-10 11:50:54 +0000 |
| commit | 6643e452e74e8cd6a49433bb5011e3b35b91df52 (patch) | |
| tree | 7926003ace2fcda650eab22d409beccd2948602b /wm | |
| parent | b612b8b04cba59b5e59c68e7159fe072ed40a8b1 (diff) | |
| download | pkgsrc-6643e452e74e8cd6a49433bb5011e3b35b91df52.tar.gz | |
*: Remove dodgy hacks for NetBSD versions older than 5.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/icewm/Makefile.common | 14 | ||||
| -rw-r--r-- | wm/sawfish/Makefile | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 7d22c9ee13a..065bd5a8beb 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.72 2020/08/17 20:20:16 leot Exp $ +# $NetBSD: Makefile.common,v 1.73 2022/05/10 11:50:55 nia Exp $ # # used by wm/icewm/Makefile # used by wm/icewm-imlib/Makefile @@ -48,16 +48,7 @@ SUBST_SED.apm= -e 's,define CONFIG_APPLET_APM 1,undef CONFIG_APPLET_APM,' SUBST_MESSAGE.apm= Disable APM applet. .endif -.if ${OPSYS} == "NetBSD" -. if !empty(OS_VERSION:M1.*) -CONFIGURE_ARGS+= --disable-i18n -. else -CONFIGURE_ARGS+= --with-unicode-set=utf-32 -. include "../../converters/libiconv/buildlink3.mk" -. endif -.else -. include "../../converters/libiconv/buildlink3.mk" -.endif +CONFIGURE_ARGS.NetBSD+= --with-unicode-set=utf-32 LIBS.SunOS+= -lintl DOCDIR= ${PREFIX}/share/doc/icewm @@ -76,6 +67,7 @@ post-install: done ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${HTMLDIR} +.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index 5b64835935f..38f5110e6d4 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2022/04/04 01:26:39 gutteridge Exp $ +# $NetBSD: Makefile,v 1.103 2022/05/10 11:50:55 nia Exp $ DISTNAME= sawfish_1.13.0 PKGNAME= ${DISTNAME:S/_/-/} @@ -34,7 +34,7 @@ SUBST_SED.env= -e 's,exec rep,exec env ${REP_ENV_PKGSRC} rep,g' .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M1.*) +.if ${OPSYS} == "NetBSD" REP_ENV_PKGSRC= LD_PRELOAD=/usr/lib/libpthread.so .else REP_ENV_PKGSRC= |