pkg/50050: x11/xorg-cf-files DragonFly.cf remove -lxpg4 else x11/xp breaks building

[davshao%gmail.com@localhost]

>Number:         50050
>Category:       pkg
>Synopsis:       x11/xorg-cf-files DragonFly.cf remove -lxpg4 else x11/xp breaks building
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jul 14 22:50:00 +0000 2015
>Originator:     David Shao
>Release:        pkgsrc HEAD
>Organization:
>Environment:
DragonFly  4.3-DEVELOPMENT DragonFly v4.2.2.4.g9b14d5-DEVELOPMENT #0: Tue Jul 14 07:03:55 PDT 2015     xxxxx@:/usr/obj/usr/src/sys/X86_64_GENERIC  x86_64
>Description:
For DragonFly 4.3-DEVELOPMENT, current pkgsrc needs to remove from the DragonFly.cf file installed by x11/xorg-cf-files the part that has an extra library search using -lxpg4.  Otherwise ports such as x11/xp that I believe have USING_IMAKE will break building.

What seems to have changed for DragonFly was that libxpg4 was removed from share/mk/bsd.libnames.mk, see as reference:

http://lists.dragonflybsd.org/pipermail/commits/2013-December/378473.html

The proposed change in xorg-cf-files DragonFly.cf should have no effect on any version of DragonFly past or present because apparently libxpg4 on DragonFly was always empty from at least 2004, with the functions it should theoretically contain instead being in libc.  It was apparently the product of uncompleted work on FreeBSD.  See as reference the thread "patch to unhook libxpg4 and liby from build"

http://leaf.dragonflybsd.org/mailarchive/submit/2004-03/msg00179.html

The proposed change is to patch-ae from x11/xorg-cf-files and can be summarized as follows.  It is part of the patch that current master DragonFly dports makes to the same port:

@@ -116,10 +116,6 @@ XCOMM operating system:  OSName (OSMajor
 # endif
 # define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm GccWarningOptions
 #endif
-#ifndef ExtraLibraries
-/* support for multi-byte locales is in libxpg4 rather than libc */
-#define ExtraLibraries          -lxpg4
-#endif
 #define HasSetUserContext       YES
 #define HasGetpeereid           YES
 #define HasMTRRSupport          YES


>How-To-Repeat:

>Fix:
The new patch-ae is as follows.  I apologize for not being able to list a proper diff from the original patch-ae, but I am using pkgsrc mkpatches to generate the new patch and cannot seem to match the format of the original patch-ae.

$NetBSD$

--- DragonFly.cf.orig	2013-07-23 05:23:14.000000000 +0000
+++ DragonFly.cf
@@ -101,7 +101,7 @@ XCOMM operating system:  OSName (OSMajor
 #ifndef CplusplusCmd
 # define CplusplusCmd            c++
 #endif
-#define CppCmd                   /usr/bin/cpp
+#define CppCmd                   cpp
 #define PreProcessCmd            CppCmd
 #define StandardCppOptions       -traditional
 #define StandardCppDefines       /**/
@@ -116,10 +116,6 @@ XCOMM operating system:  OSName (OSMajor
 # endif
 # define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm GccWarningOptions
 #endif
-#ifndef ExtraLibraries
-/* support for multi-byte locales is in libxpg4 rather than libc */
-#define ExtraLibraries          -lxpg4
-#endif
 #define HasSetUserContext       YES
 #define HasGetpeereid           YES
 #define HasMTRRSupport          YES
@@ -149,6 +145,10 @@ XCOMM operating system:  OSName (OSMajor
 #endif
 
 #ifndef BuildDmx
+#define BuildDmx		YES
+#endif
+
+#ifndef BuildDmx
 #define BuildDmx		YES
 #endif