5 files changed, 54 insertions, 45 deletions

diff --git a/comms/Makefile b/comms/Makefile
index b0c4d91d8f1a..c1c3d7048de6 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -57,6 +57,7 @@
     SUBDIR += py-lirc
     SUBDIR += py-serial
     SUBDIR += qico
+    SUBDIR += qicosi
     SUBDIR += qpage
     SUBDIR += qtpcr
     SUBDIR += ruby-serialport
diff --git a/comms/qicosi/Makefile b/comms/qicosi/Makefile
index 3851028bb296..1f477ba8ee6a 100644
--- a/comms/qicosi/Makefile
+++ b/comms/qicosi/Makefile
@@ -1,45 +1,49 @@
-# New ports collection makefile for:	qico
-# Date created:		13 Jan 2000
-# Whom:			Denis Shaposhnikov <dsh@vlink.ru>
+# New ports collection makefile for:	qicosi
+# Date created:				26 May 2004
+# Whom:					Andrey Slusar <vasallia@ukr.net>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	qico
-PORTVERSION=	0.49.10.3
+PORTNAME=	qicosi
+PORTVERSION=	0.53
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-0.49.10-p3
+MASTER_SITES=	http://santinel.bas-net.by/files/
+DISTNAME=	qico-${PORTVERSION}si
 
-MAINTAINER=	dsh@vlink.ru
-COMMENT=	An FidoNet Technology Network (FTN) compatible mailer for Unix systems
+MAINTAINER=	vasallia@ukr.net
+COMMENT=	Ip/modem fido compatible mailer
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-.if defined(WITH_QICO_AMIGA4D)
-CONFIGURE_ARGS+=	--enable-aso
-.endif
+CONFDIR?=	${PREFIX}/etc/fido/qico
 
-.if defined(WITH_QICO_MORDA)
-PLIST_SUB+=	WITH_QICO_MORDA=""
-.else
-CONFIGURE_ARGS+=	--disable-qcc
-PLIST_SUB+=	WITH_QICO_MORDA="@comment "
+.if defined(WITH_OPENLOCK)
+CONFIGURE_ARGS+=	--with-lock-style=open
 .endif
+CONFIGURE_ARGS+=	--with-config=${CONFDIR}/qico.conf \
+			--with-default-speed=115200
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/qico.conf.sample ${PREFIX}/etc/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/qico ${PREFIX}/libexec/
-.if defined(WITH_QICO_MORDA)
-	${INSTALL_PROGRAM} ${WRKSRC}/src/qcc ${PREFIX}/bin/
-.endif
+DOCS=		Changes FAQ README
+EXAMPLES=	fts-0001 onchat qhistory qico.xpm qlinks sfreq \
+		stat.run synctime tossing
+
+MAN8=		qcc.8 qctl.8 qico.8
 
+post-install:
+	${MKDIR} ${CONFDIR}
+	${INSTALL_DATA} ${WRKSRC}/qico.conf.sample ${CONFDIR}/qico.conf.sample
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qico
-	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/qico/FAQ.ru
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qico/README.ru
+	${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}.ru
+.endfor
+	${MKDIR} ${EXAMPLESDIR}
+.for i in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/stuff/${i} ${EXAMPLESDIR}/${i}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/qicosi/distinfo b/comms/qicosi/distinfo
index 6073c1123ff1..d81b69bef25f 100644
--- a/comms/qicosi/distinfo
+++ b/comms/qicosi/distinfo
@@ -1,2 +1,2 @@
-MD5 (qico-0.49.10-p3.tar.bz2) = 1fd5a72976c5d8f71a762b1243513093
-SIZE (qico-0.49.10-p3.tar.bz2) = 229434
+MD5 (qico-0.53si.tar.bz2) = 3903605decc3d82c73040377a8d86231
+SIZE (qico-0.53si.tar.bz2) = 261777
diff --git a/comms/qicosi/pkg-descr b/comms/qicosi/pkg-descr
index 924b7c97f2be..dff180d58f8d 100644
--- a/comms/qicosi/pkg-descr
+++ b/comms/qicosi/pkg-descr
@@ -1,13 +1,3 @@
-Qico is an FidoNet Technology Network (FTN) compatible mailer for Unix systems.
-It has slightly different architecture than ifcico.
-
-Features:
-
-  * Support for EMSI, ZModem, ZedZap, Hydra
-  * Support for 4D Binkley-style, Amiga-style outbound, fileboxes
-  * Daemon mode for outgoing calls
-  * Substs with support for hidden-lines
-  * Support for session time limit
-  * Support for minimum connect speed limit
-
-and so on.
+Qicosi is a simple ifcico like FTN mailer. It can works via
+TCP/IP as well as on modem links. Look at sample configs for more
+information.
diff --git a/comms/qicosi/pkg-plist b/comms/qicosi/pkg-plist
index d0cd6806a51e..c4bda7e186ce 100644
--- a/comms/qicosi/pkg-plist
+++ b/comms/qicosi/pkg-plist
@@ -1,6 +1,20 @@
-%%WITH_QICO_MORDA%%bin/qcc
-etc/qico.conf.sample
-libexec/qico
+bin/qcc
+bin/qctl
+sbin/qico
+etc/fido/qico/qico.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.ru
 %%PORTDOCS%%%%DOCSDIR%%/README.ru
+%%PORTDOCS%%%%DOCSDIR%%/Changes.ru
+%%PORTDOCS%%%%EXAMPLESDIR%%/fts-0001
+%%PORTDOCS%%%%EXAMPLESDIR%%/onchat
+%%PORTDOCS%%%%EXAMPLESDIR%%/qhistory
+%%PORTDOCS%%%%EXAMPLESDIR%%/qico.xpm
+%%PORTDOCS%%%%EXAMPLESDIR%%/qlinks
+%%PORTDOCS%%%%EXAMPLESDIR%%/sfreq
+%%PORTDOCS%%%%EXAMPLESDIR%%/stat.run
+%%PORTDOCS%%%%EXAMPLESDIR%%/synctime
+%%PORTDOCS%%%%EXAMPLESDIR%%/tossing
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/fido/qico
+@dirrm etc/fido