diff options
| author | tnn <tnn@pkgsrc.org> | 2016-04-07 13:21:38 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2016-04-07 13:21:38 +0000 |
| commit | c881cd1454c0eb7451d6f1e50c99dab8cb64280c (patch) | |
| tree | 48da041965f7a8a43fa9cb6c6046bc5bd46c7663 /x11 | |
| parent | 0181164808a8d0309e092eaca30c30a9f3f8be4f (diff) | |
| download | pkgsrc-c881cd1454c0eb7451d6f1e50c99dab8cb64280c.tar.gz | |
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)
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/sessreg/Makefile | 6 | ||||
| -rw-r--r-- | x11/sessreg/distinfo | 3 | ||||
| -rw-r--r-- | x11/sessreg/patches/patch-man_Makefile.in | 15 |
3 files changed, 21 insertions, 3 deletions
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile index 8645430fb3e..e05002ef81a 100644 --- a/x11/sessreg/Makefile +++ b/x11/sessreg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2016/04/07 10:18:08 tnn Exp $ +# $NetBSD: Makefile,v 1.11 2016/04/07 13:21:38 tnn Exp $ DISTNAME= sessreg-1.1.0 CATEGORIES= x11 @@ -11,11 +11,13 @@ COMMENT= Manage utmp/wtmp entries for xdm USE_TOOLS+= pkg-config GNU_CONFIGURE= yes -USE_LANGUAGES= c BUILD_DEFS+= VARBASE CONFIGURE_ARGS+=--localstatedir=${VARBASE:Q} +TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp +MAKE_ENV+= RAWCPP="${PREFIX}/bin/tradcpp -Uunix" + BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.25 .include "../../x11/xproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo index 25e84c12242..e007d26c874 100644 --- a/x11/sessreg/distinfo +++ b/x11/sessreg/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 03:28:54 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/04/07 13:21:38 tnn Exp $ SHA1 (sessreg-1.1.0.tar.bz2) = a27a476f7f39ae30a16dfa25ca07c12378cff7f0 RMD160 (sessreg-1.1.0.tar.bz2) = b5779a4f4bf7214fd186e41a81d4cf906f6b4443 SHA512 (sessreg-1.1.0.tar.bz2) = 5d9010874696bbc53a6271f30c089690cb341ede992f6be0914474a03ff4468e01e6a4ce7e6a437b96751fdf0ccced52b374126e5caeac6747edecd049841116 Size (sessreg-1.1.0.tar.bz2) = 134484 bytes +SHA1 (patch-man_Makefile.in) = ad772e135519cde9ad4247f42f58cf1161572db1 diff --git a/x11/sessreg/patches/patch-man_Makefile.in b/x11/sessreg/patches/patch-man_Makefile.in new file mode 100644 index 00000000000..94f2907b0f4 --- /dev/null +++ b/x11/sessreg/patches/patch-man_Makefile.in @@ -0,0 +1,15 @@ +$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' > $@ + |