From 78036308e41127f76659175e10a9da65e5556c0b Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 7 Jun 2018 09:34:26 +0000
Subject: - Add LICENSE - Switch to options helpers - Update WWW - Pet portlint

---
 x11/xmotd/Makefile  | 37 ++++++++++++++++---------------------
 x11/xmotd/pkg-descr |  2 +-
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index 8b15ad1db8f6..f17656d04473 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -8,7 +8,10 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.ee.ryerson.ca/~elf/pub/
 
 MAINTAINER=	ports@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
@@ -18,23 +21,15 @@ 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>
 
-.if ${PORT_OPTIONS:MHTML}
-MAKE_ARGS+=	-DHAVE_HTML
-BROKEN=		Does not compile when WITH_HTML is set
-.endif
+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:MMOTIF}
-MAKE_ARGS+=	-DMOTIF
-USES+=		motif
-.endif
+MOTIF_MAKE_ARGS=	-DMOTIF
+MOTIF_USES=		motif
 
-.if ${PORT_OPTIONS:MXPM}
-USE_XORG+=	xpm
-.endif
+XPM_USE=		XORG=xpm
 
 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
diff --git a/x11/xmotd/pkg-descr b/x11/xmotd/pkg-descr
index 7322e5cf5369..e163d1c50e09 100644
--- a/x11/xmotd/pkg-descr
+++ b/x11/xmotd/pkg-descr
@@ -3,4 +3,4 @@ can also be used to broadcast messages to users logged in across a
 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/
-- 
cgit v1.2.3