- Update to 1.3.2

5 files changed, 30 insertions, 20 deletions

diff --git a/net/wired/Makefile b/net/wired/Makefile
index cf11a0d0ec00..96091bf34229 100644
--- a/net/wired/Makefile
+++ b/net/wired/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wired
-PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTVERSION=	1.3.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.zankasoftware.com/dist/
 
@@ -18,7 +17,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_RC_SUBR=	wired.sh
 
-MAN1=		hl2wired.1 wiredctl.1
+MAN1=		wiredctl.1
 MAN5=		wired.conf.5
 MAN8=		wired.8
 
diff --git a/net/wired/distinfo b/net/wired/distinfo
index e52af67346f0..bf689e06e4f4 100644
--- a/net/wired/distinfo
+++ b/net/wired/distinfo
@@ -1,3 +1,3 @@
-MD5 (wired-1.3.1.tar.gz) = aecb3d17682377c8d5daa175616f46d0
-SHA256 (wired-1.3.1.tar.gz) = 7c10f229f110e0ce1dd8213e920354d59dca32fed6dc0ba20d785558844a34b9
-SIZE (wired-1.3.1.tar.gz) = 896710
+MD5 (wired-1.3.2.tar.gz) = d74c0e850d7a4a55748d6ff07ef40ec6
+SHA256 (wired-1.3.2.tar.gz) = 2f2ed04de02a9f56d4b7687fc6b03704ebaeaccad2c4a69239098269c21f3c28
+SIZE (wired-1.3.2.tar.gz) = 307092
diff --git a/net/wired/files/patch-Makefile.in b/net/wired/files/patch-Makefile.in
index dff0237f9450..4153a1d9846d 100644
--- a/net/wired/files/patch-Makefile.in
+++ b/net/wired/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Jun 18 15:08:08 2006
-+++ Makefile.in	Sun Dec  3 22:04:11 2006
-@@ -12,8 +12,8 @@
+--- Makefile.in.orig	2007-12-09 18:11:00.000000000 +0100
++++ Makefile.in	2007-12-13 20:54:54.000000000 +0100
+@@ -13,8 +13,8 @@
  
  WD_VERSION		= @WD_VERSION@
  WD_MAINTAINER	= @WD_MAINTAINER@
@@ -11,16 +11,16 @@
  
  DISTFILES		= INSTALL LICENSE NEWS README Makefile Makefile.in \
  				  config.guess config.status config.h.in config.sub configure \
-@@ -86,7 +86,7 @@
+@@ -71,7 +71,7 @@
  
- $(rundir)/wiredctl: $(top_srcdir)/wired/wiredctl.in
+ $(rundir)/wiredctl: $(abs_top_srcdir)/wired/wiredctl.in
  	@test -d $(@D) || mkdir -p $(@D)
 -	sed -e 's,@wireddir\@,$(fake_prefix)/$(wireddir),g' $< > $@
 +	sed -e 's,@wireddir\@,$(fake_prefix)/$(wireddir),g' -e 's,@prefix\@,$(prefix),g' $< > $@
  	chmod +x $@
  
- $(rundir)/etc/wired.conf: $(top_srcdir)/wired/wired.conf.in
-@@ -110,10 +110,6 @@
+ $(rundir)/etc/wired.conf: $(abs_top_srcdir)/wired/wired.conf.in
+@@ -91,10 +91,6 @@
  install-only: install-man install-wired
  
  install-wired:
@@ -31,7 +31,7 @@
  	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/
  	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/etc/
  	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/tmp/
-@@ -128,55 +124,16 @@
+@@ -109,55 +105,16 @@
  		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/files/Drop\ Box/.wired/type $(installdir)/files/Drop\ Box/.wired/; \
  	fi
  
@@ -55,7 +55,6 @@
 -		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/etc/wired.conf $(installdir)/etc/; \
 -	fi
 -
--	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/hl2wired $(installdir)/
 -	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/wired $(installdir)/
 -	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/wiredctl $(installdir)/
 -
@@ -82,17 +81,19 @@
 -		echo "    $(installdir)/wiredctl start"; \
 -		echo "to start the server."; \
 -	fi
+-
+-	@rm -f .update
+-
 +	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/banlist $(installdir)/banlist.sample
 +	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/groups $(installdir)/groups.sample
 +	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/news $(installdir)/news.sample
 +	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/users $(installdir)/users.sample
 +	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/etc/wired.conf $(installdir)/etc/wired.conf.sample
-+	$(INSTALL) -m 755 -o 0 -g 0 $(rundir)/hl2wired $(prefix)/sbin/
 +	$(INSTALL) -m 755 -o 0 -g 0 $(rundir)/wired $(prefix)/sbin/
 +	$(INSTALL) -m 755 -o 0 -g 0 $(rundir)/wiredctl $(prefix)/bin/
- 
--	@rm -f .update
++
 +	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) /etc/resolv.conf $(installdir)/etc/resolv.conf.sample
- 
++
  install-man:
  	$(INSTALL) -m 755 -d $(mandir)/man1/
+ 	$(INSTALL) -m 644 $(abs_top_srcdir)/man/wiredctl.1 $(mandir)/man1/
diff --git a/net/wired/files/patch-wired-main.c b/net/wired/files/patch-wired-main.c
new file mode 100644
index 000000000000..652c2d90242b
--- /dev/null
+++ b/net/wired/files/patch-wired-main.c
@@ -0,0 +1,11 @@
+--- wired/main.c.orig	2007-12-16 10:36:41.000000000 +0100
++++ wired/main.c	2007-12-16 10:37:10.000000000 +0100
+@@ -195,7 +195,7 @@
+ 
+ 	/* detach */
+ 	if(daemonize) {
+-		wi_array_insert_data_at_index(arguments, WI_STR("-X"), 0);
++		wi_array_add_data(arguments, WI_STR("-X"));
+ 		wi_array_insert_data_at_index(arguments, wi_string_with_cstring(argv[0]), 0);
+ 		
+ 		switch(fork()) {
diff --git a/net/wired/pkg-plist b/net/wired/pkg-plist
index bf06a5ab8697..bb21c99b30eb 100644
--- a/net/wired/pkg-plist
+++ b/net/wired/pkg-plist
@@ -22,7 +22,6 @@ wired/news.sample
 @unexec if cmp -s %D/wired/users.sample %D/wired/users; then rm -f %D/wired/users; fi
 wired/users.sample
 @exec if [ ! -f %D/wired/users ] ; then cp -p %D/%F %B/users; fi
-sbin/hl2wired
 sbin/wired
 bin/wiredctl
 @exec mkdir -p %D/wired/tmp