Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Dec 2017 16:03:54 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r456173 - in head/www: py-django-devel py-django110 py-django111 py-django18 py-django20
Message-ID:  <201712121603.vBCG3sWx040906@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue Dec 12 16:03:54 2017
New Revision: 456173
URL: https://svnweb.freebsd.org/changeset/ports/456173

Log:
  Fixup building docs with sphinx, and cleanup.
  
  Sponsored by:	Absolight

Modified:
  head/www/py-django-devel/Makefile   (contents, props changed)
  head/www/py-django110/Makefile   (contents, props changed)
  head/www/py-django111/Makefile   (contents, props changed)
  head/www/py-django18/Makefile   (contents, props changed)
  head/www/py-django20/Makefile   (contents, props changed)

Modified: head/www/py-django-devel/Makefile
==============================================================================
--- head/www/py-django-devel/Makefile	Tue Dec 12 15:55:08 2017	(r456172)
+++ head/www/py-django-devel/Makefile	Tue Dec 12 16:03:54 2017	(r456173)
@@ -31,6 +31,7 @@ CONFLICTS=	py2[0-9]-django-[0-9]*
 CPE_VENDOR=	djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=SQLITE
@@ -41,20 +42,14 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sp
 PLIST_FILES=	man/man1/django-admin.1.gz
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+HTMLDOCS_IMPLIES=	DOCS
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MHTMLDOCS} && empty(PORT_OPTIONS:MDOCS)
-IGNORE=	you cannot build documentation with DOCS option disabled
-PORTDOCS=	*
-.endif
-
 post-build-HTMLDOCS-on:
-	cd ${WRKSRC}/docs && ${MAKE} html
+	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1

Modified: head/www/py-django110/Makefile
==============================================================================
--- head/www/py-django110/Makefile	Tue Dec 12 15:55:08 2017	(r456172)
+++ head/www/py-django110/Makefile	Tue Dec 12 16:03:54 2017	(r456173)
@@ -29,6 +29,7 @@ CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
+PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
@@ -41,20 +42,14 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sp
 PLIST_FILES=	man/man1/django-admin.1.gz
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+HTMLDOCS_IMPLIES=	DOCS
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MHTMLDOCS} && empty(PORT_OPTIONS:MDOCS)
-IGNORE=	you cannot build documentation with DOCS option disabled
-PORTDOCS=	*
-.endif
-
 post-build-HTMLDOCS-on:
-	cd ${WRKSRC}/docs && ${MAKE} html
+	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1

Modified: head/www/py-django111/Makefile
==============================================================================
--- head/www/py-django111/Makefile	Tue Dec 12 15:55:08 2017	(r456172)
+++ head/www/py-django111/Makefile	Tue Dec 12 16:03:54 2017	(r456173)
@@ -31,6 +31,7 @@ CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
+PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
@@ -43,20 +44,14 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sp
 PLIST_FILES=	man/man1/django-admin.1.gz
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+HTMLDOCS_IMPLIES=	DOCS
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MHTMLDOCS} && empty(PORT_OPTIONS:MDOCS)
-IGNORE=	you cannot build documentation with DOCS option disabled
-PORTDOCS=	*
-.endif
-
 post-build-HTMLDOCS-on:
-	cd ${WRKSRC}/docs && ${MAKE} html
+	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1

Modified: head/www/py-django18/Makefile
==============================================================================
--- head/www/py-django18/Makefile	Tue Dec 12 15:55:08 2017	(r456172)
+++ head/www/py-django18/Makefile	Tue Dec 12 16:03:54 2017	(r456173)
@@ -32,6 +32,7 @@ CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
+PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
@@ -44,20 +45,14 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sp
 PLIST_FILES=	man/man1/django-admin.1.gz
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+HTMLDOCS_IMPLIES=	DOCS
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MHTMLDOCS} && empty(PORT_OPTIONS:MDOCS)
-IGNORE=	you cannot build documentation with DOCS option disabled
-PORTDOCS=	*
-.endif
-
 post-build-HTMLDOCS-on:
-	cd ${WRKSRC}/docs && ${MAKE} html
+	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1

Modified: head/www/py-django20/Makefile
==============================================================================
--- head/www/py-django20/Makefile	Tue Dec 12 15:55:08 2017	(r456172)
+++ head/www/py-django20/Makefile	Tue Dec 12 16:03:54 2017	(r456173)
@@ -30,6 +30,7 @@ CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-devel
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=		${PREFIX}/share/doc/py-django
+PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
@@ -42,20 +43,14 @@ HTMLDOCS_DESC=		Install HTML documentation (requires S
 PLIST_FILES=		man/man1/django-admin.1.gz
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+HTMLDOCS_IMPLIES=	DOCS
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
 FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MHTMLDOCS} && empty(PORT_OPTIONS:MDOCS)
-IGNORE=	you cannot build documentation with DOCS option disabled
-PORTDOCS=	*
-.endif
-
 post-build-HTMLDOCS-on:
-	cd ${WRKSRC}/docs && ${MAKE} html
+	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712121603.vBCG3sWx040906>