Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Mar 2001 02:02:33 +0100 (CET)
From:      baskruit@bsltwr.dnsalias.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/25865: Update cervisia to version 1.0 (stable)
Message-ID:  <200103170102.f2H12Xg22355@gate.bsltwr.dnsalias.org>

next in thread | raw e-mail | index | archive | help

>Number:         25865
>Category:       ports
>Synopsis:       [Update cervisia] Update to version 1.0 (stable)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 16 17:10:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD gate.bsltwr.dnsalias.org 4.2-STABLE FreeBSD 4.2-STABLE #2: Tue Feb 27 22:14:51 CET 2001 root@gate.bsltwr.dnsalias.org:/usr/obj/usr/src/sys/gate i386


	
>Description:

Update cervisia port to version 1.0
This is a stable version of cervisia that uses the kde2 en qt22 ports

Renamed the patch-ab file to patch-configure
>How-To-Repeat:
	
>Fix:

diff -ruN cervisia.orig/Makefile cervisia/Makefile
--- cervisia.orig/Makefile	Sat Mar 17 01:42:22 2001
+++ cervisia/Makefile	Fri Mar 16 02:15:27 2001
@@ -5,23 +5,27 @@
 # $FreeBSD: ports/devel/cervisia/Makefile,v 1.10 2001/01/09 00:06:17 will Exp $
 
 PORTNAME=	cervisia
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase2
 
 MAN1=		cervisia.1
-USE_QT=		yes
+USE_QT2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-extra-includes="${LOCALBASE}/include" \
-		--with-extra-libraries="${LOCALBASE}/lib"
-CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
+		--with-extra-libraries="${LOCALBASE}/lib" \
+		--with-qt-includes=${X11BASE}/include/qt2 \
+		--with-qt-libraries=${X11BASE}/lib \
+		--with-qtdoc-dir=${X11BASE}/share/doc/qt2/html
+CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}" \
+		MOC="moc2" LIBQT="-lqt2" LIBQTFILE="libqt2"
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
+
diff -ruN cervisia.orig/distinfo cervisia/distinfo
--- cervisia.orig/distinfo	Sat Mar 17 01:42:22 2001
+++ cervisia/distinfo	Fri Mar 16 02:15:27 2001
@@ -1 +1 @@
-MD5 (cervisia-0.6.0.tar.gz) = a1e3e34944641930ac0c1425ea7302d8
+MD5 (cervisia-1.0.tar.gz) = 8fb35ca79e858e23661e67a9926d4c16
diff -ruN cervisia.orig/files/patch-ab cervisia/files/patch-ab
--- cervisia.orig/files/patch-ab	Sat Mar 17 02:01:42 2001
+++ cervisia/files/patch-ab	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- configure	Sat Apr 15 09:59:57 2000
-+++ configure.new	Sun May 28 21:23:23 2000
-@@ -5338,7 +5338,7 @@
-   echo "$ac_t""$kde_result" 1>&6
- fi
- 
--bindir=$kde_bindir
-+bindir=$prefix/bin
- 
- 
- 
diff -ruN cervisia.orig/files/patch-configure cervisia/files/patch-configure
--- cervisia.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
+++ cervisia/files/patch-configure	Fri Mar 16 02:15:38 2001
@@ -0,0 +1,47 @@
+--- configure.orig	Fri Mar 16 01:45:37 2001
++++ configure	Fri Mar 16 01:45:43 2001
+@@ -4329,7 +4329,7 @@
+ 
+ 
+ 
+-LIBQT="-lqt"
++LIBQT="-lqt2"
+ if test $kde_qtver = 2; then
+ 
+   
+@@ -4411,7 +4411,7 @@
+ test=NONE
+ qt_libdir=NONE
+ for dir in $qt_libdirs; do
+-  try="ls -1 $dir/libqt.*"
++  try="ls -1 $dir/libqt2.*"
+   if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
+ done
+ 
+@@ -4548,7 +4548,7 @@
+ 
+ CXXFLAGS="$CXXFLAGS -I$qt_includes"
+ LDFLAGS="$X_LDFLAGS"
+-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
++LIBS="-lqt2 -lXext -lX11 $LIBSOCKET"
+ LD_LIBRARY_PATH=
+ export LD_LIBRARY_PATH
+ LIBRARY_PATH=
+@@ -4739,7 +4739,7 @@
+    
+ 
+ 
+-LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)'
++LIB_QT='-lqt2 $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)'
+ 
+ 
+ 
+@@ -5180,7 +5180,7 @@
+   echo "$ac_t""$kde_result" 1>&6
+ fi
+ 
+-bindir=$kde_bindir
++bindir=$prefix/bin
+ 
+ 
+ 
diff -ruN cervisia.orig/pkg-plist cervisia/pkg-plist
--- cervisia.orig/pkg-plist	Sat Mar 17 01:42:22 2001
+++ cervisia/pkg-plist	Sat Mar 17 01:40:31 2001
@@ -1,20 +1,43 @@
 bin/cervisia
 share/applnk/Development/Cervisia.kdelnk
-share/doc/HTML/en/cervisia/accessingrepository.html
-share/doc/HTML/en/cervisia/addingfiles.html
-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/index.html
-share/doc/HTML/en/cervisia/mainscreen.html
-share/doc/HTML/en/cervisia/removingfiles.html
-share/doc/HTML/en/cervisia/.anchors
-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
+share/doc/HTML/en/cervisiaaddingremovingdirs.html
+share/doc/HTML/en/cervisiaadvancedusage.html
+share/doc/HTML/en/cervisiaannotate.html
+share/doc/HTML/en/cervisiaappendix.html
+share/doc/HTML/en/cervisiabrowsinghistory.html
+share/doc/HTML/en/cervisiacheckingout.html
+share/doc/HTML/en/cervisiacheckout.png
+share/doc/HTML/en/cervisiacommandreference.html
+share/doc/HTML/en/cervisiacommit.png
+share/doc/HTML/en/cervisiacommitingfiles.html
+share/doc/HTML/en/cervisiacommon/
+share/doc/HTML/en/cervisiacustomization.html
+share/doc/HTML/en/cervisiacustomize-look.html
+share/doc/HTML/en/cervisiadiff.html
+share/doc/HTML/en/cervisiadiff.png
+share/doc/HTML/en/cervisiagettingstarted.html
+share/doc/HTML/en/cervisiahistory.png
+share/doc/HTML/en/cervisiaimport.png
+share/doc/HTML/en/cervisiaimporting.html
+share/doc/HTML/en/cervisiaindex.html
+share/doc/HTML/en/cervisiainformation.html
+share/doc/HTML/en/cervisialogtree.png
+share/doc/HTML/en/cervisiamainscreen.html
+share/doc/HTML/en/cervisiamainview.png
+share/doc/HTML/en/cervisiaobtaininginformation.html
+share/doc/HTML/en/cervisiaremovingfiles.html
+share/doc/HTML/en/cervisiaresolve.png
+share/doc/HTML/en/cervisiaresolvingconflicts.html
+share/doc/HTML/en/cervisiaupdatetag.png
+share/doc/HTML/en/cervisiawatches.html
+share/doc/HTML/en/cervisiaworkingwithfiles.html
+share/doc/HTML/en/cervisia/commonkde-common.css
+share/doc/HTML/en/cervisia/commonkde-default.css
+share/doc/HTML/en/cervisia/commonkde-localised.css
+share/doc/HTML/en/cervisia/commonlogotp3.png
+share/doc/HTML/en/cervisia/commonnote.png
+share/locale/ko/LC_MESSAGES/cervisia.mo
+share/icons/locolor/32x32/apps/cervisia.png
 @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
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103170102.f2H12Xg22355>