pkg/50083: x11/sessreg on DragonFly 4.3-DEVELOPMENT gcc5 needs Makefile CPP -P patch

[davshao%gmail.com@localhost]

>Number:         50083
>Category:       pkg
>Synopsis:       x11/sessreg on DragonFly 4.3-DEVELOPMENT gcc5 needs Makefile CPP -P patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jul 24 04:45:00 +0000 2015
>Originator:     David Shao
>Release:        pkgsrc current
>Organization:
>Environment:
DragonFly  4.3-DEVELOPMENT DragonFly v4.2.2.96.g1d3c4-DEVELOPMENT #7: Thu Jul 23 17:41:09 PDT 2015     xxxxx@:/usr/obj/usr/src/sys/X86_64_GENERIC  x86_64
>Description:
Due to DragonFly 4.3-DEVELOPMENT now using the gcc 5.x series as the base compiler:

$ gcc --version
gcc 5.2.1 [DragonFly] Release/2015-07-18

x11/sessreg needs a patch to Makefile.  The DragonFly dports version of the patch is

CPP+=  -P

That didn't seem to work for pkgsrc, so I converted it to the following patch that does work.  Without the patch on DragonFly 4.3 one gets an error such as:

/usr/pkg/bin/bmake  all-recursive
Making all in man
  GEN      filenames.sed
  GEN      sessreg.1
sed: 3: filenames.sed: unescaped newline inside substitute pattern

Here is an example link explaining the problem:

http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html

"sed -e 's/\$(CPP) \$(DEFS)/$(CPP) -P $(DEFS)/' -i man/Makefile.in: with gcc-5 the behaviour of cpp was changed to emit line numbers. That results in unterminated sed commands in filenames.sed. Adding -P restores the old behaviour."

If this patch or something similar can be committed, all of meta-pkgs/modular-xorg-apps builds on DragonFly 4.3.
>How-To-Repeat:

>Fix:
--- Makefile.orig	2015-07-15 19:03:55.121593000 -0700
+++ Makefile	2015-07-19 08:51:47.600950000 -0700
@@ -16,6 +16,12 @@
 BUILD_DEFS+=	VARBASE
 CONFIGURE_ARGS+=--localstatedir=${VARBASE:Q}
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "DragonFly"
+# Required for gcc5+
+CPP_PRECOMP_FLAGS+=	-P
+.endif
+
 ###
 ### Please see patches/patch-ab for details on this.
 ###