- unbreak and update to version 0.9.2

- add LICENSE info
- mark MAKE_JOBS_UNSAFE
- remove WITH_TABS option, now included in main package
- take maintainership

PR:             159793
Submitted by:   initial version by me, improvements by maintainer
Approved by:    maintainer (PR) miwi, wen (mentors implicit)

polish/kadu/Makefile

@@ -6,51 +6,53 @@
 #
 
 PORTNAME=		kadu
-PORTVERSION=		0.6.5.4
+PORTVERSION=		0.9.2
-PORTREVISION=	1
 PORTEPOCH=		1
 CATEGORIES=		polish net-im
 MASTER_SITES=		http://www.kadu.net/download/stable/:kadu \
-			http://www.kadu.net/download/additions/:additions \
+			http://www.kadu.net/download/additions/:additions
-			http://kadu.net/~arvenil/tabs/download/${PORTVERSION:C/(([0-9]+\.){2}[0-9]+)(.*)/\1/}/:modtab
 DISTFILES=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:kadu
 DIST_SUBDIR=		kadu
 EXTRACT_ONLY=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=		mwisnicki+freebsd@gmail.com
+MAINTAINER=		pawel@FreeBSD.org
-COMMENT=		QT Gadu-Gadu client
+COMMENT=		QT Gadu-Gadu / Jabber client
+
+LICENSE=		GPLv2
 
 BUILD_DEPENDS=		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=		enchant.1:${PORTSDIR}/textproc/enchant \
 			gadu.3:${PORTSDIR}/polish/libgadu \
+			idn:${PORTSDIR}/dns/libidn \
 			qca.2:${PORTSDIR}/devel/qca \
 			sndfile.1:${PORTSDIR}/audio/libsndfile
 RUN_DEPENDS=		qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 # TODO enable devel/libexecinfo
-
+# TODO ntrack and ntrack-qt (needs porting) ?
-BROKEN=			does not configure
+# TODO separate ports for plugins and themes (possible starting with 0.10)
-
-TABS_MOD_DISTFILE=	kadu-tabs-1.2.3.tar.bz2
 
 GG6_EMOTS_DISTFILE=	kompatybilne_z_GG6.tar.gz
 GG7_EMOTS_DISTFILE=	dodatkowe_emoty_GG7.tar.gz
 
 USE_BZIP2=		yes
 USE_CMAKE=		yes
-CMAKE_ARGS=		-DENABLE_AUTODOWNLOAD:BOOL=OFF
+USE_XORG=		xscrnsaver
+CMAKE_ARGS=		-DENABLE_AUTODOWNLOAD:BOOL=OFF \
+			-DKADU_VERSION:STRING="${DISTVERSION}" \
+			-DWITH_ENCHANT=ON
+# Setting KADU_VERSION disables git invocation
 CMAKE_USE_PTHREAD=	yes
 
 USE_QT_VER=		4
-QT_COMPONENTS=		gui dbus network qt3support script webkit xml \
+QT_COMPONENTS=		gui dbus network script webkit xml qmake_build \
-			qmake_build linguist_build moc_build rcc_build uic_build \
+			linguist_build moc_build rcc_build uic_build \
-			imageformats_run
+			imageformats_run sql-sqlite3_run
 WANT_GNOME=		yes
 INSTALLS_ICONS=		yes
 
-WRKSRC=			${WRKDIR}/${PORTNAME}
+MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	GG_EMOTS	"Install GG-compatible emoticons"	off \
+OPTIONS=	GG_EMOTS	"Install GG-compatible emoticons"	off
-		TABS	"Build tabs module"		off
 
 .include <bsd.port.pre.mk>
 
@@ -62,14 +64,6 @@ DISTFILES+=	${GG6_EMOTS_DISTFILE}:additions \
 PLIST_SUB+=	GG_EMOTS="@comment "
 .endif
 
-.if defined(WITH_TABS)
-PLIST_SUB+=	TABS_MOD=""
-DISTFILES+=	${TABS_MOD_DISTFILE}:modtab
-KADU_SHARED_MODULES+=	tabs
-.else
-PLIST_SUB+=	TABS_MOD="@comment "
-.endif
-
 KADU_SHARED_MODULES+=	spellchecker qt4_sound
 KADU_DISABLED_MODULES=	alsa_sound amarok1_mediaplayer audacious_mediaplayer mediaplayer
 
@@ -92,8 +86,5 @@ post-patch:
 	${MV} kompatybilne_z_GG6 gg6_compatible && \
 	cd gg6_compatible && ${TAR} -zxf ${_DISTDIR}/${GG7_EMOTS_DISTFILE}
 .endif
-.if defined(WITH_TABS)
-	@cd ${WRKSRC}/modules && ${TAR} -zxf ${_DISTDIR}/${TABS_MOD_DISTFILE}
-.endif
 
 .include <bsd.port.post.mk>

polish/kadu/distinfo

@@ -1,8 +1,6 @@
-SHA256 (kadu/kadu-0.6.5.4.tar.bz2) = 9decd7b9de6d91095b4f6b47bebbbbc5ca56b9ba6e8f6ee80d8ad172ba676d25
+SHA256 (kadu/kadu-0.9.2.tar.bz2) = 0b8cbd7cc2b313faf7792baed699a94478f5288f3a0b03c9dea83725eae99716
-SIZE (kadu/kadu-0.6.5.4.tar.bz2) = 1774602
+SIZE (kadu/kadu-0.9.2.tar.bz2) = 6436856
 SHA256 (kadu/kompatybilne_z_GG6.tar.gz) = f8a84acd8512fd8fc38e394aa564e6b6d7ec2e9fe9864bdf0c5b8f2edb23da6f
 SIZE (kadu/kompatybilne_z_GG6.tar.gz) = 254637
 SHA256 (kadu/dodatkowe_emoty_GG7.tar.gz) = aebeb45b6ac9139620032436f7b565aa5729a0165d1c361a473c1195b8807450
 SIZE (kadu/dodatkowe_emoty_GG7.tar.gz) = 113257
-SHA256 (kadu/kadu-tabs-1.2.3.tar.bz2) = 4ad76613e9ac19cdf1e7ad5f179ab7374bf9505eff78f3ec0202d1f6f92babef
-SIZE (kadu/kadu-tabs-1.2.3.tar.bz2) = 17771

polish/kadu/files/patch-kadu-core__CMakeLists.txt

@@ -0,0 +1,10 @@
+--- kadu-core/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ kadu-core/CMakeLists.txt	2011-08-20 22:41:28.000000000 +0200
+@@ -652,6 +652,7 @@
+ 	else (X11_Xfixes_FOUND)
+ 		message (FATAL_ERROR "Could not find X11 libraries")
+ 	endif (X11_FOUND)
++	include_directories (${X11_INCLUDE_DIR})
+ 
+ 	if (USE_X11_XFIXES)
+ 		if (X11_Xfixes_FOUND)

polish/kadu/files/patch-kadu-core_gadu_resolver.cpp

@@ -1,10 +0,0 @@
---- kadu-core/gadu_resolver.cpp.orig	2009-10-18 10:00:12.000000000 +0200
-+++ kadu-core/gadu_resolver.cpp	2010-02-16 01:41:36.000000000 +0100
-@@ -9,6 +9,7 @@
- #include <io.h>
- #else
- #include <sys/wait.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/inet.h>
- #endif

polish/kadu/files/patch-modules__docking__CMakeLists.txt

@@ -0,0 +1,19 @@
+--- modules/docking/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ modules/docking/CMakeLists.txt	2011-08-20 22:58:01.000000000 +0200
+@@ -13,6 +13,16 @@
+ 	SET_SOURCE_FILES_PROPERTIES(mac_docking_helper.cpp PROPERTIES COMPILE_FLAGS "-x objective-c++")
+ endif (APPLE)
+ 
++if (UNIX AND NOT APPLE)
++	include (FindX11)
++	if (X11_FOUND)
++		message (STATUS "Found X11 libraries: ${X11_X11_LIB}")
++	else (X11_FOUND)
++		message (FATAL_ERROR "Could not find X11 libraries")
++	endif (X11_FOUND)
++	include_directories (${X11_INCLUDE_DIR})
++endif (UNIX AND NOT APPLE)
++
+ set (TRANSLATION_SOURCES
+ 	translations/docking_en.ts
+ 	translations/docking_de.ts

polish/kadu/files/patch-modules__idle__CMakeLists.txt

@@ -0,0 +1,10 @@
+--- modules/idle/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ modules/idle/CMakeLists.txt	2011-08-21 00:06:34.000000000 +0200
+@@ -6,6 +6,7 @@
+ 		message (FATAL_ERROR "Could not find X11 Screen Saver extension")
+ 	endif (X11_Xscreensaver_FOUND)
+ 
++	include_directories (${X11_INCLUDE_DIR})
+ 	set (LIBRARIES ${X11_Xscreensaver_LIB})
+ 
+ 	set (SOURCES

polish/kadu/files/patch-modules__kde_notify__CMakeLists.txt

@@ -0,0 +1,12 @@
+--- modules/kde_notify/CMakeLists.txt.orig	2011-08-21 00:46:07.000000000 +0200
++++ modules/kde_notify/CMakeLists.txt	2011-08-21 00:45:20.000000000 +0200
+@@ -19,6 +19,9 @@
+ 	configuration/kde_notify.ui
+ )
+ 
++include_directories (${LIBGADU_INCLUDE_DIRS})
++link_directories (${LIBGADU_LIBRARY_DIRS})
++
+ kadu_module (kde_notify
+ 	MODULE_SOURCES ${SOURCES}
+ 	MODULE_MOC_SOURCES ${MOC_SOURCES}

polish/kadu/files/patch-modules__screenshot__CMakeLists.txt

@@ -0,0 +1,12 @@
+--- modules/screenshot/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ modules/screenshot/CMakeLists.txt	2011-08-21 01:51:47.000000000 +0200
+@@ -40,6 +40,9 @@
+ 	data/configuration/screenshot.ui
+ )
+ 
++include (FindX11)
++include_directories (${X11_INCLUDE_DIR})
++
+ kadu_module (screenshot
+ 	MODULE_SOURCES ${SOURCES}
+ 	MODULE_MOC_SOURCES ${MOC_SOURCES}

polish/kadu/files/patch-modules__sound__CMakeLists.txt

@@ -0,0 +1,31 @@
+--- modules/sound/CMakeLists.txt.orig	2011-08-21 02:45:28.000000000 +0200
++++ modules/sound/CMakeLists.txt	2011-08-21 03:01:52.000000000 +0200
+@@ -32,14 +32,6 @@
+ 	configuration/sound.ui
+ )
+ 
+-kadu_module (sound
+-	MODULE_SOURCES ${SOURCES}
+-	MODULE_MOC_SOURCES ${MOC_SOURCES}
+-	MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
+-	MODULE_CONFIGURATION_FILES ${CONFIGURATION_FILES}
+-	MODULE_BUILDDEF SOUND_BUILD
+-)
+-
+ if (NOT MINGW)
+ 	pkg_search_module (SNDFILE REQUIRED sndfile>=1.0)
+ else (NOT MINGW)
+@@ -58,4 +50,13 @@
+ 
+ include_directories (${SNDFILE_INCLUDE_DIRS})
+ link_directories (${SNDFILE_LIBRARY_DIRS})
++
++kadu_module (sound
++	MODULE_SOURCES ${SOURCES}
++	MODULE_MOC_SOURCES ${MOC_SOURCES}
++	MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
++	MODULE_CONFIGURATION_FILES ${CONFIGURATION_FILES}
++	MODULE_BUILDDEF SOUND_BUILD
++)
++
+ target_link_libraries (sound ${SNDFILE_LIBRARIES})

polish/kadu/files/patch-modules__spellchecker__CMakeLists.txt

@@ -0,0 +1,10 @@
+--- modules/spellchecker/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ modules/spellchecker/CMakeLists.txt	2011-08-21 03:11:41.000000000 +0200
+@@ -68,6 +68,7 @@
+ 
+ 	set (LIBRARIES ${ENCHANT_LIBRARIES})
+ 	include_directories (${ENCHANT_INCLUDE_DIRS})
++	link_directories (${ENCHANT_LIBRARY_DIRS})
+ 	add_definitions (${ENCHANT_DEFINITIONS})
+ 	add_definitions (-DHAVE_ENCHANT)
+ endif (USE_ASPELL)

polish/kadu/pkg-descr

@@ -1,4 +1,4 @@
-QT Gadu-Gadu client for Unix-like systems.
+QT Gadu-Gadu / Jabber client for Unix-like systems.
 Gadu-Gadu is an ICQ-like messenger for polish language users.
 
 WWW: http://kadu.net