Upgrade, 0.9a -> 0.95f.

Submitted by:	Alain Kalker <alain@Wit401402.student.utwente.nl>

6 files changed, 38 insertions, 41 deletions

diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index f3cbf1c48909..edf94f3c3b7c 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -1,24 +1,24 @@
-# Makefile for:		slirp
-# Version required:	0.9alpha
-# Date created:		05 April 1995
-# Whom:			jkh
+# New ports collection makefile for:	slirp
+# Version required:	0.95f
+# Date created:		25 Aug 1995
+# Whom:			Alain Kalker <alain@Wit401402.student.utwente.nl>
 #
-# $Id: Makefile,v 1.1.1.1 1995/04/06 06:52:41 jkh Exp $
+# $Id$
 #
 
-# This is ALPHA software, but I think it's of sufficient interest to enough
-# people to bring it over now.  I hope that both patches an go away soon
-# enough..  Yes, I know that it currently produces some weird error messages.
-# They're harmless as far as the operation of slirp is concerned.  I also
-# know that the "manpage" is cheesy - it's better than nothing! :-)
-
-DISTNAME=	slirp
-PKGNAME=	slirp-0.9a
+DISTNAME=	slirp-0.95f
 CATEGORIES+=	networking
 MASTER_SITES=	ftp://blitzen.canberra.edu.au/pub/slirp/ \
 		ftp://freedom.wit.com/misc4/danjo/SLiRP/
 
-WRKSRC=		${WRKDIR}/slurp/src
-MAKE_FLAGS=	freebsd -f
+MAINTAINER=	alain@Wit401402.student.utwente.nl
+
+WRKSRC=		${WRKDIR}/slirp-0.95f/src
+HAS_CONFIGURE=	yes
+
+post-install:
+.if !defined(NOMANCOMPRESS)
+	gzip -9nf ${PREFIX}/man/man1/slirp.1
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/slirp/distinfo b/net/slirp/distinfo
index d152a6bb1d3f..b5f2dc3765f5 100644
--- a/net/slirp/distinfo
+++ b/net/slirp/distinfo
@@ -1 +1 @@
-MD5 (slirp.tar.gz) = 9e0d39e1b3b7a411c3f220e48cd94d6f
+MD5 (slirp-0.95f.tar.gz) = 9fefa9fa79b103e67de77f4756c755a4
diff --git a/net/slirp/files/patch-aa b/net/slirp/files/patch-aa
index aff81bd2e96a..f901d0472d62 100644
--- a/net/slirp/files/patch-aa
+++ b/net/slirp/files/patch-aa
@@ -1,21 +1,18 @@
-*** Makefile.orig	Wed Apr  5 23:23:25 1995
---- Makefile	Wed Apr  5 23:23:51 1995
+*** Makefile.in.orig	Fri Aug 25 02:32:36 1995
+--- Makefile.in	Fri Aug 25 02:32:42 1995
 ***************
-*** 40,47 ****
+*** 38,43 ****
+--- 38,50 ----
+  slirp: $(PROTO) $(OBJ)
+  	$(CC) @LDFLAGS@ -o slirp $(OBJ) $(LIBS)
   
-  linux:
-  	@$(MAKE) "CFLAGS = $(CFLAGS) -D_LITTLE_ENDIAN_ -DLINUX -DDEBUG -O2 -g -Wstrict-prototypes" \
-!                 slurp
-! 		
++ # This is a very very crude install target, but it's less crude than
++ # creating one in the top level directory.
++ install: slirp
++ 	install -c -s -m 755 slirp ${PREFIX}/bin
++ 	@mkdir -p ${PREFIX}/man/man1
++ 	install -c -m 755 ../docs/slirp.man.OLD ${PREFIX}/man/man1/slirp.1
++ 
+  objclean:
+  	rm -f $(OBJ)
   
-  #
-  # OBJ's
---- 40,47 ----
-  
-  linux:
-  	@$(MAKE) "CFLAGS = $(CFLAGS) -D_LITTLE_ENDIAN_ -DLINUX -DDEBUG -O2 -g -Wstrict-prototypes" \
-! 		slurp
-! 
-  
-  #
-  # OBJ's
diff --git a/net/slirp/pkg-comment b/net/slirp/pkg-comment
index 83281ad96807..147488da6fc4 100644
--- a/net/slirp/pkg-comment
+++ b/net/slirp/pkg-comment
@@ -1 +1 @@
-SLuRP is a SLIP/CSLIP emulator for user with a shell accounts
+SLiRP is a SLIP/CSLIP emulator for users with shell accounts, ver 0.95f
diff --git a/net/slirp/pkg-descr b/net/slirp/pkg-descr
index fdc7bb72e814..e61838794901 100644
--- a/net/slirp/pkg-descr
+++ b/net/slirp/pkg-descr
@@ -1,4 +1,4 @@
-SLuRP is a SLIP/CSLIP emulator which allows a normal user with a shell
-account on a UNIX system to act like a SLIP/CSLIP account (a-la TIA).
-SLuRP can be (loosly) thought of as a cross between TIA and term (it's a
-SLIP-emulator, but comes with source, can redirect ports, etc.)
+SLiRP is a (C)SLIP/PPP emulator which allows users with normal shell
+accounts act as if they had a (C)SLIP/PPP account.  This allows users to use
+Netscape/Mosaic, ftp, telnet, etc. from their home machine, as if they had a
+real (C)SLIP/PPP connection (with limitations).
diff --git a/net/slirp/pkg-plist b/net/slirp/pkg-plist
index bdcbd66e8256..72398b846b84 100644
--- a/net/slirp/pkg-plist
+++ b/net/slirp/pkg-plist
@@ -1,2 +1,2 @@
-bin/slurp
-man/man1/slurp.1
+bin/slirp
+man/man1/slirp.1.gz