Index: head/databases/timescaledb/Makefile
===================================================================
--- head/databases/timescaledb/Makefile	(revision 492898)
+++ head/databases/timescaledb/Makefile	(revision 492899)
@@ -1,34 +1,37 @@
 # Created by: Kevin Bowling <kbowling@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	timescaledb
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	Time-series database built on PostgreSQL
 
 LICENSE=		APACHE20 TSL
 LICENSE_COMB=		multi
 LICENSE_NAME_TSL=	Timescale License Agreement
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_TSL=	${WRKSRC}/tsl/LICENSE-TIMESCALE
 LICENSE_PERMS_TSL=	dist-mirror pkg-mirror auto-accept
 
 USES=		compiler:c11 cmake pgsql:9.6,10,11 ssl
 
 USE_GITHUB=	YES
 GH_ACCOUNT=	timescale
 
-OPTIONS_DEFINE=		APACHEONLY
-OPTIONS_SUB=		yes
-
-APACHEONLY_CMAKE_BOOL=	APACHE_ONLY
-APACHEONLY_DESC=	Only build Apache licensed code
-
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 SUB_FILES=	pkg-message
+SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 WANT_PGSQL=	server
+
+OPTIONS_DEFINE=		TSL
+OPTIONS_DEFAULT=	TSL
+OPTIONS_SUB=		yes
+
+TSL_DESC=		Enables TSL licensed code in additon to Apache license code
+TSL_CMAKE_BOOL_OFF=	APACHE_ONLY
 
 .include <bsd.port.mk>
Index: head/databases/timescaledb/pkg-plist
===================================================================
--- head/databases/timescaledb/pkg-plist	(revision 492898)
+++ head/databases/timescaledb/pkg-plist	(revision 492899)
@@ -1,32 +1,32 @@
 lib/postgresql/timescaledb-%%PORTVERSION%%.so
-%%NO_APACHEONLY%%lib/postgresql/timescaledb-tsl-%%PORTVERSION%%.so
+%%TSL%%lib/postgresql/timescaledb-tsl-%%PORTVERSION%%.so
 lib/postgresql/timescaledb.so
 share/postgresql/extension/timescaledb--0.1.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.10.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.10.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.11.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.12.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.12.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.2.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.3.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.4.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.4.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.4.2--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.5.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.6.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.6.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.7.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.7.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.8.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.9.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.9.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--0.9.2--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--1.0.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--1.0.0-rc1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--1.0.0-rc2--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--1.0.0-rc3--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--1.0.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--1.1.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--1.1.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb.control