upgrade to 1.0b2

change maintainer (from ports@ to submitter)

PR:		24340
Submitted by:	andrey@novikov.com (new maintainer)

4 files changed, 65 insertions, 23 deletions

diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 04990c1580c4..8bb5c6738003 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -5,23 +5,47 @@
 # $FreeBSD$
 
 PORTNAME=	cervisia
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	1.0.b2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	cervisia-1.0beta2
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	andrey@novikov.com
 
+.if defined(KDE_VERSION) && ${KDE_VERSION} == "1"
 LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11
+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
 
 MAN1=		cervisia.1
-USE_QT=		yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-extra-includes="${LOCALBASE}/include" \
-		--with-extra-libraries="${LOCALBASE}/lib"
-CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
+pre-fetch:
+.if !defined(KDE_VERSION)
+	@${ECHO}
+	@${ECHO} "You may define KDE_VERSION=1 (make KDE_VERSION=1)"
+	@${ECHO} "to build ${PORTNAME} against KDE1.1."
+	@${ECHO}
+	@sleep 3
+.endif
+
+KDE_VERSION?=	2
+
+CONFIGURE_ARGS+=--with-kde-version=${KDE_VERSION} \
+		--with-extra-includes="${LOCALBASE}/include" \
+		--with-extra-libs="${LOCALBASE}/lib" \
+		--with-qt-includes="${X11BASE}/include/qt${QT_VER}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQTFILE="libqt2" KDEDIR="${LOCALBASE}/kde"
 
 .include <bsd.port.mk>
diff --git a/devel/cervisia/distinfo b/devel/cervisia/distinfo
index 679803829b3e..8918dd5825bf 100644
--- a/devel/cervisia/distinfo
+++ b/devel/cervisia/distinfo
@@ -1 +1 @@
-MD5 (cervisia-0.6.0.tar.gz) = a1e3e34944641930ac0c1425ea7302d8
+MD5 (cervisia-1.0beta2.tar.gz) = 681a8d6fd668ad7b62cbe9517e07cb5f
diff --git a/devel/cervisia/pkg-descr b/devel/cervisia/pkg-descr
index c3714d3a3c0d..c2fa1f44d87f 100644
--- a/devel/cervisia/pkg-descr
+++ b/devel/cervisia/pkg-descr
@@ -1,5 +1,5 @@
-Cervisia is a rather simplistic KDE-based CVS development
-tool.  It is part of the KDE Development Kit, which is used
-by KDE developers to ease development of applications.
+Cervisia is a KDE-based CVS development tool. It is part
+of the KDE Development Kit, which is used by KDE developers
+to ease development of applications.
 
 WWW: http://cervisia.sourceforge.net/
diff --git a/devel/cervisia/pkg-plist b/devel/cervisia/pkg-plist
index 4552c2108aff..4443a7f69787 100644
--- a/devel/cervisia/pkg-plist
+++ b/devel/cervisia/pkg-plist
@@ -1,22 +1,40 @@
 bin/cervisia
 share/applnk/Development/Cervisia.kdelnk
-share/doc/HTML/en/cervisia/accessingrepository.html
-share/doc/HTML/en/cervisia/addingfiles.html
+share/locale/pt/LC_MESSAGES/cervisia.mo
 share/doc/HTML/en/cervisia/addingremovingdirs.html
-share/doc/HTML/en/cervisia/browsinglogs.html
-share/doc/HTML/en/cervisia/history.html
-share/doc/HTML/en/cervisia/ignoredfiles.html
+share/doc/HTML/en/cervisia/advancedusage.html
+share/doc/HTML/en/cervisia/annotate.html
+share/doc/HTML/en/cervisia/appendix.html
+share/doc/HTML/en/cervisia/browsinghistory.html
+share/doc/HTML/en/cervisia/checkingout.html
+share/doc/HTML/en/cervisia/commandreference.html
+share/doc/HTML/en/cervisia/commitingfiles.html
+share/doc/HTML/en/cervisia/customization.html
+share/doc/HTML/en/cervisia/customize-look.html
+share/doc/HTML/en/cervisia/diff.html
+share/doc/HTML/en/cervisia/gettingstarted.html
+share/doc/HTML/en/cervisia/importing.html
 share/doc/HTML/en/cervisia/index.html
+share/doc/HTML/en/cervisia/information.html
 share/doc/HTML/en/cervisia/mainscreen.html
+share/doc/HTML/en/cervisia/obtaininginformation.html
 share/doc/HTML/en/cervisia/removingfiles.html
-share/doc/HTML/en/cervisia/.anchors
+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/diff.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/index-1.html
+share/doc/HTML/en/cervisia/index-2.html
+share/doc/HTML/en/cervisia/index-3.html
 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/locale/pt/LC_MESSAGES/cervisia.mo
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+share/doc/HTML/en/cervisia/common/note.png
 @dirrm share/doc/HTML/en/cervisia/common
 @dirrm share/doc/HTML/en/cervisia