[pkgsrc/trunk]: pkgsrc/x11/xorg-cf-files xorg-cf-files: Use correct compiler ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc44e920c67d
branches:  trunk
changeset: 374564:cc44e920c67d
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Jan 25 13:01:23 2018 +0000

description:
xorg-cf-files: Use correct compiler to linker flags.

Bump PKGREVISION.

diffstat:

 x11/xorg-cf-files/Makefile                   |   4 ++--
 x11/xorg-cf-files/distinfo                   |   4 ++--
 x11/xorg-cf-files/patches/patch-sv4Lib.rules |  27 ++++++++++++++++++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diffs (67 lines):

diff -r 2c9b20ff7679 -r cc44e920c67d x11/xorg-cf-files/Makefile
--- a/x11/xorg-cf-files/Makefile        Thu Jan 25 12:33:49 2018 +0000
+++ b/x11/xorg-cf-files/Makefile        Thu Jan 25 13:01:23 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2017/01/06 21:12:39 tez Exp $
+# $NetBSD: Makefile,v 1.34 2018/01/25 13:01:23 jperkin Exp $
 
 DISTNAME=              xorg-cf-files-1.0.6
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 2c9b20ff7679 -r cc44e920c67d x11/xorg-cf-files/distinfo
--- a/x11/xorg-cf-files/distinfo        Thu Jan 25 12:33:49 2018 +0000
+++ b/x11/xorg-cf-files/distinfo        Thu Jan 25 13:01:23 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2017/01/06 21:12:39 tez Exp $
+$NetBSD: distinfo,v 1.30 2018/01/25 13:01:23 jperkin Exp $
 
 SHA1 (xorg-cf-files-1.0.6.tar.bz2) = 9b6ed71c74a83181a47eb180787e9ab9a5efdfa2
 RMD160 (xorg-cf-files-1.0.6.tar.bz2) = 544d19c017066cbab2c7108ecf702c4866144755
@@ -19,4 +19,4 @@
 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
 SHA1 (patch-ak) = dba7e9f6bd9043e438bf6f309a5dc6f424204fd9
 SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
-SHA1 (patch-sv4Lib.rules) = 20bd05fe6e49cabb74317ded2f4b7565dd45c49d
+SHA1 (patch-sv4Lib.rules) = f7ea2b29a8d3f4e866578fc81d0bbb6a3e598bb3
diff -r 2c9b20ff7679 -r cc44e920c67d x11/xorg-cf-files/patches/patch-sv4Lib.rules
--- a/x11/xorg-cf-files/patches/patch-sv4Lib.rules      Thu Jan 25 12:33:49 2018 +0000
+++ b/x11/xorg-cf-files/patches/patch-sv4Lib.rules      Thu Jan 25 13:01:23 2018 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-sv4Lib.rules,v 1.1 2012/02/15 15:25:15 hans Exp $
+$NetBSD: patch-sv4Lib.rules,v 1.2 2018/01/25 13:01:23 jperkin Exp $
 
---- sv4Lib.rules.orig  2009-10-16 23:45:42.000000000 +0200
-+++ sv4Lib.rules       2012-01-15 22:45:33.359398571 +0100
+--- sv4Lib.rules.orig  2015-12-22 01:28:02.000000000 +0000
++++ sv4Lib.rules
 @@ -63,26 +63,50 @@ XCOMM $XFree86: xc/config/cf/sv4Lib.rule
  /*
   * InstallSharedLibrary - generate rules to install the shared library.
@@ -61,3 +61,24 @@
  #endif
  
  #endif /* InstallSharedLibrary */
+@@ -97,17 +121,17 @@ install:: Concat(lib,libname.so.rev)
+ #ifndef LinkWithExports
+ # if UseExportLists
+ #  define LinkWithExports(libname,rev,solist,down,up) \
+-      (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))      @@\
++      (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -Wl,-h,$@ solist $(REQUIREDLIBS))  @@\
+       if [ -f Concat(lib,libname.elist) ]; then \                     @@\
+           $(RM) down/$@.exports $@.list; \                            @@\
+           $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \   @@\
+           $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \           @@\
+-          (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \        @@\
++          (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -Wl,-h,$@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \    @@\
+           $(RM) down/$@.exports $@.list; \                            @@\
+       fi;
+ # else
+ #  define LinkWithExports(libname,rev,solist,down,up) \
+-      (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
++      (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -Wl,-h,$@ solist $(REQUIREDLIBS))
+ # endif
+ #endif
+