Update to version 1.3

Submitted by:	Andrey Novikov <andrey@novikov.com>  (MAINTAINER)

3 files changed, 51 insertions, 17 deletions

diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 8bb5c67..9985615 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	cervisia
-PORTVERSION=	1.0.b2
+PORTVERSION=	1.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	cervisia-1.0beta2
 
 MAINTAINER=	andrey@novikov.com
 
@@ -18,20 +17,19 @@ LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 USE_QT=		yes
 QT_VER=		""
 .else
-EXTRA_PATCHES=	${PATCHDIR}/kde2-patch-aa \
-		${PATCHDIR}/kde2-patch-ab \
-		${PATCHDIR}/kde2-patch-ac
 LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
 QT_VER=		2
 .endif
+LIB_DEPENDS+=	intl.1:${PORTSDIR}/devel/gettext
 
-MAN1=		cervisia.1
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-pre-fetch:
+MAN1=		cervisia.1
+
+pre-everything:
 .if !defined(KDE_VERSION)
 	@${ECHO}
 	@${ECHO} "You may define KDE_VERSION=1 (make KDE_VERSION=1)"
@@ -42,10 +40,41 @@ pre-fetch:
 
 KDE_VERSION?=	2
 
+.include <bsd.port.pre.mk>
+
+# Hack to make pthread support work correctly.
+.if exists(${X11BASE}/lib/libqt2-mt.so)
+.if exists(${X11BASE}/lib/libXThrStub.so)
+QT_ADD=		-mt
+.if ${OSVERSION} >= 500016
+PTHREAD_CFLAGS=
+PTHREAD_LIBS=	-lc_r
+.else
+PTHREAD_CFLAGS=	-D_THREAD_SAFE
+PTHREAD_LIBS=	-pthread
+.endif
+.else
+QT_ADD=		""
+PTHREAD_CFLAGS=
+PTHREAD_LIBS=
+.endif
+.endif
+CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
+
 CONFIGURE_ARGS+=--with-kde-version=${KDE_VERSION} \
 		--with-extra-includes="${LOCALBASE}/include" \
 		--with-extra-libs="${LOCALBASE}/lib" \
+		--with-qt-libraries=${X11BASE}/lib \
 		--with-qt-includes="${X11BASE}/include/qt${QT_VER}"
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQTFILE="libqt2" KDEDIR="${LOCALBASE}/kde"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt${QT_VER}${QT_ADD}" LIBQTFILE="libqt${QT_VER}${QT_ADD}" KDEDIR="${LOCALBASE}/kde" \
+		CPPFLAGS="${PTHREAD_CFLAGS}" \
+		LIBS="${PTHREAD_LIBS}" \
+		USER_LDFLAGS="${PTHREAD_LIBS}"
+
+post-configure:
+	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
+	@${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
+		> ${WRKSRC}/libtool
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/cervisia/distinfo b/devel/cervisia/distinfo
index 8918dd5..f6b7f9b 100644
--- a/devel/cervisia/distinfo
+++ b/devel/cervisia/distinfo
@@ -1 +1 @@
-MD5 (cervisia-1.0beta2.tar.gz) = 681a8d6fd668ad7b62cbe9517e07cb5f
+MD5 (cervisia-1.3.tar.gz) = 7090f35b14363b3e135f26b2db5e4f7e
diff --git a/devel/cervisia/pkg-plist b/devel/cervisia/pkg-plist
index 6f43932..1b15c80 100644
--- a/devel/cervisia/pkg-plist
+++ b/devel/cervisia/pkg-plist
@@ -1,6 +1,9 @@
 bin/cervisia
-share/applnk/Development/Cervisia.kdelnk
-share/locale/pt/LC_MESSAGES/cervisia.mo
+share/doc/HTML/en/cervisia/common/kde-common.css
+share/doc/HTML/en/cervisia/common/kde-default.css
+share/doc/HTML/en/cervisia/common/kde-localised.css
+share/doc/HTML/en/cervisia/common/logotp3.png
+share/doc/HTML/en/cervisia/common/note.png
 share/doc/HTML/en/cervisia/addingremovingdirs.html
 share/doc/HTML/en/cervisia/advancedusage.html
 share/doc/HTML/en/cervisia/annotate.html
@@ -23,15 +26,17 @@ share/doc/HTML/en/cervisia/resolvingconflicts.html
 share/doc/HTML/en/cervisia/watches.html
 share/doc/HTML/en/cervisia/workingwithfiles.html
 share/doc/HTML/en/cervisia/checkout.png
+share/doc/HTML/en/cervisia/commit.png
 share/doc/HTML/en/cervisia/diff.png
+share/doc/HTML/en/cervisia/history.png
 share/doc/HTML/en/cervisia/import.png
 share/doc/HTML/en/cervisia/logtree.png
 share/doc/HTML/en/cervisia/mainview.png
 share/doc/HTML/en/cervisia/resolve.png
-share/doc/HTML/en/cervisia/common/kde-common.css
-share/doc/HTML/en/cervisia/common/kde-default.css
-share/doc/HTML/en/cervisia/common/kde-localised.css
-share/doc/HTML/en/cervisia/common/logotp3.png
-share/doc/HTML/en/cervisia/common/note.png
+share/doc/HTML/en/cervisia/updatetag.png
+share/applnk/Development/cervisia.desktop
+share/icons/hicolor/32x32/apps/cervisia.png
+share/icons/hicolor/16x16/apps/cervisia.png
+share/locale/ko/LC_MESSAGES/cervisia.mo
 @dirrm share/doc/HTML/en/cervisia/common
 @dirrm share/doc/HTML/en/cervisia