From beat@chruetertee.ch  Thu Jul 24 11:50:42 2008
Return-Path: <beat@chruetertee.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E1F9D1065672
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Jul 2008 11:50:42 +0000 (UTC)
	(envelope-from beat@chruetertee.ch)
Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55])
	by mx1.freebsd.org (Postfix) with ESMTP id 6106A8FC1F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Jul 2008 11:50:41 +0000 (UTC)
	(envelope-from beat@chruetertee.ch)
Received: from _HOSTNAME_ (cafe.interxion.wlan.hotspot.nexellent.net [217.147.222.218])
	(authenticated bits=0)
	by marvin.chruetertee.ch (8.14.2/8.13.6) with ESMTP id m6OBoeY9090557
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Jul 2008 11:50:41 GMT
	(envelope-from beat@chruetertee.ch)
Received: by _HOSTNAME_ (sSMTP sendmail emulation); Thu, 24 Jul 2008 13:51:12 +0200
Message-Id: <200807241150.m6OBoeY9090557@marvin.chruetertee.ch>
Date: Thu, 24 Jul 2008 13:51:12 +0200
From: "Beat Gtzi" <beat@chruetertee.ch>
Reply-To: Beat Gtzi <beat@chruetertee.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] www/awstats: install corrupted icons
X-Send-Pr-Version: 3.113
X-GNATS-Notify: samm@os2.kiev.ua

>Number:         125930
>Category:       ports
>Synopsis:       [PATCH] www/awstats: install corrupted icons
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 24 12:00:13 UTC 2008
>Closed-Date:    Thu Jul 24 13:34:03 UTC 2008
>Last-Modified:  Thu Jul 24 13:40:03 UTC 2008
>Originator:     Beat Gtzi
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD daedalus.network.local 7.0-STABLE FreeBSD 7.0-STABLE #1: Wed Jul 23 23:39:51 CEST 2008 root@daedalus.network.local:/usr/obj/usr/src/sys/BEASTIE i386


	
>Description:
	- Icons of awstats are corrupted after "make patch"
	- usage of USE_DOS2UNIX on png files causes this corrpution
	
>How-To-Repeat:
	# make extract
	===>  Found saved configuration for awstats-6.6_1,1
	===>  Extracting for awstats-6.8,1
	=> MD5 Checksum OK for awstats-6.8.tar.gz.
	=> SHA256 Checksum OK for awstats-6.8.tar.gz.
	# file work/awstats-6.8/wwwroot/icon/other/vk.png
	work/awstats-6.8/wwwroot/icon/other/vk.png: PNG image data, 13 x 1, 4-bit colormap, non-interlaced
	# make patch
	===>  Patching for awstats-6.8,1
	===>   Converting DOS text files to UNIX text files
	===>  Applying FreeBSD patches for awstats-6.8,1
	# file work/awstats-6.8/wwwroot/icon/other/vk.png
	work/awstats-6.8/wwwroot/icon/other/vk.png: PNG image data, CORRUPTED,
	
>Fix:

	

--- awstats.patch begins here ---
diff -Naur awstats.orig/Makefile awstats/Makefile
--- awstats.orig/Makefile	2008-07-24 05:18:16.000000000 +0200
+++ awstats/Makefile	2008-07-24 13:42:46.000000000 +0200
@@ -7,6 +7,7 @@
 
 PORTNAME=	awstats
 PORTVERSION=	6.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
@@ -18,7 +19,18 @@
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
-USE_DOS2UNIX=	yes
+USE_DOS2UNIX=	tools/*.pl \
+		wwwroot/cgi-bin/awstats.model.conf \
+		wwwroot/cgi-bin/*.pl \
+		wwwroot/cgi-bin/lang/tooltips_f/*.txt \
+		wwwroot/cgi-bin/lang/tooltips_m/*.txt \
+		wwwroot/cgi-bin/lang/tooltips_w/*.txt \
+		wwwroot/cgi-bin/lang/*.txt \
+		wwwroot/cgi-bin/lib/* \
+		wwwroot/cgi-bin/plugins/*.pm \
+		wwwroot/cgi-bin/plugins/example/* \
+		wwwroot/css/* \
+		wwwroot/js/*
 
 SUB_FILES=	pkg-message
 
--- awstats.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Jul 24 12:01:00 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: samm@os2.kiev.ua
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/125930: [PATCH] www/awstats: install corrupted icons
Date: Thu, 24 Jul 2008 12:00:58 UT

 Maintainer of www/awstats,
 
 Please note that PR ports/125930 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/125930
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Alex Samorukov <samm@os2.kiev.ua>
To: bug-followup@FreeBSD.org, beat@chruetertee.ch
Cc:  
Subject: Re: ports/125930: [PATCH] www/awstats: install corrupted icons
Date: Thu, 24 Jul 2008 14:18:05 +0200

 i`m accepting this patch. Regression was caused by previous version dump :(
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Thu Jul 24 13:27:39 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125930 
State-Changed-From-To: feedback->closed 
State-Changed-By: wxs 
State-Changed-When: Thu Jul 24 13:34:02 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125930: commit references a PR
Date: Thu, 24 Jul 2008 13:33:55 +0000 (UTC)

 wxs         2008-07-24 13:33:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/awstats          Makefile 
   Log:
   - Avoid calling USE_DOS2UNIX on PNG files.
   
   PR:             ports/125930
   Submitted by:   "Beat Gtzi" <beat@chruetertee.ch>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.40      +13 -1     ports/www/awstats/Makefile
 _______________________________________________
 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:
