6 files changed, 15 insertions, 56 deletions

diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile
index bae48ce2c537..4949557c3cc7 100644
--- a/net/ladvd/Makefile
+++ b/net/ladvd/Makefile
@@ -6,21 +6,28 @@
 #
 
 PORTNAME=	ladvd
-PORTVERSION=	0.6.1
+PORTVERSION=	0.8
 CATEGORIES=	net
 MASTER_SITES=	http://blinkenlights.nl/software/ladvd/
 
 MAINTAINER=	sten@blinkenlights.nl
 COMMENT=	A minimal CDP/LLDP sender
 
+LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
+
+ONLY_FOR_ARCHS=	i386
+
 GNU_CONFIGURE=	yes
 
+PORTDOCS=	*
 MAN8=		ladvd.8
 USE_RC_SUBR+=	ladvd
 SUB_FILES=	pkg-message pkg-install
 
+post-patch:
 .if defined(NOPORTDOCS)
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile.in
+	@@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA|install-data-am:|' \
+		${WRKSRC}/doc/Makefile.in
 .endif
 
 post-install:
diff --git a/net/ladvd/distinfo b/net/ladvd/distinfo
index 9c39dc40f39d..61c50086d5f1 100644
--- a/net/ladvd/distinfo
+++ b/net/ladvd/distinfo
@@ -1,3 +1,3 @@
-MD5 (ladvd-0.6.1.tar.gz) = 90989dec5200d6cab48dc7a6cff3cbe6
-SHA256 (ladvd-0.6.1.tar.gz) = eed25fb6a299f3beb89c46e145e6cef6035fb568a5cd04414ad4701c476e8172
-SIZE (ladvd-0.6.1.tar.gz) = 125949
+MD5 (ladvd-0.8.tar.gz) = 9a80b45ac830faf0151d23623aed5494
+SHA256 (ladvd-0.8.tar.gz) = d05453d3f18f76056e8764c3933fb3abe922b51dc5eb87ccfa5b4e6c754562c7
+SIZE (ladvd-0.8.tar.gz) = 398595
diff --git a/net/ladvd/files/extra-patch-Makefile.in b/net/ladvd/files/extra-patch-Makefile.in
deleted file mode 100644
index 819695f8bbdf..000000000000
--- a/net/ladvd/files/extra-patch-Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- Makefile.in.orig	2008-09-22 20:26:22.000000000 +0200
-+++ Makefile.in	2008-09-23 08:57:33.000000000 +0200
-@@ -178,7 +178,6 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- SUBDIRS = src
--dist_doc_DATA = LICENSE doc/ChangeLog doc/README
- man_MANS = doc/ladvd.8
- EXTRA_DIST = debian doc/ladvd.8.in
- all: all-recursive
-@@ -263,15 +262,6 @@
- 	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
- 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
--install-dist_docDATA: $(dist_doc_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
--	@list='$(dist_doc_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
--	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
--	done
- 
- uninstall-dist_docDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -609,7 +599,7 @@
- 
- info-am:
- 
--install-data-am: install-dist_docDATA install-man
-+install-data-am: install-man
- 
- install-exec-am:
- 
-@@ -650,7 +640,7 @@
- 	distclean-generic distclean-recursive distclean-tags \
- 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dist_docDATA install-exec \
-+	install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
- 	install-man8 install-strip installcheck installcheck-am \
- 	installdirs installdirs-am maintainer-clean \
diff --git a/net/ladvd/files/ladvd.in b/net/ladvd/files/ladvd.in
index f988113b4236..e59f6f381123 100644
--- a/net/ladvd/files/ladvd.in
+++ b/net/ladvd/files/ladvd.in
@@ -21,7 +21,7 @@ load_rc_config ${name}
 
 # set defaults
 ladvd_enable=${ladvd_enable:-"NO"}
-ladvd_flags=${ladvd_flags:-"-cl"}
+ladvd_flags=${ladvd_flags:-"-a"}
 
 start_precmd="ladvd_check"
 
diff --git a/net/ladvd/pkg-descr b/net/ladvd/pkg-descr
index 919368072a94..5375d849cb94 100644
--- a/net/ladvd/pkg-descr
+++ b/net/ladvd/pkg-descr
@@ -1,4 +1,4 @@
-ladvd is a minimal link layer advertisement sender which supports the
-CDP and LLDP packet formats.
+ladvd is a minimal link layer advertisement daemon which supports
+LLDP, CDP, EDP, FDP and NDP advertisements.
 
 WWW: http://www.blinkenlights.nl/software/ladvd/
diff --git a/net/ladvd/pkg-plist b/net/ladvd/pkg-plist
index 8cf580ac9546..ae739a1aa13a 100644
--- a/net/ladvd/pkg-plist
+++ b/net/ladvd/pkg-plist
@@ -1,8 +1,4 @@
 sbin/ladvd
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec echo ""
 @unexec echo "If you are permanently removing ladvd, you should also:" | /usr/bin/fmt
 @unexec echo "'remove user/group 'ladvd'." | /usr/bin/fmt