diff options
author | dholland <dholland@pkgsrc.org> | 2015-07-15 17:16:50 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2015-07-15 17:16:50 +0000 |
commit | a917e56fd9b13894d3d7a766d1d22c687df5310a (patch) | |
tree | 840ea058f01ba0fb92cf6d0806bd7a75a66a0f52 | |
parent | 233b4aacec7b1ee21566a14046c91198b2fe9713 (diff) | |
download | pkgsrc-a917e56fd9b13894d3d7a766d1d22c687df5310a.tar.gz |
PR pkg/50050 David Shao: remove use of -lxpg4 on Dragonfly. PKGREVISION++
-rw-r--r-- | x11/xorg-cf-files/Makefile | 4 | ||||
-rw-r--r-- | x11/xorg-cf-files/distinfo | 4 | ||||
-rw-r--r-- | x11/xorg-cf-files/patches/patch-ae | 13 |
3 files changed, 16 insertions, 5 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index 99abd599331..93595ca624c 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2014/07/28 14:38:17 jperkin Exp $ +# $NetBSD: Makefile,v 1.29 2015/07/15 17:16:50 dholland Exp $ DISTNAME= xorg-cf-files-1.0.5 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=util/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo index 850e8f3d7e2..c4ddcec58e6 100644 --- a/x11/xorg-cf-files/distinfo +++ b/x11/xorg-cf-files/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2014/07/28 14:38:17 jperkin Exp $ +$NetBSD: distinfo,v 1.23 2015/07/15 17:16:50 dholland Exp $ SHA1 (xorg-cf-files-1.0.5.tar.bz2) = ae22eb81d56d018f0b3b149f70965ebfef2385fd RMD160 (xorg-cf-files-1.0.5.tar.bz2) = c389c5c1642a7a3b3bc9603c2cb0217a028f905e @@ -10,7 +10,7 @@ SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3 SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280 -SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2 +SHA1 (patch-ae) = 79cb76c47b283707c9799881dbcc2926f0ab0089 SHA1 (patch-af) = c000ab24fafd1f6e154df6b317291f89f952c479 SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36 diff --git a/x11/xorg-cf-files/patches/patch-ae b/x11/xorg-cf-files/patches/patch-ae index 7bbe22e4172..dccfc0f714f 100644 --- a/x11/xorg-cf-files/patches/patch-ae +++ b/x11/xorg-cf-files/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.2 2010/05/21 22:09:43 schwarz Exp $ +$NetBSD: patch-ae,v 1.3 2015/07/15 17:16:50 dholland Exp $ --- DragonFly.cf.orig 2010-05-16 12:38:48.000000000 +0200 +++ DragonFly.cf 2010-05-16 12:41:18.000000000 +0200 @@ -18,6 +18,17 @@ $NetBSD: patch-ae,v 1.2 2010/05/21 22:09:43 schwarz Exp $ #define PreProcessCmd CppCmd #define StandardCppOptions -traditional #define StandardCppDefines /**/ +@@ -116,10 +116,6 @@ + # 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 @@ -152,6 +152,10 @@ #define BuildDmx YES #endif |