Update to 1.3

PR: ports/76689
Submitted by: MAINTAINER

5 files changed, 33 insertions, 53 deletions

diff --git a/net-mgmt/openvmps/Makefile b/net-mgmt/openvmps/Makefile
index 87ab548f47dd..eafd30ee0fdd 100644
--- a/net-mgmt/openvmps/Makefile
+++ b/net-mgmt/openvmps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openvmps
-PORTVERSION=	1.1
+PORTVERSION=	1.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vmps
@@ -15,13 +15,17 @@ DISTNAME=	vmpsd-${PORTVERSION}
 MAINTAINER=	craig@yekse.gank.org
 COMMENT=	A GPL implementation of the VMPS protocol
 
+WRKSRC=		${WRKDIR}/vmpsd
 USE_RC_SUBR=	yes
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=--bindir=${PREFIX}/sbin
 
+MAN1=		vmpsd.1
+
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
 		RC_SUBR=${RC_SUBR}
 
@@ -29,7 +33,7 @@ post-install:
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/vmpsd.sh > ${PREFIX}/etc/rc.d/vmpsd.sh
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/vmpsd.sh
-	${INSTALL_DATA} -m 644 ${FILESDIR}/vmps.db \
+	${INSTALL_DATA} -m 644 ${WRKSRC}/vlan.db \
 		${PREFIX}/etc/vmps.db.sample
 	@if [ ! -f ${PREFIX}/etc/vmps.db ]; then \
 		${CP} -p ${PREFIX}/etc/vmps.db.sample ${PREFIX}/etc/vmps.db ; \
diff --git a/net-mgmt/openvmps/distinfo b/net-mgmt/openvmps/distinfo
index 3ca8fa234324..97124fa76fdc 100644
--- a/net-mgmt/openvmps/distinfo
+++ b/net-mgmt/openvmps/distinfo
@@ -1,2 +1,2 @@
-MD5 (vmpsd-1.1.tar.gz) = ca76836a057fe534fe29721939e0a57a
-SIZE (vmpsd-1.1.tar.gz) = 47528
+MD5 (vmpsd-1.3.tar.gz) = 07ad86343ad715c94b9de4c54c62d3db
+SIZE (vmpsd-1.3.tar.gz) = 95202
diff --git a/net-mgmt/openvmps/files/patch-Makefile.in b/net-mgmt/openvmps/files/patch-Makefile.in
new file mode 100644
index 000000000000..1e707623a6a7
--- /dev/null
+++ b/net-mgmt/openvmps/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Jan 25 18:16:11 2005
++++ Makefile.in	Tue Jan 25 18:17:02 2005
+@@ -684,7 +684,7 @@
+ 
+ install-data-am: install-man
+ 
+-install-exec-am: install-binPROGRAMS install-sysconfDATA
++install-exec-am: install-binPROGRAMS
+ 
+ install-info: install-info-am
+ 
diff --git a/net-mgmt/openvmps/files/patch-daemon.c b/net-mgmt/openvmps/files/patch-daemon.c
new file mode 100644
index 000000000000..15be7ddf0b99
--- /dev/null
+++ b/net-mgmt/openvmps/files/patch-daemon.c
@@ -0,0 +1,14 @@
+--- daemon.c.orig	Tue Jan 25 18:00:12 2005
++++ daemon.c	Tue Jan 25 18:00:47 2005
+@@ -44,7 +44,10 @@
+ 
+ {
+ 	register int	childpid;
+-
++#ifdef	VMPS_CHECK_BSD
++	int fd;
++#endif
++	
+ #ifdef	SIGTTOU
+ 	signal(SIGTTOU, SIG_IGN);
+ #endif
diff --git a/net-mgmt/openvmps/files/vmps.db b/net-mgmt/openvmps/files/vmps.db
deleted file mode 100644
index 26f9261e4762..000000000000
--- a/net-mgmt/openvmps/files/vmps.db
+++ /dev/null
@@ -1,49 +0,0 @@
-! $FreeBSD$
-!
-! Sample VLAN database file for OpenVMPS server
-!
-!vmps domain <domain-name>
-! The VMPS domain must be defined.
-!vmps mode { open | secure }
-! The default mode is open.
-!vmps fallback <vlan-name>
-!vmps no-domain-req { allow | deny }
-!
-! The default value is allow.
-vmps domain CHANGE_THIS
-vmps mode open
-vmps fallback --NONE--
-vmps no-domain-req deny
-!
-!
-!MAC Addresses
-!
-!vmps-mac-addrs
-!
-! address <addr> vlan-name <vlan_name> 
-!
-! address 00a0.2460.c452 vlan-name ST	
-! address 10a0.2460.c452 vlan-name ST	
-! address 20a0.2460.c452 vlan-name ST	
-! address 30a0.2460.c452 vlan-name ST	
-! address 40a0.2460.c452 vlan-name ST	
-! address 0090.278c.59d5 vlan-name ST	
-!
-!Port Groups
-!
-!vmps-port-group <group-name>
-! device <device-id> { port <port-name> | all-ports }
-!
-!
-!
-!VLAN groups
-!
-!vmps-vlan-group <group-name>
-! vlan-name <vlan-name>
-!
-!
-!VLAN port Policies
-!
-!vmps-port-policies {vlan-name <vlan_name> | vlan-group <group-name> }
-! { port-group <group-name> | device <device-id> port <port-name> }
-!