2 files changed, 18 insertions, 87 deletions

diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index 573b5e132863..292928604248 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -12,9 +12,11 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	TCL extension for accessing a PostgreSQL server (PGTCL-NG)
 
-LICENSE=	BSD
+LICENSE=	PGSQL
 
-USE_TCL=	yes
+OPTIONS_DEFINE=	DOCS
+
+USES=		tcl
 USE_PGSQL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR}
@@ -22,27 +24,33 @@ LIBDIR=		${PREFIX}/lib/${PORTNAME}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 MANUALREL=	20110918
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 EXTRACT_ONLY=	${_DISTFILES:M*tar.gz}
 DISTFILES+=	pgtcldocs-${MANUALREL}.zip:doc
 MASTER_SITES+=	SF/pgtclng/Manual/${MANUALREL}:doc
 .endif
 
-NO_STAGE=	yes
+PLIST_FILES=	lib/pgtcl/libpgtcl${PORTVERSION}.so \
+		lib/pgtcl/pkgIndex.tcl
+PLIST_DIRRM=	lib/pgtcl
+PORTDOCS=	*
+
 post-configure:
 	${REINPLACE_CMD} -e 's,tclstub,tcl,g' \
 	    -e 's,-DUSE_TCL_STUBS=1,-UUSE_TCL_STUBS,g' \
 		${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} ${LIBDIR}
+	@${MKDIR} ${STAGEDIR}${LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl	\
-		${WRKSRC}/libpgtcl${PORTVERSION}.so ${LIBDIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} -p ${DOCSDIR}
-	${TAR} -xf ${DISTDIR}/${_DISTFILES:M*.zip} -C ${DOCSDIR} \
+		${WRKSRC}/libpgtcl${PORTVERSION}.so ${STAGEDIR}${LIBDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${TAR} -xf ${DISTDIR}/${_DISTFILES:M*.zip} -C ${STAGEDIR}${DOCSDIR} \
 		--strip-components 1 --no-same-permission --no-same-owner
-	${CHMOD} ${SHAREMODE} ${DOCSDIR}/*
+	${CHMOD} ${SHAREMODE} ${STAGEDIR}${DOCSDIR}/*
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/pgtcl/pkg-plist b/databases/pgtcl/pkg-plist
deleted file mode 100644
index 86d713ef2e60..000000000000
--- a/databases/pgtcl/pkg-plist
+++ /dev/null
@@ -1,77 +0,0 @@
-lib/pgtcl/libpgtcl%%PORTVERSION%%.so
-lib/pgtcl/pkgIndex.tcl
-@dirrm lib/pgtcl
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/legalnotice.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-backend-pid.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-blocking.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-cancelrequest.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-conndefaults.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-connect.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-describe-cursor.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-describe-prepared.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-disconnect.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-encrypt-password.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-escape-bytea.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-escape-string.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-exec-params.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-exec-prepared.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-exec.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-execute.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-getresult.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-isbusy.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-listen.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-close.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-creat.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-export.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-import.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-lseek.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-open.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-read.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-tell.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-truncate.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-unlink.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-lo-write.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-notice-handler.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-on-connection-loss.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-parameter-status.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-quote.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-result-callback.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-result.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-select.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-sendquery-params.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-sendquery-prepared.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-sendquery.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-server-version.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-transaction-status.html
-%%PORTDOCS%%%%DOCSDIR%%/pg-unescape-bytea.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-async.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-asyncevent.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-cnq-execute.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-copy.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-dblist.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-picstore-esc.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-picstore-lo.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-picstore-pq.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-picview-esc.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-picview-lo.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-picview-pq.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-example-results.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-examples.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-load-static.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-loading-load.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-loading.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-make-bcc.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-make-macos.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-make-mingw.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-make.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-overview.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-preface.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-ref-async.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-ref-connstatus.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-ref-largeobj.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-ref-notif.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-ref-query.html
-%%PORTDOCS%%%%DOCSDIR%%/pgtcl-ref.html
-%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%