svn commit: r326164 - in head/mail: gmime2 gmime24

[William Grzybowski]

Author: wg
Date: Tue Sep  3 16:03:41 2013
New Revision: 326164
URL: http://svnweb.freebsd.org/changeset/ports/326164

Log:
  mail/{gmime2,gmime24}: convert docs to options ng
  
  - NOPORTDOCS -> PORT_OPTIONS:MDOCS [1]
  - Convert to USES gmake
  - Define DOCS option
  
  PR:		ports/181778 [1]
  Submitted by:	Alan Hicks <ahicks p-o.co.uk> (maintainer)

Modified:
  head/mail/gmime2/Makefile
  head/mail/gmime24/Makefile

Modified: head/mail/gmime2/Makefile
==============================================================================
--- head/mail/gmime2/Makefile	Tue Sep  3 15:59:59 2013	(r326163)
+++ head/mail/gmime2/Makefile	Tue Sep  3 16:03:41 2013	(r326164)
@@ -16,9 +16,8 @@ CONFLICTS=	gmime-1.0.* gmime-2.4.*
 
 SLAVEDIRS=	mail/gmime2-sharp
 
-USE_GMAKE=	yes
 USE_GNOME?=	glib20
-USES=		pathfix pkgconfig iconv
+USES=		gmake pathfix pkgconfig iconv
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 # www.freebsd.org/cgi/query-pr.cgi?pr=118092
@@ -32,15 +31,19 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHR
 
 LATEST_LINK?=	${PORTNAME}2
 
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/gmime/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if  ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in docs/reference/html/*
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}

Modified: head/mail/gmime24/Makefile
==============================================================================
--- head/mail/gmime24/Makefile	Tue Sep  3 15:59:59 2013	(r326163)
+++ head/mail/gmime24/Makefile	Tue Sep  3 16:03:41 2013	(r326164)
@@ -18,9 +18,8 @@ CONFLICTS=	gmime-1.0.*
 SLAVEDIRS=	mail/gmime2-sharp
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}24
-USE_GMAKE=	yes
 USE_GNOME?=	glib20
-USES=		pathfix pkgconfig iconv
+USES=		gmake pathfix pkgconfig iconv
 USE_LDCONFIG=	yes
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
@@ -35,14 +34,18 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHR
 
 LATEST_LINK?=	${PORTNAME}24
 
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/*/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in docs/reference/html/*
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}