5 files changed, 10 insertions, 40 deletions

diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index fab629249306..f4f5d0fb01c0 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
 
 MAINTAINER=	pav@FreeBSD.org
-COMMENT=	A universal digital camera picture control tool
+COMMENT=	Universal digital camera picture control tool
 
 LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
@@ -34,16 +34,7 @@ USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800064
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
-.elif ${OSVERSION} < 800069
-CONFIGURE_ENV+=	LIBUSB_LIBS="-L/usr/lib -lusb20" LIBUSB_CFLAGS="-I/usr/include/dev/usb -I/usr/include"
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-usb20
-.else
 CONFIGURE_ENV+=	LIBUSB_LIBS="-lusb" LIBUSB_CFLAGS="-I/usr/include"
-.endif
 
 post-patch:
 .for file in configure libgphoto2_port/configure
@@ -58,9 +49,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; s| "$$(DESTDIR)$$(udevscriptdir)"||' ${WRKSRC}/libgphoto2_port/usb/Makefile.in ${WRKSRC}/packaging/generic/Makefile.in
 	@${REINPLACE_CMD} -e 's|linux-hotplug ||' ${WRKSRC}/packaging/Makefile.in
 	@${REINPLACE_CMD} -e 's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' ${WRKSRC}/doc/Makefile.in
-.if ${OSVERSION} >= 800064
 	@${REINPLACE_CMD} -e '/Requires/d' ${WRKSRC}/libgphoto2_port/libgphoto2_port.pc.in
-.endif
 	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' ${WRKSRC}/libgphoto2_port/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index 20d6b7ee1fb3..5f50f43f05d0 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	lprof
-# Date created:		09 Jan 2008
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	lprof
 PORTVERSION=	20080514
@@ -31,12 +27,6 @@ CMAKE_ARGS=	-DQTTRANS_LRELEASE_EXECUTABLE="${LOCALBASE}/bin/lrelease-qt4"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/asm\/types.h/ d' ${WRKSRC}/src/argyll/spectro/hidio.c
 	@${REINPLACE_CMD} -e '/DESTINATION/ s|data/|share/${PORTNAME}/data/|' \
@@ -45,4 +35,4 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/icons/lprof.png ${PREFIX}/share/pixmaps
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/multican/Makefile b/graphics/multican/Makefile
index 50b36d6101c6..51ed89a42d7f 100644
--- a/graphics/multican/Makefile
+++ b/graphics/multican/Makefile
@@ -20,13 +20,7 @@ PLIST_FILES=	bin/multican lib/libmultican.so.0 lib/libmultican.so \
 
 PORTDOCS=	ChangeLog README TODO
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS=	usb:${PORTSDIR}/devel/libusb
-CFLAGS+=	-I${LOCALBASE}/include		# does not uphold CPPFLAGS
-LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|endian.h|sys/&|' ${WRKSRC}/canonio.c \
@@ -43,4 +37,4 @@ post-install:
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile
index 9644d24f5088..bf10dd16b15c 100644
--- a/graphics/sane-epkowa/Makefile
+++ b/graphics/sane-epkowa/Makefile
@@ -1,9 +1,7 @@
-# New ports collection makefile for:	epkowa
-# Date created:		Dec.23, 2008
-# Whom:			luigi@FreeBSD.org
-#
-# Maintainers:		Luigi Rizzo <luigi@FreeBSD.org>
+# Created by: luigi@FreeBSD.org
 # $FreeBSD$
+
+# Maintainers:		Luigi Rizzo <luigi@FreeBSD.org>
 #
 # This port builds version 2.11.0 of the sane-epkowa driver for SANE.
 # (more recent versions do not work - read details below).
@@ -61,7 +59,6 @@ MAN5=		sane-epkowa.5
 
 # We use LIB_DEPENDS, but the dependency is also at build time
 LIB_DEPENDS+=	ltdl:${PORTSDIR}/devel/libltdl
-LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
 LIB_DEPENDS+=	getline:${PORTSDIR}/devel/libgetline
 LIB_DEPENDS+=	sane.1:${PORTSDIR}/graphics/sane-backends
 
diff --git a/graphics/sane-epkowa/pkg-descr b/graphics/sane-epkowa/pkg-descr
index 93fb96d520a4..a13f89aac876 100644
--- a/graphics/sane-epkowa/pkg-descr
+++ b/graphics/sane-epkowa/pkg-descr
@@ -4,4 +4,4 @@ This backend supports many more devices than the sane-epson included
 in graphics/sane-backends, including new multifunction devices such
 as the SX400.
 
-http://avasys.jp/english/
+WWW: http://avasys.jp/english/