Merge in some changes from PR 9657

Add a master site
Add RESTRICTED (license has use restrictions)
copy html and pdf docs to share
print inetd message at install/pkgadd
remove security as category

This port started in security, but should be repo-moved to audio.

PR:		9657
Submitted by:	mi@aldan.algebra.com

5 files changed, 64 insertions, 72 deletions

diff --git a/audio/raproxy/Makefile b/audio/raproxy/Makefile
index 03f18021f852..7e87279b4e20 100644
--- a/audio/raproxy/Makefile
+++ b/audio/raproxy/Makefile
@@ -1,32 +1,38 @@
-# Ports collection makefile for:  raproxy
-# Version required:     	  3.0b1
-# Date created:			  Sat May 8, 1999
-# Whom:				  Nick Sayer (nsayer@freebsd.org)
+# New ports collection makefile for:	raproxy
+# Version required:	3.0b1
+# Date created:		January 24, 1999
+# Whom:		mi@aldan.algebra.com
 #
 # $FreeBSD$
 #
 
 DISTNAME=	raproxy3.0b1
 PKGNAME=	raproxy-3.0b1
-CATEGORIES=	security net audio
-#EXTRACT_SUFX=	.tar.gz
+CATEGORIES=	audio net
+MASTER_SITES=	http://docs.real.com/proxykit/
 
-MAINTAINER=     nsayer@freebsd.org
+MAINTAINER=	nsayer@freebsd.org
 
+# Get it through http://www.real.com/firewall/fwdload/index.html
+# if the master site does not exists somehow.
 WRKSRC=		${WRKDIR}/raproxy
+ALL_TARGET=	raproxy
 
-RESTRICTED=	"No redistribution allowed."
+RESTRICTED=	License allows only use in a firewall or with RA products.
 
 MAN8=		raproxy.8
 
-.include <bsd.port.pre.mk>
-
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE='Please fill out the form at http://service.real.com/firewall/index.html and place the sources at ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} then run make again'
-.endif
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/raproxy ${PREFIX}/libexec/raproxy
+	${INSTALL_PROGRAM} ${WRKSRC}/raproxy ${PREFIX}/libexec
+.if !defined(NO_INSTALL_MANPAGES)
 	${INSTALL_MAN} ${WRKSRC}/raproxy.man ${PREFIX}/man/man8/raproxy.8
+.endif
+
+.if !defined(NOPORTDOCS)
+	-${MKDIR} ${PREFIX}/share/doc/raproxy
+	${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/*.pdf \
+		${PREFIX}/share/doc/raproxy
+.endif
+	-cat ${PKGDIR}/MESSAGE
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/raproxy/files/patch-aa b/audio/raproxy/files/patch-aa
index bd644fe15627..28d266009152 100644
--- a/audio/raproxy/files/patch-aa
+++ b/audio/raproxy/files/patch-aa
@@ -1,50 +1,7 @@
---- raproxy.c.dist	Thu Dec 19 15:53:23 1996
-+++ raproxy.c	Mon Jul 27 11:09:01 1998
-@@ -668,6 +668,7 @@
- {
- 	int		size;
- 	struct sockaddr_in	addr, info;
-+	int	port;
- 
- 	/* setup bind/listen etc for udp backchannel from server */
- 	if ( (serveraudiofd = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0 ) {
-@@ -675,6 +676,15 @@
- 		syslog(LOG_LVL, "raproxy: can't setup socket: %m");
- 		return(-1);		/* Probably out of sockets */
- 	}
-+#ifdef IP_PORTRANGE
-+	port = IP_PORTRANGE_HIGH;
-+	if ( setsockopt(serveraudiofd, IPPROTO_IP, IP_PORTRANGE, (char *) &port,
-+		sizeof(port)) < 0 ) {
-+		syslog(LOG_LVL, "raproxy: can't setsockopt(): %m");
-+		/* syslog error ? */
-+		return(-1);
-+	}
-+#endif
- 	(void) bzero (&addr, sizeof (addr));
- 	addr.sin_family = AF_INET;
- 	/* 
-@@ -1145,6 +1155,7 @@
- {
- 	struct sockaddr_in	addr, info;
- 	int		size;
-+	int		port;
- 
- 	/*
- 	 * allocate/setup socket/fd/port FROM which we'll
-@@ -1155,6 +1166,15 @@
- 		syslog(LOG_LVL, "raproxy: can't setup socket: %m");
- 		return(-1);		/* Probably out of sockets */
- 	}
-+#ifdef IP_PORTRANGE
-+	port = IP_PORTRANGE_HIGH;
-+	if ( setsockopt(serveraudiofd, IPPROTO_IP, IP_PORTRANGE, (char *) &port,
-+		sizeof(port)) < 0 ) {
-+		syslog(LOG_LVL, "raproxy: can't setsockopt(): %m");
-+		/* syslog error ? */
-+		return(-1);
-+	}
-+#endif
- 	(void) bzero (&addr, sizeof (addr));
- 	addr.sin_family = AF_INET;
- 	addr.sin_port = htons(0);
+--- Makefile.orig	Thu Dec 19 19:12:26 1996
++++ Makefile	Sun Jan 24 02:33:30 1999
+@@ -8,2 +8,2 @@
+-CC=	cc
+-CFLAGS= #-DDEBUG -g
++#CC=	cc
++#CFLAGS= #-DDEBUG -g
diff --git a/audio/raproxy/pkg-comment b/audio/raproxy/pkg-comment
index 1e4385348a61..d590f7f5200d 100644
--- a/audio/raproxy/pkg-comment
+++ b/audio/raproxy/pkg-comment
@@ -1 +1 @@
-Real Audio (5.0 and previous) stream proxy
+Progressive Networks' RealAudio Proxy Kit 3.0 beta 1
diff --git a/audio/raproxy/pkg-descr b/audio/raproxy/pkg-descr
index 7c83238f2050..c01b1b985f80 100644
--- a/audio/raproxy/pkg-descr
+++ b/audio/raproxy/pkg-descr
@@ -1,5 +1,23 @@
-Proxy for pnm: streams (real audio 5.0 and previous).
+THE REALAUDIO FIREWALL PROXY KIT 3.0 BETA 1
 
-The only way to get the source is to fill out a stupid form,
-which probably puts you on real's (spam) mailing list. A
-throwaway mail address is recommended.
+raproxy
+=======
+raproxy is the application-level proxy.  raproxy is meant as a
+reference implementation for those writing firewall software.
+
+raproxy can also be used with other firewall software, such as the
+TIS Firewall Toolkit (fwtk) to provide a means for people inside
+of a firewall to use RealAudio.  For more details on how to do this
+
+tproxy
+======
+tproxy is a reference implementation for a transparent proxy.  This
+is meant as a reference implementation for those writing firewall
+software.
+
+NOTE: tproxy is not immediately useful for firewall administrators who wish
+      to provide RealAudio access to users inside a firewall.  For
+      those that want an immediate solution for providing RealAudio,
+      please use raproxy.
+
+Copyright 1996, Progressive Networks, Inc.
diff --git a/audio/raproxy/pkg-plist b/audio/raproxy/pkg-plist
index d0f9f669df81..9604a194b579 100644
--- a/audio/raproxy/pkg-plist
+++ b/audio/raproxy/pkg-plist
@@ -1,2 +1,13 @@
 libexec/raproxy
-man/man8/raproxy.8.gz
+share/doc/raproxy/about.html
+share/doc/raproxy/advanced.html
+share/doc/raproxy/contents.html
+share/doc/raproxy/generic.html
+share/doc/raproxy/index.html
+share/doc/raproxy/moreinfo.html
+share/doc/raproxy/player.html
+share/doc/raproxy/raproxy.pdf
+share/doc/raproxy/thrdprty.html
+share/doc/raproxy/tproxy.pdf
+share/doc/raproxy/usekit.html
+@dirrm share/doc/raproxy