[19501] trunk/dports/devel/cvsweb/Portfile

[source_changes at macosforge.org]

Revision: 19501
Author:   markd at macports.org
Date:     2006-09-11 17:55:49 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
Closes ticket 9040.  Corrected paths soo .css file is accessible.  Removed FreeBSD variant and clarifed variant usage.

Modified Paths:
--------------
    trunk/dports/devel/cvsweb/Portfile

Modified: trunk/dports/devel/cvsweb/Portfile
===================================================================
--- trunk/dports/devel/cvsweb/Portfile	2006-09-11 19:48:42 UTC (rev 19500)
+++ trunk/dports/devel/cvsweb/Portfile	2006-09-12 00:55:49 UTC (rev 19501)
@@ -28,50 +28,37 @@
 configure	{}
 build		{}
 
-set cgi_path ""
-set httpd_conf_path ""
-set icons_path ""
-set css_path ""
-
-variant darwin {
+# Default is for Apple's Apache
 	global cgi_path httpd_conf_path
 	set cgi_path "/Library/WebServer/CGI-Executables/"
 	set httpd_conf_path "/private/etc/httpd/"
-	set icons_path "/Library/WebServer/icons/"
-	set css_path "/Library/WebServer/css/"
-}
+	set icons_path "/Library/WebServer/Documents/icons/"
+	set css_path "/Library/WebServer/Documents/css/"
 
-variant freebsd {
-        global cgi_path httpd_conf_path
-        set cgi_path "/usr/local/www/cgi-bin/"
-        set httpd_conf_path "/usr/local/etc/apache/"
-        set icons_path "/usr/local/www/icons/"
-        set css_path "/usr/local/www/css/"
-}
+variant macports_apache2 {
+# Optional MacPorts Apache2 port
+	global cgi_path httpd_conf_path
+        set cgi_path "${prefix}/apache2/cgi-bin/"
+        set httpd_conf_path "${prefix}/apache2/htdocs/"
+        set icons_path "${prefix}/apache2/icons/"
+        set css_path "${prefix}/apache2/htdocs/css/"
 
-# apache darwinport interop
-        if {[ file exists ${prefix}/sbin/httpd]} {
-                set cgi_path "${prefix}/www/cgi-bin/"
-                set httpd_conf_path "${prefix}/etc/apache/"
-                set icons_path "${prefix}/www/icons/"
-                set icons_path "${prefix}/www/css/"
 }
 
+destroot {
+	file mkdir ${destroot}${cgi_path}
+	file mkdir ${destroot}${httpd_conf_path}
+	file mkdir ${destroot}${icons_path}
+	file mkdir ${destroot}${css_path}
+	xinstall -m 755 ${worksrcpath}/cvsweb.cgi ${destroot}${cgi_path}
+	xinstall -m 644 ${worksrcpath}/cvsweb.conf ${destroot}${httpd_conf_path}
+	eval xinstall -m 755 [glob ${worksrcpath}/icons/*] ${destroot}${icons_path}
+	eval xinstall -m 755 [glob ${worksrcpath}/css/*] ${destroot}${css_path}
 
-	destroot {
-		file mkdir ${destroot}${cgi_path}
-		file mkdir ${destroot}${httpd_conf_path}
-		file mkdir ${destroot}${icons_path}
-                file mkdir ${destroot}${css_path}
-		xinstall -m 755 ${worksrcpath}/cvsweb.cgi ${destroot}${cgi_path}
-		xinstall -m 644 ${worksrcpath}/cvsweb.conf ${destroot}${httpd_conf_path}
-		eval xinstall -m 755 [glob ${worksrcpath}/icons/*] ${destroot}${icons_path}
-                eval xinstall -m 755 [glob ${worksrcpath}/css/*] ${destroot}${css_path}
-
-		reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl|g" \
-                        "${destroot}${cgi_path}/cvsweb.cgi"
-                reinplace "s|/usr/local/etc/cvsweb/cvsweb.conf|${httpd_conf_path}cvsweb.conf|g" \
-                        "${destroot}${cgi_path}/cvsweb.cgi"
-                reinplace "s|/bin /usr/bin /usr/local/bin|/bin /usr/bin /usr/local/bin ${prefix}/bin ${prefix}/sbin|g" \
-                        "${destroot}${cgi_path}/cvsweb.cgi"
+	reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl|g" \
+		"${destroot}${cgi_path}/cvsweb.cgi"
+	reinplace "s|/usr/local/etc/cvsweb/cvsweb.conf|${httpd_conf_path}cvsweb.conf|g" \
+		"${destroot}${cgi_path}/cvsweb.cgi"
+	reinplace "s|/bin /usr/bin /usr/local/bin|/bin /usr/bin /usr/local/bin ${prefix}/bin ${prefix}/sbin|g" \
+		"${destroot}${cgi_path}/cvsweb.cgi"
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20060911/4b439144/attachment.html