diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2013-05-06 21:56:18 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2013-05-06 21:56:18 +0000 |
commit | 0caa2215f1d523a639fe3f64b05f59df378561d0 (patch) | |
tree | 13b4a44e0c469384044238fa8f669bfabee7a405 /comms/openobex | |
parent | Remove USE_GETTEXT leftover. (diff) |
- Take advantage of accept4() in recent CURRENT [1]
- Fix plist when DOXYGEN option is not enabled
Suggested by: jilles [1]
Notes
Notes:
svn path=/head/; revision=317552
Diffstat (limited to 'comms/openobex')
-rw-r--r-- | comms/openobex/Makefile | 2 | ||||
-rw-r--r-- | comms/openobex/files/patch-lib_cloexec.h | 4 | ||||
-rw-r--r-- | comms/openobex/pkg-plist | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile index f2fbf3253b05..cbe72cf8ee56 100644 --- a/comms/openobex/Makefile +++ b/comms/openobex/Makefile @@ -2,7 +2,7 @@ PORTNAME= openobex PORTVERSION= 1.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms net MASTER_SITES= http://www.hendrik-sattler.de/downloads/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source diff --git a/comms/openobex/files/patch-lib_cloexec.h b/comms/openobex/files/patch-lib_cloexec.h index 23625cd0bfcf..32305701a14a 100644 --- a/comms/openobex/files/patch-lib_cloexec.h +++ b/comms/openobex/files/patch-lib_cloexec.h @@ -1,5 +1,5 @@ --- lib/cloexec.h.orig 2012-03-26 20:25:19.000000000 +0200 -+++ lib/cloexec.h 2013-04-11 16:12:55.161482749 +0200 ++++ lib/cloexec.h 2013-05-06 23:36:45.087537539 +0200 @@ -22,6 +22,7 @@ #ifndef _WIN32 #include <sys/types.h> @@ -13,7 +13,7 @@ socklen_t *addrlen) { -#ifdef SOCK_CLOEXEC -+#if defined(SOCK_CLOEXEC) && !defined(__FreeBSD__) ++#if defined(SOCK_CLOEXEC) && __FreeBSD_version < 1000032 return accept4(sockfd, addr, addrlen, SOCK_CLOEXEC); #else socket_t fd = accept(sockfd, addr, addrlen); diff --git a/comms/openobex/pkg-plist b/comms/openobex/pkg-plist index 8092b55c841e..48b7e8811465 100644 --- a/comms/openobex/pkg-plist +++ b/comms/openobex/pkg-plist @@ -72,8 +72,8 @@ libdata/pkgconfig/openobex.pc %%DOXYGEN%%%%DOCSDIR%%/html/tabs.css %%DOXYGEN%%%%DOCSDIR%%/html/unionobex__headerdata__t.html %%DOXYGEN%%%%DOCSDIR%%/html/unionobex__interface__t.html -@dirrm %%DOCSDIR%%/html -@dirrm %%DOCSDIR%% +%%DOXYGEN%%@dirrm %%DOCSDIR%%/html +%%DOXYGEN%%@dirrm %%DOCSDIR%% @dirrm include/openobex @dirrm lib/cmake/OpenObex-1.7 @dirrmtry lib/cmake |