From sgk@outpost.globcon.net  Fri Oct 18 09:36:44 2002
Return-Path: <sgk@outpost.globcon.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 93C1E37B407
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Oct 2002 09:36:39 -0700 (PDT)
Received: from outpost.lukarcos.com (outpost.globcon.net [62.141.88.161])
	by mx1.FreeBSD.org (Postfix) with SMTP id 60B4543E75
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Oct 2002 09:36:38 -0700 (PDT)
	(envelope-from sgk@outpost.globcon.net)
Received: (qmail 51063 invoked by uid 911); 18 Oct 2002 16:36:38 -0000
Message-Id: <20021018163638.51062.qmail@outpost.globcon.net>
Date: 18 Oct 2002 16:36:38 -0000
From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Unbreak bento build for sysutils/lcdproc
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         44213
>Category:       ports
>Synopsis:       [PATCH] Unbreak bento build for sysutils/lcdproc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 18 09:40:03 PDT 2002
>Closed-Date:    Mon Oct 28 20:48:58 PST 2002
>Last-Modified:  Mon Oct 28 20:48:58 PST 2002
>Originator:     Sergei Kolobov
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Aug 1 02:44:26 MSD 2002 sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST i386
>Description:
- Unbreak build on bento - do not configure guess MTAB_FILE location;
  always define it to be /etc/fstab by patching configure
- Convert use of SED to patch to avoid touching configure by a patch and 
  a sed call in Makefile
- Do not copy a file unneedlessly before running sed

Noticed by:	http://bento.freebsd.org/errorlogs/5-latest/lcdproc-0.4.3.log

>How-To-Repeat:
>Fix:

--- lcdproc-0.4.3.patch begins here ---
diff -urN --exclude=CVS /usr/ports/sysutils/lcdproc/Makefile /home/sgk/ports/sysutils/lcdproc/Makefile
--- /usr/ports/sysutils/lcdproc/Makefile	Tue Jun 18 12:38:45 2002
+++ /home/sgk/ports/sysutils/lcdproc/Makefile	Fri Oct 18 20:26:16 2002
@@ -21,11 +21,7 @@
 MAN8=		LCDd.8
 
 pre-patch:
-	@${CP} ${WRKSRC}/configure ${WRKSRC}/configure.orig
-	@${SED} -e 's|CFLAGS=\"-O3\"||' ${WRKSRC}/configure.orig \
-		> ${WRKSRC}/configure
-	@${CP} ${FILESDIR}/LCDd.sh.sample ${WRKSRC}/LCDd.sh.sample.orig
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/LCDd.sh.sample.orig \
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/LCDd.sh.sample \
 		> ${WRKSRC}/LCDd.sh.sample
 
 post-install:
diff -urN --exclude=CVS /usr/ports/sysutils/lcdproc/files/patch-configure /home/sgk/ports/sysutils/lcdproc/files/patch-configure
--- /usr/ports/sysutils/lcdproc/files/patch-configure	Thu Jan  1 03:00:00 1970
+++ /home/sgk/ports/sysutils/lcdproc/files/patch-configure	Fri Oct 18 20:23:51 2002
@@ -0,0 +1,19 @@
+--- configure.orig	Fri Oct 18 20:16:40 2002
++++ configure	Fri Oct 18 20:23:32 2002
+@@ -886,7 +886,7 @@
+ if test $debug = "yes"; then
+ 	CFLAGS="-g -O"
+ else
+-	CFLAGS="-O3"
++	
+ fi
+ CFLAGS="-Wall $CFLAGS"
+ export CFLAGS
+@@ -2902,6 +2902,7 @@
+ 
+ 	echo $ac_n "checking for your mounted filesystem table""... $ac_c" 1>&6
+ echo "configure:2905: checking for your mounted filesystem table" >&5
++ac_cv_mtab_file=/etc/fstab
+ if eval "test \"`echo '$''{'ac_cv_mtab_file'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
--- lcdproc-0.4.3.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Mon Oct 28 20:48:36 PST 2002 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=44213 
>Unformatted:
