ports/55288: [patch] misc/44bsd-more: Unbreak w/ GCC3.3 (bento)

[Volker Stolz]

>Number:         55288
>Category:       ports
>Synopsis:       [patch] misc/44bsd-more: Unbreak w/ GCC3.3 (bento)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 05 08:40:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Volker Stolz
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Lehrstuhl für Informatik II
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.8-STABLE FreeBSD 4.8-STABLE #7: Tue Aug 5 15:53:30 CEST 2003 root at menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386


>Description:
- Eliminate one multiple-liner string
- Condense Makefile while here
>How-To-Repeat:
>Fix:
One new patch-file: files/patch-main.c

--- 44bsd-more begins here ---
diff -urN /usr/ports/misc/44bsd-more/Makefile 44bsd-more/Makefile
--- /usr/ports/misc/44bsd-more/Makefile	Mon Mar 10 17:23:03 2003
+++ 44bsd-more/Makefile	Tue Aug  5 17:28:12 2003
@@ -21,7 +21,6 @@
 MAN1=		44bsd-more.1
 
 RELDATE=	20000521
-EXAMPDIR=	${PREFIX}/share/examples/44bsd-more
 
 post-extract:
 	-cd ${WRKSRC} && co -d${RELDATE} RCS/*,v
@@ -33,16 +32,12 @@
 	${CP} ${FILESDIR}/queue.h ${WRKSRC}
 
 do-install:
-	${MKDIR} ${EXAMPDIR}
+	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_MAN} ${WRKSRC}/more.1 ${PREFIX}/man/man1/44bsd-more.1
-	${INSTALL_DATA} ${WRKSRC}/default.morerc ${EXAMPDIR}
-	${INSTALL_DATA} ${WRKSRC}/less.morerc ${EXAMPDIR}
-	${INSTALL_DATA} ${WRKSRC}/most.morerc ${EXAMPDIR}
+.for f in default.morerc less.morerc most.morerc
+	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/more.help ${PREFIX}/share/misc/44bsd-more.help
 	${INSTALL_PROGRAM} ${WRKSRC}/more ${PREFIX}/bin/44bsd-more
-
-tarup:
-	cd ${WRKSRC} && tar cyf /tmp/${DISTFILES} RCS
-	scp /tmp/${DISTFILES} freefall:public_html/dists
 
 .include <bsd.port.mk>
diff -urN /usr/ports/misc/44bsd-more/files/patch-main.c 44bsd-more/files/patch-main.c
--- /usr/ports/misc/44bsd-more/files/patch-main.c	Thu Jan  1 01:00:00 1970
+++ 44bsd-more/files/patch-main.c	Tue Aug  5 17:22:04 2003
@@ -0,0 +1,14 @@
+--- main.c.orig	Tue Aug  5 17:17:15 2003
++++ main.c	Tue Aug  5 17:21:34 2003
+@@ -33,9 +33,9 @@
+  */
+ 
+ #ifndef lint
+-char copyright[] =
++char copyright[] = \
+ "@(#) Copyright (c) 1988 Mark Nudleman.\n\
+-@(#) Copyright (c) 1988, 1993
++@(#) Copyright (c) 1988, 1993\
+ 	Regents of the University of California.  All rights reserved.\n";
+ #endif /* not lint */
+ 
--- 44bsd-more ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: