[Midnightbsd-cvs] mports [18743] trunk/benchmarks/netio: fix netio compile

[laffer1 at midnightbsd.org]

Revision: 18743
          http://svnweb.midnightbsd.org/mports/?rev=18743
Author:   laffer1
Date:     2015-05-02 17:30:57 -0400 (Sat, 02 May 2015)
Log Message:
-----------
fix netio compile

Modified Paths:
--------------
    trunk/benchmarks/netio/Makefile
    trunk/benchmarks/netio/pkg-descr

Modified: trunk/benchmarks/netio/Makefile
===================================================================
--- trunk/benchmarks/netio/Makefile	2015-05-02 21:29:19 UTC (rev 18742)
+++ trunk/benchmarks/netio/Makefile	2015-05-02 21:30:57 UTC (rev 18743)
@@ -3,6 +3,7 @@
 
 PORTNAME=	netio
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	benchmarks net ipv6
 MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL}
 MASTER_SITE_SUBDIR=	arved
@@ -19,28 +20,30 @@
 RESTRICTED=	No commercial use
 
 WRKSRC=		${WRKDIR}
-USE_ZIP=	yes
-USE_GMAKE=	yes
+USES=		gmake zip
 PLIST_FILES=	bin/netio
 
-CFLAGS+=	-DUNIX ${PTHREAD_CFLAGS}
-MAKE_ENV+=	OUT="-o" LIBS=${PTHREAD_LIBS}
-.if defined(WITH_IPV6)
-PLIST_FILES+=	bin/netio6
-.endif
+CFLAGS+=	-DUNIX
+LIBS+=		-pthread
+MAKE_ENV+=	OUT=-o
 
+OPTIONS_DEFINE=	IPV6
+IPV6_PLIST_FILES=	bin/netio6
+
+.include <bsd.mport.options.mk>
+
 do-build:
-	cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${GMAKE} all
-.if defined(WITH_IPV6)
-	cd ${WRKSRC}; \
-	${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${GMAKE} all
+	@(cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${MAKE_CMD} all)
+.if ${PORT_OPTIONS:MIPV6}
+	@(cd ${WRKSRC} && \
+	${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${MAKE_CMD} all)
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/netio ${PREFIX}/bin
-.if defined(WITH_IPV6)
-	${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/netio ${STAGEDIR}${PREFIX}/bin
+.if ${PORT_OPTIONS:MIPV6}
+	${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${STAGEDIR}${PREFIX}/bin
 .endif
 
 .include <bsd.port.mk>

Modified: trunk/benchmarks/netio/pkg-descr
===================================================================
--- trunk/benchmarks/netio/pkg-descr	2015-05-02 21:29:19 UTC (rev 18742)
+++ trunk/benchmarks/netio/pkg-descr	2015-05-02 21:30:57 UTC (rev 18743)
@@ -7,5 +7,4 @@
 instance is used on another machine to perform the benchmark. When
 executed without arguments, the program will explain its usage.
 
-Author:	Kai Uwe Rommel
-WWW:	http://www.ars.de/ars/ars.nsf/docs/netio/
+WWW: http://www.ars.de/ars/ars.nsf/docs/netio/