16 files changed, 56 insertions, 202 deletions

diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index 827780647798..4bbaf6783a67 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -6,37 +6,38 @@
 #
 
 PORTNAME=	kcd
-PORTVERSION=	5.0.3
+PORTVERSION=	6.0.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 400010
-LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
-USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-MAN1=		kcd.1
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
-post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/kcd.1
+MAN1=		kcd.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/kcd-inst ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/kcdscr ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/kcd.1 ${PREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/share/examples/kcd
-	${INSTALL_DATA} ${WRKSRC}/kcd.csh.init ${PREFIX}/share/examples/kcd
-	${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${PREFIX}/share/examples/kcd
+	${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/kcd.1 ${MANPREFIX}/man/man1
+.for i in en_GB en_GB.UTF-8 en_US.UTF-8
+	@${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/po/${i}.gmo \
+		${PREFIX}/share/locale/${i}/LC_MESSAGES/kcd.mo
+.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/kcd
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/kcd
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/kcd.csh.init ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kcd-devel/distinfo b/misc/kcd-devel/distinfo
index 6fd88e592a13..4093203fee58 100644
--- a/misc/kcd-devel/distinfo
+++ b/misc/kcd-devel/distinfo
@@ -1 +1 @@
-MD5 (kcd-5.0.3.tar.gz) = e173b37436c0c0f24a774788c4f25208
+MD5 (kcd-6.0.0.tar.gz) = 39fa41ef3a5b1c9560365a4b754d9ac6
diff --git a/misc/kcd-devel/files/patch-ac b/misc/kcd-devel/files/patch-ac
deleted file mode 100644
index 2f297c027f4e..000000000000
--- a/misc/kcd-devel/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 0a40c49352b3..000000000000
--- a/misc/kcd-devel/files/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index b413bdaeaf3b..000000000000
--- a/misc/kcd-devel/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index cfd92798b3cd..000000000000
--- a/misc/kcd-devel/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 87b0a9e34381..000000000000
--- a/misc/kcd-devel/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 23eb95017a92..c92f07ed9238 100644
--- a/misc/kcd-devel/pkg-plist
+++ b/misc/kcd-devel/pkg-plist
@@ -1,7 +1,11 @@
+bin/kcd-inst
 bin/kcdmain
 bin/kcdscr
-share/examples/kcd/kcd.csh.init
-share/examples/kcd/kcd.sh.init
+share/locale/en_GB/LC_MESSAGES/kcd.mo
+share/locale/en_GB.UTF-8/LC_MESSAGES/kcd.mo
+share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
 %%PORTDOCS%%share/doc/kcd/README
+%%PORTDOCS%%share/examples/kcd/kcd.csh.init
+%%PORTDOCS%%share/examples/kcd/kcd.sh.init
+%%PORTDOCS%%@dirrm share/examples/kcd
 %%PORTDOCS%%@dirrm share/doc/kcd
-@dirrm share/examples/kcd
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index 827780647798..4bbaf6783a67 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -6,37 +6,38 @@
 #
 
 PORTNAME=	kcd
-PORTVERSION=	5.0.3
+PORTVERSION=	6.0.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 400010
-LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
-USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-MAN1=		kcd.1
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
-post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/kcd.1
+MAN1=		kcd.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/kcd-inst ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/kcdscr ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/kcd.1 ${PREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/share/examples/kcd
-	${INSTALL_DATA} ${WRKSRC}/kcd.csh.init ${PREFIX}/share/examples/kcd
-	${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${PREFIX}/share/examples/kcd
+	${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/kcd.1 ${MANPREFIX}/man/man1
+.for i in en_GB en_GB.UTF-8 en_US.UTF-8
+	@${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/po/${i}.gmo \
+		${PREFIX}/share/locale/${i}/LC_MESSAGES/kcd.mo
+.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/kcd
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/kcd
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/kcd.csh.init ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kcd/distinfo b/misc/kcd/distinfo
index 6fd88e592a13..4093203fee58 100644
--- a/misc/kcd/distinfo
+++ b/misc/kcd/distinfo
@@ -1 +1 @@
-MD5 (kcd-5.0.3.tar.gz) = e173b37436c0c0f24a774788c4f25208
+MD5 (kcd-6.0.0.tar.gz) = 39fa41ef3a5b1c9560365a4b754d9ac6
diff --git a/misc/kcd/files/patch-ac b/misc/kcd/files/patch-ac
deleted file mode 100644
index 2f297c027f4e..000000000000
--- a/misc/kcd/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 0a40c49352b3..000000000000
--- a/misc/kcd/files/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index b413bdaeaf3b..000000000000
--- a/misc/kcd/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index cfd92798b3cd..000000000000
--- a/misc/kcd/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 87b0a9e34381..000000000000
--- a/misc/kcd/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 23eb95017a92..c92f07ed9238 100644
--- a/misc/kcd/pkg-plist
+++ b/misc/kcd/pkg-plist
@@ -1,7 +1,11 @@
+bin/kcd-inst
 bin/kcdmain
 bin/kcdscr
-share/examples/kcd/kcd.csh.init
-share/examples/kcd/kcd.sh.init
+share/locale/en_GB/LC_MESSAGES/kcd.mo
+share/locale/en_GB.UTF-8/LC_MESSAGES/kcd.mo
+share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
 %%PORTDOCS%%share/doc/kcd/README
+%%PORTDOCS%%share/examples/kcd/kcd.csh.init
+%%PORTDOCS%%share/examples/kcd/kcd.sh.init
+%%PORTDOCS%%@dirrm share/examples/kcd
 %%PORTDOCS%%@dirrm share/doc/kcd
-@dirrm share/examples/kcd