Use tradcpp(1) for preprocessing sed script which is not actually C code. Fixes build with gcc5. (sed: 3: filenames.sed: unescaped newline inside substitute pattern)diff -r1.10 -r1.11 pkgsrc/x11/sessreg/Makefile
(tnn)
@@ -1,21 +1,23 @@ | @@ -1,21 +1,23 @@ | |||
1 | # $NetBSD: Makefile,v 1.10 2016/04/07 10:18:08 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.11 2016/04/07 13:21:38 tnn Exp $ | |
2 | 2 | |||
3 | DISTNAME= sessreg-1.1.0 | 3 | DISTNAME= sessreg-1.1.0 | |
4 | CATEGORIES= x11 | 4 | CATEGORIES= x11 | |
5 | MASTER_SITES= ${MASTER_SITE_XORG:=app/} | 5 | MASTER_SITES= ${MASTER_SITE_XORG:=app/} | |
6 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
7 | 7 | |||
8 | MAINTAINER= joerg@NetBSD.org | 8 | MAINTAINER= joerg@NetBSD.org | |
9 | HOMEPAGE= http://xorg.freedesktop.org/ | 9 | HOMEPAGE= http://xorg.freedesktop.org/ | |
10 | COMMENT= Manage utmp/wtmp entries for xdm | 10 | COMMENT= Manage utmp/wtmp entries for xdm | |
11 | 11 | |||
12 | USE_TOOLS+= pkg-config | 12 | USE_TOOLS+= pkg-config | |
13 | GNU_CONFIGURE= yes | 13 | GNU_CONFIGURE= yes | |
14 | USE_LANGUAGES= c | |||
15 | 14 | |||
16 | BUILD_DEFS+= VARBASE | 15 | BUILD_DEFS+= VARBASE | |
17 | CONFIGURE_ARGS+=--localstatedir=${VARBASE:Q} | 16 | CONFIGURE_ARGS+=--localstatedir=${VARBASE:Q} | |
18 | 17 | |||
18 | TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp | |||
19 | MAKE_ENV+= RAWCPP="${PREFIX}/bin/tradcpp -Uunix" | |||
20 | ||||
19 | BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.25 | 21 | BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.25 | |
20 | .include "../../x11/xproto/buildlink3.mk" | 22 | .include "../../x11/xproto/buildlink3.mk" | |
21 | .include "../../mk/bsd.pkg.mk" | 23 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2015/11/04 03:28:54 agc Exp $ | 1 | $NetBSD: distinfo,v 1.9 2016/04/07 13:21:38 tnn Exp $ | |
2 | 2 | |||
3 | SHA1 (sessreg-1.1.0.tar.bz2) = a27a476f7f39ae30a16dfa25ca07c12378cff7f0 | 3 | SHA1 (sessreg-1.1.0.tar.bz2) = a27a476f7f39ae30a16dfa25ca07c12378cff7f0 | |
4 | RMD160 (sessreg-1.1.0.tar.bz2) = b5779a4f4bf7214fd186e41a81d4cf906f6b4443 | 4 | RMD160 (sessreg-1.1.0.tar.bz2) = b5779a4f4bf7214fd186e41a81d4cf906f6b4443 | |
5 | SHA512 (sessreg-1.1.0.tar.bz2) = 5d9010874696bbc53a6271f30c089690cb341ede992f6be0914474a03ff4468e01e6a4ce7e6a437b96751fdf0ccced52b374126e5caeac6747edecd049841116 | 5 | SHA512 (sessreg-1.1.0.tar.bz2) = 5d9010874696bbc53a6271f30c089690cb341ede992f6be0914474a03ff4468e01e6a4ce7e6a437b96751fdf0ccced52b374126e5caeac6747edecd049841116 | |
6 | Size (sessreg-1.1.0.tar.bz2) = 134484 bytes | 6 | Size (sessreg-1.1.0.tar.bz2) = 134484 bytes | |
7 | SHA1 (patch-man_Makefile.in) = ad772e135519cde9ad4247f42f58cf1161572db1 |
$NetBSD: patch-man_Makefile.in,v 1.1 2016/04/07 13:21:38 tnn Exp $
Use tradcpp(1) for preprocessing sed script which is not actually C code.
--- man/Makefile.in.orig 2015-01-20 05:01:38.000000000 +0000
+++ man/Makefile.in
@@ -490,7 +490,7 @@ uninstall-am: uninstall-appmanDATA
.PRECIOUS: Makefile
filenames.sed: filenames.sed.c
- $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_V_GEN)$(RAWCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
$(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@