upgrade to 4.7.7

6 files changed, 53 insertions, 3 deletions

diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index 835a6975cd19..9c8ac77729a8 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	centericq
-PORTVERSION=	4.7.2
+PORTVERSION=	4.7.7
 PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://konst.org.ua/download/
@@ -16,10 +16,14 @@ MAINTAINER=	ijliao@FreeBSD.org
 
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		sigc.1:${PORTSDIR}/devel/libsigc++
+		sigc.1:${PORTSDIR}/devel/libsigc++ \
+		fribidi.0:${PORTSDIR}/converters/fribidi
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-fribidi
 
 MAN1=	centericq.1
 
@@ -29,6 +33,13 @@ MAN1=	centericq.1
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 
+post-patch:
+.for file in kkconsui-0.1/include/conf.h kkstrtext-0.1/conf.h kksystr-0.1/include/conf.h
+	@(cd ${WRKSRC} ; \
+	  ${MV} -f ${file} ${file}.orig ; \
+	  ${GREP} -v "_G_config.h" ${file}.orig > ${file})
+.endfor
+		
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
diff --git a/net/centericq/distinfo b/net/centericq/distinfo
index d7cae16bb3c6..968d66eaf222 100644
--- a/net/centericq/distinfo
+++ b/net/centericq/distinfo
@@ -1 +1 @@
-MD5 (centericq-4.7.2.tar.gz) = 232f4bf04e6dbc59441af8c19f8211bb
+MD5 (centericq-4.7.7.tar.gz) = 9ce6de30777f0b453e01407d4f20bee9
diff --git a/net/centericq/files/patch-conscommon.cc b/net/centericq/files/patch-conscommon.cc
new file mode 100644
index 000000000000..ca2d8b24232d
--- /dev/null
+++ b/net/centericq/files/patch-conscommon.cc
@@ -0,0 +1,20 @@
+--- kkconsui-0.1/src/conscommon.cc.orig	Tue Jul 16 19:18:01 2002
++++ kkconsui-0.1/src/conscommon.cc	Tue Jul 16 19:20:11 2002
+@@ -28,6 +28,8 @@
+ #include <sys/filio.h>
+ #endif
+ 
++#include <iostream>
++
+ bool kintf_graph = true, kintf_refresh = true;
+ 
+ void (*kt_resize_event)(void);
+@@ -255,7 +257,7 @@
+ #include <fribidi/fribidi.h>
+ }
+ 
+-string makebidi(const string &buf, int lpad = 0) {
++string makebidi(const string &buf, int lpad) {
+     FriBidiChar *us, *out_us;
+     char *outstring, *cbuf;
+     int size;
diff --git a/net/centericq/files/patch-po:Makefile.in.in b/net/centericq/files/patch-po:Makefile.in.in
new file mode 100644
index 000000000000..5cc15f291f42
--- /dev/null
+++ b/net/centericq/files/patch-po:Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Tue Jul  9 02:46:10 2002
++++ po/Makefile.in.in	Tue Jul  9 02:46:32 2002
+@@ -122,7 +122,7 @@
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+ 	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
+-	    *)     destdir=$(DESTDIR)$(localedir);; \
++	    *)     destdir=$(DESTDIR)$(gnulocaledir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/net/centericq/files/patch-src:Makefile.in b/net/centericq/files/patch-src:Makefile.in
new file mode 100644
index 000000000000..484d4daa8409
--- /dev/null
+++ b/net/centericq/files/patch-src:Makefile.in
@@ -0,0 +1,7 @@
+--- src/Makefile.in.orig	Tue Jul  9 02:27:11 2002
++++ src/Makefile.in	Tue Jul  9 02:27:22 2002
+@@ -95,3 +95,3 @@
+ centericq_LDFLAGS = -L$(top_srcdir)/kkstrtext-0.1 -L$(top_srcdir)/kkconsui-0.1 -L$(top_srcdir)/kksystr-0.1 -L$(top_srcdir)/libyahoo-0.1 -L$(top_srcdir)/libmsn-0.1 -L$(top_srcdir)/libicq2000-0.6 -L$(top_srcdir)/firetalk-0.1
+-centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a -lkkstrtext -lkkconsui -lkksystr -llibyahoo -llibmsn -llibicq2000 -lfiretalk @LIBS@ @INTLLIBS@
++centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a -lkkstrtext -lkkconsui -lkksystr -llibyahoo -llibmsn -llibicq2000 -lfiretalk @LIBS@ @INTLLIBS@ -lintl
+ SUBDIRS = hooks
diff --git a/net/centericq/pkg-plist b/net/centericq/pkg-plist
index 55097cf2b1ff..092a50bf08ad 100644
--- a/net/centericq/pkg-plist
+++ b/net/centericq/pkg-plist
@@ -26,6 +26,7 @@ share/locale/pl/LC_MESSAGES/centericq.mo
 share/locale/pt_BR/LC_MESSAGES/centericq.mo
 share/locale/ro/LC_MESSAGES/centericq.mo
 share/locale/ru/LC_MESSAGES/centericq.mo
+share/locale/sv/LC_MESSAGES/centericq.mo
 share/locale/uk/LC_MESSAGES/centericq.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
 %%PORTDOCS%%share/doc/centericq/FAQ