Index: Makefile
===================================================================
--- Makefile	(revision 310324)
+++ Makefile	(working copy)
@@ -24,17 +24,17 @@
 OPTIONS_DEFINE=		CHECK_FOR_ROOT EMAILS LSOF LOG_COMPRESS PARALLEL \
 			TMPFS
 
+OPTIONS_DEFAULT=	MYSQL APACHE CHECK_FOR_ROOT EMAILS LSOF \
+			LOG_COMPRESS PARALLEL
+
 CHECK_FOR_ROOT_DESC=	Check if ./tc is run by uid 0
 EMAILS_DESC=		Support for build failure/completion emails
 LSOF_DESC=		For killMountProcesses() when using nullfs
-LOG_COMPRESS_DESC=	Support bzip'ing the logs
+LOG_COMPRESS_DESC=	Support logfile compression
 PARALLEL_DESC=		Apply PARALLEL extra patch
 TMPFS_DESC=		Apply TMPFS extra patch
 HIAWATHA_DESC=		Hiawatha server
 
-OPTIONS_DEFAULT=	MYSQL APACHE CHECK_FOR_ROOT EMAILS LSOF \
-			LOG_COMPRESS PARALLEL
-
 NO_BUILD=	yes
 WANT_PERL=	yes
 SUB_FILES=	pkg-message
@@ -53,7 +53,7 @@
 
 .if defined(WEBUI)
 WANT_PHP_WEB=	yes
-USE_PHP=	session
+USE_PHP=	pdo session
 PLIST_SUB+=	WEBUI=""
 .else
 PLIST_SUB+=	WEBUI="@comment "
@@ -62,16 +62,14 @@
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 .if defined(WEBUI)
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
-USE_PHP+=	pgsql
+USE_PHP+=	pgsql pdo_pgsql
 .endif
 RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 .if defined(WEBUI)
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
-USE_PHP+=	mysql
+USE_PHP+=	mysql pdo_mysql
 .endif
 USE_MYSQL=	yes
 RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
@@ -79,8 +77,7 @@
 
 .if ${PORT_OPTIONS:MSQLITE}
 .if defined(WEBUI)
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/sqlite.php:${PORTSDIR}/databases/pear-MDB2_Driver_sqlite
-USE_PHP+=	sqlite
+USE_PHP+=	sqlite pdo_sqlite
 .endif
 RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 .endif
@@ -123,8 +120,6 @@
 	${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \
 		${WRKSRC}/tc
 .endif
-	${REINPLACE_CMD} -e 's/.set_rcvar./tinderd_enable/' \
-		${WRKSRC}/etc/rc.d/tinderd
 	@cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \;
 
 do-install: