svn commit: r317552 - in head/comms/openobex: . files

[Guido Falsi]

Author: madpilot
Date: Mon May  6 21:56:18 2013
New Revision: 317552
URL: http://svnweb.freebsd.org/changeset/ports/317552

Log:
  - Take advantage of accept4() in recent CURRENT [1]
  - Fix plist when DOXYGEN option is not enabled
  
  Suggested by:	jilles [1]

Modified:
  head/comms/openobex/Makefile
  head/comms/openobex/files/patch-lib_cloexec.h
  head/comms/openobex/pkg-plist

Modified: head/comms/openobex/Makefile
==============================================================================
--- head/comms/openobex/Makefile	Mon May  6 21:53:56 2013	(r317551)
+++ head/comms/openobex/Makefile	Mon May  6 21:56:18 2013	(r317552)
@@ -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

Modified: head/comms/openobex/files/patch-lib_cloexec.h
==============================================================================
--- head/comms/openobex/files/patch-lib_cloexec.h	Mon May  6 21:53:56 2013	(r317551)
+++ head/comms/openobex/files/patch-lib_cloexec.h	Mon May  6 21:56:18 2013	(r317552)
@@ -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);

Modified: head/comms/openobex/pkg-plist
==============================================================================
--- head/comms/openobex/pkg-plist	Mon May  6 21:53:56 2013	(r317551)
+++ head/comms/openobex/pkg-plist	Mon May  6 21:56:18 2013	(r317552)
@@ -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
- at dirrm %%DOCSDIR%%/html
- at dirrm %%DOCSDIR%%
+%%DOXYGEN%%@dirrm %%DOCSDIR%%/html
+%%DOXYGEN%%@dirrm %%DOCSDIR%%
 @dirrm include/openobex
 @dirrm lib/cmake/OpenObex-1.7
 @dirrmtry lib/cmake