In preparation of removing devel/libusb (expires 2013-04-30), remove it

from these ports.

Other changes:
- convert Makefile header
- convert to optionsNG
- remove indefinite article from comment
- drop support for FreeBSD < 8.0
- pet portlint (leave library ABI versions in LIB_DEPENDS)
- net-mgmt/spectools: change option name from GTK to GTK2 to use default
  description from bsd.options.desc.mk

Approved by:	portmgr (bapt)

6 files changed, 18 insertions, 55 deletions

diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index 6658081a8f6d..b1a611527440 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  asusoled
-# Date created:                   2008-09-11
-# Whom:                           Jung-uk Kim <jkim@FreeBSD.org>
-#
+# Created by: Jung-uk Kim <jkim@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	asusoled
 PORTVERSION=	0.10
@@ -29,11 +25,7 @@ MAKE_ARGS+=	TTF_FONT=${FONTDIR}/TTF/luxisr.ttf
 
 FONTDIR?=	${LOCALBASE}/lib/X11/fonts
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
 .if !defined(NOPORTDATA)
@@ -42,7 +34,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/data/${i} ${DATADIR}
 .endfor
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${CAT} ${PKGMESSAGE} > ${WRKSRC}/README.FreeBSD
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
@@ -53,4 +45,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index a2627973b702..89ad90b58f9d 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
 MAINTAINER=	bsdfan@nurfuerspam.de
-COMMENT=	A client/server suite for LCD devices
+COMMENT=	Client/server suite for LCD devices
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -77,12 +77,7 @@ LCDPROC_DRIVERS=bayrad \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUSB}
-. if ${OSVERSION} < 800069
-LIB_DEPENDS+=		usb-0.1:${PORTSDIR}/devel/libusb
-CONFIGURE_ARGS+=	--with-libusb
-. else
 CONFIGURE_ARGS+=	--with-libusb=/usr
-. endif
 PLIST_SUB+=		USB=""
 LCDPROC_DRIVERS+=IOWarrior \
 		picolcd \
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index a27437f344be..c95c4679ed07 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    nut
-# Date created:         08 Jan 2000
-# Whom:                 Boris Popov <bp@freebsd.org>
-#
+# Created by: Boris Popov <bp@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	nut
 PORTVERSION=	2.6.5
@@ -61,7 +57,7 @@ MAN8=		nut-recorder.8 nut-scanner.8 nutupsdrv.8 upsc.8 \
 
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--program-transform-name="" \
@@ -110,11 +106,7 @@ PLIST_SUB+=	NUT_SERIAL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUSB}
-. if ${OSVERSION} < 800069
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
-. else
 #EXTRA_PATCHES=	${FILESDIR}/extra-patch-m4_nut_check_libusb.m4
-. endif
 CONFIGURE_ARGS+=	--with-usb=auto
 MAN8+=		bcmxcp_usb.8 richcomm_usb.8 tripplite_usb.8 usbhid-ups.8
 PLIST_SUB+=	NUT_USB=""
@@ -185,7 +177,7 @@ pre-install:
 	@${CHOWN} ${NUT_USER}:${NUT_GROUP} ${STATEDIR}
 	@${CHMOD} 0750 ${STATEDIR}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 .if ${PORT_OPTIONS:MBASH}
 	@${MKDIR} ${PREFIX}/etc/bash_completion.d/
@@ -200,4 +192,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/scanbuttond/Makefile b/sysutils/scanbuttond/Makefile
index 5bb62ed388f6..504da924f0a9 100644
--- a/sysutils/scanbuttond/Makefile
+++ b/sysutils/scanbuttond/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	scanbuttond
-# Date created:		31 March 2006
-# Whom:			Daniel Thiele
-#
+# Created by: Daniel Thiele
 # $FreeBSD$
-#
 
 PORTNAME=	scanbuttond
 PORTVERSION=	0.2.3
@@ -12,7 +8,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
 MAINTAINER=	dthiele@gmx.net
-COMMENT=	A daemon to monitor and configure modern scanner's buttons
+COMMENT=	Daemon to monitor and configure modern scanner's buttons
 
 LICENSE=	GPLv2
 
@@ -24,12 +20,6 @@ MAKE_JOBS_SAFE=	yes
 
 SUB_FILES+=	pkg-message
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
-
 pre-configure:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
 		${REINPLACE_CMD} -e 's|-ldl||g'
@@ -52,4 +42,4 @@ post-install:
 	done
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/scanbuttond/pkg-descr b/sysutils/scanbuttond/pkg-descr
index e699ae71061b..2130dbb8f6b0 100644
--- a/sysutils/scanbuttond/pkg-descr
+++ b/sysutils/scanbuttond/pkg-descr
@@ -8,4 +8,4 @@ the button number as an argument.
 The supported scanner backends currently are: epson, niash, plustek, snapscan
 
 Author:	Bernhard Stiftner <root84@users.sourceforge.net>
-WWW:	http://scanbuttond.sourceforge.net/
+WWW: http://scanbuttond.sourceforge.net/
diff --git a/sysutils/usbutils/Makefile b/sysutils/usbutils/Makefile
index c45549998585..b78a21a4b100 100644
--- a/sysutils/usbutils/Makefile
+++ b/sysutils/usbutils/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	usbutils
-# Date created:		14 Nov 2007
-# Whom:			Henrik Brix Andersen <brix@FreeBSD.org>
-#
+# Created by: Henrik Brix Andersen <brix@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	usbutils
@@ -14,6 +11,7 @@ MAINTAINER=	brix@FreeBSD.org
 COMMENT=	Utility for listing USB devices
 
 LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -25,14 +23,10 @@ MAN1=		usb-devices.1
 MAN8=		lsusb.8
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
-.else
 CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I/usr/include" \
 		LIBUSB_LIBS="-L/usr/lib -lusb"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -i '' \
@@ -40,9 +34,9 @@ post-patch:
 		${WRKSRC}/usb-devices
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>