Index: head/devel/as31/Makefile
===================================================================
--- head/devel/as31/Makefile	(revision 445010)
+++ head/devel/as31/Makefile	(revision 445011)
@@ -1,40 +1,37 @@
 # Created by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
 # $FreeBSD$
 
 PORTNAME=	as31
 PORTVERSION=	2.0.b3
 PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.pjrc.com/tech/8051/tools/
 DISTNAME=	${PORTNAME}_beta3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free 8051 assembler
 
+LICENSE=	NONE
+
 # GNU make(1) allows parallel (-jX) builds to work: we plug a race in
 # "bison" rule (which outputs multiple files) via order prerequisites
 # (see files/patch-Makefile)
 USES=		bison gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_FILES=	bin/as31 %%X11%%bin/as31_gtk man/man1/as31.1.gz
 
 OPTIONS_DEFINE=	X11
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+X11_USE=		GNOME=gtk12
+X11_ALL_TARGET_OFF=	as31
 
-.if ${PORT_OPTIONS:MX11}
-USE_GNOME=	gtk12
-.else
-ALL_TARGET=	as31
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/as31 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/as31.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.if ${PORT_OPTIONS:MX11}
+
+do-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/as31_gtk ${STAGEDIR}${PREFIX}/bin
-.endif
 
 .include <bsd.port.mk>
Index: head/devel/as31/pkg-descr
===================================================================
--- head/devel/as31/pkg-descr	(revision 445010)
+++ head/devel/as31/pkg-descr	(revision 445011)
@@ -1,7 +1,7 @@
 AS31 is a free 8051 assembler originally written by Ken Stauffer.  Versions
 of AS31 found here include important bug fixes and added features, such as
 standard intel-hex output format for use with PAULMON2 and EPROM programmers.
 AS31 is a good tool for building small 8051-based projects that are written
 in 100% 8051 assembly language.
 
-WWW: http://www.pjrc.com/tech/8051/
+WWW: https://www.pjrc.com/tech/8051/