svn commit: r347068 - head/sysutils/fusefs-smbnetfs

[Tijl Coosemans]

Author: tijl
Date: Tue Mar  4 20:33:52 2014
New Revision: 347068
URL: http://svnweb.freebsd.org/changeset/ports/347068
QAT: https://qat.redports.org/buildarchive/r347068/

Log:
  - Add DOCS option.
  - Use option helpers.
  - Fix portlint warnings.
  - Add USES=iconv to fix build on FreeBSD 10.

Modified:
  head/sysutils/fusefs-smbnetfs/Makefile
  head/sysutils/fusefs-smbnetfs/pkg-plist

Modified: head/sysutils/fusefs-smbnetfs/Makefile
==============================================================================
--- head/sysutils/fusefs-smbnetfs/Makefile	Tue Mar  4 20:31:47 2014	(r347067)
+++ head/sysutils/fusefs-smbnetfs/Makefile	Tue Mar  4 20:33:52 2014	(r347068)
@@ -3,6 +3,7 @@
 
 PORTNAME=	smbnetfs
 PORTVERSION=	0.5.3a
+PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION}
 PKGNAMEPREFIX=	fusefs-
@@ -10,31 +11,25 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Mount smb shares (Fuse filesystem)
 
-OPTIONS_DEFINE=	GNOME_KEYRING
+LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+
+OPTIONS_DEFINE=	DOCS GNOME_KEYRING
 OPTIONS_DEFAULT=GNOME_KEYRING
-GNOME_KEYRING_DESC=	Build with gnome-keyring support
 
-LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+GNOME_KEYRING_DESC=		Build with gnome-keyring support
+GNOME_KEYRING_CONFIGURE_WITH=	gnome-keyring
+GNOME_KEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 
-DOCSDIR+=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 USE_BZIP2=	yes
-USES=		fuse pkgconfig
+USES=		fuse iconv pkgconfig
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 SUB_FILES=	pkg-message
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNOME_KEYRING}
-CONFIGURE_ARGS+=--with-gnome-keyring=yes
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
-.else
-CONFIGURE_ARGS+=--with-gnome-keyring=no
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|а|a|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 

Modified: head/sysutils/fusefs-smbnetfs/pkg-plist
==============================================================================
--- head/sysutils/fusefs-smbnetfs/pkg-plist	Tue Mar  4 20:31:47 2014	(r347067)
+++ head/sysutils/fusefs-smbnetfs/pkg-plist	Tue Mar  4 20:33:52 2014	(r347068)
@@ -1,6 +1,6 @@
 bin/smbnetfs
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/ENGLISH.FAQ
-%%DOCSDIR%%/RUSSIAN.FAQ
-%%DOCSDIR%%/smbnetfs.conf
- at dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/ENGLISH.FAQ
+%%PORTDOCS%%%%DOCSDIR%%/RUSSIAN.FAQ
+%%PORTDOCS%%%%DOCSDIR%%/smbnetfs.conf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%