Make mysql optional and not default. form viewvc/INSTALL Optional: * MySQL 3.22 and MySQLdb 0.9.0 or later to create a commit database Fix: -RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python \ - ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb +OPTIONS= MYSQL "enable experimental MYSQL support" off \ + MODPYTHON3 "enable mod_python3 support" off + +#.include <bsd.port.pre.mk> + +RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python USE_PYTHON= yes .if defined (WITH_APACHE) USE_APACHE= 2.0+ .endif + +.if defined(WITH_MYSQL) +RUN_DEPENDS+= ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb +.endif + .if defined(WITH_MODPYTHON3) RUN_DEPENDS+= ${APACHEMODDIR}/mod_python.so:${PORTSDIR}/www/mod_python3 .endif--lliJu7YmUQ1gIAvnyYZRYXblZxQgiuxi6sKkLXzxM3UIW3Tq Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" --- Makefile.orig 2008-04-03 04:39:36.000000000 +0200 +++ Makefile 2008-04-04 09:41:51.000000000 +0200 @@ -13,13 +13,22 @@ MAINTAINER= pgollucci@p6m7g8.com COMMENT= Web-based Version Control Repository Browsing
olli hauer wrote: > --- Makefile.orig 2008-04-03 04:39:36.000000000 +0200 > +++ Makefile 2008-04-04 09:41:51.000000000 +0200 > @@ -13,13 +13,22 @@ > MAINTAINER= pgollucci@p6m7g8.com > COMMENT= Web-based Version Control Repository Browsing > > -RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python \ > - ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb > +OPTIONS= MYSQL "enable experimental MYSQL support" off \ > + MODPYTHON3 "enable mod_python3 support" off > + > +#.include <bsd.port.pre.mk> > + > +RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python > > USE_PYTHON= yes > .if defined (WITH_APACHE) > USE_APACHE= 2.0+ > .endif > + > +.if defined(WITH_MYSQL) > +RUN_DEPENDS+= ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb > +.endif > + > .if defined(WITH_MODPYTHON3) > RUN_DEPENDS+= ${APACHEMODDIR}/mod_python.so:${PORTSDIR}/www/mod_python3 > .endif 1) Needs a PORTVERSION bump, the default depends changed. 2) Also, the final include needs to change to bsd.port.post.mk from bsd.port.mk 3) Why not move APACHE into the OPTIONS ? 4) It might be good to use WITH_APACHE2 not WITH_APACHE in this case tough this one is my fault :) Patch looks good otherwise though. Please submit and updated PATCH. Thanks. -- ------------------------------------------------------------------------ Philip M. Gollucci (pgollucci@p6m7g8.com) c:703.336.9354 Consultant / http://p6m7g8.net/Resume/resume.txt http://riderway.com / http://ridecharge.com 1024D/EC88A0BF 0DE5 C55C 6BF3 B235 2DAB B89E 1324 9B4F EC88 A0BF Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching.
Hi Philip, > 1) Needs a PORTVERSION bump, the default depends changed. > 2) Also, the final include needs to change to bsd.port.post.mk > from bsd.port.mk > 3) Why not move APACHE into the OPTIONS ? > 4) It might be good to use WITH_APACHE2 not WITH_APACHE in this case > tough this one is my fault :) > > Patch looks good otherwise though. > > Please submit and updated PATCH. > I overlooked to change <bsd.port.mk> to <bsd.port.post.mk> (made the same time a patch for cvs2svn). I have not tested viewvc with lighttp but the lighttp site runs trac which depends on python so it can be an option. Regards, olli Here comes the new patch :-) --- Makefile.orig 2008-04-03 04:39:36.000000000 +0200 +++ Makefile 2008-04-05 21:56:48.449919000 +0200 @@ -7,19 +7,36 @@ PORTNAME= viewvc PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/41694/ MAINTAINER= pgollucci@p6m7g8.com COMMENT= Web-based Version Control Repository Browsing -RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python \ - ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb +OPTIONS= APACHE2 "use Apache as webserver" on \ + LIGHTTPD "use lighttp as webserver" off \ + MYSQL "enable experimental MYSQL support" off \ + MYSQL "enable experimental MYSQL support" off \ + MODPYTHON3 "enable mod_python3 support" off + +.include <bsd.port.pre.mk> + +RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python USE_PYTHON= yes -.if defined (WITH_APACHE) +.if defined (WITH_APACHE2) USE_APACHE= 2.0+ .endif + +.if defined (WITH_LIGHTTPD) +RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd +.endif + +.if defined(WITH_MYSQL) +RUN_DEPENDS+= ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb +.endif + .if defined(WITH_MODPYTHON3) RUN_DEPENDS+= ${APACHEMODDIR}/mod_python.so:${PORTSDIR}/www/mod_python3 .endif @@ -37,4 +54,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk>
sorry reply was to gnats not bug-followup so i sent again. Hi Philip, > 1) Needs a PORTVERSION bump, the default depends changed. > 2) Also, the final include needs to change to bsd.port.post.mk > from bsd.port.mk > 3) Why not move APACHE into the OPTIONS ? > 4) It might be good to use WITH_APACHE2 not WITH_APACHE in this case > tough this one is my fault :) > > Patch looks good otherwise though. > > Please submit and updated PATCH. > I overlooked to change <bsd.port.mk> to <bsd.port.post.mk> (made the same time a patch for cvs2svn). I have not tested viewvc with lighttp but the lighttp site runs trac which depends on python so it can be an option. Regards, olli Here comes the new patch :-) --- Makefile.orig 2008-04-03 04:39:36.000000000 +0200 +++ Makefile 2008-04-05 21:56:48.449919000 +0200 @@ -7,19 +7,36 @@ PORTNAME= viewvc PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/41694/ MAINTAINER= pgollucci@p6m7g8.com COMMENT= Web-based Version Control Repository Browsing -RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python \ - ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb +OPTIONS= APACHE2 "use Apache as webserver" on \ + LIGHTTPD "use lighttp as webserver" off \ + MYSQL "enable experimental MYSQL support" off \ + MYSQL "enable experimental MYSQL support" off \ + MODPYTHON3 "enable mod_python3 support" off + +.include <bsd.port.pre.mk> + +RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python USE_PYTHON= yes -.if defined (WITH_APACHE) +.if defined (WITH_APACHE2) USE_APACHE= 2.0+ .endif + +.if defined (WITH_LIGHTTPD) +RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd +.endif + +.if defined(WITH_MYSQL) +RUN_DEPENDS+= ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb +.endif + .if defined(WITH_MODPYTHON3) RUN_DEPENDS+= ${APACHEMODDIR}/mod_python.so:${PORTSDIR}/www/mod_python3 .endif @@ -37,4 +54,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk>
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Olli Hauer wrote: > ${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb > +OPTIONS= APACHE2 "use Apache as webserver" on \ > + LIGHTTPD "use lighttp as webserver" off \ > + MYSQL "enable experimental MYSQL support" off \ > + MYSQL "enable experimental MYSQL support" off \ > + MODPYTHON3 "enable mod_python3 support" off Too many mysql's :) > +.if defined (WITH_APACHE2) > USE_APACHE= 2.0+ > .endif > + > +.if defined (WITH_LIGHTTPD) > +RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd > +.endif There should probably be some logic to prevent you from defining both at the same-time if you want add LIGHTTPD support. -- ------------------------------------------------------------------------ Philip M. Gollucci (pgollucci@p6m7g8.com) c:703.336.9354 Consultant / http://p6m7g8.net/Resume/resume.txt http://riderway.com / http://ridecharge.com 1024D/EC88A0BF 0DE5 C55C 6BF3 B235 2DAB B89E 1324 9B4F EC88 A0BF Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching.
Hi, I forgot about the open PR until I have to install ViewVC at another machine. Now the port is nearly rewritten, with OPTIONS also a new rc script for the standalone server was written. With the rc script there is absolute no need to install a Webserver like Apache/LigHTTP. Also it makes now no sense to track a depency/conflict to one of the Webservers, since the pkg-plist will not change, but I keep this in the Makefile (before another flameware starts) The pkg-message contains now a short explain/howto setup ViewVC standalone and with Apache/LigHTTP. I delete the passage to copy the cgi into the /cgi-bin directoy since in most cases it provides more trouble for users during updates. Since the patch is now a little bit bigger it is attached. If the patch is garbled you can download the file here: http://sorry.mine.nu/patches/FreeBSD/ports/viewvc/patch-viewvc_2008-08-03 Regards, olli -- Ist Ihr Browser Vista-kompatibel? Jetzt die neuesten Browser-Versionen downloaden: http://www.gmx.net/de/go/browser
Responsible Changed From-To: freebsd-ports-bugs->pgollucci Over to maintainer.
State Changed From-To: feedback->open Feedback received.
pgollucci 2008-08-19 21:59:24 UTC FreeBSD ports repository Modified files: devel/viewvc Makefile devel/viewvc/files pkg-message.in Added files: devel/viewvc/files viewvc.in Log: - Add OPTIONS o LIGHTTPD - Add rc.d script for standalone server - Much better pkg-message content - Bump PORTREVISION PR: ports/122469 Submitted by: olli hauer <ohauer@gmx.de> Reworked by: pgollucci Approved by: gabor (mentor) Revision Changes Path 1.31 +51 -10 ports/devel/viewvc/Makefile 1.4 +51 -5 ports/devel/viewvc/files/pkg-message.in 1.1 +51 -0 ports/devel/viewvc/files/viewvc.in (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with changes. Thanks!