svn commit: r421940 - head/devel/libkolab

[Tobias C. Berner]

Author: tcberner
Date: Mon Sep 12 17:13:14 2016
New Revision: 421940
URL: https://svnweb.freebsd.org/changeset/ports/421940

Log:
  Fix devel/libkolab, to properly export symbols in the library.
  
  The update to libkolab in r421840 unfortunately broke desktuils/libkolab on the
  current version of FreeBSD.
  
  The issue is addressed in two upstream commits
          * 62ebad910fa7d1843373056dd795fc5c36b20bb2
                          ==> Workaround for qt not defining Q_DECL_IMPORT
          * d0a2fda6059abda610afe6a8d29b8f5a1c6ae4ae
                          ==> Fix multiple-definition-warning due to redefining Q_DECL_IMPORT.
  
  Instead of applying said two patches and enabling them on Q_OS_FREEBSD, rakcuo@
  suggested to instead just define MAKE_KOLAB_LIB while the proper fix isn't
  upstreamed.
  
  Reported by:	Steve Wills <swills at FreeBSD.org> via jenkins
  Approved by:	rakcuo (mentor)

Modified:
  head/devel/libkolab/Makefile

Modified: head/devel/libkolab/Makefile
==============================================================================
--- head/devel/libkolab/Makefile	Mon Sep 12 17:03:03 2016	(r421939)
+++ head/devel/libkolab/Makefile	Mon Sep 12 17:13:14 2016	(r421940)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libkolab
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://mirror.kolabsys.com/pub/releases/
 
@@ -27,6 +28,8 @@ USE_KDE=	automoc4 kdelibs pimlibs
 USE_LDCONFIG=	yes
 USE_QT4=	corelib dbus gui network svg xml \
 		moc_build qmake_build rcc_build uic_build
+# Fix build of desktuils/kdepim4-runtime:
+CXXFLAGS+=	-DMAKE_KOLAB_LIB
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}