diff options
-rw-r--r-- | www/cvsweb/Makefile | 13 | ||||
-rw-r--r-- | www/cvsweb/distinfo | 5 | ||||
-rw-r--r-- | www/cvsweb/patches/patch-aa | 22 | ||||
-rw-r--r-- | www/cvsweb/patches/patch-ab | 15 | ||||
-rw-r--r-- | www/cvsweb/patches/patch-ac | 12 |
5 files changed, 11 insertions, 56 deletions
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile index dd4122e680a..ed50c5e42d9 100644 --- a/www/cvsweb/Makefile +++ b/www/cvsweb/Makefile @@ -1,5 +1,5 @@ # -# $NetBSD: Makefile,v 1.21 2004/06/09 01:56:15 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2004/06/09 18:55:11 xtraeme Exp $ # DISTNAME= cvsweb-3.0.1 @@ -17,6 +17,7 @@ DEPENDS+= p5-MIME-Types>=1.12:../../mail/p5-MIME-Types DEPENDS+= p5-URI>=1.30:../../www/p5-URI NO_BUILDLINK= YES +NO_BUILD= YES USE_PERL5= # defined USE_PKGINSTALL= YES @@ -47,8 +48,6 @@ CONF_FILES= ${EGDIR}/cvsweb.conf ${PKG_SYSCONFDIR}/cvsweb.conf DEPENDS+= rcs-[0-9]*:../../devel/rcs .endif -do-build: - do-install: ${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cgi-bin ${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/libexec/cgi-bin @@ -69,4 +68,12 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} .endfor +SUBST_CLASSES= prefix +SUBST_STAGE.prefix= post-patch +SUBST_FILES.prefix= cvsweb.conf cvsweb.cgi INSTALL +SUBST_SED.prefix= -e "s,/usr/local/etc/apache,${PKG_SYSCONFBASE}/httpd,g" +SUBST_SED.prefix+= -e "s,/usr/local/etc/cvsweb,${PKG_SYSCONFDIR},g" +SUBST_SED.prefix+= -e "s,/usr/local/bin,${LOCALBASE}/bin,g" +SUBST_MESSAGE.prefix= "Fixing harcoded paths." + .include "../../mk/bsd.pkg.mk" diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo index f4b34db43f4..ff50a744622 100644 --- a/www/cvsweb/distinfo +++ b/www/cvsweb/distinfo @@ -1,7 +1,4 @@ -$NetBSD: distinfo,v 1.11 2004/06/09 01:54:16 lukem Exp $ +$NetBSD: distinfo,v 1.12 2004/06/09 18:55:11 xtraeme Exp $ SHA1 (cvsweb-3.0.1.tar.gz) = 52ae5e8cc65cef7c3fdc33f9369fe00b2c5af8da Size (cvsweb-3.0.1.tar.gz) = 69916 bytes -SHA1 (patch-aa) = 6b5b4e70a493068cae6e4859f7f86b91249d4e71 -SHA1 (patch-ab) = 7419965bf4e078c1f72e8ddb9834959215d3a477 -SHA1 (patch-ac) = f1dc55f458de536624e6c44c526490a21b3d25e0 diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa deleted file mode 100644 index 20acb04993d..00000000000 --- a/www/cvsweb/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2004/06/09 01:54:16 lukem Exp $ - ---- cvsweb.conf.orig 2004-05-05 09:40:50.000000000 +1000 -+++ cvsweb.conf -@@ -19,7 +19,7 @@ - # cvsgraph (if you enable $allow_graph) - # enscript (if you enable $allow_enscript) - # --@command_path = qw(/bin /usr/bin /usr/local/bin); -+@command_path = qw(/bin /usr/bin /usr/pkg/bin /usr/local/bin); - - # Search the above directories for each command (prefer gtar over tar). - # -@@ -344,7 +344,7 @@ $inputTextSize = 12; - # The traditional mime.types file, eg. the one from Apache is fine. - # See above where this gets used. - # --$mime_types = '/usr/local/etc/apache/mime.types'; -+$mime_types = '/usr/pkg/etc/httpd/mime.types'; - - # Charset appended to the Content-Type HTTP header for text/* MIME types. - # Note that the web server may default to some charset which may take effect diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab deleted file mode 100644 index 843ea8f9832..00000000000 --- a/www/cvsweb/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2004/06/09 01:54:16 lukem Exp $ - ---- cvsweb.cgi.orig 2004-05-09 00:13:40.000000000 +1000 -+++ cvsweb.cgi -@@ -214,7 +214,9 @@ my ($mydir) = (dirname($0) =~ /(.*)/); - - # == EDIT this == - # Locations to search for user configuration, in order: --for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') { -+for (catfile($mydir, 'cvsweb.conf'), -+ '/usr/pkg/etc/cvsweb/cvsweb.conf', -+ '/usr/local/etc/cvsweb/cvsweb.conf') { - if (-r $_) { - $config = $_; - last; diff --git a/www/cvsweb/patches/patch-ac b/www/cvsweb/patches/patch-ac deleted file mode 100644 index a55a9b6cdce..00000000000 --- a/www/cvsweb/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/06/09 01:54:16 lukem Exp $ - ---- INSTALL.orig 2004-05-09 00:13:40.000000000 +1000 -+++ INSTALL -@@ -49,6 +49,7 @@ of this document. - configuration notes. You'll need version 2.0 or newer. - - 2) Copy cvsweb.conf to a configuration directory, typically -+ /usr/pkg/etc/cvsweb/cvsweb.conf or - /usr/local/etc/cvsweb/cvsweb.conf. - Edit cvsweb.conf to fit your needs, you'll probably need to tweak the - CVS root(s) of the Repository(ies) you want to view. |