svn commit: r396138 - head/mail/fetchmail

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Sep  4 21:33:19 2015
New Revision: 396138
URL: https://svnweb.freebsd.org/changeset/ports/396138

Log:
  - Switch to options helpers
  - Switch to @sample
  
  Approved by:	portmgr blanket

Modified:
  head/mail/fetchmail/Makefile
  head/mail/fetchmail/pkg-plist

Modified: head/mail/fetchmail/Makefile
==============================================================================
--- head/mail/fetchmail/Makefile	Fri Sep  4 21:33:16 2015	(r396137)
+++ head/mail/fetchmail/Makefile	Fri Sep  4 21:33:19 2015	(r396138)
@@ -97,19 +97,18 @@ post-patch:
 .endif
 
 post-build:
-	@${MAKE} -C ${WRKSRC} check
+	@${MAKE_CMD} -C ${WRKSRC} check
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \
+		${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
-.if empty(PORT_OPTIONS:MX11)
+post-install-X11-off:
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec
-.endif
-	${INSTALL} ${FILESDIR}/fetchmailrc.sample \
-		${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
 
 .include <bsd.port.mk>

Modified: head/mail/fetchmail/pkg-plist
==============================================================================
--- head/mail/fetchmail/pkg-plist	Fri Sep  4 21:33:16 2015	(r396137)
+++ head/mail/fetchmail/pkg-plist	Fri Sep  4 21:33:19 2015	(r396138)
@@ -30,6 +30,4 @@ man/man1/fetchmailconf.1.gz
 %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.py
 %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc
 %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo
- at unexec if cmp -s %D/etc/fetchmailrc.sample %D/etc/fetchmailrc; then rm -f %D/etc/fetchmailrc; fi
-etc/fetchmailrc.sample
- at exec if [ ! -f %D/etc/fetchmailrc ] ; then cp -p %D/%F %B/fetchmailrc; fi
+ at sample etc/fetchmailrc.sample