From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 13 21:20:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 442DA1065679 for ; Sun, 13 Feb 2011 21:20:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0CA708FC14 for ; Sun, 13 Feb 2011 21:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1DLK8i3043077 for ; Sun, 13 Feb 2011 21:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1DLK80G043076; Sun, 13 Feb 2011 21:20:08 GMT (envelope-from gnats) Resent-Date: Sun, 13 Feb 2011 21:20:08 GMT Resent-Message-Id: <201102132120.p1DLK80G043076@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, olli hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1F811065694; Sun, 13 Feb 2011 21:11:41 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from u18-124.dslaccess.de (unknown [194.231.39.124]) by mx1.freebsd.org (Postfix) with ESMTP id 56F608FC29; Sun, 13 Feb 2011 21:11:41 +0000 (UTC) Message-Id: <20110213211141.A1F811065694@hub.freebsd.org> Date: Sun, 13 Feb 2011 22:11:35 +0100 (CET) From: olli hauer To: X-Send-Pr-Version: 3.113 Cc: ohauer@FreeBSD.org Subject: ports/154752: [patch] port www/websh fix leftover during package building X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: olli hauer List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Feb 2011 21:20:09 -0000 >Number: 154752 >Category: ports >Synopsis: [patch] port www/websh fix leftover during package building >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 13 21:20:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olli Hauer >Release: >Organization: >Environment: >Description: Fix lefetover during package building During deinstall apxs -e -A ... is executed, this will normally remove the LoadModule $modulename line if there is any, else a line with an '#' in front of LoadModule $modulename is added. Since apxs is not executed during port install the commented line will be added during deinstall into httpd.conf and this leads to a build failed with leftover in tinderbox and pointyhat.FreeBSD.org >How-To-Repeat: Build the module with apache22 and inspect httpd.conf after install and deinstall of the port Reference: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147009 http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/a.8-exp.20110129080700/ap22-mod_log_sql-1.101.log >Fix: --- websh.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/websh/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 4 Dec 2010 07:34:01 -0000 1.15 +++ Makefile 13 Feb 2011 20:13:24 -0000 @@ -7,7 +7,7 @@ PORTNAME= websh PORTVERSION= 3.6.0b5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www tcl MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR=tcl/${PORTNAME}/source @@ -82,6 +82,7 @@ .endif post-install: + @${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/mod_${MODULENAME}.so" @${CAT} ${PKGMESSAGE} .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/www/websh/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 25 Feb 2010 03:38:57 -0000 1.2 +++ distinfo 13 Feb 2011 20:13:24 -0000 @@ -1,3 +1,2 @@ -MD5 (websh-3.6.0b5-src.tar.gz) = 01d8772c8c2f76df9a096d404bc6783e SHA256 (websh-3.6.0b5-src.tar.gz) = 5d1cd89e1e2259453f5b82d29a516f12b2b33f7a6cf9b075719639684d4047f8 SIZE (websh-3.6.0b5-src.tar.gz) = 269549 --- websh.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: