5 files changed, 50 insertions, 41 deletions

diff --git a/net/wired-tracker/Makefile b/net/wired-tracker/Makefile
index 06bf00df65a5..f110563d00b4 100644
--- a/net/wired-tracker/Makefile
+++ b/net/wired-tracker/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wired-tracker
-PORTVERSION=	1.0
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.zankasoftware.com/dist/
 
diff --git a/net/wired-tracker/distinfo b/net/wired-tracker/distinfo
index fa719fe047a6..1791b891beef 100644
--- a/net/wired-tracker/distinfo
+++ b/net/wired-tracker/distinfo
@@ -1,3 +1,3 @@
-MD5 (wired-tracker-1.0.tar.gz) = 27969fd4cb94ab9d8a019d28be17a9ee
-SHA256 (wired-tracker-1.0.tar.gz) = 6c85894395e4a8a4c4a6e792b55283032fe8cb37d6822d2777ddfc478eafad5b
-SIZE (wired-tracker-1.0.tar.gz) = 225072
+MD5 (wired-tracker-1.0.1.tar.gz) = d06b90f4e570d5ecd1cb2a24ae708370
+SHA256 (wired-tracker-1.0.1.tar.gz) = 3e3572f9f52d34e8a4a06f06ac5edd830094f9092e4a5e0f9065b34a8078bcfa
+SIZE (wired-tracker-1.0.1.tar.gz) = 277340
diff --git a/net/wired-tracker/files/patch-Makefile.in b/net/wired-tracker/files/patch-Makefile.in
index 9b02d760fcfb..581dd8b3032e 100644
--- a/net/wired-tracker/files/patch-Makefile.in
+++ b/net/wired-tracker/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed May 31 22:24:23 2006
-+++ Makefile.in	Sun Dec  3 21:19:20 2006
-@@ -12,8 +12,8 @@
+--- Makefile.in.orig	2007-12-09 18:11:07.000000000 +0100
++++ Makefile.in	2007-12-13 21:07:28.000000000 +0100
+@@ -13,8 +13,8 @@
  
  WT_VERSION		= @WT_VERSION@
  WT_MAINTAINER	= @WT_MAINTAINER@
@@ -11,16 +11,16 @@
  
  DISTFILES		= INSTALL LICENSE NEWS README Makefile Makefile.in \
  				  config.guess config.status config.h.in config.sub configure \
-@@ -74,7 +74,7 @@
- 	$(LINK) $(TRACKERDOBJECTS) $(LIBS)
+@@ -71,7 +71,7 @@
  
- $(rundir)/trackerdctl: trackerd/trackerdctl.in
+ $(rundir)/trackerdctl: $(abs_top_srcdir)/trackerd/trackerdctl.in
+ 	@test -d $(@D) || mkdir -p $(@D)
 -	sed -e 's,@trackerddir\@,$(fake_prefix)/$(trackerddir),g' $< > $@
 +	sed -e 's,@trackerddir\@,$(fake_prefix)/$(trackerddir),g' -e 's,@prefix\@,$(prefix),g' $< > $@
  	chmod +x $@
  
- $(rundir)/etc/trackerd.conf: trackerd/trackerd.conf.in
-@@ -97,61 +97,15 @@
+ $(rundir)/etc/trackerd.conf: $(abs_top_srcdir)/trackerd/trackerd.conf.in
+@@ -95,57 +95,16 @@
  		touch .update; \
  	fi
  
@@ -29,19 +29,19 @@
 -	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) -d $(installdir)/tmp/
 -
 -	if [ ! -f $(installdir)/banlist ]; then \
--		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) run/banlist $(installdir)/; \
+-		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/banlist $(installdir)/; \
 -	fi
 -
 -	if [ ! -f $(installdir)/categories ]; then \
--		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) run/categories $(installdir)/; \
+-		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/categories $(installdir)/; \
 -	fi
 -
 -	if [ ! -f $(installdir)/etc/trackerd.conf ]; then \
--		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) run/etc/trackerd.conf $(installdir)/etc/; \
+-		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/etc/trackerd.conf $(installdir)/etc/; \
 -	fi
 -	
--	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) run/trackerd $(installdir)/
--	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) run/trackerdctl $(installdir)/
+-	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/trackerd $(installdir)/
+-	$(INSTALL) -m 755 -o $(WT_USER) -g $(WT_GROUP) $(rundir)/trackerdctl $(installdir)/
 -
 -	if [ -f /etc/resolv.conf ]; then \
 -		$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) /etc/resolv.conf $(installdir)/etc/; \
@@ -55,10 +55,6 @@
 -		echo "    $(installdir)/trackerdctl restart"; \
 -		echo "to restart a running tracker."; \
 -	else \
--		if [ ! -f $(installdir)/etc/certificate.pem ]; then \
--			$(installdir)/trackerdctl certificate.pem; \
--		fi; \
--		\
 -		echo ""; \
 -		echo "Installation complete!"; \
 -		echo ""; \
@@ -70,22 +66,24 @@
 -	fi
 -	
 -	@rm -f .update
+-
 +	$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) run/categories $(installdir)/categories.sample
 +	$(INSTALL) -m 644 -o $(WT_USER) -g $(WT_GROUP) run/etc/trackerd.conf $(installdir)/etc/trackerd.conf.sample
 +	$(INSTALL) -m 755 -o 0 -g 0 run/trackerd $(prefix)/sbin
 +	$(INSTALL) -m 755 -o 0 -g 0 run/trackerdctl $(prefix)/bin
- 
++ 
  install-man:
--	$(INSTALL) -m 755 -o root -g bin -d $(mandir)/man1/
--	$(INSTALL) -m 755 -o root -g bin -d $(mandir)/man5/
--	$(INSTALL) -m 755 -o root -g bin -d $(mandir)/man8/
+-	$(INSTALL) -m 755 -d $(mandir)/man1/
+-	$(INSTALL) -m 644 $(abs_top_srcdir)/man/trackerdctl.1 $(mandir)/man1/
+-	$(INSTALL) -m 755 -d $(mandir)/man5/
+-	$(INSTALL) -m 644 $(abs_top_srcdir)/man/trackerd.conf.5 $(mandir)/man5/
+-	$(INSTALL) -m 755 -d $(mandir)/man8/
+-	$(INSTALL) -m 644 $(abs_top_srcdir)/man/trackerd.8 $(mandir)/man8/
 -
--	$(INSTALL) -m 644 -o root -g bin man/trackerdctl.1 $(mandir)/man1/
--	$(INSTALL) -m 644 -o root -g bin man/trackerd.conf.5 $(mandir)/man5/
--	$(INSTALL) -m 644 -o root -g bin man/trackerd.8 $(mandir)/man8/
 +	$(INSTALL) -m 644 -o root -g wheel man/trackerdctl.1 $(mandir)/man1/
 +	$(INSTALL) -m 644 -o root -g wheel man/trackerd.conf.5 $(mandir)/man5/
 +	$(INSTALL) -m 644 -o root -g wheel man/trackerd.8 $(mandir)/man8/
- 
++ 
  dist:
  	rm -rf wired-tracker-$(WT_VERSION)
+ 	rm -f wired-tracker-$(WT_VERSION).tar.gz
diff --git a/net/wired-tracker/files/patch-configure b/net/wired-tracker/files/patch-configure
index 2d6471ecb0a8..d73f32c2bdaf 100644
--- a/net/wired-tracker/files/patch-configure
+++ b/net/wired-tracker/files/patch-configure
@@ -1,20 +1,20 @@
---- configure.orig	Sat Dec  2 01:33:02 2006
-+++ configure	Sat Dec  2 01:33:12 2006
-@@ -4945,7 +4945,7 @@
- 	if test "$wt_pthreads_found" != yes ; then
- 		# Save libs
+--- configure.orig	2007-12-09 18:11:07.000000000 +0100
++++ configure	2007-12-13 21:12:14.000000000 +0100
+@@ -5988,7 +5988,7 @@
+ 
+ 	if test "$_wi_pthreads_found" != yes ; then
  		OLD_LIBS="$LIBS"
 -		LIBS="-lpthread $LIBS"
 +		LIBS="-pthread $LIBS"
  
- 		# Try to run it
  		if test "$cross_compiling" = yes; then
-@@ -5077,7 +5077,7 @@
- 		# Did we find something?
- 		if test "$wt_pthreads_test" = yes ; then
- 			wt_pthreads_found=yes
--			wt_pthreads_libs="-lpthread"
-+			wt_pthreads_libs="-pthread"
+ 
+@@ -6125,7 +6125,7 @@
+ 
+ 		if test "$_wi_pthreads_test" = yes ; then
+ 			_wi_pthreads_found=yes
+-			_wi_pthreads_libs="-lpthread"
++			_wi_pthreads_libs="-pthread"
  		fi
  	fi
  
diff --git a/net/wired-tracker/files/patch-trackerd-main.c b/net/wired-tracker/files/patch-trackerd-main.c
new file mode 100644
index 000000000000..94dbd2f328f7
--- /dev/null
+++ b/net/wired-tracker/files/patch-trackerd-main.c
@@ -0,0 +1,11 @@
+--- trackerd/main.c.orig	2007-12-16 14:55:55.000000000 +0100
++++ trackerd/main.c	2007-12-16 14:56:27.000000000 +0100
+@@ -190,7 +190,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()) {