From owner-svn-ports-head@FreeBSD.ORG  Fri Jun  7 11:45:03 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A7B4EEAD;
 Fri,  7 Jun 2013 11:45:03 +0000 (UTC)
 (envelope-from avilla@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 999D919D9;
 Fri,  7 Jun 2013 11:45:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r57Bj3bM080955;
 Fri, 7 Jun 2013 11:45:03 GMT (envelope-from avilla@svn.freebsd.org)
Received: (from avilla@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r57Bj3I3080954;
 Fri, 7 Jun 2013 11:45:03 GMT (envelope-from avilla@svn.freebsd.org)
Message-Id: <201306071145.r57Bj3I3080954@svn.freebsd.org>
From: Alberto Villa <avilla@FreeBSD.org>
Date: Fri, 7 Jun 2013 11:45:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320192 - head/x11/kactivitymanagerd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jun 2013 11:45:03 -0000

Author: avilla
Date: Fri Jun  7 11:45:03 2013
New Revision: 320192
URL: http://svnweb.freebsd.org/changeset/ports/320192

Log:
  - Add a workaround to fix a crash on exit() on FreeBSD 10.

Modified:
  head/x11/kactivitymanagerd/Makefile

Modified: head/x11/kactivitymanagerd/Makefile
==============================================================================
--- head/x11/kactivitymanagerd/Makefile	Fri Jun  7 11:42:10 2013	(r320191)
+++ head/x11/kactivitymanagerd/Makefile	Fri Jun  7 11:45:03 2013	(r320192)
@@ -26,12 +26,20 @@ DISTINFO_FILE=	${.CURDIR}/../kactivities
 # https://bugs.kde.org/show_bug.cgi?id=305529#c10
 CMAKE_ARGS+=	-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=-rdynamic
 
-# 'USES= moderncompiler' would help, for now force dependence on gcc
+# 'USES= moderncompiler' would help, for now force dependency on gcc
 USE_GCC=	4.6+
 
+.include <bsd.port.pre.mk>
+
+# Workaround to keep kactivitymanagerd from crashing:
+# http://lists.freebsd.org/pipermail/freebsd-current/2012-May/033972.html
+.if ${OSVERSION} > 1000000
+CXXFLAGS+=	-fno-use-cxa-atexit
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "/add_subdirectory (lib)/d" \
 		-e "/add_subdirectory (ontologies)/d" \
 		${WRKSRC}/src/CMakeLists.txt \
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>