pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/pkgconfig - pkgconfig uses dlopen(), so include ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/aef5ac620359
branches:  trunk
changeset: 485677:aef5ac620359
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Dec 18 16:57:56 2004 +0000

description:
- pkgconfig uses dlopen(), so include dlopen.buildlink3.mk.
- Darwin has no prototype for poll(), so in glib, do what it already did
  for Solaris.

fixes build on Darwin.

bump PKGREVISION for dlcompat dependency.

diffstat:

 devel/pkgconfig/Makefile         |   5 +++--
 devel/pkgconfig/distinfo         |   3 ++-
 devel/pkgconfig/patches/patch-ac |  15 +++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r ffdf74543250 -r aef5ac620359 devel/pkgconfig/Makefile
--- a/devel/pkgconfig/Makefile  Sat Dec 18 16:36:29 2004 +0000
+++ b/devel/pkgconfig/Makefile  Sat Dec 18 16:57:56 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/10/13 19:12:22 reed Exp $
+# $NetBSD: Makefile,v 1.20 2004/12/18 16:57:56 grant Exp $
 #
 
 DISTNAME=      pkgconfig-0.15.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  http://www.freedesktop.org/software/pkgconfig/releases/
 
@@ -29,4 +29,5 @@
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
 
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ffdf74543250 -r aef5ac620359 devel/pkgconfig/distinfo
--- a/devel/pkgconfig/distinfo  Sat Dec 18 16:36:29 2004 +0000
+++ b/devel/pkgconfig/distinfo  Sat Dec 18 16:57:56 2004 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2004/09/04 21:51:20 jschauma Exp $
+$NetBSD: distinfo,v 1.10 2004/12/18 16:57:56 grant Exp $
 
 SHA1 (pkgconfig-0.15.0.tar.gz) = 1019c8027c0cf94bca680886f4e2ae4e629a2a97
 Size (pkgconfig-0.15.0.tar.gz) = 610697 bytes
 SHA1 (patch-aa) = 6ac538ffabfadb5ac46e92878f32f969ac14515f
 SHA1 (patch-ab) = 7eee4f3df5bb68e0af3202b48c99d32256bfe8c7
+SHA1 (patch-ac) = cfea2b4ba5fea85daa0329688c43e6b967c3f498
diff -r ffdf74543250 -r aef5ac620359 devel/pkgconfig/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pkgconfig/patches/patch-ac  Sat Dec 18 16:57:56 2004 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2004/12/18 16:57:56 grant Exp $
+
+--- glib-1.2.8/gmain.c.orig    2000-05-19 15:58:48.000000000 +1000
++++ glib-1.2.8/gmain.c
+@@ -187,7 +187,9 @@ static gboolean poll_changed = FALSE;
+ /* SunOS has poll, but doesn't provide a prototype. */
+ #  if defined (sun) && !defined (__SVR4)
+ extern gint poll (GPollFD *ufds, guint nfsd, gint timeout);
+-#  endif  /* !sun */
++#  elif defined (__APPLE__)
++extern gint poll (GPollFD *ufds, guint nfsd, gint timeout);
++#  endif
+ static GPollFunc poll_func = (GPollFunc) poll;
+ #else /* !HAVE_POLL */
+ #ifdef NATIVE_WIN32



Home | Main Index | Thread Index | Old Index