Date: Sat, 5 Apr 2008 21:00:10 GMT From: Olli Hauer <ohauer@gmx.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/122469: [patch] options for viewvc] Message-ID: <200804052100.m35L0AsY022446@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/122469; it has been noted by GNATS.
From: Olli Hauer <ohauer@gmx.de>
To: "Philip M. Gollucci" <pgollucci@p6m7g8.com>,
bug-followup@FreeBSD.org, Olli Hauer <ohauer@gmx.de>
Cc:
Subject: Re: ports/122469: [patch] options for viewvc]
Date: Sat, 05 Apr 2008 22:29:17 +0200
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804052100.m35L0AsY022446>