Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Jul 2008 13:51:12 +0200
From:      "Beat Gätzi" <beat@chruetertee.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/125930: [PATCH] www/awstats: install corrupted icons
Message-ID:  <200807241150.m6OBoeY9090557@marvin.chruetertee.ch>
Resent-Message-ID: <200807241200.m6OC0DrM031911@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         125930
>Category:       ports
>Synopsis:       [PATCH] www/awstats: install corrupted icons
>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:   Thu Jul 24 12:00:13 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Beat Gätzi
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807241150.m6OBoeY9090557>