Update to 2.6.

net/vtun/Makefile

@@ -1,30 +1,33 @@
-# $OpenBSD: Makefile,v 1.25 2002/10/28 01:38:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2003/06/06 00:35:12 naddy Exp $
 
 COMMENT=	"virtual tunnels over TCP/IP networks with traffic shaping"
 
-DISTNAME=	vtun-2.5
+DISTNAME=	vtun-2.6
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vtun/}
-
 HOMEPAGE=	http://vtun.sourceforge.net/
 
-LIB_DEPENDS=	lzo.1.0::archivers/lzo
+# GPL
-
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vtun/}
+
+LIB_DEPENDS=	lzo.1::archivers/lzo
+
 LOG_DIR=	/var
 SUBST_VARS=	LOG_DIR
 
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf
+AUTOCONF_VERSION= 2.13
 CONFIGURE_ARGS=	--localstatedir="${LOG_DIR}" \
 		--with-ssl-headers="/usr/include/openssl" \
 		--with-lzo-headers="${LOCALBASE}/include" \
 		--with-lzo-lib="${LOCALBASE}/lib"
 
 WRKDIST=	${WRKDIR}/vtun
+ALL_TARGET=	vtund
 
 NO_REGRESS=	Yes
 
@@ -34,6 +37,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vtun
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vtun
 	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/vtun
-	${INSTALL_DATA} ${WRKSRC}/vtund.conf ${PREFIX}/share/examples/vtun/vtund.conf-sample
+	${INSTALL_DATA} ${WRKSRC}/vtund.conf \
+		${PREFIX}/share/examples/vtun/vtund.conf-sample
 
 .include <bsd.port.mk>

net/vtun/distinfo

@@ -1,3 +1,3 @@
-MD5 (vtun-2.5.tar.gz) = b29bffeb07e66567e247641919c45b23
+MD5 (vtun-2.6.tar.gz) = 309534fd03c5d13a19c43916f61f4bbf
-RMD160 (vtun-2.5.tar.gz) = 340bc7da0c9c5fa251c520e44f0131ed85b2a730
+RMD160 (vtun-2.6.tar.gz) = 9f666189740b78a88f6b0e2807add3267551198b
-SHA1 (vtun-2.5.tar.gz) = 6220497fc64b8b4d42e972e3b7855ec97cab1975
+SHA1 (vtun-2.6.tar.gz) = ba6474a551856a7bb55b4cc21d858b8275a2e610

net/vtun/patches/patch-Makefile.in

@@ -1,59 +1,12 @@
---- Makefile.in.orig	Sat Feb 23 22:22:50 2002
+$OpenBSD: patch-Makefile.in,v 1.3 2003/06/06 00:35:12 naddy Exp $
-+++ Makefile.in	Sat Feb 23 22:26:52 2002
+--- Makefile.in.orig	Mon Jun  2 00:28:46 2003
-@@ -30,6 +30,8 @@ LEXFLAGS = -t 
++++ Makefile.in	Mon Jun  2 00:29:02 2003
- INSTALL = @INSTALL@
+@@ -54,7 +54,7 @@ OBJS = main.o cfg_file.tab.o cfg_file.le
- INSTALL_OWNER = -o root -g 0
  
-+DESTDIR = 
+ CONFIGURE_FILES = Makefile config.status config.cache config.h config.log 
-+
- prefix = @prefix@
- exec_prefix = @exec_prefix@
  
-@@ -57,6 +59,8 @@ CONFIGURE_FILES = Makefile config.status
+-%.o: %.c vtun.h lib.h
- .c.o:
++.c.o:
  	$(CC) $(CFLAGS) $(DEFS) -c $<
  
-+all: vtund
-+
  vtund: $(OBJS)
- 	$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
- 
-@@ -77,24 +81,24 @@ distclean: clean
- 	rm -f `cat vtun.drivers`	
- 
- install_man: 
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(MAN_DIR)/man8
--	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(MAN_DIR)/man8
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(MAN_DIR)/man5
--	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(MAN_DIR)/man5
--	rm -f $(MAN_DIR)/man8/vtun.8 
--	ln -s vtund.8 $(MAN_DIR)/man8/vtun.8 
-+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
-+	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
-+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
-+	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
-+	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
-+	cd $(DESTDIR)$(MAN_DIR)/man8; ln -s vtund.8 vtun.8 
- 
- install_config: 
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(ETC_DIR)
--	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
--	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(ETC_DIR); \
-+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
-+	if [ ! -f $(DESTDIR)$(ETC_DIR)/vtund.conf ]; then \
-+	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
- 	fi
- 
- install: vtund install_config install_man
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(VAR_DIR)/run
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(STAT_DIR)
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(LOCK_DIR)
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(SBIN_DIR)
--	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(SBIN_DIR)
-+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
-+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
-+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
-+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
-+	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.

net/vtun/patches/patch-configure_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure_in,v 1.1 2003/06/06 00:35:12 naddy Exp $
+--- configure.in.orig	Mon Jun  2 01:04:06 2003
++++ configure.in	Mon Jun  2 01:04:28 2003
+@@ -134,7 +134,7 @@ if test "$SSL" = "yes"; then
+    AC_MSG_RESULT()
+    AC_CHECKING( for md5 Library and Header files ... )
+ AC_SEARCH_HEADERS(md5.h,
+-    $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include, /usr/include/sys, 
++    $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys, 
+     ,
+     AC_MSG_ERROR( SSL headers not found. )
+    )

net/vtun/patches/patch-lfd_lzo_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-lfd_lzo_c,v 1.1 2003/06/06 00:35:12 naddy Exp $
+--- lfd_lzo.c.orig	Mon Jun  2 01:10:19 2003
++++ lfd_lzo.c	Mon Jun  2 01:10:38 2003
+@@ -36,6 +36,7 @@
+ #ifdef HAVE_LZO
+ 
+ #include "lzo1x.h"
++#include "lzoutil.h"
+ 
+ static lzo_byte *zbuf;
+ static lzo_voidp wmem;