Attachment #88652 for bug #125473

View | Details | Raw Unified | Return to bug 125473
Collapse All | Expand All




#

PORTNAME=		kadu
PORTVERSION=		0.6.0.2
PORTREVISION=	1
PORTEPOCH=		1
CATEGORIES=		polish net-im
MASTER_SITES=		http://www.kadu.net/download/stable/:kadu \

LIB_DEPENDS=		gadu.3:${PORTSDIR}/polish/libgadu\
			sndfile.1:${PORTSDIR}/audio/libsndfile

TABS_MOD_DISTFILE=	kadu-tabs-1.1.6.tar.bz2
ASPELL_MOD_DISTFILE=	spellchecker-20071230.tar.bz2

GG6_EMOTS_DISTFILE=	kompatybilne_z_GG6.tar.gz
GG7_EMOTS_DISTFILE=	dodatkowe_emoty_GG7.tar.gz

USE_AUTOTOOLS=		autoconf:261
USE_BZIP2=		yes
USE_GMAKE=		yes
USE_OPENSSL=		yes

Lines 1-6 Link Here

(-)/usr/ports/polish/kadu/distinfo (-6 / +6 lines)
1	MD5 (kadu/kadu-0.6.0.tar.bz2) = 8f1ee07558c82573d2c6e7ccd05f224f	1	MD5 (kadu/kadu-0.6.0.2.tar.bz2) = 4dc9b51de59f2089cf4526804bffc4fb
2	SHA256 (kadu/kadu-0.6.0.tar.bz2) = f0e31b5ef00c64cad75a43220842b5564b8ec1dfd0c4481f0f3ac8b88fb9e752	2	SHA256 (kadu/kadu-0.6.0.2.tar.bz2) = 8e06b554761e39890e48ba723145d4e1e0919cc84fcd978f215a6e2a30f87bfa
3	SIZE (kadu/kadu-0.6.0.tar.bz2) = 1583937	3	SIZE (kadu/kadu-0.6.0.2.tar.bz2) = 1568547
4	MD5 (kadu/spellchecker-20071230.tar.bz2) = a46eab2f3d9c31cee13ccf3a441bceec	4	MD5 (kadu/spellchecker-20071230.tar.bz2) = a46eab2f3d9c31cee13ccf3a441bceec
5	SHA256 (kadu/spellchecker-20071230.tar.bz2) = ecde5f7ad2b60f53dbd7715df52459531cac8cce06670d016014da82589483d0	5	SHA256 (kadu/spellchecker-20071230.tar.bz2) = ecde5f7ad2b60f53dbd7715df52459531cac8cce06670d016014da82589483d0
6	SIZE (kadu/spellchecker-20071230.tar.bz2) = 9504	6	SIZE (kadu/spellchecker-20071230.tar.bz2) = 9504
Lines 10-15 Link Here
10	MD5 (kadu/dodatkowe_emoty_GG7.tar.gz) = f9b0404cc1e1599ddf5eda4c15f1abce	10	MD5 (kadu/dodatkowe_emoty_GG7.tar.gz) = f9b0404cc1e1599ddf5eda4c15f1abce
11	SHA256 (kadu/dodatkowe_emoty_GG7.tar.gz) = aebeb45b6ac9139620032436f7b565aa5729a0165d1c361a473c1195b8807450	11	SHA256 (kadu/dodatkowe_emoty_GG7.tar.gz) = aebeb45b6ac9139620032436f7b565aa5729a0165d1c361a473c1195b8807450
12	SIZE (kadu/dodatkowe_emoty_GG7.tar.gz) = 113257	12	SIZE (kadu/dodatkowe_emoty_GG7.tar.gz) = 113257
13	MD5 (kadu/kadu-tabs-1.1.5.tar.bz2) = 8313ae2aa85b4a6f890203ed5f93fa1b	13	MD5 (kadu/kadu-tabs-1.1.6.tar.bz2) = fa780b90db6f7e41b16008291dde3dac
14	SHA256 (kadu/kadu-tabs-1.1.5.tar.bz2) = 78bfb2737f5b900e98f2a192d22fa832a05bf5e5ce4ec136893d4d592ebf1ee3	14	SHA256 (kadu/kadu-tabs-1.1.6.tar.bz2) = 99ec1e2c44a72a8a91651fe9f0b1166a70a62460baedc08d6f700ab05b24f1c1
15	SIZE (kadu/kadu-tabs-1.1.5.tar.bz2) = 16719	15	SIZE (kadu/kadu-tabs-1.1.6.tar.bz2) = 16887




--- configure.ac.orig	2008-02-26 01:07:33.000000000 +0100
+++ configure.ac	2008-03-23 18:11:17.000000000 +0100
@@ -335,7 +335,7 @@
 				done; \
 			fi && \
 
-			if test $enable_final == yes; then \
+			if test "$enable_final" = "yes"; then \
 				for src in $MODULE_SOURCES; do \
 					if test "`echo $src | sed 's/.*\.\(.*\)$/\1/'`" == "cpp"; then \
 						echo "#include \"$src\"" >> modules/$mod/.final2.cpp; \
@@ -762,6 +762,7 @@
 	with_existing_libgadu=no
 fi
 if test "$with_existing_libgadu" != "no"; then
+	save_CXXFLAGS="$CXXFLAGS"
 	FIND_HEADER([libgadu.h],[$with_existing_libgadu $with_existing_libgadu/include],
 	[
 		GADU_INCLUDES="-I$FILE_DIR"
@@ -771,9 +772,11 @@
 	[
 		GADU_LIBS="$GADU_LIBS -L$FILE_DIR"
 	])
+	CXXFLAGS="$CXXFLAGS $GADU_INCLUDES"
 	AC_CHECK_MEMBER([struct gg_dcc7.uin], [],
 	[AC_MSG_ERROR([Your libgadu doesn't support for dcc7, please use our SVN snapshot by removing --with-existing-libgadu option !])],
 	[#include <libgadu.h>])
+	CXXFLAGS="$save_CXXFLAGS"
 else
 	MY_SUBDIRS="$MY_SUBDIRS libgadu"
 	GADU_LIBS="../libgadu/src/.libs/libgadu.a"

Return to bug 125473

Lines 6-13 Link Here

(-)/usr/ports/polish/kadu/Makefile (-4 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= kadu	8	PORTNAME= kadu
9	PORTVERSION= 0.6.0	9	PORTVERSION= 0.6.0.2
10	PORTREVISION= 1
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= polish net-im	11	CATEGORIES= polish net-im
13	MASTER_SITES= http://www.kadu.net/download/stable/:kadu \	12	MASTER_SITES= http://www.kadu.net/download/stable/:kadu \
Lines 25-37 Link Here
25	LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu\	24	LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu\
26	sndfile.1:${PORTSDIR}/audio/libsndfile	25	sndfile.1:${PORTSDIR}/audio/libsndfile
27		26
28	TABS_MOD_DISTFILE= kadu-tabs-1.1.5.tar.bz2	27	TABS_MOD_DISTFILE= kadu-tabs-1.1.6.tar.bz2
29	ASPELL_MOD_DISTFILE= spellchecker-20071230.tar.bz2	28	ASPELL_MOD_DISTFILE= spellchecker-20071230.tar.bz2
30		29
31	GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.tar.gz	30	GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.tar.gz
32	GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz	31	GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz
33		32
34	USE_AUTOTOOLS= autoconf:261
35	USE_BZIP2= yes	33	USE_BZIP2= yes
36	USE_GMAKE= yes	34	USE_GMAKE= yes
37	USE_OPENSSL= yes	35	USE_OPENSSL= yes

Lines 1-31 Link Here

(-)/usr/ports/polish/kadu/files/patch-configure (-31 lines)
1	--- configure.ac.orig 2008-02-26 01:07:33.000000000 +0100
2	+++ configure.ac 2008-03-23 18:11:17.000000000 +0100
3	@@ -335,7 +335,7 @@
4	done; \
5	fi && \
6
7	- if test $enable_final == yes; then \
8	+ if test "$enable_final" = "yes"; then \
9	for src in $MODULE_SOURCES; do \
10	if test "`echo $src \| sed 's/.\.\(.\)$/\1/'`" == "cpp"; then \
11	echo "#include \"$src\"" >> modules/$mod/.final2.cpp; \
12	@@ -762,6 +762,7 @@
13	with_existing_libgadu=no
14	fi
15	if test "$with_existing_libgadu" != "no"; then
16	+ save_CXXFLAGS="$CXXFLAGS"
17	FIND_HEADER([libgadu.h],[$with_existing_libgadu $with_existing_libgadu/include],
18	[
19	GADU_INCLUDES="-I$FILE_DIR"
20	@@ -771,9 +772,11 @@
21	[
22	GADU_LIBS="$GADU_LIBS -L$FILE_DIR"
23	])
24	+ CXXFLAGS="$CXXFLAGS $GADU_INCLUDES"
25	AC_CHECK_MEMBER([struct gg_dcc7.uin], [],
26	[AC_MSG_ERROR([Your libgadu doesn't support for dcc7, please use our SVN snapshot by removing --with-existing-libgadu option !])],
27	[#include <libgadu.h>])
28	+ CXXFLAGS="$save_CXXFLAGS"
29	else
30	MY_SUBDIRS="$MY_SUBDIRS libgadu"
31	GADU_LIBS="../libgadu/src/.libs/libgadu.a"