Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Aug 2000 10:30:20 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/20655: Update port: misc/kcd to 5.0.1
Message-ID:  <20000816173020.86A5437CA3C@hub.freebsd.org>

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

>Number:         20655
>Category:       ports
>Synopsis:       Update port: misc/kcd to 5.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 16 10:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 5.0.1

New file:
patches/patch-ac  patches/patch-ad  patches/patch-ae  patches/patch-af
patches/patch-ag

Remove file:
patches/patch-aa  patches/patch-ab

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/misc/kcd/Makefile misc/kcd/Makefile
--- /usr/ports/misc/kcd/Makefile	Thu Jun 15 01:27:43 2000
+++ misc/kcd/Makefile	Tue Aug 15 02:18:15 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kcd
-PORTVERSION=	4.11.2
+PORTVERSION=	5.0.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +25,7 @@
 MAN1=		kcd.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cc
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/kcd.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${PREFIX}/bin
@@ -36,7 +36,7 @@
 	${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${PREFIX}/share/examples/kcd
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/kcd
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/kcd
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/kcd
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/kcd
 .endif
 
diff -urN /usr/ports/misc/kcd/files/md5 misc/kcd/files/md5
--- /usr/ports/misc/kcd/files/md5	Mon May  8 19:31:23 2000
+++ misc/kcd/files/md5	Tue Aug 15 00:57:06 2000
@@ -1 +1 @@
-MD5 (kcd-4.11.2.tar.gz) = 932583bb246fe79380db267d75bedd67
+MD5 (kcd-5.0.1.tar.gz) = 84628ad54fa53227e32480fe0fa027c1
diff -urN /usr/ports/misc/kcd/patches/patch-aa misc/kcd/patches/patch-aa
--- /usr/ports/misc/kcd/patches/patch-aa	Mon May  8 06:41:50 2000
+++ misc/kcd/patches/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,12 +0,0 @@
---- list.h.orig	Wed Jan 12 10:20:25 2000
-+++ list.h	Tue May  2 00:35:08 2000
-@@ -25,7 +25,9 @@
- 
- #include "config.h"
- 
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include CXX__HEADER_cstring
- #include <list>
- #include <vector>
diff -urN /usr/ports/misc/kcd/patches/patch-ab misc/kcd/patches/patch-ab
--- /usr/ports/misc/kcd/patches/patch-ab	Mon May  8 06:41:50 2000
+++ misc/kcd/patches/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- kcdmain.cc.orig	Wed Jan 12 10:20:23 2000
-+++ kcdmain.cc	Tue May  2 01:29:02 2000
-@@ -3062,7 +3062,7 @@
- 					// Save current working dir
- 	saveCwd = getcwd(cwdBuf,PATH_MAX);
- 
--	confGlobalFile = "/etc/kcd.conf";
-+	confGlobalFile = "%%PREFIX%%/etc/kcd.conf";
- 
- 					/* Initialize ~/.kcd.save and
- 					   ~/.kcd.newdir filename */
diff -urN /usr/ports/misc/kcd/patches/patch-ac misc/kcd/patches/patch-ac
--- /usr/ports/misc/kcd/patches/patch-ac	Thu Jan  1 09:00:00 1970
+++ misc/kcd/patches/patch-ac	Sat Aug 12 05:23:36 2000
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Fri Aug 11 23:14:54 2000
++++ Makefile.in	Sat Aug 12 05:23:26 2000
+@@ -46,8 +46,8 @@
+ CXXFLAGS	= @CXXFLAGS@
+ CPPFLAGS	= @CPPFLAGS@
+ 
+-CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
+-CXXCFLAGS	= $(CPPFLAGS) $(CXXFLAGS)
++CCFLAGS		= $(CPPFLAGS) $(CFLAGS) -DSYSCONFDIR=\"$(etcdir)\"
++CXXCFLAGS	= $(CPPFLAGS) $(CXXFLAGS) -DSYSCONFDIR=\"$(etcdir)\"
+ 
+ LDFLAGS		= @LDFLAGS@
+ LIBS		= @LIBS@
diff -urN /usr/ports/misc/kcd/patches/patch-ad misc/kcd/patches/patch-ad
--- /usr/ports/misc/kcd/patches/patch-ad	Thu Jan  1 09:00:00 1970
+++ misc/kcd/patches/patch-ad	Tue Aug 15 01:09:47 2000
@@ -0,0 +1,25 @@
+--- configure.orig	Sat Aug 12 17:03:47 2000
++++ configure	Tue Aug 15 01:09:10 2000
+@@ -1105,11 +1105,6 @@
+ echo "$ac_t""$CXXCPP" 1>&6
+ 
+ 
+-if test "$GXX" = yes; then
+-	CFLAGS="$CFLAGS -W -Wall"
+-	CXXFLAGS="$CXXFLAGS -W -Wall"
+-fi
+-
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+   if test -f $ac_dir/install-sh; then
+@@ -5309,10 +5304,6 @@
+ fi
+ if test "$prefix" = NONE; then
+ 	prefix=$ac_default_prefix
+-fi
+-
+-if test "$sysconfdir" = '${prefix}/etc'; then
+-	sysconfdir=/etc
+ fi
+ 
+ 
diff -urN /usr/ports/misc/kcd/patches/patch-ae misc/kcd/patches/patch-ae
--- /usr/ports/misc/kcd/patches/patch-ae	Thu Jan  1 09:00:00 1970
+++ misc/kcd/patches/patch-ae	Sat Aug 12 04:57:47 2000
@@ -0,0 +1,13 @@
+--- conffile.cc.orig	Fri Aug 11 23:14:54 2000
++++ conffile.cc	Sat Aug 12 04:57:34 2000
+@@ -1276,9 +1276,7 @@
+ 		return;
+ 	
+ 	loaded = 1;
+-	LoadConfig("/etc/kcd.conf", quiet);
+-	LoadConfig("/usr/etc/kcd.conf", quiet);
+-	LoadConfig("/usr/local/etc/kcd.conf", quiet);
++	LoadConfig(SYSCONFDIR "/kcd.conf", quiet);
+ 	LoadConfig(confLocalFile, quiet);
+ }
+ 
diff -urN /usr/ports/misc/kcd/patches/patch-af misc/kcd/patches/patch-af
--- /usr/ports/misc/kcd/patches/patch-af	Thu Jan  1 09:00:00 1970
+++ misc/kcd/patches/patch-af	Sat Aug 12 05:33:16 2000
@@ -0,0 +1,14 @@
+--- cxxlib.cc.orig	Fri Aug 11 23:14:55 2000
++++ cxxlib.cc	Sat Aug 12 05:33:05 2000
+@@ -19,7 +19,11 @@
+ */
+ 
+ #include "cxxlib.h"
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#else
++#include <stdlib.h>
++#endif
+ #include <unistd.h>
+ 
+ extern char progName[];
diff -urN /usr/ports/misc/kcd/patches/patch-ag misc/kcd/patches/patch-ag
--- /usr/ports/misc/kcd/patches/patch-ag	Thu Jan  1 09:00:00 1970
+++ misc/kcd/patches/patch-ag	Tue Aug 15 02:14:18 2000
@@ -0,0 +1,13 @@
+--- kcd.1.orig	Sat Aug 12 17:03:56 2000
++++ kcd.1	Tue Aug 15 02:14:01 2000
+@@ -64,9 +64,7 @@
+ .TP
+ .I "\-\-config"
+ Display current configuration (excluding screen attributes) obtained from
+-.I /etc/kcd.conf
+-.I /usr/etc/kcd.conf,
+-.I /usr/local/etc/kcd.conf,
++.I %%PREFIX%%/etc/kcd.conf,
+ and
+ .I ~/.kcd.conf.
+ 
diff -urN /usr/ports/misc/kcd/pkg/PLIST misc/kcd/pkg/PLIST
--- /usr/ports/misc/kcd/pkg/PLIST	Mon May  8 19:31:25 2000
+++ misc/kcd/pkg/PLIST	Tue Aug 15 02:00:08 2000
@@ -1,6 +1,6 @@
 bin/kcdmain
 bin/kcdscr
-share/doc/kcd/CHANGES
+share/doc/kcd/ChangeLog
 share/doc/kcd/README
 share/examples/kcd/kcd.csh.init
 share/examples/kcd/kcd.sh.init


>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?20000816173020.86A5437CA3C>