summaryrefslogtreecommitdiff
path: root/devel/libevent
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2007-02-27 10:38:45 +0000
committergrant <grant@pkgsrc.org>2007-02-27 10:38:45 +0000
commit5a6a5f4e21e56a2c6f82a5e7435af2595fd42fa1 (patch)
tree9d19058ccc776f22c60a90989c1c3273e77efa36 /devel/libevent
parent5aa5c900ab1a56b03b17ea05947c013e53fa9378 (diff)
downloadpkgsrc-5a6a5f4e21e56a2c6f82a5e7435af2595fd42fa1.tar.gz
make this build on Solaris with sunpro.
Diffstat (limited to 'devel/libevent')
-rw-r--r--devel/libevent/Makefile16
-rw-r--r--devel/libevent/distinfo3
-rw-r--r--devel/libevent/patches/patch-aa24
3 files changed, 41 insertions, 2 deletions
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 096995eef16..901348eac09 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/02/11 05:34:33 tv Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/27 10:38:45 grant Exp $
#
# WARNING: updating this package (as of the 1.1/1.2 releases) means
# updating BUILDLINK_ABI_DEPENDS in buildlink3.mk and a PKGREVISION
@@ -20,4 +20,18 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
TEST_TARGET= verify
+LIBS.SunOS+= -lnsl -lresolv
+
+# Solaris doesn't have u_intX_t types in <inttypes.h>.
+CFLAGS.SunOS+= -Du_int8_t=uint8_t
+CFLAGS.SunOS+= -Du_int16_t=uint16_t
+CFLAGS.SunOS+= -Du_int32_t=uint32_t
+
+# The SunPro compiler doesn't understand __inline.
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Msunpro)
+CFLAGS.SunOS+= -D__inline=inline
+.endif
+
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index e7b1335e651..64949aa01a0 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2007/02/08 17:06:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.13 2007/02/27 10:38:45 grant Exp $
SHA1 (libevent-1.2a.tar.gz) = 904724e029bfea42affc6e73630becd1ba30c217
RMD160 (libevent-1.2a.tar.gz) = 5790bee3f198d7fac9e74dfac1c025441229ead9
Size (libevent-1.2a.tar.gz) = 410346 bytes
+SHA1 (patch-aa) = ed170a74ee2f73c6b3894ff3801f8601167702ac
diff --git a/devel/libevent/patches/patch-aa b/devel/libevent/patches/patch-aa
new file mode 100644
index 00000000000..da668db18f4
--- /dev/null
+++ b/devel/libevent/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2007/02/27 10:38:45 grant Exp $
+
+--- Makefile.in.orig 2006-11-29 13:26:12.000000000 +1100
++++ Makefile.in
+@@ -117,8 +117,8 @@ EXTRA_DIST = acconfig.h event.h event-in
+
+ lib_LTLIBRARIES = libevent.la
+
+-@BUILD_WIN32_TRUE@SUBDIRS = . sample
+-@BUILD_WIN32_FALSE@SUBDIRS = . sample test
++@BUILD_WIN32_TRUE@SUBDIRS = .
++@BUILD_WIN32_FALSE@SUBDIRS = .
+ @BUILD_WIN32_TRUE@SYS_LIBS = -lws2_32
+ @BUILD_WIN32_FALSE@SYS_LIBS =
+ @BUILD_WIN32_TRUE@SYS_SRC = WIN32-Code/misc.c WIN32-Code/win32.c
+@@ -187,7 +187,7 @@ DIST_COMMON = README $(include_HEADERS)
+ configure configure.in devpoll.c epoll.c epoll_sub.c evport.c \
+ install-sh kqueue.c ltmain.sh missing mkinstalldirs poll.c \
+ rtsig.c select.c signal.c strlcpy.c
+-DIST_SUBDIRS = . sample test
++DIST_SUBDIRS = . test
+ SOURCES = $(libevent_la_SOURCES)
+
+ all: config.h