Bug 182348

Summary: www/py-django requires DB backend, but it should not
Product: Ports & Packages Reporter: Dmitry Sivachenko <demon>
Component: Individual Port(s)Assignee: Li-Wen Hsu <lwhsu>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Dmitry Sivachenko freebsd_committer freebsd_triage 2013-09-24 15:20:00 UTC 
py-django port requires me to select at least one DB backend.  But it is not necessary to use any DB backend for 
many django projects.

Can you please make it optional?  (Now if I deselect all DB options, it tells me that config is invalid).
Comment 1 Dmitry Sivachenko freebsd_committer freebsd_triage 2013-09-24 15:23:07 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->lwhsu

Over to maintainer.
Comment 2 Li-Wen Hsu freebsd_committer freebsd_triage 2013-09-29 10:14:59 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-09-29 10:15:00 UTC 
Author: lwhsu
Date: Sun Sep 29 09:14:46 2013
New Revision: 328654
URL: http://svnweb.freebsd.org/changeset/ports/328654

Log:
  - Enable stage support
  - Turn DATABASE to OPTIONS_GROUP for people don't want DB backend support [1]
  
  PR:		ports/182348
  Submitted by:	demon

Modified:
  head/www/py-django-devel/Makefile
  head/www/py-django-devel/pkg-plist
  head/www/py-django/Makefile
  head/www/py-django/pkg-plist
  head/www/py-django14/Makefile
  head/www/py-django14/pkg-plist

Modified: head/www/py-django-devel/Makefile
==============================================================================
--- head/www/py-django-devel/Makefile	Sun Sep 29 09:00:04 2013	(r328653)
+++ head/www/py-django-devel/Makefile	Sun Sep 29 09:14:46 2013	(r328654)
@@ -22,7 +22,6 @@ USE_XZ=	yes
 USES=		gettext
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-
 PYDISTUTILS_PKGNAME=	Django
 PYDISTUTILS_PKGVERSION=	1.7
 
@@ -34,13 +33,10 @@ DOCSDIR=	${PREFIX}/share/doc/py-django
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}-devel/options
 OPTIONS_DEFINE=	FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=SQLITE
-OPTIONS_MULTI=	DATABASE
-OPTIONS_MULTI_DATABASE=	PGSQL MYSQL SQLITE
+OPTIONS_GROUP=	DATABASE
+OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 HTMLDOCS_DESC=	Install the HTML documentation (requires Sphinx)
 
-MAN1=		daily_cleanup.1 django-admin.1 gather_profile_stats.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPGSQL}
@@ -73,13 +69,13 @@ post-build:
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 .if ${PORT_OPTIONS:MHTMLDOCS}
-	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/www/py-django-devel/pkg-plist
==============================================================================
--- head/www/py-django-devel/pkg-plist	Sun Sep 29 09:00:04 2013	(r328653)
+++ head/www/py-django-devel/pkg-plist	Sun Sep 29 09:14:46 2013	(r328654)
@@ -1,4 +1,7 @@
 bin/django-admin.py
+man/man1/daily_cleanup.1.gz
+man/man1/django-admin.1.gz
+man/man1/gather_profile_stats.1.gz
 %%PYTHON_SITELIBDIR%%/django/__init__.py
 %%PYTHON_SITELIBDIR%%/django/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/__init__.pyo

Modified: head/www/py-django/Makefile
==============================================================================
--- head/www/py-django/Makefile	Sun Sep 29 09:00:04 2013	(r328653)
+++ head/www/py-django/Makefile	Sun Sep 29 09:14:46 2013	(r328654)
@@ -28,13 +28,10 @@ DOCSDIR=	${PREFIX}/share/doc/py-django
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=SQLITE
-OPTIONS_MULTI=	DATABASE
-OPTIONS_MULTI_DATABASE=	PGSQL MYSQL SQLITE
+OPTIONS_GROUP=	DATABASE
+OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 HTMLDOCS_DESC=	Install the HTML documentation (requires Sphinx)
 
-MAN1=		daily_cleanup.1 django-admin.1 gather_profile_stats.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPGSQL}
@@ -67,13 +64,13 @@ post-build:
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 .if ${PORT_OPTIONS:MHTMLDOCS}
-	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/www/py-django/pkg-plist
==============================================================================
--- head/www/py-django/pkg-plist	Sun Sep 29 09:00:04 2013	(r328653)
+++ head/www/py-django/pkg-plist	Sun Sep 29 09:14:46 2013	(r328654)
@@ -1,4 +1,7 @@
 bin/django-admin.py
+man/man1/daily_cleanup.1.gz
+man/man1/django-admin.1.gz
+man/man1/gather_profile_stats.1.gz
 %%PYTHON_SITELIBDIR%%/django/__init__.py
 %%PYTHON_SITELIBDIR%%/django/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/__init__.pyo

Modified: head/www/py-django14/Makefile
==============================================================================
--- head/www/py-django14/Makefile	Sun Sep 29 09:00:04 2013	(r328653)
+++ head/www/py-django14/Makefile	Sun Sep 29 09:14:46 2013	(r328654)
@@ -30,13 +30,10 @@ DOCSDIR=	${PREFIX}/share/doc/py-django
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=SQLITE
-OPTIONS_MULTI=	DATABASE
-OPTIONS_MULTI_DATABASE=	PGSQL MYSQL SQLITE
+OPTIONS_GROUP=	DATABASE
+OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 HTMLDOCS_DESC=	Install the HTML documentation (requires Sphinx)
 
-MAN1=		daily_cleanup.1 django-admin.1 gather_profile_stats.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPGSQL}
@@ -69,13 +66,13 @@ post-build:
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 .if ${PORT_OPTIONS:MHTMLDOCS}
-	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/www/py-django14/pkg-plist
==============================================================================
--- head/www/py-django14/pkg-plist	Sun Sep 29 09:00:04 2013	(r328653)
+++ head/www/py-django14/pkg-plist	Sun Sep 29 09:14:46 2013	(r328654)
@@ -1,4 +1,7 @@
 bin/django-admin.py
+man/man1/daily_cleanup.1.gz
+man/man1/django-admin.1.gz
+man/man1/gather_profile_stats.1.gz
 %%PYTHON_SITELIBDIR%%/django/__init__.py
 %%PYTHON_SITELIBDIR%%/django/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/__init__.pyo
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"