Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Apr 2006 23:05:26 -1000 (HST)
From:      Antonio Querubin <tony@lava.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/96503: [patch] update beacon from version 1.1 to version 1.3
Message-ID:  <20060429090526.24BCB47285@cheesecake.lava.net>
Resent-Message-ID: <200604290910.k3T9AItJ025318@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         96503
>Category:       ports
>Synopsis:       [patch] update beacon from version 1.1 to version 1.3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 29 09:10:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Antonio Querubin
>Release:        FreeBSD 4.11-RELEASE-p13 i386
>Organization:
LavaNet
>Environment:
System: FreeBSD cheesecake.lava.net 4.11-RELEASE-p13 FreeBSD 4.11-RELEASE-p13 #2: Tue Nov 8 12:19:37 HST 2005 adrian@cheesecake.lava.net:/usr/obj/usr/src/sys/LAVA i386


>Description:

	The multicast group address changed between version 1.1 and 
	version 1.3 rendering the current port of beacon unable to 
	communicate with the central beacon server.  Version 1.3 also 
	includes IPv6 support.  This updates the port to version 1.3, 
	installs the binary in /usr/local/bin instead of /usr/local/www, 
	and corrects a typographical error in the port Makefile.

>How-To-Repeat:
	Patch /usr/ports/net/beacon using the diff file below.

>Fix:

diff -ruN beacon/Makefile beacon-new/Makefile
--- beacon/Makefile	Tue Nov 15 01:19:28 2005
+++ beacon-new/Makefile	Fri Apr 28 22:35:30 2006
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	beacon
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.3
+PORTREVISION=
 CATEGORIES=	net perl5 mbone ipv6
 MASTER_SITES=	http://dast.nlanr.net/Projects/Beacon/releases/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-0
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Beacon active measurement tool to monitor multicast
@@ -22,14 +22,15 @@
 PLIST_SUB+=	VERSION=${PORTVERSION}
 USE_PERL5=	yes
 USE_AUTOTOOLS=	autoconf:259
-CONFIGURE_ARGS=	--bindir=${WWW_DIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.ifdef(WITH_IPV6)
+.ifdef(WITHOUT_IPV6)
+CONFIGURE_ARGS=
+.else
 #enable IPv6 name lookup, and sending IPv6 multicast
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_beacon.in
-CONFUGURE_ARGS+=	--enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
 .include <bsd.port.pre.mk>
@@ -39,7 +40,7 @@
 .endif
 
 .if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+BROKEN=		Does not compile on !i386
 .endif
 
 post-install:
diff -ruN beacon/distinfo beacon-new/distinfo
--- beacon/distinfo	Mon Jan 23 01:20:19 2006
+++ beacon-new/distinfo	Fri Apr 28 15:46:01 2006
@@ -1,3 +1,2 @@
-MD5 (beacon-1.1-0.tar.gz) = 93c7c9278b1b37a1bb6b9f4bd0af9d9d
-SHA256 (beacon-1.1-0.tar.gz) = 6b17b4e703e9e5e2aedf310b3a36faf1ffcc4014d19dac88bd0bbdb17e987552
-SIZE (beacon-1.1-0.tar.gz) = 247815
+MD5 (beacon-1.3.tar.gz) = e01b0de6b0d7d01ea51bad799b147d8c
+SIZE (beacon-1.3.tar.gz) = 411823
diff -ruN beacon/files/patch-NMB-Makefile.in beacon-new/files/patch-NMB-Makefile.in
--- beacon/files/patch-NMB-Makefile.in	Sat Jan  8 05:35:07 2005
+++ beacon-new/files/patch-NMB-Makefile.in	Wed Dec 31 14:00:00 1969
@@ -1,11 +0,0 @@
---- Net-Multicast-Beacon/Makefile.in.orig	Tue Jul 13 20:56:28 2004
-+++ Net-Multicast-Beacon/Makefile.in	Sat Dec 18 16:52:21 2004
-@@ -300,7 +300,7 @@
- 	$(PERL) Makefile.PL MAKEFILE=$@
- 
- install-data-local:
--	$(MAKE) -fMakefile.perl install
-+	$(MAKE) -fMakefile.perl pure_install
- clean-local:
- 	if test -f Makefile.perl; then $(MAKE) -fMakefile.perl realclean; fi
- 	rm -f Makefile.perl Makefile.perl.old
diff -ruN beacon/files/patch-src_Makefile.in beacon-new/files/patch-src_Makefile.in
--- beacon/files/patch-src_Makefile.in	Sun Jul 11 10:06:33 2004
+++ beacon-new/files/patch-src_Makefile.in	Fri Apr 28 22:32:37 2006
@@ -1,16 +1,13 @@
-
-$FreeBSD: ports/net/beacon/files/patch-src_Makefile.in,v 1.1 2004/07/11 20:06:33 thierry Exp $
-
---- src/Makefile.in.orig	Tue Jun  8 03:09:48 2004
-+++ src/Makefile.in	Tue Jul  6 17:16:16 2004
-@@ -202,8 +202,8 @@
+--- src/Makefile.in.orig	Fri Apr 28 22:29:11 2006
++++ src/Makefile.in	Fri Apr 28 22:30:22 2006
+@@ -160,8 +160,8 @@
  	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
-+	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
+-	  echo " $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
+-	  $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
++	  echo " $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.sample"; \
++	  $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.sample; \
  	done
  
  uninstall-dist_sysconfDATA:
diff -ruN beacon/pkg-plist beacon-new/pkg-plist
--- beacon/pkg-plist	Sun Jan 22 01:20:50 2006
+++ beacon-new/pkg-plist	Fri Apr 28 22:42:09 2006
@@ -7,8 +7,8 @@
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
-www/beacon-%%VERSION%%/beacon
-@dirrm www/beacon-%%VERSION%%
+bin/beacon
+@dirrm bin/beacon
 etc/beacon.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060429090526.24BCB47285>