Vendor made minor code changes with no version bump. Label this as

ru-cyrproxy-1.4.2.20010208.

3 files changed, 82 insertions, 81 deletions

diff --git a/russian/cyrproxy/Makefile b/russian/cyrproxy/Makefile
index a42785b76d78..7b953393e12d 100644
--- a/russian/cyrproxy/Makefile
+++ b/russian/cyrproxy/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=		cyrproxy
-PORTVERSION=		1.4.2
+PORTVERSION=		1.4.2.20010208
 CATEGORIES=		russian net www
 MASTER_SITES=		ftp://ftp.lexa.ru/pub/domestic/lexa/
+DISTNAME=		cyrproxy-1.4.2
 
 MAINTAINER=		ports@FreeBSD.org
 
diff --git a/russian/cyrproxy/distinfo b/russian/cyrproxy/distinfo
index 8b8834d8b4fc..a13db1c1ee8e 100644
--- a/russian/cyrproxy/distinfo
+++ b/russian/cyrproxy/distinfo
@@ -1 +1 @@
-MD5 (cyrproxy-1.4.2.tar.gz) = 2a5cfbcba5c51fff043121fdbe269b4a
+MD5 (cyrproxy-1.4.2.tar.gz) = 2b175a990fca55402cebbc374e88aa5e
diff --git a/russian/cyrproxy/files/patch-aa b/russian/cyrproxy/files/patch-aa
index e6d22980862e..a8f2f5b8be8e 100644
--- a/russian/cyrproxy/files/patch-aa
+++ b/russian/cyrproxy/files/patch-aa
@@ -1,79 +1,79 @@
-*** Makefile.orig	Sat May  3 13:37:04 1997
---- Makefile	Thu Jun 19 10:09:09 1997
-***************
-*** 6,14 ****
-  
-  CHMOD=/bin/chmod
-  CHOWN=/usr/sbin/chown
-! GCC=gcc -O
-! CFLAGS=-funsigned-char -Wall
-! CC=${GCC} ${CFLAGS}
-  # Some systems contains resolver routines in libresolv
-  # EXTRALIBS=lresolv
-  EXTRALIBS=
---- 6,14 ----
-  
-  CHMOD=/bin/chmod
-  CHOWN=/usr/sbin/chown
-! #GCC=gcc -O
-! CFLAGS+=-funsigned-char -Wall
-! #CC=${GCC} ${CFLAGS}
-  # Some systems contains resolver routines in libresolv
-  # EXTRALIBS=lresolv
-  EXTRALIBS=
-***************
-*** 23,40 ****
-  TABLEOWN=root.wheel
-  
-  #directory to place  binary
-! BINDIR=/usr/local/libexec
-! UTILDIR=/usr/local/bin
-! CGIPATH=/usr/local/www/cgi-bin
-  # name of binaries
-  CYRPROXY=cyrproxy
-  SPY=tcpspy
-  
-  # directory ty place recoding tables
-! TBLDIR=/usr/local/share/proxy
-  
-  # config file location
-! CONF_FILE=/etc/cyrproxy.conf
-  
-  # Subdirs for make
-  # cyrcoder - filter-like cyrillic recoder
---- 23,40 ----
-  TABLEOWN=root.wheel
-  
-  #directory to place  binary
-! BINDIR=${PREFIX}/libexec
-! UTILDIR=${PREFIX}/bin
-! CGIPATH=${PREFIX}/www/cgi-bin
-  # name of binaries
-  CYRPROXY=cyrproxy
-  SPY=tcpspy
-  
-  # directory ty place recoding tables
-! TBLDIR=${PREFIX}/share/cyrproxy
-  
-  # config file location
-! CONF_FILE=${PREFIX}/etc/cyrproxy.conf
-  
-  # Subdirs for make
-  # cyrcoder - filter-like cyrillic recoder
-***************
-*** 58,64 ****
-  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}
-  
-  
-  all: ${CYRPROXY} ${SPY} subdirmake config.gen
---- 58,64 ----
-  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+= ${DEFINES}
-  
-  
-  all: ${CYRPROXY} ${SPY} subdirmake config.gen
+--- Makefile.orig	Thu Feb  8 14:33:53 2001
++++ Makefile	Sat Oct 12 12:55:07 2002
+@@ -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=
+@@ -18,23 +18,23 @@
+ TABLEMODE=644
+ TABLEDIRMODE=755
+ 
+-CONFOWN=root.wheel
+-BINOWN=root.wheel
+-TABLEOWN=root.wheel
++CONFOWN=root:wheel
++BINOWN=root:wheel
++TABLEOWN=root:wheel
+ 
+ #directory to place  binary
+-BINDIR=/usr/local/bin
+-UTILDIR=/usr/local/bin
+-CGIPATH=/usr/local/www/cgi-bin
++BINDIR=${PREFIX}/bin
++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/proxy
+ 
+ # config file location
+-CONF_FILE=/etc/cyrproxy.conf
++CONF_FILE=${PREFIX}/etc/cyrproxy.conf
+ 
+ # Subdirs for make
+ # cyrcoder - filter-like cyrillic recoder
+@@ -58,14 +58,14 @@
+ 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
+ 
+ 
+ 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 @@
+ 	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}