7 files changed, 15 insertions, 58 deletions

diff --git a/net-p2p/hagelslag/Makefile b/net-p2p/hagelslag/Makefile
index e340e3f82fc1..0af2d752fecf 100644
--- a/net-p2p/hagelslag/Makefile
+++ b/net-p2p/hagelslag/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	hagelslag
-PORTVERSION=	0.12.1
+PORTVERSION=	0.13
 CATEGORIES=	net
 MASTER_SITES=	http://tiefighter.et.tudelft.nl/hagelslag/ \
 		ftp://tiefighter.et.tudelft.nl/pub/hagelslag/v${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	johann@egenetics.com
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 USE_GMAKE=	yes
-MAKEFILES=	Makefile gui/Makefile gui-api/Makefile
+MAKEFILES=	Makefile gui/Makefile src/Makefile
 HS_DOCDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 post-patch:
@@ -28,7 +27,7 @@ post-patch:
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${HS_DOCDIR}
-	@ ${INSTALL_MAN} ${WRKSRC}/doc/* ${HS_DOCDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/* ${HS_DOCDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/hagelslag/distinfo b/net-p2p/hagelslag/distinfo
index 3cf1bcf016cf..eb6c7d806b58 100644
--- a/net-p2p/hagelslag/distinfo
+++ b/net-p2p/hagelslag/distinfo
@@ -1 +1 @@
-MD5 (hagelslag-0.12.1.tgz) = 65142f58f170f23ee0a6d097cfa11cf9
+MD5 (hagelslag-0.13.tar.gz) = 9038c8c2324e6d94af01cae34524c439
diff --git a/net-p2p/hagelslag/files/patch-Makefile b/net-p2p/hagelslag/files/patch-Makefile
index c28337153865..8fa4fc94aab8 100644
--- a/net-p2p/hagelslag/files/patch-Makefile
+++ b/net-p2p/hagelslag/files/patch-Makefile
@@ -1,13 +1,10 @@
---- Makefile.orig	Wed Jan 31 20:40:56 2001
-+++ Makefile	Wed Feb 14 15:05:19 2001
-@@ -4,10 +4,7 @@
+--- Makefile.orig	Sun Apr  8 20:00:36 2001
++++ Makefile	Mon May  7 12:09:57 2001
+@@ -3,7 +3,7 @@
  	make -C gui all
  
  install:
 -	cp bin/* /usr/local/bin
--	mkdir ~/.hagelslag
--	cp doc/hosts.txt ~/.hagelslag/hagelslag.hosts
--	@echo remember to copy doc/hosts.txt to ~/.hagelslag/hagelslag.hosts
 +	${BSD_INSTALL_PROGRAM} bin/* ${PREFIX}/bin
  
  
diff --git a/net-p2p/hagelslag/files/patch-gui-api-c++-Makefile b/net-p2p/hagelslag/files/patch-gui-api-c++-Makefile
deleted file mode 100644
index c08e636c1fa7..000000000000
--- a/net-p2p/hagelslag/files/patch-gui-api-c++-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- gui-api/c++/Makefile.orig	Thu Feb  1 16:28:34 2001
-+++ gui-api/c++/Makefile	Wed Feb 14 14:43:15 2001
-@@ -1,5 +1,4 @@
--CXX=g++
--CXXFLAGS=-Wall -O2 -g
-+CXXFLAGS+=-Wall -O2 -g
- 
- H_FILES = List.h DownloadList.h ResultList.h UploadList.h ConnectionList.h \
- 	ShareList.h HostList.h OptionList.h StatList.h QueryList.h \
-@@ -24,7 +23,7 @@
- 	rm -f *~ *.o *.a *.bak
- 
- depend:
--	makedepend $(CPP_FILES) -Y
-+	makedepend $(CPP_FILES)
- 
- count:
- 	@echo GUI-API c++
diff --git a/net-p2p/hagelslag/files/patch-gui-test-Makefile b/net-p2p/hagelslag/files/patch-gui-test-Makefile
deleted file mode 100644
index 9229aca6b7b5..000000000000
--- a/net-p2p/hagelslag/files/patch-gui-test-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- gui/test/Makefile.orig	Thu Feb  1 16:28:43 2001
-+++ gui/test/Makefile	Wed Feb 14 14:42:42 2001
-@@ -1,5 +1,4 @@
--CXX=g++
--CXXFLAGS=-Wall -O2 -g -I../../gui-api/c++
-+CXXFLAGS+=-Wall -O2 -g -I../../gui-api/c++
- LFLAGS= ../../lib/HagelslagInterface.a
- 
- H_FILES = TestGui.h UserTranslator.h ListTranslator.h
-@@ -14,7 +13,7 @@
- 	rm -f *~ core *.o testgui *.bak
- 
- depend:
--	makedepend $(CPP_FILES) -Y
-+	makedepend $(CPP_FILES) -I../../gui-api/c++/
- 
- testgui: TestGui.h TestGui.cpp $(O_FILES) ../../lib/HagelslagInterface.a
- 	$(CXX) $(CXXFLAGS) TestGui.cpp $(O_FILES) $(LFLAGS) -o testgui
diff --git a/net-p2p/hagelslag/files/patch-src-Makefile b/net-p2p/hagelslag/files/patch-src-Makefile
index 42d7c1830005..d5a6dc2b97f7 100644
--- a/net-p2p/hagelslag/files/patch-src-Makefile
+++ b/net-p2p/hagelslag/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	Thu Feb  1 16:27:37 2001
-+++ src/Makefile	Wed Feb 14 14:41:23 2001
+--- src/Makefile.orig	Sun Apr  8 19:58:59 2001
++++ src/Makefile	Mon May  7 12:18:41 2001
 @@ -1,5 +1,4 @@
  # Don't change this...
 -CXX=g++
@@ -15,12 +15,12 @@
  
  # Nothing below here should be changed
  
-@@ -70,7 +69,7 @@
- 	cp hagelslagd ../bin
+@@ -98,7 +97,7 @@
+ 	cp -f UserLib.a ../lib
  
  depend:
--	makedepend -Y -- $(CPP_FILES)
-+	makedepend -- $(CPP_FILES)
+-	makedepend -Y -- $(CPP_FILES) $(RC_CPP) $(USER_CPP)
++	makedepend -- $(CPP_FILES) $(RC_CPP) $(USER_CPP)
+ 	make -C RC depend
  
  clean:
- 	rm -f hagelslag hagelslagd hagelslagrouter *.o *~ core *.bak
diff --git a/net-p2p/hagelslag/pkg-plist b/net-p2p/hagelslag/pkg-plist
index ef328a3dae32..c3665d5fd171 100644
--- a/net-p2p/hagelslag/pkg-plist
+++ b/net-p2p/hagelslag/pkg-plist
@@ -1,7 +1,5 @@
 %%PORTDOCS%%share/doc/hagelslag/Hagelslag-design.txt
-%%PORTDOCS%%share/doc/hagelslag/HagelslagInternal.txt
 %%PORTDOCS%%share/doc/hagelslag/LICENSE
-%%PORTDOCS%%share/doc/hagelslag/ProgrammersManual.txt
 %%PORTDOCS%%share/doc/hagelslag/README
 %%PORTDOCS%%share/doc/hagelslag/TODO
 %%PORTDOCS%%share/doc/hagelslag/UsersManual.txt
@@ -10,5 +8,4 @@
 %%PORTDOCS%%share/doc/hagelslag/hagelslag-structure.fig
 %%PORTDOCS%%share/doc/hagelslag/hagelslag-structure.jpg
 bin/hagelslag
-bin/testgui
 %%PORTDOCS%%@dirrm share/doc/hagelslag