svn commit: r471905 - head/x11/xmotd

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Jun  7 09:34:26 2018
New Revision: 471905
URL: https://svnweb.freebsd.org/changeset/ports/471905

Log:
  - Add LICENSE
  - Switch to options helpers
  - Update WWW
  - Pet portlint

Modified:
  head/x11/xmotd/Makefile
  head/x11/xmotd/pkg-descr

Modified: head/x11/xmotd/Makefile
==============================================================================
--- head/x11/xmotd/Makefile	Thu Jun  7 09:04:26 2018	(r471904)
+++ head/x11/xmotd/Makefile	Thu Jun  7 09:34:26 2018	(r471905)
@@ -8,8 +8,11 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.ee.ryerson.ca/~elf/pub/
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	message-of-the-day browser for X11 and dumb-terminals
+COMMENT=	Message-of-the-day browser for X11 and dumb-terminals
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/GNU
+
 USES=		imake:noman
 USE_XORG=	ice sm x11 xaw xext xmu xt
 XFREE86_HTML_MAN=	no
@@ -18,24 +21,16 @@ PLIST_FILES=	bin/xmotd \
 		man/man8/xmotd.8.gz
 
 OPTIONS_DEFINE=	HTML MOTIF XPM
-HTML_DESC=	Use HTML widget instead of ASCII text
 
-.include <bsd.port.options.mk>
+HTML_DESC=		Use HTML widget instead of ASCII text
+HTML_MAKE_ARGS=		-DHAVE_HTML
+HTML_BROKEN=		Does not compile when WITH_HTML is set
 
-.if ${PORT_OPTIONS:MHTML}
-MAKE_ARGS+=	-DHAVE_HTML
-BROKEN=		Does not compile when WITH_HTML is set
-.endif
+MOTIF_MAKE_ARGS=	-DMOTIF
+MOTIF_USES=		motif
 
-.if ${PORT_OPTIONS:MMOTIF}
-MAKE_ARGS+=	-DMOTIF
-USES+=		motif
-.endif
+XPM_USE=		XORG=xpm
 
-.if ${PORT_OPTIONS:MXPM}
-USE_XORG+=	xpm
-.endif
-
 post-extract:
 	@${TOUCH} ${WRKSRC}/xmotd.man
 
@@ -44,15 +39,15 @@ post-patch:
 .for file in libhtmlw/HTML-PSformat.c main.c textmode.c xmotd.c
 	@${REINPLACE_CMD} -e 's:malloc.h:stdlib.h:' ${WRKSRC}/${file}
 .endfor
-.if ${PORT_OPTIONS:MHTML}
+
+post-patch-HTML-on:
 	@${REINPLACE_CMD} -e 's:XCOMM #define HAVE_HTML:#define HAVE_HTML:g' ${WRKSRC}/Imakefile
-.endif
-.if ${PORT_OPTIONS:MMOTIF}
+
+post-patch-MOTIF-on:
 	@${REINPLACE_CMD} -e 's:XCOMM #define MOTIF:#define MOTIF:g' ${WRKSRC}/Imakefile
-.endif
-.if ${PORT_OPTIONS:MXPM}
+
+post-patch-XPM-on:
 	@${REINPLACE_CMD} -e 's:XCOMM #define HAVE_XPM:#define HAVE_XPM:g' ${WRKSRC}/Imakefile
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${STAGEDIR}${LOCALBASE}/bin/xmotd

Modified: head/x11/xmotd/pkg-descr
==============================================================================
--- head/x11/xmotd/pkg-descr	Thu Jun  7 09:04:26 2018	(r471904)
+++ head/x11/xmotd/pkg-descr	Thu Jun  7 09:34:26 2018	(r471905)
@@ -3,4 +3,4 @@ can also be used to broadcast messages to users logged
 network.  xmotd periodically checks whether a file has been modified
 and pops up and displays the contents of the file, if it has.
 
-WWW: http://www.ee.ryerson.ca/~elf/xmotd/
+WWW: https://www.ee.ryerson.ca/~elf/xmotd/