Update to version 0.46.2

PR: 20739
Submitted by: MAINTAINER

7 files changed, 27 insertions, 46 deletions

diff --git a/comms/qicosi/Makefile b/comms/qicosi/Makefile
index 1d936c076713..7a5f15df76f1 100644
--- a/comms/qicosi/Makefile
+++ b/comms/qicosi/Makefile
@@ -1,17 +1,15 @@
 # New ports collection makefile for:	qico
-# Date created:				13 Jan 2000
-# Whom:					Denis Shaposhnikov <dsh@vlink.ru>
+# Version required:	0.46.2
+# Date created:		13 Jan 2000
+# Whom:			Denis Shaposhnikov <dsh@vlink.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	qico
-PORTVERSION=	0.45.3.1
+PORTVERSION=	0.46.2
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.ruxy.org.ru/~aaz/files/
-MASTER_SITE_SUBDIR=	will
-DISTNAME=	${PORTNAME}-0.45pl3.1
+MASTER_SITES=	http://lev.serebryakov.spb.ru/download/
 
 MAINTAINER=	dsh@vlink.ru
 
diff --git a/comms/qicosi/distinfo b/comms/qicosi/distinfo
index 69b24e76b73a..911c5b03a5a2 100644
--- a/comms/qicosi/distinfo
+++ b/comms/qicosi/distinfo
@@ -1 +1 @@
-MD5 (qico-0.45pl3.1.tar.gz) = 9fd337654a53b6bd56733035c8fb101d
+MD5 (qico-0.46.2.tar.gz) = 5c585ae8266a8b5132ed4523024e5462
diff --git a/comms/qicosi/files/patch-aa b/comms/qicosi/files/patch-aa
index cf24599fbd9b..0ac36b13c187 100644
--- a/comms/qicosi/files/patch-aa
+++ b/comms/qicosi/files/patch-aa
@@ -1,5 +1,5 @@
---- CONFIG.orig	Sat Mar 18 10:12:29 2000
-+++ CONFIG	Sat Mar 18 11:43:16 2000
+--- CONFIG.orig	Tue Jul 18 18:41:42 2000
++++ CONFIG	Thu Jul 20 19:49:34 2000
 @@ -6,7 +6,7 @@
  BINDIR  = /usr/local/bin
  
@@ -9,11 +9,13 @@
  # non-binary file permissions
  PERM    = 00600
  
-@@ -20,10 +20,9 @@
- 
- # qcc features (for building this you must have ncurses-4.2+) 
+@@ -22,11 +22,11 @@
  MORDA	 = 1
--#DEFS	+= -DFREE_BSD
+ 
+ # Please, set it under FreeBSD
+-#FREE_BSD=1
++FREE_BSD=1
+ 
  
  # lock dir
 -DEFS    += -DLOCK_DIR=\"/var/lock\" 
@@ -21,7 +23,7 @@
  
  # communication socket
  DEFS    += -DQIPC_SOCKET=\"/tmp/qlog\"
-@@ -52,19 +51,19 @@
+@@ -55,13 +55,13 @@
  ### OS depended settings #####################################################
  ##############################################################################
  
@@ -30,22 +32,14 @@
 -AWK     = awk
 -INSTALL = install
 -LEX     = lex
-+SHELL  ?= /bin/sh
-+CC     ?= gcc
-+AWK    ?= awk
-+INSTALL?= install
-+LEX    ?= lex
++SHELL   ?= /bin/sh
++CC      ?= gcc
++AWK     ?= awk
++INSTALL ?= install
++LEX     ?= lex
  #YACC    = bison -y
 -YACC    = yacc
-+YACC   ?= yacc
++YACC    ?= yacc
  
  # required for linux glibc2 systems
  #LIBS=-lresolv
- 
--# required for FreeBSD, if define -DFREE_BSD
--#LIBS=-lutil
-+# required for FreeBSD
-+LIBS=-lutil
- 
- #
- # $Id: CONFIG,v 1.7 2000/01/28 15:53:38 aaz Exp $
diff --git a/comms/qicosi/files/patch-ab b/comms/qicosi/files/patch-ab
index 7f8d0ecfa5d8..ad445a5ad302 100644
--- a/comms/qicosi/files/patch-ab
+++ b/comms/qicosi/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Feb  6 10:47:47 2000
-+++ Makefile	Sun Feb  6 11:01:10 2000
+--- Makefile.orig	Tue Jul 18 18:41:42 2000
++++ Makefile	Thu Jul 20 19:51:32 2000
 @@ -5,8 +5,6 @@
  
  DIRS    = src
diff --git a/comms/qicosi/files/patch-ac b/comms/qicosi/files/patch-ac
index ebf59a0b1062..4370c5401f5b 100644
--- a/comms/qicosi/files/patch-ac
+++ b/comms/qicosi/files/patch-ac
@@ -1,19 +1,10 @@
---- src/Makefile.orig	Sat Mar 18 10:12:29 2000
-+++ src/Makefile	Sat Mar 18 12:02:56 2000
-@@ -3,7 +3,7 @@
- #
- include	../CONFIG
- 
--STRIP=0
-+STRIP=1
- #DEFS   += -DEMSI_LOG # log emsi in /tmp/emsi.log
- #DEFS   += -DH_DEBUG # Hydra
- #DEFS   += -DZ_DEBUG # ZModem
+--- src/Makefile.orig	Tue Aug 15 20:53:42 2000
++++ src/Makefile	Sun Aug 20 10:06:44 2000
 @@ -14,7 +14,7 @@
  #DEFS   += -DY_DEBUG #-DYYERROR_VERBOSE=1 -DYYDEBUG=100
  
  DEFS    += -DSHELL=\"$(SHELL)\" -DCONFIG=\"$(CONF)\"
--CFLAGS	= $(DEFS) -Wall -m486 -O2 -D_GNU_SOURCE=1 -D_BSD_SOURCE=1
+-CFLAGS	= $(DEFS) -Wall -m486 -O2 -D_GNU_SOURCE=1 -D_BSD_SOURCE=1 -I/usr/local/include
 +CFLAGS	+= $(DEFS)
  ifeq (1,$(STRIP))
  IFLAGS  = -s
diff --git a/comms/qicosi/pkg-descr b/comms/qicosi/pkg-descr
index ee84e187d6d2..924b7c97f2be 100644
--- a/comms/qicosi/pkg-descr
+++ b/comms/qicosi/pkg-descr
@@ -11,5 +11,3 @@ Features:
   * Support for minimum connect speed limit
 
 and so on.
-
-WWW: http://www.ruxy.org.ru/~aaz
diff --git a/comms/qicosi/pkg-plist b/comms/qicosi/pkg-plist
index 07535d9ad139..a0488c38e531 100644
--- a/comms/qicosi/pkg-plist
+++ b/comms/qicosi/pkg-plist
@@ -1,6 +1,6 @@
+bin/qcc
 etc/qico.conf.sample
 libexec/qico
-bin/qcc
 share/doc/qico/FAQ.ru
 share/doc/qico/README.ru
 @dirrm share/doc/qico