5 files changed, 34 insertions, 62 deletions

diff --git a/net/ipvs/Makefile b/net/ipvs/Makefile
index ca018ef7f31c..c734bf317781 100644
--- a/net/ipvs/Makefile
+++ b/net/ipvs/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	ipvs
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	http://dragon.linux-vs.org/~dragonfly/software/
-DISTNAME=	ipvs_freebsd-${PORTVERSION}
+MASTER_SITES=	http://www.cultdeadsheep.org/~clement/FreeBSD/ipvs/
+DISTNAME=	ipvs-${PORTVERSION}_${PORTREVISION}
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	FreeBSD port of Linux Virtual Server
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+#WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 SRCDIR?=	/usr/src
 
 MAN8=		ipvsadm.8 ipvsadm-restore.8 ipvsadm-save.8
@@ -37,26 +38,28 @@ pre-everything::
 
 
 .if !defined(SYSTEM_PATCHED)
-.if ${OSVERSION} < 503001 || ${OSVERSION} > 600000 || defined(PACKAGE_BUILDING)
+.if ${OSVERSION} < 503001 || defined(PACKAGE_BUILDING)
 IGNORE=	Does not compile. If your system is patched to support ipvs, please\
 	define SYSTEM_PATCHED
 .elif ${OSVERSION} == 503001
-FREEBSD_VERSION=	5.4
+FREEBSD_VERSION=	5.3-RELEASE
 .elif (${OSVERSION} == 504000 || defined(TRY_STABLE))
-FREEBSD_VERSION=	5.4
+FREEBSD_VERSION=	5.4-RELEASE
+.elif (${OSVERSION} >= 600029 || defined(TRY_STABLE6))
+FREEBSD_VERSION=	6.0-RELEASE
+.elif (${OSVERSION} >= 700000 || defined(TRY_CURRENT))
+FREEBSD_VERSION=	7.0-CURRENT
 .else
-IGNORE=	is designed for 5.3-RELEASE and 5.4-RELEASE, define TRY_STABLE\
-	to test it on 5-STABLE
+IGNORE=	is designed orginally for 5.3-RELEASE and 5.4-RELEASE, define TRY_STABLE\
+	to test it on 5-STABLE, TRY_STABLE6 on 6-STABLE or TRY_CURRENT\
+	on 7.0-CURRENT
 .endif
 .endif
 
 ONLY_FOR_ARCHS=		i386
 
 patch-system: extract
-	@${FIND} ${WRKSRC}/patch/${FREEBSD_VERSION}-RELEASE -type f \
+	@${FIND} ${WRKSRC}/patch/${FREEBSD_VERSION} -type f \
 		-name "*.patch" -exec ${PATCH} -p0 -d ${SRCDIR} -i {} \;
 
-post-patch:
-	@${INSTALL_DATA} ${FILESDIR}/Makefile ${WRKSRC}
-
 .include <bsd.port.post.mk>
diff --git a/net/ipvs/distinfo b/net/ipvs/distinfo
index 7a35401be079..aa5318a9b84d 100644
--- a/net/ipvs/distinfo
+++ b/net/ipvs/distinfo
@@ -1,2 +1,2 @@
-MD5 (ipvs_freebsd-0.4.0.tar.gz) = e5038cf9a4d138e6f5737aa63c2ba130
-SIZE (ipvs_freebsd-0.4.0.tar.gz) = 150473
+MD5 (ipvs-0.4.0_1.tar.gz) = 928d69af2f3e9fbb6bf89674d2fff56a
+SIZE (ipvs-0.4.0_1.tar.gz) = 75601
diff --git a/net/ipvs/files/Makefile b/net/ipvs/files/Makefile
deleted file mode 100644
index 79ebc30200fa..000000000000
--- a/net/ipvs/files/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	ipvs ipvs/ipvsadm
-
-.include <bsd.port.subdir.mk>
diff --git a/net/ipvs/files/patch-ipvs_ipvsadm_Makefile b/net/ipvs/files/patch-ipvs_ipvsadm_Makefile
deleted file mode 100644
index ef3a3535f2b7..000000000000
--- a/net/ipvs/files/patch-ipvs_ipvsadm_Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
---- ipvs/ipvsadm/Makefile.orig	Fri May 27 14:10:19 2005
-+++ ipvs/ipvsadm/Makefile	Sat Jun 11 12:40:27 2005
-@@ -4,16 +4,13 @@
- SCHEDULERS = "rr|wrr|lc|wlc|lblc|lblcr|dh|sh|sed|nq"
- PROGROOT = $(shell basename 'pwd')
- 
--CC = gcc
--CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -O2
-+CFLAGS?= -Wall -Wunused -Wstrict-prototypes
- OBJS = ipvsadm.o dynamic_array.o config_stream.o libipvs.o
- 
--SBIN = $(BUILD_ROOT)/sbin
--MANDIR = usr/share/man
--MAN = $(BUILD_ROOT)/$(MANDIR)/man8
-+SBIN = ${PREFIX}/sbin
-+MANDIR = ${MANPREFIX}/man
-+MAN = $(MANDIR)/man8
- INIT = $(BUILD_ROOT)/etc/rc.d/init.d
--MKDIR = mkdir
--INSTALL = install
- 
- .PHONY = all clean install dist distclean
- 
-@@ -25,17 +22,14 @@
- libipvs.o:	libipvs/libipvs.c
- 
- install:	ipvsadm
--	if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
-+	if [ ! -d $(SBIN) ]; then $(MKDIR) $(SBIN); fi
- 	$(INSTALL) -m 0755 -s ipvsadm $(SBIN)
- 	$(INSTALL) -m 0755 ipvsadm-save $(SBIN)
- 	$(INSTALL) -m 0755 ipvsadm-restore $(SBIN)
--	[ -d $(MAN) ] || $(MKDIR) -p $(MAN)
-+	[ -d $(MAN) ] || $(MKDIR) $(MAN)
- 	$(INSTALL) -m 0644 ipvsadm.8 $(MAN)
- 	$(INSTALL) -m 0644 ipvsadm-save.8 $(MAN)
- 	$(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN)
--	if [ -d $(INIT) ]; then \
--	  $(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm; \
--	fi
-  
- clean:
- 	rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz
diff --git a/net/ipvs/pkg-plist b/net/ipvs/pkg-plist
index 7d54148dd060..c134efde779d 100644
--- a/net/ipvs/pkg-plist
+++ b/net/ipvs/pkg-plist
@@ -1,5 +1,22 @@
 sbin/ipvsadm
 sbin/ipvsadm-restore
 sbin/ipvsadm-save
+include/ipvs/ip_vs.h
+include/libipvs/libipvs.h
+lib/libipvs.a
+lib/libipvs_p.a
+@dirrm include/ipvs
+@dirrm include/libipvs
 @cwd /boot/modules
 ipvs.ko
+ip_vs_dh.ko
+ip_vs_lblc.ko
+ip_vs_lblcr.ko
+ip_vs_lc.ko
+ip_vs_nq.ko
+ip_vs_rr.ko
+ip_vs_sed.ko
+ip_vs_sh.ko
+ip_vs_wlc.ko
+ip_vs_wrr.ko
+linker.hints