9 files changed, 44 insertions, 104 deletions

diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index d6dc987e29c8..acdaa72d9b35 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -1,38 +1,58 @@
-# ex:ts=8
-#
-# New ports collection makefile for:	kaptain
-# Date created:			2002-12-12
-# Whom:				Alan Eldridge <alane@freebsd.org>
-#
+# Created by: Alan Eldridge <alane@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	kaptain
-PORTVERSION=	0.72
-PORTREVISION=	7
+PORTVERSION=	0.73
 CATEGORIES=	devel
 MASTER_SITES=	SF
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A tool for building/running QT GUIs for command line programs
+COMMENT=	Tool for building/running Qt GUIs for command line programs
 
-DEPRECATED=	Depends on QT3; unmaintained
-EXPIRATION_DATE=	2013-07-01
+LICENSE=	GPLv2 # (or later)
 
-USE_XORG=	x11 ice xext
-USE_QT_VER=	3
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-mt
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+USE_QT4=	qt3support moc_build qmake_build
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		kaptain.1
 INFO=		kaptain
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/kaptain
 
-post-extract:
-	@${RM} -f ${WRKSRC}/doc/*.info*
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/examples/dia2code.kaptn
+		's|^QMAKE_|#QMAKE_|' ${WRKSRC}/kaptain.pro
+	@${FIND} ${WRKSRC}/examples -maxdepth 1 -type f | ${XARGS} \
+		${REINPLACE_CMD} -e \
+		's|/usr/bin/kaptain|${SETENV} kaptain|'
+
+do-configure:
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
+
+do-install:
+	(cd ${WRKSRC} \
+		&& ${INSTALL_PROGRAM} kaptain ${PREFIX}/bin)
+	(cd ${WRKSRC}/man \
+		&& ${INSTALL_MAN} kaptain.1 ${MANPREFIX}/man/man1)
+	(cd ${WRKSRC}/doc \
+		&& ${INSTALL_DATA} kaptain.info ${PREFIX}/${INFO_PATH})
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} \
+		&& ${INSTALL_DATA} README ${DOCSDIR})
+	(cd ${WRKSRC}/doc \
+		&& ${INSTALL_DATA} *.gif *.html *.png *.tgz ${DOCSDIR})
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples \
+		&& ${INSTALL_DATA} *.kaptn *.tgz ${EXAMPLESDIR})
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/kaptain/distinfo b/devel/kaptain/distinfo
index daadcad66e22..3791d016e7d9 100644
--- a/devel/kaptain/distinfo
+++ b/devel/kaptain/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kaptain-0.72.tar.gz) = d086592c6cb081e7681c19ab557569d66c0d1f1fda702a15b54fb308d6a37120
-SIZE (kaptain-0.72.tar.gz) = 1057252
+SHA256 (kaptain-0.73.tgz) = 2e055c66cd8657c9f94983fc8fdc1d874ecdf2001fe06c2101d64695a2488bd8
+SIZE (kaptain-0.73.tgz) = 345116
diff --git a/devel/kaptain/files/patch-doc-kaptain.texi b/devel/kaptain/files/patch-doc-kaptain.texi
deleted file mode 100644
index 71e01ba29a7b..000000000000
--- a/devel/kaptain/files/patch-doc-kaptain.texi
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/kaptain.texi.orig	Mon Mar 24 21:07:29 2003
-+++ doc/kaptain.texi	Sat Aug 30 16:13:22 2003
-@@ -3,6 +3,10 @@
- @c %**start of header
- @setfilename kaptain.info
- @settitle Kaptain
-+@dircategory
-+@direntry Applications
-+* Kaptain: (kaptain).		The Universal Graphical Front-end.
-+@end direntry
- @finalout
- @c %**end of header
- 
diff --git a/devel/kaptain/files/patch-examples-dia2code.kaptn b/devel/kaptain/files/patch-examples-dia2code.kaptn
index 414691f08f07..4116bae94553 100644
--- a/devel/kaptain/files/patch-examples-dia2code.kaptn
+++ b/devel/kaptain/files/patch-examples-dia2code.kaptn
@@ -1,8 +1,6 @@
 --- examples/dia2code.kaptn.orig	Sat Nov 17 00:11:04 2001
 +++ examples/dia2code.kaptn	Fri Dec 20 13:17:45 2002
-@@ -1,17 +1,20 @@
--#!/usr/bin/kaptain
-+#!%%PREFIX%%/bin/kaptain
+@@ -2,16 +2,19 @@
  start "Dia2Code" -> dia2code buttons;
  dia2code :tabbed -> main about;
  
diff --git a/devel/kaptain/files/patch-kaptain-intermediate.h b/devel/kaptain/files/patch-kaptain-intermediate.h
deleted file mode 100644
index c70e6ceb6348..000000000000
--- a/devel/kaptain/files/patch-kaptain-intermediate.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- kaptain/intermediate.h.orig	2004-09-11 16:07:54.000000000 +0200
-+++ kaptain/intermediate.h	2007-11-02 11:23:46.000000000 +0100
-@@ -7,6 +7,7 @@
- using namespace std;
- 
- class Grammar;
-+class Kaptain;
- class Rule;
- class Conjunction;
- class Parameter;
diff --git a/devel/kaptain/files/patch-kaptain-kaptain.h b/devel/kaptain/files/patch-kaptain-kaptain.h
deleted file mode 100644
index 0354d164c018..000000000000
--- a/devel/kaptain/files/patch-kaptain-kaptain.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- kaptain/kaptain.h.orig	Wed Aug 14 19:15:09 2002
-+++ kaptain/kaptain.h	Wed Sep  3 18:44:51 2003
-@@ -18,6 +18,7 @@
- #include <qvalidator.h>
- #include <qmultilineedit.h>
- #include <qwizard.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <string>
- #include <list>
diff --git a/devel/kaptain/files/patch-kaptain-tools.cpp b/devel/kaptain/files/patch-kaptain-tools.cpp
deleted file mode 100644
index 8233cea7690e..000000000000
--- a/devel/kaptain/files/patch-kaptain-tools.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- kaptain/tools.cpp.orig	Wed Mar 12 01:38:12 2003
-+++ kaptain/tools.cpp	Wed Sep  3 18:43:40 2003
-@@ -1,5 +1,6 @@
- #include <stdlib.h>
- #include <stdio.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <iostream>
- #include <iterator>
diff --git a/devel/kaptain/pkg-descr b/devel/kaptain/pkg-descr
index 48312cf83cc7..bc99484d770b 100644
--- a/devel/kaptain/pkg-descr
+++ b/devel/kaptain/pkg-descr
@@ -1,5 +1,5 @@
 Kaptain is a tool that lets you build a GUI for a command line program
 in the form of a script. The program interprets that script to present
-the graphical interface. The built interfaces use the QT library.
+the graphical interface. The built interfaces use the Qt library.
 
 WWW: http://kaptain.sourceforge.net/
diff --git a/devel/kaptain/pkg-plist b/devel/kaptain/pkg-plist
deleted file mode 100644
index 62f201604bcf..000000000000
--- a/devel/kaptain/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-bin/kaptain
-%%DATADIR%%/arping.kaptn
-%%DATADIR%%/budget.kaptn
-%%DATADIR%%/crypt.gif
-%%DATADIR%%/crypt.kaptn
-%%DATADIR%%/curl.kaptn
-%%DATADIR%%/database.tgz
-%%DATADIR%%/dia2code.kaptn
-%%DATADIR%%/emboss.tgz
-%%DATADIR%%/enscript.kaptn
-%%DATADIR%%/fig1.png
-%%DATADIR%%/find.kaptn
-%%DATADIR%%/finger.kaptn
-%%DATADIR%%/grep.kaptn
-%%DATADIR%%/indent.kaptn
-%%DATADIR%%/kaptain.html
-%%DATADIR%%/lameGUI.kaptn
-%%DATADIR%%/ls.kaptn
-%%DATADIR%%/mpage.kaptn
-%%DATADIR%%/nslookup.kaptn
-%%DATADIR%%/old-doc.tgz
-%%DATADIR%%/open.kaptn
-%%DATADIR%%/ping.kaptn
-%%DATADIR%%/povray.kaptn
-%%DATADIR%%/procmail.kaptn
-%%DATADIR%%/puf.tgz
-%%DATADIR%%/record.gif
-%%DATADIR%%/search.kaptn
-%%DATADIR%%/tar.gif
-%%DATADIR%%/tar.kaptn
-%%DATADIR%%/tutorial.tgz
-%%DATADIR%%/weblint.kaptn
-%%DATADIR%%/wget.kaptn
-%%DATADIR%%/whois.kaptn
-%%DATADIR%%/zangband.kaptn
-@dirrm %%DATADIR%%