diff options
author | adrianp <adrianp@pkgsrc.org> | 2008-10-21 20:46:28 +0000 |
---|---|---|
committer | adrianp <adrianp@pkgsrc.org> | 2008-10-21 20:46:28 +0000 |
commit | a4e4c29f110c23970a3743a829ccdeaa60b972e6 (patch) | |
tree | 9a5c2896c03a60acef16425f0e12ffc78cd3f601 /www/viewvc | |
parent | 676cf312b8350b1c9b148bc03e0410d1fb508ba2 (diff) | |
download | pkgsrc-a4e4c29f110c23970a3743a829ccdeaa60b972e6.tar.gz |
Fix paths on install
PKGREVISION++
Diffstat (limited to 'www/viewvc')
-rw-r--r-- | www/viewvc/Makefile | 12 | ||||
-rw-r--r-- | www/viewvc/distinfo | 6 | ||||
-rw-r--r-- | www/viewvc/patches/patch-aa | 8 | ||||
-rw-r--r-- | www/viewvc/patches/patch-ab | 31 |
4 files changed, 43 insertions, 14 deletions
diff --git a/www/viewvc/Makefile b/www/viewvc/Makefile index 6b2709b3c4d..e529d0524c1 100644 --- a/www/viewvc/Makefile +++ b/www/viewvc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2008/10/19 18:02:19 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/21 20:46:28 adrianp Exp $ # DISTNAME= viewvc-1.0.7 +PKGREVISION= 1 CATEGORIES= devel www MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/44050/ @@ -13,6 +14,9 @@ PYTHON_PATCH_SCRIPTS= viewvc-install bin/* bin/cgi/*.cgi lib/*.py .if !exists(/usr/bin/rlog) DEPENDS+= rcs-[0-9]*:../../devel/rcs +RCS_PKG= YES +.else +RCS_PKG= NO .endif NO_BUILD= YES @@ -35,6 +39,12 @@ SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" SUBST_SED.conf+= -e "s|@PHP_OPT@|${PHP_OPT}|g" SUBST_SED.conf+= -e "s|@CVSGRAPH_OPT@|${CVSGRAPH_OPT}|g" +.if defined(RCS_PKG) && ${RCS_PKG} == "YES" +SUBST_SED.conf+= -e "s|@RCS_PREFIX@|${PREFIX}|g" +.else +SUBST_SED.conf+= -e "s|@RCS_PREFIX@|/usr|g" +.endif + CHECK_PORTABILITY_SKIP= tools/make-release do-install: diff --git a/www/viewvc/distinfo b/www/viewvc/distinfo index b72e3400068..240288feba8 100644 --- a/www/viewvc/distinfo +++ b/www/viewvc/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2008/10/19 18:02:19 adrianp Exp $ +$NetBSD: distinfo,v 1.6 2008/10/21 20:46:28 adrianp Exp $ SHA1 (viewvc-1.0.7.tar.gz) = 9c07eeba6067cf1806644d696710df5c668334dc RMD160 (viewvc-1.0.7.tar.gz) = 92c691e492f7b927a7113e745ce4464f790c67ca Size (viewvc-1.0.7.tar.gz) = 522560 bytes -SHA1 (patch-aa) = da1bc13cf0936289d4254d73f14864c39b2ddf96 -SHA1 (patch-ab) = c8562a82ea747690d748807503d826bbc0a063ab +SHA1 (patch-aa) = b4f5e36e5d744249aec8128d6ccaa670398afafe +SHA1 (patch-ab) = cf4c56e5b4254d0deb1a7b51121b6b1d2113fd3e diff --git a/www/viewvc/patches/patch-aa b/www/viewvc/patches/patch-aa index 35677fe1f7c..cf45f27542f 100644 --- a/www/viewvc/patches/patch-aa +++ b/www/viewvc/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2007/05/20 09:01:04 xtraeme Exp $ +$NetBSD: patch-aa,v 1.4 2008/10/21 20:46:28 adrianp Exp $ ---- viewvc-install.orig 2007-05-20 08:45:42.000000000 +0200 -+++ viewvc-install 2007-05-20 08:47:21.000000000 +0200 -@@ -58,10 +58,6 @@ +--- viewvc-install.orig 2007-05-03 19:03:36.000000000 +0100 ++++ viewvc-install +@@ -58,10 +58,6 @@ FILE_INFO_LIST = [ ("bin/cvsdbadmin", "bin/cvsdbadmin", 0755, 1, 0, 0), ("bin/svndbadmin", "bin/svndbadmin", 0755, 1, 0, 0), ("bin/make-database", "bin/make-database", 0755, 1, 0, 0), diff --git a/www/viewvc/patches/patch-ab b/www/viewvc/patches/patch-ab index 615ae0923b9..6b6aa5efc75 100644 --- a/www/viewvc/patches/patch-ab +++ b/www/viewvc/patches/patch-ab @@ -1,8 +1,26 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/10/21 09:05:44 adrianp Exp $ +$NetBSD: patch-ab,v 1.2 2008/10/21 20:46:28 adrianp Exp $ ---- viewvc.conf.dist.orig 2006-09-28 02:13:36.000000000 +0100 +--- viewvc.conf.dist.orig 2008-02-25 20:47:24.000000000 +0000 +++ viewvc.conf.dist -@@ -135,7 +135,7 @@ use_rcsparse = 0 +@@ -105,6 +105,7 @@ cvs_roots = cvs: /home/cvsroot + default_root = cvs + + # uncomment if the RCS binaries are not on the standard path ++rcs_path = @RCS_PREFIX@/bin/ + #rcs_path = /usr/bin/ + + # ViewVC can use CVSNT (www.cvsnt.org) instead of the RCS +@@ -125,7 +126,8 @@ default_root = cvs + use_rcsparse = 0 + + # uncomment if the svn command-line utilities are not on the standard path +-#svn_path = /usr/bin/ ++#svn_path = @PREFIX@/bin/ ++svn_path = @PREFIX@/bin/ + + # + # This is a pathname to a MIME types file to help viewvc to guess the +@@ -135,7 +137,7 @@ use_rcsparse = 0 # uncomment this option and point it at a MIME type file. # # For example, you can use the mime.types from apache here: @@ -11,7 +29,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/10/21 09:05:44 adrianp Exp $ # This address is shown in the footer of the generated pages. # It must be replaced with the address of the local repository maintainer. -@@ -456,14 +456,14 @@ highlight_line_numbers = 1 +@@ -495,14 +497,14 @@ highlight_line_numbers = 1 highlight_convert_tabs = 2 # use php to colorize .php and .inc files? @@ -28,7 +46,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/10/21 09:05:44 adrianp Exp $ # php_exe_path = /usr/local/bin/php # php_exe_path = C:\Program Files\php\cli\php.exe -@@ -477,20 +477,20 @@ allow_tar = 0 +@@ -510,20 +512,20 @@ php_exe_path = php # Use CvsGraph. See http://www.akhphd.au.dk/~bertho/cvsgraph/ for # documentation and download. # @@ -39,8 +57,9 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/10/21 09:05:44 adrianp Exp $ # # if the cvsgraph program is not on the path, set this value # - cvsgraph_path = +-cvsgraph_path = -# cvsgraph_path = /usr/local/bin/ ++cvsgraph_path = @PREFIX@/bin/ +# cvsgraph_path = @PREFIX@/bin/ # |