2 files changed, 27 insertions, 24 deletions

diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index 639dde9b4140..f347fc2b44d7 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -19,10 +19,15 @@ LIB_DEPENDS=	libtds.so:${PORTSDIR}/databases/freetds
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+OPTIONS_DEFINE=	DOCS THREADS EXAMPLES
+OPTIONS_DEFAULT=THREADS
+
 .if defined(TDS_VERSION)
 TDS_SUF="=${TDS_VERSION}"
 .else
 
+.include <bsd.port.options.mk>
+
 pre-build:
 	@V=`${PKG_INFO} | ${SED} -ne 's/^freetds-0.\(..\).*/\1/p'` ; \
 	if [ $$V -le 60 ]; then \
@@ -34,7 +39,7 @@ pre-build:
 
 MAKE_ENV+=	SYBASE=${LOCALBASE}
 
-.if !defined(WITHOUT_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 BUILDARGS=	-D WANT_THREADS -U WANT_BULKCOPY -D HAVE_FREETDS${TDS_SUF}
 .else
 BUILDARGS=	-U WANT_BULKCOPY -D HAVE_FREETDS${TDS_SUF}
@@ -46,10 +51,8 @@ do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} build)
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}
 	@${TAR} -cf - -C ${WRKSRC}/examples . | ${TAR} -xf - -C ${STAGEDIR}${EXAMPLESDIR}
 	@${TAR} -cf - -C ${WRKDIR}/${PORTNAME} . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-sybase/pkg-plist b/databases/py-sybase/pkg-plist
index 0420d4e8987c..0f360de53c25 100644
--- a/databases/py-sybase/pkg-plist
+++ b/databases/py-sybase/pkg-plist
@@ -50,26 +50,26 @@
 %%PORTDOCS%%%%DOCSDIR%%/icons/previous.png
 %%PORTDOCS%%%%DOCSDIR%%/icons/up.gif
 %%PORTDOCS%%%%DOCSDIR%%/icons/up.png
-%%PORTDOCS%%share/examples/sybase/README
-%%PORTDOCS%%share/examples/sybase/array_bind.py
-%%PORTDOCS%%share/examples/sybase/array_bind.sql
-%%PORTDOCS%%share/examples/sybase/bulkcopy.py
-%%PORTDOCS%%share/examples/sybase/bulkcopy.sql
-%%PORTDOCS%%share/examples/sybase/cursor_sel.py
-%%PORTDOCS%%share/examples/sybase/cursor_upd.py
-%%PORTDOCS%%share/examples/sybase/cursor_upd.sql
-%%PORTDOCS%%share/examples/sybase/diag_example.py
-%%PORTDOCS%%share/examples/sybase/dynamic_cur.py
-%%PORTDOCS%%share/examples/sybase/dynamic_ins.py
-%%PORTDOCS%%share/examples/sybase/dynamic_ins.sql
-%%PORTDOCS%%share/examples/sybase/example.py
-%%PORTDOCS%%share/examples/sybase/mult_text.py
-%%PORTDOCS%%share/examples/sybase/mult_text.sql
-%%PORTDOCS%%share/examples/sybase/params.py
-%%PORTDOCS%%share/examples/sybase/rpc.py
-%%PORTDOCS%%share/examples/sybase/rpc.sql
-%%PORTDOCS%%share/examples/sybase/timeout.py
-%%PORTDOCS%%share/examples/sybase/timeout.readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/array_bind.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/array_bind.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bulkcopy.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bulkcopy.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor_sel.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor_upd.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor_upd.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diag_example.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_cur.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_ins.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_ins.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mult_text.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mult_text.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/params.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpc.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpc.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timeout.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timeout.readme
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm share/examples/sybase
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%