Bug 70338 - Update devel/kscope to latest version (0.8a).
Summary: Update devel/kscope to latest version (0.8a).
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-08-12 03:10 UTC by frank
Modified: 2004-08-13 15:54 UTC (History)
0 users

See Also:


Attachments
file.diff (1.87 KB, patch)
2004-08-12 03:10 UTC, frank
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description frank 2004-08-12 03:10:21 UTC
	N/A

Fix: Please apply the following patch with "patch -E."  It updates the
	Makefile and distinfo and with "patch -E" removes the patch file
	files/patch-src-ctagsfrontend.cpp.  That file should also be
	"cvs rm"-ed.  If the patch isn't run with "patch -E" it will leave
	an empty files/patch-src-ctagsfrontend.cpp that should be removed
	by hand.  That patch is no longer needed as the distribution handles
	the problem in a much more elegant way.

	Thanks!

Patch follows:
How-To-Repeat: 	N/A
Comment 1 Volker Stolz freebsd_committer freebsd_triage 2004-08-12 10:34:32 UTC
State Changed
From-To: open->feedback

Does not package: 
===>   Registering installation for kscope-0.8a 
===>  Building package for kscope-0.8a 
Creating package /usr/ports/packages/All/kscope-0.8a.tgz 
Registering depends: kdelibs-3.2.3_1 XFree86-fontScalable-4.3.0 arts-1.2.3,1 XFree86-fontEncodings-4.3.0 cscope-15.5 ctags-5.5.4_1 qt-3.3.2_2 esound-0.2.34 libXft-2.1.6 fam-2.6.9_4 glib-2.4.4 nas-1.6 libxslt-1.1.8_1 XFree86-libraries-4.3.0_7 imake-4.3.0_2 jasper-1.701.0 libmng-1.0.7 fontconfig-2.2.3,1 lcms-1.13,1 libgcrypt-1.2.0_1 libart_lgpl2-2.3.16 libaudiofile-0.2.6 libidn-0.5.2 libgnugetopt-1.2 libgpg-error-0.7_1 libxml2-2.6.11_1 gettext-0.13.1_1 libmad-0.15.1b cups-base-1.1.20.0 libvorbis-1.0.1,3 libogg-1.1,3 libiconv-1.9.2_1 expat-1.95.7 freetype2-2.1.7_3 openldap-client-2.2.14 openssl-0.9.7d pcre-4.5 perl-5.6.1_15 pkgconfig-0.15.0_1 png-1.2.5_7 tiff-3.6.1_1 jpeg-6b_3. 
Creating gzip'd tar ball in '/usr/ports/packages/All/kscope-0.8a.tgz' 
tar: share/doc/HTML/en/kscope/welcome.png: Cannot stat: No such file or directory 
tar: Error exit delayed from previous errors 
pkg_create: make_dist: tar command failed with code 512 
*** Error code 1 

Maybe you can also fix some of the warnings 'portlint -a' is giving.
Comment 2 frank 2004-08-12 16:31:47 UTC
(I had to resend this since the first try seemed to end up in the bit bucket.
Hopefully this one and _only_ this one will get through.)

Argh.  Sorry about that; seems that I always manage at least one bobble
during an update.  At least they seem to be unique each time...

Here's a corrected patch, fixing the pkg-plist problem and all of the
"portlint -a" warnings:

Index: Makefile
===================================================================
RCS file: /cvs/repos/ports/devel/kscope/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	22 Jul 2004 05:58:30 -0000	1.3
+++ Makefile	12 Aug 2004 14:42:35 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kscope
-PORTVERSION=	0.7
+PORTVERSION=	0.8a
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}/
@@ -17,6 +17,9 @@
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags \
 		cscope:${PORTSDIR}/devel/cscope
+
+WRKSRC=		${WRKDIR}/kscope-0.8
+DOCSDIR=	${PREFIX}/share/doc/HTML/en/${PORTNAME}
 
 USE_KDELIBS_VER=3
 
Index: distinfo
===================================================================
RCS file: /cvs/repos/ports/devel/kscope/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	22 Jul 2004 05:58:30 -0000	1.2
+++ distinfo	12 Aug 2004 02:02:45 -0000
@@ -1,2 +1,2 @@
-MD5 (kscope-0.7.tar.gz) = fa9a5c4cf7694e1b5d683be5ad5433f5
-SIZE (kscope-0.7.tar.gz) = 950310
+MD5 (kscope-0.8a.tar.gz) = 9f079a947b82ff6dd3dcc23a9b260148
+SIZE (kscope-0.8a.tar.gz) = 942415
Index: pkg-plist
===================================================================
RCS file: /cvs/repos/ports/devel/kscope/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	30 Apr 2004 03:02:33 -0000	1.1
+++ pkg-plist	12 Aug 2004 15:01:09 -0000
@@ -1,15 +1,14 @@
 bin/kscope
-share/doc/HTML/en/kscope/project_new.png
-share/doc/HTML/en/kscope/query_dlg.png
-share/doc/HTML/en/kscope/call_tree.png
-share/doc/HTML/en/kscope/project_open.png
-share/doc/HTML/en/kscope/main_window.png
-share/doc/HTML/en/kscope/pref.png
-share/doc/HTML/en/kscope/project_files.png
-share/doc/HTML/en/kscope/welcome.png
-share/doc/HTML/en/kscope/index.docbook
-share/doc/HTML/en/kscope/index.cache.bz2
-share/doc/HTML/en/kscope/common
+%%DOCSDIR%%/project_new.png
+%%DOCSDIR%%/query_dlg.png
+%%DOCSDIR%%/call_tree.png
+%%DOCSDIR%%/project_open.png
+%%DOCSDIR%%/main_window.png
+%%DOCSDIR%%/pref.png
+%%DOCSDIR%%/project_files.png
+%%DOCSDIR%%/index.docbook
+%%DOCSDIR%%/index.cache.bz2
+%%DOCSDIR%%/common
 share/icons/locolor/16x16/apps/kscope.png
 share/icons/hicolor/32x32/apps/kscope.png
 share/icons/locolor/32x32/apps/kscope.png
@@ -21,5 +20,5 @@
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@dirrm share/doc/HTML/en/kscope
+@dirrm %%DOCSDIR%%
 @dirrm share/apps/kscope
Index: files/patch-src-ctagsfrontend.cpp
===================================================================
RCS file:
/cvs/repos/ports/devel/kscope/files/patch-src-ctagsfrontend.cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-src-ctagsfrontend.cpp
--- files/patch-src-ctagsfrontend.cpp	22 Jul 2004 05:58:30 -0000	1.2
+++ files/patch-src-ctagsfrontend.cpp	12 Aug 2004 14:48:54 -0000
@@ -1,11 +0,0 @@
---- src/ctagsfrontend.cpp.orig	Fri Jul  9 11:03:47 2004
-+++ src/ctagsfrontend.cpp	Fri Jul  9 11:04:02 2004
-@@ -81,7 +81,7 @@
- 	QFileInfo fi(sPath);
- 
- 	if (!fi.exists() || !fi.isFile() || !fi.isExecutable() ||
--		fi.fileName().left(5) != "ctags") {
-+		fi.fileName().left(7) != "exctags") {
- 		KMessageBox::error(0, i18n("Ctags cannot be found in the given "
- 			"path"));
- 		return false;


-- 
Frank Mayhar frank@exit.com	http://www.exit.com/
Exit Consulting                 http://www.gpsclock.com/
                                http://www.exit.com/blog/frank/
Comment 3 Tilman Keskinoz freebsd_committer freebsd_triage 2004-08-13 15:54:19 UTC
State Changed
From-To: feedback->closed

committed, thanks