Update to 5.0.1.

PR:		20655
Submitted by:	Ports Fury

16 files changed, 166 insertions, 10 deletions

diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index a1d616b46b97..2f87c2777f30 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -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 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include"
 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 @@ do-install:
 	${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 --git a/misc/kcd-devel/distinfo b/misc/kcd-devel/distinfo
index 602f94f569f4..910332256f50 100644
--- a/misc/kcd-devel/distinfo
+++ b/misc/kcd-devel/distinfo
@@ -1 +1 @@
-MD5 (kcd-4.11.2.tar.gz) = 932583bb246fe79380db267d75bedd67
+MD5 (kcd-5.0.1.tar.gz) = 84628ad54fa53227e32480fe0fa027c1
diff --git a/misc/kcd-devel/files/patch-ac b/misc/kcd-devel/files/patch-ac
new file mode 100644
index 000000000000..2f297c027f4e
--- /dev/null
+++ b/misc/kcd-devel/files/patch-ac
@@ -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 --git a/misc/kcd-devel/files/patch-ad b/misc/kcd-devel/files/patch-ad
new file mode 100644
index 000000000000..0a40c49352b3
--- /dev/null
+++ b/misc/kcd-devel/files/patch-ad
@@ -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 --git a/misc/kcd-devel/files/patch-ae b/misc/kcd-devel/files/patch-ae
new file mode 100644
index 000000000000..b413bdaeaf3b
--- /dev/null
+++ b/misc/kcd-devel/files/patch-ae
@@ -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 --git a/misc/kcd-devel/files/patch-af b/misc/kcd-devel/files/patch-af
new file mode 100644
index 000000000000..cfd92798b3cd
--- /dev/null
+++ b/misc/kcd-devel/files/patch-af
@@ -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 --git a/misc/kcd-devel/files/patch-ag b/misc/kcd-devel/files/patch-ag
new file mode 100644
index 000000000000..87b0a9e34381
--- /dev/null
+++ b/misc/kcd-devel/files/patch-ag
@@ -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 --git a/misc/kcd-devel/pkg-plist b/misc/kcd-devel/pkg-plist
index d4749b515622..13a9e30d4bf8 100644
--- a/misc/kcd-devel/pkg-plist
+++ b/misc/kcd-devel/pkg-plist
@@ -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
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index a1d616b46b97..2f87c2777f30 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -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 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include"
 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 @@ do-install:
 	${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 --git a/misc/kcd/distinfo b/misc/kcd/distinfo
index 602f94f569f4..910332256f50 100644
--- a/misc/kcd/distinfo
+++ b/misc/kcd/distinfo
@@ -1 +1 @@
-MD5 (kcd-4.11.2.tar.gz) = 932583bb246fe79380db267d75bedd67
+MD5 (kcd-5.0.1.tar.gz) = 84628ad54fa53227e32480fe0fa027c1
diff --git a/misc/kcd/files/patch-ac b/misc/kcd/files/patch-ac
new file mode 100644
index 000000000000..2f297c027f4e
--- /dev/null
+++ b/misc/kcd/files/patch-ac
@@ -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 --git a/misc/kcd/files/patch-ad b/misc/kcd/files/patch-ad
new file mode 100644
index 000000000000..0a40c49352b3
--- /dev/null
+++ b/misc/kcd/files/patch-ad
@@ -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 --git a/misc/kcd/files/patch-ae b/misc/kcd/files/patch-ae
new file mode 100644
index 000000000000..b413bdaeaf3b
--- /dev/null
+++ b/misc/kcd/files/patch-ae
@@ -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 --git a/misc/kcd/files/patch-af b/misc/kcd/files/patch-af
new file mode 100644
index 000000000000..cfd92798b3cd
--- /dev/null
+++ b/misc/kcd/files/patch-af
@@ -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 --git a/misc/kcd/files/patch-ag b/misc/kcd/files/patch-ag
new file mode 100644
index 000000000000..87b0a9e34381
--- /dev/null
+++ b/misc/kcd/files/patch-ag
@@ -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 --git a/misc/kcd/pkg-plist b/misc/kcd/pkg-plist
index d4749b515622..13a9e30d4bf8 100644
--- a/misc/kcd/pkg-plist
+++ b/misc/kcd/pkg-plist
@@ -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