- Unbreak on alpha, sparc64 and other non-i386 platforms.

(remove discover binary for Linux which accidentally crept into tarball
before build).
- Generate sample config with comments even with gcc 3.x

7 files changed, 137 insertions, 124 deletions

diff --git a/russian/cyrproxy/Makefile b/russian/cyrproxy/Makefile
index 8ad8c310d52..9eb051cf852 100644
--- a/russian/cyrproxy/Makefile
+++ b/russian/cyrproxy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrproxy
 PORTVERSION=	1.4.2.20010208
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	russian net www
 MASTER_SITES=	ftp://ftp.lexa.ru/pub/domestic/lexa/
 DISTNAME=	cyrproxy-1.4.2
@@ -15,11 +15,8 @@ DISTNAME=	cyrproxy-1.4.2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cyrillic proxy for network protocols
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == alpha || ${ARCH} == sparc64
-BROKEN=		"Does not compile on ${ARCH}"
-.endif
+post-extract:
+	@ ${RM} ${WRKSRC}/discover/discover
 
 do-install:
 	@ ${MKDIR} ${PREFIX}/share/cyrproxy
@@ -43,4 +40,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/russian/cyrproxy/files/patch-Makefile b/russian/cyrproxy/files/patch-Makefile
new file mode 100644
index 00000000000..1887a702c82
--- /dev/null
+++ b/russian/cyrproxy/files/patch-Makefile
@@ -0,0 +1,35 @@
+--- Makefile.orig	Fri Feb  9 04:33:53 2001
++++ Makefile	Sat Mar  6 18:25:24 2004
+@@ -65,7 +65,7 @@
+ 
+ 
+ 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}
+@@ -128,7 +128,7 @@
+ 	awk '/^\#/{print $0}' <policy.h >alldefs.h
+ 
+ config.gen: cyrproxy.conf.tmpl Makefile alldefs.h
+-	${CC}  ${CFLAGS} -P -E - < cyrproxy.conf.tmpl | awk -f extranl.awk >config.gen
++	${CC}  ${CFLAGS} -P -E - < cyrproxy.conf.tmpl | awk -f extranl.awk | sed 's,^%,#,' >config.gen
+ 
+ ${CYRPROXY}: ${OBJS}
+ 	${CC} ${CFLAGS} ${LDFLAGS} -o ${CYRPROXY} ${OBJS} ${EXTRALIBS}
diff --git a/russian/cyrproxy/files/patch-aa b/russian/cyrproxy/files/patch-aa
deleted file mode 100644
index a8f2f5b8be8..00000000000
--- a/russian/cyrproxy/files/patch-aa
+++ /dev/null
@@ -1,79 +0,0 @@
---- 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}
diff --git a/russian/cyrproxy/files/patch-ac b/russian/cyrproxy/files/patch-ac
deleted file mode 100644
index 12bf1fee6ed..00000000000
--- a/russian/cyrproxy/files/patch-ac
+++ /dev/null
@@ -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
diff --git a/russian/cyrproxy/files/patch-ad b/russian/cyrproxy/files/patch-ad
deleted file mode 100644
index d2b5bc87f6c..00000000000
--- a/russian/cyrproxy/files/patch-ad
+++ /dev/null
@@ -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
diff --git a/russian/cyrproxy/files/patch-cyrproxy.conf.tmpl b/russian/cyrproxy/files/patch-cyrproxy.conf.tmpl
new file mode 100644
index 00000000000..6ae6eda3684
--- /dev/null
+++ b/russian/cyrproxy/files/patch-cyrproxy.conf.tmpl
@@ -0,0 +1,83 @@
+--- cyrproxy.conf.tmpl.orig	Sat May  3 16:37:05 1997
++++ cyrproxy.conf.tmpl	Sat Mar  6 18:23:59 2004
+@@ -1,31 +1,31 @@
+ #include "alldefs.h"
+ 
+-# tabledir - диpектоpия с табличками
+-tabledir /usr/local/share/proxy
++% tabledir - диpектоpия с табличками
++tabledir /usr/local/share/cyrproxy
+ 
+-# encoding name table_from_client table_to_client
+-# none is reserved filename - no encoding
++% encoding name table_from_client table_to_client
++% none is reserved filename - no encoding
+ encoding koi8 NONE NONE 
+ encoding alt  alt-koi8 koi8-alt 
+ encoding win  win-koi8 koi8-win 
+-#encoding iso  iso-koi8 koi8-iso
+-#encoding mac  mac-koi8 koi8-mac
++%encoding iso  iso-koi8 koi8-iso
++%encoding mac  mac-koi8 koi8-mac
+ 
+ 
+-# add MIME charset descriptions for each encoding
+-# emailcharset encoding_name server-charset client-charset
+-#
+-# different charset rules for different clients
+-# can be  described with _several_ encodings with same tables
+-# and different emailcharset strings
+-# 
++% add MIME charset descriptions for each encoding
++% emailcharset encoding_name server-charset client-charset
++%
++% different charset rules for different clients
++% can be  described with _several_ encodings with same tables
++% and different emailcharset strings
++% 
+ emailcharset win koi8-r windows-1251
+ emailcharset alt koi8-r cp866
+ 
+ 
+ 
+ #ifdef TRANSPARENT_HOST
+-#
++%
+ transparenthost ns.lexa.ru
+ #endif
+ 
+@@ -34,24 +34,24 @@
+ 
+ default koi8
+ 
+-# options.
++% options.
+ option port 23 protocol telnet
+ option port 70 protocol gopher
+ option port 8080 protocol http
+ option port 110 protocol pop
+ option port 25  protocol smtp
+ 
+-# option tos  16 protocol telnet
++% option tos  16 protocol telnet
+ 
+-# peer section. 
+-# Syntax:
+-# Peer address encoding
++% peer section. 
++% Syntax:
++% Peer address encoding
+ peer 1.2.3.4 win
+ 
+-# Virtualhost
+-# virtualhost koi8.lexa.ru koi8
++% Virtualhost
++% virtualhost koi8.lexa.ru koi8
+ virtualhost win.lexa.ru  win
+-#virtualhost iso.lexa.ru  iso
++%virtualhost iso.lexa.ru  iso
+ virtualhost dos.lexa.ru  alt
+-# virtualhost mac.lexa.ru  mac
+-# virtualhost 127.0.0.1	 koi8
++% virtualhost mac.lexa.ru  mac
++% virtualhost 127.0.0.1	 koi8
diff --git a/russian/cyrproxy/files/patch-discover-Makefile b/russian/cyrproxy/files/patch-discover-Makefile
new file mode 100644
index 00000000000..ce739ecb861
--- /dev/null
+++ b/russian/cyrproxy/files/patch-discover-Makefile
@@ -0,0 +1,15 @@
+--- discover/Makefile.orig	Tue Mar 26 02:24:35 1996
++++ discover/Makefile	Sat Mar  6 18:37:20 2004
+@@ -1,9 +1,9 @@
+ # $Id: Makefile,v 1.1 1996/03/25 20:24:35 lexa Exp $
+ 
+-CC=gcc
+-CFLAGS=
++CC?=gcc
++CFLAGS?=
+ BINARY=encdiscover
+-UTILDIR?=/usr/local/bin
++UTILDIR?=${PREFIX}/bin
+ BINOWN?=root.wheel
+ BINMODE?=755
+ CHOWN?=/usr/sbin/chown