Master site is alive.

New distfile.
md5 -> distinfo.
rename patches.
This commit is contained in:
form 2001-11-27 10:06:50 +00:00
parent 5c9da71389
commit 47c2fe5a52
16 changed files with 137 additions and 188 deletions

View File

@ -1,12 +1,11 @@
# $FreeBSD: ports/russian/cyrproxy/Makefile,v 1.4 1999/08/31 01:46:57 peter Exp $
# $OpenBSD: Makefile,v 1.9 2001/03/29 09:46:17 form Exp $
# $OpenBSD: Makefile,v 1.10 2001/11/27 10:06:50 form Exp $
COMMENT= "cyrillic proxy for network protocols"
DISTNAME= cyrproxy-1.4.2
CATEGORIES= russian net www
MASTER_SITES= ${MASTER_SITE_BACKUP} \
ftp://ftp.lexa.ru/pub/domestic/lexa/
MASTER_SITES= ftp://ftp.lexa.ru/pub/domestic/lexa/
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

View File

@ -0,0 +1,3 @@
MD5 (cyrproxy-1.4.2.tar.gz) = 2b175a990fca55402cebbc374e88aa5e
RMD160 (cyrproxy-1.4.2.tar.gz) = c4080ec09b6fcff940375557229ccd449a6d815e
SHA1 (cyrproxy-1.4.2.tar.gz) = ee40714d109bd84159ed0b716a71208d06a60df8

View File

@ -1,3 +0,0 @@
MD5 (cyrproxy-1.4.2.tar.gz) = 2a5cfbcba5c51fff043121fdbe269b4a
RMD160 (cyrproxy-1.4.2.tar.gz) = d13bd8e181e29ed0233f8d9aa25dd3dc1a09e271
SHA1 (cyrproxy-1.4.2.tar.gz) = dab4f371e37c23e89f0b42f27bf3fa383a26d00f

View File

@ -0,0 +1,40 @@
$OpenBSD: patch-Makefile,v 1.1 2001/11/27 10:06:50 form Exp $
--- Makefile.orig Fri Feb 9 04:33:53 2001
+++ Makefile Tue Nov 27 15:53:47 2001
@@ -6,9 +6,9 @@
CHMOD=/bin/chmod
CHOWN=/usr/sbin/chown
-GCC=gcc -O
-CFLAGS=-funsigned-char -Wall
-CC=${GCC} ${CFLAGS}
+#GCC=gcc -O
+CFLAGS+=-funsigned-char -Wall
+#CC=${GCC} ${CFLAGS}
# Some systems contains resolver routines in libresolv
# EXTRALIBS=lresolv
EXTRALIBS=
@@ -65,7 +65,7 @@ all: ${CYRPROXY} ${SPY} subdirmake confi
subdirmake:
- @for i in ${SUBDIRS}; do echo "Making all in $$i" ;cd $$i; pmake all; cd ..; done
+ @for i in ${SUBDIRS}; do echo "Making all in $$i" ;cd $$i; ${MAKE} all; cd ..; done
.SUFFIXES: .a .o .c
@@ -78,12 +78,12 @@ clean: clean-sub
rm -f config.gen cyrproxy.config.sample alldefs.h
clean-sub:
- @for i in ${SUBDIRS}; do echo "Make clean in $$i" ; cd $$i; pmake clean; cd .. ; done
+ @for i in ${SUBDIRS}; do echo "Make clean in $$i" ; cd $$i; ${MAKE} clean; cd .. ; done
install: install-bin install-config install-tables install-sub
install-sub:
- @for i in ${SUBDIRS} ; do cd $$i ; pmake install; cd ..; done
+ @for i in ${SUBDIRS} ; do cd $$i ; ${MAKE} install; cd ..; done
install-bin: ${CYRPROXY} ${SPY}
cp ${CYRPROXY} ${BINDIR}

View File

@ -1,44 +0,0 @@
--- Makefile.orig Sat May 3 16:37:04 1997
+++ Makefile Wed Jan 26 09:21:42 2000
@@ -6,9 +6,9 @@
CHMOD=/bin/chmod
CHOWN=/usr/sbin/chown
-GCC=gcc -O
-CFLAGS=-funsigned-char -Wall
-CC=${GCC} ${CFLAGS}
+#GCC=gcc -O
+CFLAGS+=-funsigned-char -Wall
+#CC=${GCC} ${CFLAGS}
# Some systems contains resolver routines in libresolv
# EXTRALIBS=lresolv
EXTRALIBS=
@@ -23,15 +23,15 @@
TABLEOWN=root.wheel
#directory to place binary
-BINDIR=/usr/local/libexec
-UTILDIR=/usr/local/bin
-CGIPATH=/usr/local/www/cgi-bin
+BINDIR=${PREFIX}/libexec
+UTILDIR=${PREFIX}/bin
+CGIPATH=${PREFIX}/www/cgi-bin
# name of binaries
CYRPROXY=cyrproxy
SPY=tcpspy
# directory ty place recoding tables
-TBLDIR=/usr/local/share/proxy
+TBLDIR=${PREFIX}/share/cyrproxy
# config file location
CONF_FILE=/etc/cyrproxy.conf
@@ -58,7 +58,7 @@
ALLSRCS=${SRCS} spy.c
OBJS=com_gw.o readconf.o connect.o gopher_gw.o main.o telnet_gw.o http_gw.o log.o bufio.o
-CFLAGS+= -Wall -O ${DEFINES}
+CFLAGS+= ${DEFINES}
all: ${CYRPROXY} ${SPY} subdirmake config.gen

View File

@ -1,37 +0,0 @@
*** cyrcoder/Makefile.orig Fri Jul 19 00:28:29 1996
--- cyrcoder/Makefile Thu Jun 19 10:14:36 1997
***************
*** 1,7 ****
# $Id: patch-ab,v 1.1.1.1 2000/01/26 07:35:48 form Exp $
TDIR=../tables
! UTILDIR?=/usr/local/bin
BINLIST=cyrtrans transtree transfiles
CHOWN?=/usr/sbin/chown
CHMOD?=chmod
--- 1,8 ----
# $Id: patch-ab,v 1.1.1.1 2000/01/26 07:35:48 form Exp $
TDIR=../tables
! UTILDIR?=${PREFIX}/bin
! CGIPATH=${PREFIX}/www/cgi-bin
BINLIST=cyrtrans transtree transfiles
CHOWN?=/usr/sbin/chown
CHMOD?=chmod
***************
*** 9,15 ****
BINOWNER=root.wheel
TESTBIN=cytest
! CC=gcc -O
ENCLIST?=alt iso koi8 win
#### DO NOT CHANGE BELOW THIS LINE ###########
--- 10,16 ----
BINOWNER=root.wheel
TESTBIN=cytest
! #CC=gcc -O
ENCLIST?=alt iso koi8 win
#### DO NOT CHANGE BELOW THIS LINE ###########

View File

@ -1,19 +0,0 @@
*** discover/Makefile Mon Mar 25 20:24:35 1996
--- /home/andy/tmp/wrk/discover/Makefile Mon May 26 19:06:53 1997
***************
*** 3,9 ****
CC=gcc
CFLAGS=
BINARY=encdiscover
! UTILDIR?=/usr/local/bin
BINOWN?=root.wheel
BINMODE?=755
CHOWN?=/usr/sbin/chown
--- 3,9 ----
CC=gcc
CFLAGS=
BINARY=encdiscover
! UTILDIR?=${PREFIX}/bin
BINOWN?=root.wheel
BINMODE?=755
CHOWN?=/usr/sbin/chown

View File

@ -1,19 +0,0 @@
*** cyrproxy.conf.tmpl Sat May 3 09:37:05 1997
--- /home/andy/tmp/wrk/cyrproxy.conf.tmpl Tue May 27 16:03:00 1997
***************
*** 1,7 ****
#include "alldefs.h"
# tabledir - ÄÉpÅËÔÏpÉÑ Ó ÔÁÂÌÉÞËÁÍÉ
! tabledir /usr/local/share/proxy
# encoding name table_from_client table_to_client
# none is reserved filename - no encoding
--- 1,7 ----
#include "alldefs.h"
# tabledir - ÄÉpÅËÔÏpÉÑ Ó ÔÁÂÌÉÞËÁÍÉ
! tabledir /usr/local/share/cyrproxy
# encoding name table_from_client table_to_client
# none is reserved filename - no encoding

View File

@ -1,36 +0,0 @@
*** policy.h.bak Mon May 5 20:47:06 1997
--- policy.h Thu Jun 19 15:31:36 1997
***************
*** 94,100 ****
/* #define NO_VSNPRINTF */
! #if defined(_AIX) || !defined(NO_VSNPRINTF)
#define NO_VSNPRINTF
#endif
--- 94,100 ----
/* #define NO_VSNPRINTF */
! #if defined(_AIX)
#define NO_VSNPRINTF
#endif
***************
*** 105,111 ****
*/
/* #define NO_HSTRERROR */
! #if defined(_AIX) || !defined(NO_HSTRERROR)
#define NO_HSTRERROR
#endif
--- 105,111 ----
*/
/* #define NO_HSTRERROR */
! #if defined(_AIX)
#define NO_HSTRERROR
#endif

View File

@ -1,23 +0,0 @@
*** http_gw.c.bak Sat May 3 15:57:21 1997
--- http_gw.c Sat Jun 21 03:13:55 1997
***************
*** 353,360 ****
char *p = strstr(buf,"charset=");
if(p)
sprintf(p,"charset=%s\n",enc->clientcharset);
- #if 0 /* commented out. I'm not sure, that we must force charset addition
- for documents, which not contains it! */
else
{
p=strchr(buf,'\n');
--- 353,358 ----
***************
*** 369,375 ****
strcat(buf,"\n");
}
}
- #endif
n=strlen(buf);
}
--- 367,372 ----

View File

@ -1,6 +1,7 @@
--- com_gw.c.orig Sat May 3 20:57:20 1997
+++ com_gw.c Mon Dec 21 21:19:58 1998
@@ -169,7 +169,7 @@
$OpenBSD: patch-com_gw_c,v 1.1 2001/11/27 10:06:50 form Exp $
--- com_gw.c.orig Fri Feb 9 06:34:55 2001
+++ com_gw.c Tue Nov 27 15:37:43 2001
@@ -169,7 +169,7 @@ simpleServerPipe(int netfd, encoding *en
int cnt = 0; \
while(cnt < ENTLEN && *from && *from!=';' && !isspace(*from)) \
{\
@ -9,7 +10,7 @@
cnt++;\
}\
*to='\0';\
@@ -222,12 +222,15 @@
@@ -222,12 +222,15 @@ EmailGateway (int fromfile,int tofile, c
if(!strncasecmp(buf,"Content-Type:",13))
{
parseContentType(buf+13,ctype,ocharset,garbage);

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-cyrcoder_Makefile,v 1.1 2001/11/27 10:06:50 form Exp $
--- cyrcoder/Makefile.orig Fri Jul 19 03:28:29 1996
+++ cyrcoder/Makefile Tue Nov 27 15:37:42 2001
@@ -1,7 +1,8 @@
# $Id: patch-cyrcoder_Makefile,v 1.1 2001/11/27 10:06:50 form Exp $
TDIR=../tables
-UTILDIR?=/usr/local/bin
+UTILDIR?=${PREFIX}/bin
+CGIPATH=${PREFIX}/www/cgi-bin
BINLIST=cyrtrans transtree transfiles
CHOWN?=/usr/sbin/chown
CHMOD?=chmod
@@ -9,7 +10,7 @@ BINMODE?=755
BINOWNER=root.wheel
TESTBIN=cytest
-CC=gcc -O
+#CC=gcc -O
ENCLIST?=alt iso koi8 win
#### DO NOT CHANGE BELOW THIS LINE ###########

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-cyrproxy_conf_tmpl,v 1.1 2001/11/27 10:06:50 form Exp $
--- cyrproxy.conf.tmpl.orig Sat May 3 16:37:05 1997
+++ cyrproxy.conf.tmpl Tue Nov 27 15:37:42 2001
@@ -1,7 +1,7 @@
#include "alldefs.h"
# tabledir - ÄÉpÅËÔÏpÉÑ Ó ÔÁÂÌÉÞËÁÍÉ
-tabledir /usr/local/share/proxy
+tabledir /usr/local/share/cyrproxy
# encoding name table_from_client table_to_client
# none is reserved filename - no encoding

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-discover_Makefile,v 1.1 2001/11/27 10:06:50 form Exp $
--- discover/Makefile.orig Tue Mar 26 02:24:35 1996
+++ discover/Makefile Tue Nov 27 15:37:42 2001
@@ -3,7 +3,7 @@
CC=gcc
CFLAGS=
BINARY=encdiscover
-UTILDIR?=/usr/local/bin
+UTILDIR?=${PREFIX}/bin
BINOWN?=root.wheel
BINMODE?=755
CHOWN?=/usr/sbin/chown

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-http_gw_c,v 1.1 2001/11/27 10:06:50 form Exp $
--- http_gw.c.orig Fri Feb 9 07:33:04 2001
+++ http_gw.c Tue Nov 27 15:37:42 2001
@@ -344,8 +344,6 @@ http_response(int netfd,encoding *enc)
char *p = strstr(buf,"charset=");
if(p)
sprintf(p,"charset=%s\n",enc->clientcharset);
-#if 0 /* commented out. I'm not sure, that we must force charset addition
- for documents, which not contains it! */
else
{
p=strchr(buf,'\n');
@@ -360,7 +358,6 @@ http_response(int netfd,encoding *enc)
strcat(buf,"\n");
}
}
-#endif
n=strlen(buf);
}

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-policy_h,v 1.1 2001/11/27 10:06:50 form Exp $
--- policy.h.orig Fri Feb 9 06:52:50 2001
+++ policy.h Tue Nov 27 15:37:42 2001
@@ -94,7 +94,7 @@
/* #define NO_VSNPRINTF */
-#if defined(_AIX) || !defined(NO_VSNPRINTF)
+#if defined(_AIX)
#define NO_VSNPRINTF
#endif
@@ -105,7 +105,7 @@
*/
/* #define NO_HSTRERROR */
-#if defined(_AIX) || !defined(NO_HSTRERROR)
+#if defined(_AIX)
#define NO_HSTRERROR
#endif