o Update to 0.3.2: older distfile no longer fetchable

o Update informational files pkg-{comment,descr} with new data added
  after this project moved to MASTER_SITE_SOURCEFORGE

Approved by:	portmgr (self & no objections)

8 files changed, 44 insertions, 38 deletions

diff --git a/misc/edonkey-tool-hash/Makefile b/misc/edonkey-tool-hash/Makefile
index 50271e166808..696cce6079ed 100644
--- a/misc/edonkey-tool-hash/Makefile
+++ b/misc/edonkey-tool-hash/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.0.2
+PORTVERSION=	0.3.2
 CATEGORIES=	misc
-MASTER_SITES=	http://users.aber.ac.uk/tpm01/ed2k_tools/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	ed2k-tools
 PKGNAMESUFFIX=	-tool-hash
-DISTNAME=	ed2k_hash-${PORTVERSION:S/^0.//}
+DISTNAME=	ed2k_hash-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
-WRKSRC=	${WRKDIR}/ed2k_hash
-
-# I could have written a Makefile but I would rather
-# not waste inodes
-do-build:
-	cd ${WRKSRC} && ${CC} -D__linux ${CFLAGS} ${LDFLAGS} -lmd \
-		-I${LOCALBASE}/include -L${LOCALBASE}/lib -lgnugetopt \
-		ed2k_hash.c -o ${PORTNAME}${PKGNAMESUFFIX}
+post-patch:
+# respect CFLAGS
+	@${REINPLACE_CMD} -E -e \
+		's|-O2||' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} \
-		${PREFIX}/bin
+# uphold POLA, do not change binary name
+	@${INSTALL_PROGRAM} ${WRKSRC}/ed2k_hash/ed2k_hash \
+		${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.mk>
diff --git a/misc/edonkey-tool-hash/distinfo b/misc/edonkey-tool-hash/distinfo
index 734dcd1acf24..bf3094412e66 100644
--- a/misc/edonkey-tool-hash/distinfo
+++ b/misc/edonkey-tool-hash/distinfo
@@ -1 +1 @@
-MD5 (ed2k_hash-0.2.tar.gz) = fda4cf150c6a40dfdb98776abb08bc8b
+MD5 (ed2k_hash-0.3.2.tar.gz) = d350608ce000d0f0e34fd91c572ee9bf
diff --git a/misc/edonkey-tool-hash/pkg-comment b/misc/edonkey-tool-hash/pkg-comment
index 8ba672f57cb8..07dd6ba9327f 100644
--- a/misc/edonkey-tool-hash/pkg-comment
+++ b/misc/edonkey-tool-hash/pkg-comment
@@ -1 +1 @@
-Both calculates 'eDonkey hashes' and produces ed2k:// links for files
+Both calculates 'eDonkey/Overnet hashes' producing ed2k:// file links
diff --git a/misc/edonkey-tool-hash/pkg-descr b/misc/edonkey-tool-hash/pkg-descr
index a84aa5eacc41..24f71696cf93 100644
--- a/misc/edonkey-tool-hash/pkg-descr
+++ b/misc/edonkey-tool-hash/pkg-descr
@@ -1,6 +1,8 @@
-This tool takes a file and calculates the final 'eDonkey hash' for
-it that you need if you want to create ed2k:// links to that file.
+This tool takes a file and calculates the final 'eDonkey/Overnet
+hash' for it that you need if you want to create ed2k:// links to
+that file.
+
 It also spits out the complete ed2k:// link in the end and appends
 it to the file 'ed2k_links.txt' for easier copy-and-paste later on.
 
-WWW: http://users.aber.ac.uk/tpm01/ed2k_tools/
+WWW: http://ed2k-tools.sourceforge.net/
diff --git a/net-p2p/edonkey-tool-hash/Makefile b/net-p2p/edonkey-tool-hash/Makefile
index 50271e166808..696cce6079ed 100644
--- a/net-p2p/edonkey-tool-hash/Makefile
+++ b/net-p2p/edonkey-tool-hash/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.0.2
+PORTVERSION=	0.3.2
 CATEGORIES=	misc
-MASTER_SITES=	http://users.aber.ac.uk/tpm01/ed2k_tools/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	ed2k-tools
 PKGNAMESUFFIX=	-tool-hash
-DISTNAME=	ed2k_hash-${PORTVERSION:S/^0.//}
+DISTNAME=	ed2k_hash-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
-WRKSRC=	${WRKDIR}/ed2k_hash
-
-# I could have written a Makefile but I would rather
-# not waste inodes
-do-build:
-	cd ${WRKSRC} && ${CC} -D__linux ${CFLAGS} ${LDFLAGS} -lmd \
-		-I${LOCALBASE}/include -L${LOCALBASE}/lib -lgnugetopt \
-		ed2k_hash.c -o ${PORTNAME}${PKGNAMESUFFIX}
+post-patch:
+# respect CFLAGS
+	@${REINPLACE_CMD} -E -e \
+		's|-O2||' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} \
-		${PREFIX}/bin
+# uphold POLA, do not change binary name
+	@${INSTALL_PROGRAM} ${WRKSRC}/ed2k_hash/ed2k_hash \
+		${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/edonkey-tool-hash/distinfo b/net-p2p/edonkey-tool-hash/distinfo
index 734dcd1acf24..bf3094412e66 100644
--- a/net-p2p/edonkey-tool-hash/distinfo
+++ b/net-p2p/edonkey-tool-hash/distinfo
@@ -1 +1 @@
-MD5 (ed2k_hash-0.2.tar.gz) = fda4cf150c6a40dfdb98776abb08bc8b
+MD5 (ed2k_hash-0.3.2.tar.gz) = d350608ce000d0f0e34fd91c572ee9bf
diff --git a/net-p2p/edonkey-tool-hash/pkg-comment b/net-p2p/edonkey-tool-hash/pkg-comment
index 8ba672f57cb8..07dd6ba9327f 100644
--- a/net-p2p/edonkey-tool-hash/pkg-comment
+++ b/net-p2p/edonkey-tool-hash/pkg-comment
@@ -1 +1 @@
-Both calculates 'eDonkey hashes' and produces ed2k:// links for files
+Both calculates 'eDonkey/Overnet hashes' producing ed2k:// file links
diff --git a/net-p2p/edonkey-tool-hash/pkg-descr b/net-p2p/edonkey-tool-hash/pkg-descr
index a84aa5eacc41..24f71696cf93 100644
--- a/net-p2p/edonkey-tool-hash/pkg-descr
+++ b/net-p2p/edonkey-tool-hash/pkg-descr
@@ -1,6 +1,8 @@
-This tool takes a file and calculates the final 'eDonkey hash' for
-it that you need if you want to create ed2k:// links to that file.
+This tool takes a file and calculates the final 'eDonkey/Overnet
+hash' for it that you need if you want to create ed2k:// links to
+that file.
+
 It also spits out the complete ed2k:// link in the end and appends
 it to the file 'ed2k_links.txt' for easier copy-and-paste later on.
 
-WWW: http://users.aber.ac.uk/tpm01/ed2k_tools/
+WWW: http://ed2k-tools.sourceforge.net/