ports/98633: xscreensaver-5.00 does not compile on FreeBSD 4

[Michael Nottebrock]

>Number:         98633
>Category:       ports
>Synopsis:       xscreensaver-5.00 does not compile on FreeBSD 4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 07 17:50:19 GMT 2006
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: