From owner-freebsd-ports Mon Jul 1 12:10:19 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46AB137B401 for ; Mon, 1 Jul 2002 12:10:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8148143E26 for ; Mon, 1 Jul 2002 12:10:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g61JA3JU008897 for ; Mon, 1 Jul 2002 12:10:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g61JA3KE008896; Mon, 1 Jul 2002 12:10:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE3C537B401 for ; Mon, 1 Jul 2002 12:08:12 -0700 (PDT) Received: from smtp.noos.fr (lafontaine.noos.net [212.198.2.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDEED43E26 for ; Mon, 1 Jul 2002 12:08:09 -0700 (PDT) (envelope-from root@gits.dyndns.org) Received: (qmail 9218446 invoked by uid 0); 1 Jul 2002 19:08:07 -0000 Received: from unknown (HELO gits.gits.dyndns.org) ([212.198.229.153]) (envelope-sender ) by 212.198.2.72 (qmail-ldap-1.03) with SMTP for ; 1 Jul 2002 19:08:07 -0000 Received: from gits.gits.dyndns.org (3a74r596umnl5ig1@localhost [127.0.0.1]) by gits.gits.dyndns.org (8.12.4/8.12.4) with ESMTP id g61J86tY066255; Mon, 1 Jul 2002 21:08:06 +0200 (CEST) (envelope-from root@gits.dyndns.org) Received: (from root@localhost) by gits.gits.dyndns.org (8.12.4/8.12.4/Submit) id g61J853M066254; Mon, 1 Jul 2002 21:08:05 +0200 (CEST) (envelope-from root) Message-Id: <200207011908.g61J853M066254@gits.gits.dyndns.org> Date: Mon, 1 Jul 2002 21:08:05 +0200 (CEST) From: Cyrille Lefevre Reply-To: Cyrille Lefevre To: FreeBSD-gnats-submit@FreeBSD.org Cc: mwm@mired.org X-Send-Pr-Version: 3.113 Subject: ports/40088: Update: www/webcheck (patches deleted) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40088 >Category: ports >Synopsis: Update: www/webcheck (patches deleted) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 01 12:10:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.6-STABLE i386 >Organization: ACME >Environment: System: FreeBSD gits 4.6-STABLE FreeBSD 4.6-STABLE #15: Sun Jun 23 06:31:23 CEST 2002 root@gits:/disk2/freebsd/src/sys/compile/CUSTOM i386 >Description: webcheck patch files aren't needed anymore. Makefile CP -> INSTALL_DATA / INSTALL_SCRIPT and relooked pkg-plist $FreeBSD$ added files/patch-compat files/patch-usage deleted CC -maintainer >How-To-Repeat: # make ===> Extracting for webcheck-1.0 >> Checksum OK for webcheck-1.0.bz2. ===> webcheck-1.0 depends on file: /usr/local/bin/python2.2 - found ===> Patching for webcheck-1.0 ===> Applying FreeBSD patches for webcheck-1.0 Ignoring previously applied (or reversed) patch. 4 out of 4 hunks ignored--saving rejects to myUrlLib.py.rej 4 out of 4 hunks failed--saving rejects to robotparser.py.rej Ignoring previously applied (or reversed) patch. 3 out of 3 hunks ignored--saving rejects to schemes/filelink.py.rej 2 out of 2 hunks failed--saving rejects to htmlparse.py.rej >> Patch patch-compat failed to apply cleanly. *** Error code 1 Stop in /tmp/ports/www/webcheck. >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/webcheck/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 30 May 2002 07:33:51 -0000 1.17 +++ Makefile 1 Jul 2002 18:53:46 -0000 @@ -15,25 +15,27 @@ USE_PYTHON= YES USE_BZIP2= YES +.if defined(NOPORTDOCS) +NO_BUILD= YES +.endif + +do-build: + ${AWK} '/^Running Webcheck/ { output=1 } output' \ + < ${WRKSRC}/INSTALL > ${WRKSRC}/USAGE do-install: @${MKDIR} ${DATADIR} - ${CP} ${WRKSRC}/*.py ${DATADIR} - ${CP} ${WRKSRC}/*.css ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.py ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.css ${DATADIR} .for d in plugins schemes @${MKDIR} ${DATADIR}/${d} - ${CP} ${WRKSRC}/${d}/*.py ${DATADIR}/${d} + ${INSTALL_DATA} ${WRKSRC}/${d}/*.py ${DATADIR}/${d} .endfor + ${INSTALL_SCRIPT} ${WRKSRC}/webcheck.py ${DATADIR} ${LN} -sf ${DATADIR}/webcheck.py ${PREFIX}/bin/webcheck -.ifndef NOPORTDOCS +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/USAGE ${DOCSDIR} - -do-build: - ${AWK} '/^Running Webcheck/ { output=1 } output' \ - < ${WRKSRC}/INSTALL > ${WRKSRC}/USAGE -.else -NO_BUILD= yes .endif .include Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/webcheck/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 15 May 2002 15:33:01 -0000 1.7 +++ pkg-plist 1 Jul 2002 18:51:40 -0000 @@ -1,3 +1,4 @@ +@comment $FreeBSD$ share/webcheck/config.py share/webcheck/debugio.py share/webcheck/htmlparse.py >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message