Date: Sun, 13 Aug 2000 10:10:33 +0400 (MSD) From: dsh@vlink.ru To: FreeBSD-gnats-submit@freebsd.org Subject: ports/20571: update comms/qico to 0.46.1 Message-ID: <20000813061033.BE63F62D04@wizard.vlink.ru>
next in thread | raw e-mail | index | archive | help
>Number: 20571
>Category: ports
>Synopsis: update comms/qico to 0.46.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 12 23:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Denis Shaposhnikov
>Release: FreeBSD 4.1-STABLE i386
>Organization:
>Environment:
>Description:
Please, close ports/20233.
>How-To-Repeat:
diff -Nru qico.orig/Makefile qico/Makefile
--- qico.orig/Makefile Fri Aug 11 16:24:03 2000
+++ qico/Makefile Sun Aug 13 09:54:32 2000
@@ -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.1
+# Date created: 13 Jan 2000
+# Whom: Denis Shaposhnikov <dsh@vlink.ru>
#
-# $FreeBSD: ports/comms/qico/Makefile,v 1.1 2000/08/11 12:24:03 will Exp $
+# $FreeBSD$
#
PORTNAME= qico
-PORTVERSION= 0.45.3.1
+PORTVERSION= 0.46.1
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 -Nru qico.orig/files/md5 qico/files/md5
--- qico.orig/files/md5 Fri Aug 11 16:24:03 2000
+++ qico/files/md5 Sun Aug 13 09:54:32 2000
@@ -1 +1 @@
-MD5 (qico-0.45pl3.1.tar.gz) = 9fd337654a53b6bd56733035c8fb101d
+MD5 (qico-0.46.1.tar.gz) = 85b98a6fc13247202cc7621a3514d335
diff -Nru qico.orig/patches/patch-aa qico/patches/patch-aa
--- qico.orig/patches/patch-aa Fri Aug 11 16:24:03 2000
+++ qico/patches/patch-aa Sun Aug 13 09:54:32 2000
@@ -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 -Nru qico.orig/patches/patch-ab qico/patches/patch-ab
--- qico.orig/patches/patch-ab Fri Aug 11 16:24:03 2000
+++ qico/patches/patch-ab Sun Aug 13 09:54:32 2000
@@ -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 -Nru qico.orig/patches/patch-ac qico/patches/patch-ac
--- qico.orig/patches/patch-ac Fri Aug 11 16:24:03 2000
+++ qico/patches/patch-ac Sun Aug 13 09:54:32 2000
@@ -1,5 +1,5 @@
---- src/Makefile.orig Sat Mar 18 10:12:29 2000
-+++ src/Makefile Sat Mar 18 12:02:56 2000
+--- src/Makefile.orig Tue Jul 18 18:41:42 2000
++++ src/Makefile Thu Jul 20 19:53:44 2000
@@ -3,7 +3,7 @@
#
include ../CONFIG
@@ -13,7 +13,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 -Nru qico.orig/patches/patch-ad qico/patches/patch-ad
--- qico.orig/patches/patch-ad Fri Aug 11 16:24:03 2000
+++ qico/patches/patch-ad Thu Jan 1 03:00:00 1970
@@ -1,20 +0,0 @@
---- src/ftn.c.orig Tue Mar 28 19:23:19 2000
-+++ src/ftn.c Tue Mar 28 20:43:31 2000
-@@ -398,7 +398,7 @@
- fputc(0,f);fputc(0,f);fputc(0,f);fclose(f);
- }
-
--#ifndef FREE_BSD
-+#ifndef __FreeBSD__
- #ifdef PROCTITLE
- /*
- * clobber argv so ps will show what we're doing.
-@@ -433,7 +433,7 @@
- void setproctitle(char *str){}
-
- #endif
--#endif /* FREE_BSD */
-+#endif /* __FreeBSD__ */
-
- char *xstrcpy(char **to, char *from)
- {
diff -Nru qico.orig/patches/patch-ae qico/patches/patch-ae
--- qico.orig/patches/patch-ae Fri Aug 11 16:24:03 2000
+++ qico/patches/patch-ae Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/ftn.h.orig Mon Mar 6 17:44:57 2000
-+++ src/ftn.h Sat Mar 18 10:51:57 2000
-@@ -209,7 +209,7 @@
- extern char *engms[];
- extern FILE *openpktmsg(ftnaddr_t *fa, ftnaddr_t *ta, char *from, char *to, char *subj, char *pwd, char *fn);
- extern void closepkt(FILE *f, ftnaddr_t *fa, char *tear, char *orig);
--#ifndef FREE_BSD
-+#ifndef __FreeBSD__
- extern void setargspace(char **argv, char **envp);
- extern void setproctitle(char *str);
- #endif
diff -Nru qico.orig/patches/patch-af qico/patches/patch-af
--- qico.orig/patches/patch-af Fri Aug 11 16:24:03 2000
+++ qico/patches/patch-af Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/main.c.orig Mon Mar 6 17:44:57 2000
-+++ src/main.c Sat Mar 18 10:52:28 2000
-@@ -429,7 +429,7 @@
- slist_t *sl=NULL, *l;
- sts_t sts;
-
--#ifndef FREE_BSD
-+#ifndef __FreeBSD__
- setargspace(argv,envp);
- #endif
- setlocale(LC_ALL, "");
diff -Nru qico.orig/patches/patch-ag qico/patches/patch-ag
--- qico.orig/patches/patch-ag Fri Aug 11 16:24:03 2000
+++ qico/patches/patch-ag Thu Jan 1 03:00:00 1970
@@ -1,20 +0,0 @@
---- src/qcc.c.orig Mon Mar 6 17:44:57 2000
-+++ src/qcc.c Sat Mar 18 11:03:50 2000
-@@ -16,7 +16,7 @@
- #include <sys/ioctl.h>
- #include <time.h>
- #include <signal.h>
--#ifdef FREE_BSD
-+#if defined __FreeBSD__ && __FreeBSD__ < 4
- #include <ncurses.h>
- #else
- #include <curses.h>
-@@ -29,7 +29,7 @@
- extern unsigned short crc16(char *str, int l);
- void sigwinch(int s);
-
--#ifdef FREE_BSD
-+#if defined __FreeBSD__ && __FreeBSD__ < 4
- void mvvline (int y,int x,int ch,int n)
- {
- move (y,x);
diff -Nru qico.orig/patches/patch-ah qico/patches/patch-ah
--- qico.orig/patches/patch-ah Fri Aug 11 16:24:03 2000
+++ qico/patches/patch-ah Thu Jan 1 03:00:00 1970
@@ -1,20 +0,0 @@
---- src/qipc.c.orig Sat Mar 18 10:12:29 2000
-+++ src/qipc.c Sat Mar 18 10:54:14 2000
-@@ -11,7 +11,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <stdarg.h>
--#ifdef FREE_BSD
-+#ifdef __FreeBSD__
- #include <libutil.h>
- #endif
- #include "ftn.h"
-@@ -181,7 +181,7 @@
- vsprintf(lin, str, args);
- va_end(args);
- qsendpkt(QC_TITLE, QLNAME, lin, strlen(lin)+1);
--#ifdef FREE_BSD
-+#ifdef __FreeBSD__
- setproctitle("%s", lin);
- #else
- setproctitle(lin);
diff -Nru qico.orig/pkg/DESCR qico/pkg/DESCR
--- qico.orig/pkg/DESCR Fri Aug 11 16:24:04 2000
+++ qico/pkg/DESCR Sun Aug 13 09:54:32 2000
@@ -11,5 +11,3 @@
* Support for minimum connect speed limit
and so on.
-
-WWW: http://www.ruxy.org.ru/~aaz
diff -Nru qico.orig/pkg/PLIST qico/pkg/PLIST
--- qico.orig/pkg/PLIST Fri Aug 11 16:24:04 2000
+++ qico/pkg/PLIST Sun Aug 13 10:03:43 2000
@@ -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
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000813061033.BE63F62D04>