From ohauer@FreeBSD.org  Sun Feb 13 23:04:08 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 52098106566B;
	Sun, 13 Feb 2011 23:04:08 +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 0AA3E8FC12;
	Sun, 13 Feb 2011 23:04:08 +0000 (UTC)
Message-Id: <20110213230408.52098106566B@hub.freebsd.org>
Date: Mon, 14 Feb 2011 00:04:03 +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 textproc/htdig fix leftover during package building
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         154758
>Category:       ports
>Synopsis:       [patch] port textproc/htdig fix leftover during package building
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 13 23:10:11 UTC 2011
>Closed-Date:    Tue Feb 22 00:30:49 UTC 2011
>Last-Modified:  Tue Feb 22 00:40:09 UTC 2011
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:


>Description:
If APACHE_VERSION > 13, then the following directories are left over.
- www/cgi-bin
- www/data
- www/icons

>How-To-Repeat:
Build the port against apache22

Reference: 
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147009
http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/a.8-exp.20110129080700/htdig-3.2.0.b6_2.log

>Fix:

--- htdig.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/htdig/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile	22 Aug 2009 00:36:58 -0000	1.40
+++ Makefile	13 Feb 2011 22:59:15 -0000
@@ -7,9 +7,10 @@
 
 PORTNAME=	htdig
 PORTVERSION=	3.2.0.b6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/3.2.0b6
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/3.2.0b6
 DISTNAME=	htdig-3.2.0b6
 
 MAINTAINER=	DougB@FreeBSD.org
@@ -40,6 +41,10 @@
 .if !defined(WITHOUT_APACHE)
 USE_APACHE=	1.3+
 CONFIGURE_ARGS+=	--with-apache=${LOCALBASE}/sbin
+.include "${PORTSDIR}/Mk/bsd.apache.mk"
+.  if ${APACHE_VERSION} > 13
+PLIST_DIRSTRY+=	www/cgi-bin www/data www/icons
+.  endif
 .endif
 
 post-patch:
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/textproc/htdig/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo	24 Nov 2005 00:08:50 -0000	1.10
+++ distinfo	13 Feb 2011 22:59:15 -0000
@@ -1,3 +1,2 @@
-MD5 (htdig-3.2.0b6.tar.gz) = 8a6952f5b97e305dbb7489045bad220f
 SHA256 (htdig-3.2.0b6.tar.gz) = 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8
 SIZE (htdig-3.2.0b6.tar.gz) = 3104936
--- htdig.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dougb 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Feb 13 23:10:49 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154758 
State-Changed-From-To: open->closed 
State-Changed-By: ohauer 
State-Changed-When: Tue Feb 22 00:30:25 UTC 2011 
State-Changed-Why:  
Committed! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154758: commit references a PR
Date: Tue, 22 Feb 2011 00:30:16 +0000 (UTC)

 ohauer      2011-02-22 00:29:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/htdig       Makefile distinfo 
   Log:
    - fix pkg-plist if installed with apache20 / apache22
    - remove MD5 from distinfo
   
   PR:             ports/154758
   Submitted by:   myself
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.41      +7 -2      ports/textproc/htdig/Makefile
   1.11      +0 -1      ports/textproc/htdig/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"
 
>Unformatted:
