From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 11 05:30:04 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7D11716A401 for ; Wed, 11 Apr 2007 05:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 5745E13C45A for ; Wed, 11 Apr 2007 05:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l3B5U3Qu026557 for ; Wed, 11 Apr 2007 05:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l3B5U31r026556; Wed, 11 Apr 2007 05:30:03 GMT (envelope-from gnats) Resent-Date: Wed, 11 Apr 2007 05:30:03 GMT Resent-Message-Id: <200704110530.l3B5U31r026556@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Logvinov Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7319616A401 for ; Wed, 11 Apr 2007 05:25:32 +0000 (UTC) (envelope-from user@blg.akavia.ru) Received: from blg.akavia.ru (blg.akavia.ru [62.33.174.250]) by mx1.freebsd.org (Postfix) with ESMTP id 1D8CE13C44C for ; Wed, 11 Apr 2007 05:25:30 +0000 (UTC) (envelope-from user@blg.akavia.ru) Received: from blg.akavia.ru (localhost [127.0.0.1]) by blg.akavia.ru (8.13.8/8.13.8) with ESMTP id l3B5P1cE001378; Wed, 11 Apr 2007 15:25:01 +1000 (YAKST) (envelope-from user@blg.akavia.ru) Received: (from root@localhost) by blg.akavia.ru (8.13.8/8.13.8/Submit) id l3B5P0O2001374; Wed, 11 Apr 2007 15:25:00 +1000 (YAKST) (envelope-from user) Message-Id: <200704110525.l3B5P0O2001374@blg.akavia.ru> Date: Wed, 11 Apr 2007 15:25:00 +1000 (YAKST) From: Alexander Logvinov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jbq@caraldi.com Subject: ports/111467: [PATCH] devel/viewvc: update to 1.0.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexander Logvinov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2007 05:30:04 -0000 >Number: 111467 >Category: ports >Synopsis: [PATCH] devel/viewvc: update to 1.0.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Apr 11 05:30:03 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Alexander Logvinov >Release: FreeBSD 6.2-RELEASE-p3 i386 >Organization: >Environment: >Description: Update to 1.0.4. Remove unnecessary FETCH_DEPENDS. Add install of viewvc.conf and cvsgraph.conf without overwriting user modified files and save them on port deinstall. Remove patch-viewvc-install file and pkg-message messages. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/viewvc/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 22 Dec 2006 09:28:41 -0000 1.24 +++ Makefile 11 Apr 2007 02:00:07 -0000 @@ -6,18 +6,15 @@ # PORTNAME= viewvc -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= devel python -MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/34803/ +MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/37319/ MAINTAINER= jbq@caraldi.com COMMENT= Web-based Version Control Repository Browsing -FETCH_DEPENDS= wget:${PORTSDIR}/ftp/wget RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python -DISABLE_SIZE= yes # Need because -S are not recognized by wget -FETCH_CMD= ${LOCALBASE}/bin/wget -c USE_PYTHON= yes NO_BUILD= yes @@ -28,7 +25,7 @@ PLIST_SUB= INSTDIR=${INSTDIR} do-install: - (cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${INSTDIR} --destdir="") + (cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${INSTDIR} --destdir="" --clean-mode=false) post-install: @${CAT} ${PKGMESSAGE} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/devel/viewvc/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo 22 Dec 2006 09:28:41 -0000 1.13 +++ distinfo 11 Apr 2007 02:00:07 -0000 @@ -1,3 +1,3 @@ -MD5 (viewvc-1.0.3.tar.gz) = 3d44ad485d38bf9f61d8111661260b4a -SHA256 (viewvc-1.0.3.tar.gz) = 20cf5a8c5e46a147f4b484934f5f254d9acf74f149a4dc6326d0040527513ead -SIZE (viewvc-1.0.3.tar.gz) = 406570 +MD5 (viewvc-1.0.4.tar.gz) = e55ba2864a23b0597f80ccf726966b96 +SHA256 (viewvc-1.0.4.tar.gz) = 555ee9fffa4f883bf56b077e856ea313d994e59c0267b41c558dbc0d1950cd1f +SIZE (viewvc-1.0.4.tar.gz) = 383491 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/viewvc/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 4 May 2006 18:30:10 -0000 1.7 +++ pkg-plist 11 Apr 2007 02:00:07 -0000 @@ -1,3 +1,5 @@ +@unexec if cmp -s %D/%%INSTDIR%%/cvsgraph.conf %D/%%INSTDIR%%/cvsgraph.conf.dist; then rm -f %D/%%INSTDIR%%/cvsgraph.conf; fi +@unexec if cmp -s %D/%%INSTDIR%%/viewvc.conf %D/%%INSTDIR%%/viewvc.conf.dist; then rm -f %D/%%INSTDIR%%/viewvc.conf; fi %%INSTDIR%%/bin/cgi/query.cgi %%INSTDIR%%/bin/cgi/viewvc.cgi %%INSTDIR%%/bin/cvsdbadmin @@ -10,6 +12,7 @@ %%INSTDIR%%/bin/standalone.py %%INSTDIR%%/bin/svndbadmin %%INSTDIR%%/cvsgraph.conf.dist +@exec [ -f %B/cvsgraph.conf ] || cp %B/%f %B/cvsgraph.conf %%INSTDIR%%/lib/PyFontify.py %%INSTDIR%%/lib/PyFontify.pyc %%INSTDIR%%/lib/accept.py @@ -120,6 +123,7 @@ %%INSTDIR%%/templates/roots.ezt %%INSTDIR%%/templates/rss.ezt %%INSTDIR%%/viewvc.conf.dist +@exec [ -f %B/viewvc.conf ] || cp %B/%f %B/viewvc.conf @dirrm %%INSTDIR%%/templates/include @dirrm %%INSTDIR%%/templates/docroot/images @dirrm %%INSTDIR%%/templates/docroot Index: files/patch-viewvc-install =================================================================== RCS file: files/patch-viewvc-install diff -N files/patch-viewvc-install --- files/patch-viewvc-install 4 May 2006 18:30:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ ---- viewvc-install.orig Thu Apr 20 15:14:37 2006 -+++ viewvc-install Thu Apr 20 15:15:46 2006 -@@ -67,11 +67,11 @@ - ("bin/mod_python/handler.py", "bin/mod_python/handler.py", 0755, 1, 0, 0), - ("bin/mod_python/.htaccess", "bin/mod_python/.htaccess", 0755, 0, 0, 0), - ("bin/standalone.py", "bin/standalone.py", 0755, 1, 0, 0), -- ("viewvc.conf.dist", "viewvc.conf", 0644, 0, -+ ("viewvc.conf.dist", "viewvc.conf.dist", 0644, 0, - """Note: If you are upgrading from viewcvs-0.7 or earlier: - The section [text] has been removed from viewcvs.conf. The functionality - went into the new files in subdirectory templates.""", 0), -- ("cvsgraph.conf.dist", "cvsgraph.conf", 0644, 0, 1, 0), -+ ("cvsgraph.conf.dist", "cvsgraph.conf.dist", 0644, 0, 1, 0), - - ("bin/loginfo-handler", "bin/loginfo-handler", 0755, 1, 0, 0), - ("bin/cvsdbadmin", "bin/cvsdbadmin", 0755, 1, 0, 0), Index: files/pkg-message.in =================================================================== RCS file: /home/pcvs/ports/devel/viewvc/files/pkg-message.in,v retrieving revision 1.2 diff -u -r1.2 pkg-message.in --- files/pkg-message.in 26 Jul 2006 19:01:22 -0000 1.2 +++ files/pkg-message.in 11 Apr 2007 02:00:07 -0000 @@ -5,12 +5,5 @@ %%INSTDIR%%/viewvc.conf, to note where your CVSROOT is, and then copy the actual CGI (located at %%INSTDIR%%/bin/cgi/viewvc.cgi) to your cgi-bin. -Please notice that configuration files are installed as -".dist" and must be copied to their actual names prior to -be edited, e.g.: -$ cd %%INSTDIR%% -$ cp viewvc.conf.dist viewvc.conf -$ cp cvsgraph.conf.dist cvsgraph.conf -It's up to you to check the ".dist" files after upgrades. ***************************************************************** >Release-Note: >Audit-Trail: >Unformatted: