[REPOCOPY] net/hawknl-devel: Portable networking library (devel)

	HawkNL is a free, open source, game oriented network API
	released under the GNU Library General Public License (LGPL).
	HawkNL (NL) is a fairly low level API, a wrapper over
	Berkeley/Unix Sockets and Winsock.

	But NL also provides other features including support for
	many OSs, groups of sockets, socket statistics, high accuracy
	timer, CRC functions, macros to read and write data to
	packets with endian conversion, and support for multiple
	network transports.

	NL has been tested on Windows 9x/ME/NT/2000/XP/CE, Linux,
	Solaris, IRIX, AIX, BSDs, Mac OSX.

	WWW:	http://www.hawksoft.com/hawknl/

PR:		ports/94984
Submitted by:	Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>

6 files changed, 55 insertions, 25 deletions

diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile
index dd286fceb1bb..a9e4283665db 100644
--- a/net/hawknl-devel/Makefile
+++ b/net/hawknl-devel/Makefile
@@ -6,15 +6,19 @@
 #
 
 PORTNAME=	hawknl
-PORTVERSION=	1.68
+PORTVERSION=	1.70
 CATEGORIES=	net devel
 MASTER_SITES=	http://www.hawksoft.com/download/files/
-DISTNAME=	HawkNL168src
+PKGNAMESUFFIX=	-devel
+DISTNAME=	HawkNL17b1src
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acardenas@bsd.org.pe
-COMMENT=	Portable networking library
+COMMENT=	Portable networking library (devel)
 
+CONFLICTS=	hawknl-[0-9]*
+
+USE_ZIP=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile.linux
@@ -25,29 +29,25 @@ CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
 MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
-WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
+WRKSRC=	${WRKDIR}/HawkNL1.70
 
 OPTIONS=	OPTIMIZATION	"Enable optimization"	off
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=	Doesn't build on < 5.x
-.endif
-
 .if defined(WITH_OPTIMIZATION)
 CFLAGS+=	-funroll-all-loops -ffast-math -fomit-frame-pointer -D_GNU_SOURCE -D_REENTRANT
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|make -f|${GMAKE} -f|g' ${WRKSRC}/${MAKEFILE}
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/nlinternal.h
+	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/nlinternal.h ${WRKSRC}/src/htinternal.h
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for FILE in readme.txt nlchanges.txt
-	${INSTALL_DATA} ${WRKSRC}/src/${FILE} ${DOCSDIR}
+.for FILE in readme.txt NLchanges.txt
+	@${INSTALL_DATA} ${WRKSRC}/src/${FILE} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/net/hawknl-devel/distinfo b/net/hawknl-devel/distinfo
index 25824c8b8379..37a987a4dd28 100644
--- a/net/hawknl-devel/distinfo
+++ b/net/hawknl-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (hawknl/HawkNL168src.tar.gz) = 2e4971d422b8c5cadfe2a85527ff2fcf
-SHA256 (hawknl/HawkNL168src.tar.gz) = 31a2883dbfe02937c9c862bb1aac0b89e465bbab822513c06bffa3f13e4c3c2e
-SIZE (hawknl/HawkNL168src.tar.gz) = 181263
+MD5 (hawknl/HawkNL17b1src.zip) = 7b19d653bee243a040c21af6a9932b92
+SHA256 (hawknl/HawkNL17b1src.zip) = 9583b08a523e38a1c6a70a99df150bbb42616f836c5ed7ec5bf0b32f1cad8ae3
+SIZE (hawknl/HawkNL17b1src.zip) = 228389
diff --git a/net/hawknl-devel/files/patch-src_htcondition.c b/net/hawknl-devel/files/patch-src_htcondition.c
new file mode 100644
index 000000000000..08aef0fa79d7
--- /dev/null
+++ b/net/hawknl-devel/files/patch-src_htcondition.c
@@ -0,0 +1,30 @@
+--- src/htcondition.c	Sun Mar  5 16:05:39 2006
++++ src/htcondition.c	Sun Mar  5 16:06:17 2006
+@@ -37,8 +37,6 @@
+ 
+ #else /* !HT_WIN_THREADS */
+ 
+-#include <sys/timeb.h>
+-
+ #ifdef HL_WINDOWS_APP
+ #define timeb _timeb
+ #define ftime _ftime
+@@ -156,13 +154,14 @@
+ #else
+         int                 result = 0;
+         struct timespec     tv;
+-        struct timeb        t;
++        struct timeval       t;
++        struct timezone     tz;
+         long                ms;
+ 
+         /* convert timeout to an absolute time */
+-        ftime(&t);
+-        ms = t.millitm + timeout;
+-        tv.tv_sec = t.time + (ms / 1000);
++	gettimeofday(&t, &tz);
++        ms = (t.tv_sec * 1000) + timeout;
++        tv.tv_sec = t.tv_sec + (ms / 1000);
+         tv.tv_nsec = (ms % 1000) * 1000000;
+ 
+         (void)pthread_mutex_lock((pthread_mutex_t *)&cv->mutex);
diff --git a/net/hawknl-devel/files/patch-src_makefile.linux b/net/hawknl-devel/files/patch-src_makefile.linux
index bd7a29c87acb..1b9dde86526b 100644
--- a/net/hawknl-devel/files/patch-src_makefile.linux
+++ b/net/hawknl-devel/files/patch-src_makefile.linux
@@ -1,13 +1,13 @@
---- src/makefile.linux	Sun Mar  5 03:46:18 2006
-+++ src/makefile.linux	Sun Mar  5 03:51:02 2006
+--- src/makefile.linux	Sun Mar  5 13:36:41 2006
++++ src/makefile.linux	Sun Mar  5 13:38:06 2006
 @@ -1,19 +1,18 @@
 -CC = gcc
 +CC? = ${CC}
  AR = ar cru
  RANLIB = ranlib
  MAJOR_VERSION = 1
- MINOR_VERSION = 6
- PATCH_LEVEL = 8
+ MINOR_VERSION = 7
+ PATCH_LEVEL = 0
  VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
 -LIBDIR = /usr/local/lib
 -INCDIR = /usr/local/include
@@ -22,10 +22,10 @@
 -LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
 +CFLAGS? = ${CFLAGS} -Wall -fPIC $(INCLUDE)
 +LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic ${LDFLAGS}
- OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o
+ OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o hthread.o htmutex.o htcondition.o nltime.o
  
  all: $(OBJECTS)
-@@ -37,20 +36,11 @@
+@@ -38,20 +37,11 @@
  	cp $(OUTPUT) $(LIBDIR)
  	cp $(STATIC) $(LIBDIR)
  	chmod 755 $(LIBDIR)/$(OUTPUT)
diff --git a/net/hawknl-devel/pkg-descr b/net/hawknl-devel/pkg-descr
index 52b63de24c03..09391b3c4001 100644
--- a/net/hawknl-devel/pkg-descr
+++ b/net/hawknl-devel/pkg-descr
@@ -1,9 +1,9 @@
 HawkNL is a free, open source, game oriented network API released under the GNU
-Library General Public License (LGPL). HawkNL (NL) is a fairly low level API, 
-a wrapper over Berkeley/Unix Sockets and Winsock. 
+Library General Public License (LGPL). HawkNL (NL) is a fairly low level API, a
+wrapper over Berkeley/Unix Sockets and Winsock. 
 
 But NL also provides other features including support for many OSs, groups of 
-sockets, socket statistics, high accuracy timer, CRC functions, macros to read
+sockets, socket statistics, high accuracy timer, CRC functions, macros to read 
 and write data to packets with endian conversion, and support for multiple 
 network transports. 
 
diff --git a/net/hawknl-devel/pkg-plist b/net/hawknl-devel/pkg-plist
index 3a19be533229..72a76e70ac4d 100644
--- a/net/hawknl-devel/pkg-plist
+++ b/net/hawknl-devel/pkg-plist
@@ -1,9 +1,9 @@
 include/nl.h
 lib/libNL.a
-lib/libNL.so.1.6.8
+lib/libNL.so.1.7.0
 lib/libNL.so.1
 lib/libNL.so
 lib/NL.so
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/nlchanges.txt
+%%PORTDOCS%%%%DOCSDIR%%/NLchanges.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%