From lofi@freebsd.org  Wed Jun  7 17:48:59 2006
Return-Path: <lofi@freebsd.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A43B416D2BA
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jun 2006 15:31:10 +0000 (UTC)
	(envelope-from lofi@freebsd.org)
Received: from mail-in-09.arcor-online.net (mail-in-09.arcor-online.net [151.189.21.49])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E75DC43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jun 2006 15:31:09 +0000 (GMT)
	(envelope-from lofi@freebsd.org)
Received: from mail-in-01-z2.arcor-online.net (mail-in-01-z2.arcor-online.net [151.189.8.13])
	by mail-in-09.arcor-online.net (Postfix) with ESMTP id 50F3A2BEAD3
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jun 2006 17:31:08 +0200 (CEST)
Received: from mail-in-07.arcor-online.net (mail-in-07.arcor-online.net [151.189.21.47])
	by mail-in-01-z2.arcor-online.net (Postfix) with ESMTP id 4026BCC0CC
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jun 2006 17:31:08 +0200 (CEST)
Received: from lofi.dyndns.org (dslb-084-061-132-199.pools.arcor-ip.net [84.61.132.199])
	by mail-in-07.arcor-online.net (Postfix) with ESMTP id 728A3170CD0
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jun 2006 17:31:07 +0200 (CEST)
Received: from vm-kiste.my.domain (root@vm-kiste.my.domain [192.168.8.6])
	by lofi.dyndns.org (8.13.4/8.13.3) with ESMTP id k57FV573072347
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 7 Jun 2006 17:31:05 +0200 (CEST)
	(envelope-from lofi@freebsd.org)
Received: from vm-kiste.my.domain (lofi@localhost [127.0.0.1])
	by vm-kiste.my.domain (8.13.4/8.13.4) with ESMTP id k57FV4Q1001227
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 7 Jun 2006 17:31:05 +0200 (CEST)
	(envelope-from lofi@vm-kiste.my.domain)
Received: (from lofi@localhost)
	by vm-kiste.my.domain (8.13.4/8.13.4/Submit) id k57FV4TY001226;
	Wed, 7 Jun 2006 17:31:04 +0200 (CEST)
	(envelope-from lofi)
Message-Id: <200606071531.k57FV4TY001226@vm-kiste.my.domain>
Date: Wed, 7 Jun 2006 17:31:04 +0200 (CEST)
From: Michael Nottebrock <lofi@freebsd.org>
Reply-To: Michael Nottebrock <lofi@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: xscreensaver-5.00 does not compile on FreeBSD 4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         98633
>Category:       ports
>Synopsis:       xscreensaver-5.00 does not compile on FreeBSD 4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 07 17:50:19 GMT 2006
>Closed-Date:    Thu Jun 08 17:09:28 GMT 2006
>Last-Modified:  Fri Jun  9 00:10:16 GMT 2006
>Originator:     Michael Nottebrock
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD vm-kiste 5.4-STABLE FreeBSD 5.4-STABLE #4: Sun Mar 19 23:22:22 CET 2006 root@kiste:/usr/obj/usr/src/sys/KISTE-SMP i386


	
>Description:
	xscreensaver-5.00's distribution tarball contains a file with DOS-
	style CR/LF pairs, which gcc 2.95 cannot handle. 
>How-To-Repeat:
	
>Fix:

	

--- xscreensaver.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/xscreensaver/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- Makefile	4 Jun 2006 08:22:51 -0000	1.87
+++ Makefile	7 Jun 2006 13:48:38 -0000
@@ -105,6 +105,10 @@
 		-e 's#malloc.h#stdlib.h#g' \
 		-e 's#/usr/X11R6#${X11BASE}#g' \
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
+	@ ${CP} ${WRKSRC}/hacks/glx/topblock.c \
+		${WRKSRC}/hacks/glx/topblock.c.orig
+	@ col -bx < ${WRKSRC}/hacks/glx/topblock.c.orig \
+		> ${WRKSRC}/hacks/glx/topblock.c
 
 post-install:
 	@(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \
--- xscreensaver.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dougb 
Responsible-Changed-By: lofi 
Responsible-Changed-When: Wed Jun 7 21:47:43 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer. 


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

From: Pav Lucistnik <pav@FreeBSD.org>
To: Michael Nottebrock <lofi@FreeBSD.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/98633: xscreensaver-5.00 does not compile on FreeBSD 4
Date: Wed, 07 Jun 2006 23:58:25 +0200

 Michael Nottebrock p=ED=B9e v st 07. 06. 2006 v 17:31 +0200:
 
 > +	@ ${CP} ${WRKSRC}/hacks/glx/topblock.c \
 > +		${WRKSRC}/hacks/glx/topblock.c.orig
 > +	@ col -bx < ${WRKSRC}/hacks/glx/topblock.c.orig \
 > +		> ${WRKSRC}/hacks/glx/topblock.c
 
 What about
 
 USE_DOS2UNIX=3D	hacks/glx/topblock.c
 
 ?
 
 --=20
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 Canada is a country whose main exports are hockey players and cold fronts.
 Our main imports are baseball players and acid rain.
   -- Pierre Elliott Trudeau
State-Changed-From-To: open->feedback 
State-Changed-By: dougb 
State-Changed-When: Thu Jun 8 04:49:56 UTC 2006 
State-Changed-Why:  

Please try this instead: 

+USE_DOS2UNIX=	hacks/glx/topblock.c 
post-patch: 


http://www.freebsd.org/cgi/query-pr.cgi?pr=98633 
State-Changed-From-To: feedback->closed 
State-Changed-By: dougb 
State-Changed-When: Thu Jun 8 17:08:57 UTC 2006 
State-Changed-Why:  

I applied the USE_DOS2UNIX solution. 

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

From: Michael Nottebrock <lofi@freebsd.org>
To: bug-followup@freebsd.org, lofi@freebsd.org
Cc:  
Subject: Re: ports/98633: xscreensaver-5.00 does not compile on FreeBSD 4
Date: Fri, 09 Jun 2006 02:01:38 +0200

 Ah, but USE_DOS2UNIX uses REINPLACE_CMD, which Doug has been carefully
 avoiding in the past. I was merely trying to accomodate that preference.
>Unformatted:
