1. Upgrade to 0.6.

2. Remove a lot of patch file (Thanks dima port it :)
3. Change one of MASTER_SITES.

3 files changed, 31 insertions, 25 deletions

diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index fa8c42d093f6..8e44386f61e4 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	rumba
-# Version required:	0.4
+# Version required:	0.6
 # Date created:		14 June 1997
 # Whom:			Dmitrij Tejblum <dima@tejblum.dnttm.rssi.ru>
 #
-# $Id: Makefile,v 1.1.1.1 1997/07/15 14:09:18 tg Exp $
+# $Id: Makefile,v 1.2 1997/07/21 19:28:46 max Exp $
 #
 
-DISTNAME=	rumba.0.4.s
-PKGNAME=	rumba-0.4
+DISTNAME=	rumba.0.6.s
+PKGNAME=	rumba-0.6
 CATEGORIES=	net
 MASTER_SITES=	ftp://hal.kph.tuwien.ac.at/pub/NeXT/tools/rumba/ \
-		ftp://next-ftp.peak.org/pub/next/apps/utils/networks/
+		ftp://ftp.obdev.at/pub/Products/rumba/
 EXTRACT_SUFX=	.gnutar.gz
 
 MAINTAINER=	dima@tejblum.dnttm.rssi.ru
diff --git a/net/sharity-light/distinfo b/net/sharity-light/distinfo
index f64f6faa789f..c6ecd6040b5e 100644
--- a/net/sharity-light/distinfo
+++ b/net/sharity-light/distinfo
@@ -1 +1 @@
-MD5 (rumba.0.4.s.gnutar.gz) = 7a3fc82f8e108b8d05decb11d45c09c4
+MD5 (rumba.0.6.s.gnutar.gz) = 743ed7d48161ce962f353389447b55a5
diff --git a/net/sharity-light/files/patch-ad b/net/sharity-light/files/patch-ad
index b93d35c1c24d..e3c08e1d19f2 100644
--- a/net/sharity-light/files/patch-ad
+++ b/net/sharity-light/files/patch-ad
@@ -1,32 +1,38 @@
---- Makefile.orig	Mon Feb 10 13:30:00 1997
-+++ Makefile	Tue Jul 15 15:54:21 1997
-@@ -17,16 +17,21 @@
+--- Makefile.orig	Wed Jun  3 15:19:51 1998
++++ Makefile	Wed Jun  3 15:20:59 1998
+@@ -13,12 +13,12 @@
  ##############################################################################
  
  # For NEXTSTEP/OPENSTEP:
 -CFLAGS = -Wall -O2 -traditional-cpp -g
--INCLUDES = -I$(MYINCL) -I$(INCL)
 +#CFLAGS = -Wall -O2 -traditional-cpp -g
-+#INCLUDES = -I$(MYINCL) -I$(INCL)
+ INCLUDES = $(MYINCL) $(INCL)
  # put your architecture here:
 -ARCH = -arch i386
 -THE_CC = cc
+-RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
 +#ARCH = -arch i386
 +#THE_CC = cc
++#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
  
  # For Linux:
  #CFLAGS = -Wall -O2 -g
- #INCLUDES = -I$(INCL)
- 
-+# For FreeBSD
-+CFLAGS = -Wall -O2
-+INCLUDES = -I$(MYINCL) -I$(INCL)
+@@ -26,10 +26,10 @@
+ #RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
+ 
+ # For FreeBSD
+-#CFLAGS = -Wall -O2
+-#INCLUDES = $(MYINCL) $(INCL)
+-#THE_CC = cc
+-#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
++CFLAGS += -Wall
++INCLUDES = $(MYINCL) $(INCL)
 +THE_CC = cc
-+
- ##############################################################################
- ######################## End of system specific part #########################
- ##############################################################################
-@@ -38,7 +43,7 @@
++RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
+ 
+ # For NetBsd
+ #CFLAGS = -Wall -O2 -DNETBSD
+@@ -67,7 +67,7 @@
  OFILES = proc.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o
  
  .c.o:
@@ -35,12 +41,12 @@
  
  all: $(NAME)
  
-@@ -46,7 +51,7 @@
- 	$(MAKE) -C nfs
+@@ -75,7 +75,7 @@
+ 	(cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(THE_CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)")
  
  $(NAME): $(OFILES) nfs_dir
--	$(CC) $(ARCH) -o $(NAME) $(OFILES) nfs/nfs.o
-+	$(CC) -o $(NAME) $(OFILES) nfs/nfs.o
+-	$(CC) $(ARCH) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS)
++	$(CC) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS)
  
  clean:
  	rm -f $(OFILES)