diff options
| author | grant <grant@pkgsrc.org> | 2004-12-18 16:57:56 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-12-18 16:57:56 +0000 |
| commit | 88b2f1bdc9d485848d4c3e8461cb92ed1f301fd4 (patch) | |
| tree | 2344d038e010a4b561375b94d83eff052d5ecac4 /devel | |
| parent | 3b03cc6d2fe96c1ef032a9e125c17a58dd53f569 (diff) | |
| download | pkgsrc-88b2f1bdc9d485848d4c3e8461cb92ed1f301fd4.tar.gz | |
- 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 (limited to 'devel')
| -rw-r--r-- | devel/pkgconfig/Makefile | 5 | ||||
| -rw-r--r-- | devel/pkgconfig/distinfo | 3 | ||||
| -rw-r--r-- | devel/pkgconfig/patches/patch-ac | 15 |
3 files changed, 20 insertions, 3 deletions
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 663d5d236b1..169ce062c66 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -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 @@ TEST_TARGET= check post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig +.include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo index 5949b177cff..50e66e9b135 100644 --- a/devel/pkgconfig/distinfo +++ b/devel/pkgconfig/distinfo @@ -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 --git a/devel/pkgconfig/patches/patch-ac b/devel/pkgconfig/patches/patch-ac new file mode 100644 index 00000000000..3680ee1a931 --- /dev/null +++ b/devel/pkgconfig/patches/patch-ac @@ -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 |