From ohauer@FreeBSD.org  Sun Feb 13 21:11:41 2011
Return-Path: <ohauer@FreeBSD.org>
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 <ohauer@FreeBSD.org>
Reply-To: olli hauer <ohauer@FreeBSD.org>
To: <FreeBSD-gnats-submit@freebsd.org>
Cc: <ohauer@FreeBSD.org>
Subject: [patch] port www/websh fix leftover during package building
X-Send-Pr-Version: 3.113
X-GNATS-Notify: mi@aldan.algebra.com

>Number:         154752
>Category:       ports
>Synopsis:       [patch] port www/websh fix leftover during package building
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 13 21:20:08 UTC 2011
>Closed-Date:    Tue Feb 22 00:41:03 UTC 2011
>Last-Modified:  Tue Feb 22 00:41:03 UTC 2011
>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 <bsd.port.pre.mk>
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:
Responsible-Changed-From-To: freebsd-ports-bugs->mi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Feb 13 21:20:17 UTC 2011 
Responsible-Changed-Why:  
mi@aldan.algebra.com => mi@ (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154752 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Feb 13 21:20:22 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154752 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: mi@aldan.algebra.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/154752: [patch] port www/websh fix leftover during package building
Date: Sun, 13 Feb 2011 21:20:20 UT

 Maintainer of www/websh,
 
 Please note that PR ports/154752 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/154752
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154752: commit references a PR
Date: Mon, 21 Feb 2011 23:45:21 +0000 (UTC)

 ohauer      2011-02-21 23:45:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/websh            Makefile distinfo 
   Log:
    - fix pkg-plist if installed from port (leftover in httpd.conf)
    - remove MD5 from distfile
   
    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
   
   PR:             ports/154752
   Submitted by:   myself
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.16      +2 -1      ports/www/websh/Makefile
   1.3       +0 -1      ports/www/websh/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: ohauer 
State-Changed-When: Tue Feb 22 00:39:43 UTC 2011 
State-Changed-Why:  
Committed! 


Responsible-Changed-From-To: mi->ohauer 
Responsible-Changed-By: ohauer 
Responsible-Changed-When: Tue Feb 22 00:39:43 UTC 2011 
Responsible-Changed-Why:  
Committed! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154752 
>Unformatted:
