From sanewo@ba2.so-net.ne.jp  Mon Jul 15 10:53:56 2002
Return-Path: <sanewo@ba2.so-net.ne.jp>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0A1F537B406; Mon, 15 Jul 2002 10:53:56 -0700 (PDT)
Received: from muse.sanewo.ddo.jp (pd332a2.tkyoac00.ap.so-net.ne.jp [61.211.50.162])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2753943E75; Mon, 15 Jul 2002 10:53:54 -0700 (PDT)
	(envelope-from sanewo@ba2.so-net.ne.jp)
Received: from muse.sanewo.dyn.to (sanewo@localhost [127.0.0.1])
	by muse.sanewo.dyn.to (8.12.5/8.12.5) with ESMTP id g6CE07bV071468;
	Fri, 12 Jul 2002 23:00:07 +0900 (JST)
	(envelope-from sanewo@muse.sanewo.dyn.to)
Received: (from sanewo@localhost)
	by muse.sanewo.dyn.to (8.12.5/8.12.5/Submit) id g6CE06uQ071467;
	Fri, 12 Jul 2002 23:00:06 +0900 (JST)
Message-Id: <200207121400.g6CE06uQ071467@muse.sanewo.dyn.to>
Date: Fri, 12 Jul 2002 23:00:06 +0900 (JST)
From: Takanori Saneto <sanewo@ba2.so-net.ne.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: knu@freebsd.org
Subject: graphics/libflash won't compile on -CURRENT
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         40606
>Category:       ports
>Synopsis:       graphics/libflash won't compile on -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    knu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 15 11:00:03 PDT 2002
>Closed-Date:    Wed Jul 24 06:07:32 JST 2002
>Last-Modified:  Wed Jul 24 06:07:32 JST 2002
>Originator:     Takanori Saneto
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
an individual
>Environment:
System: FreeBSD muse.sanewo.dyn.to 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Mon Jul 8 02:03:47 JST 2002 root@muse.sanewo.dyn.to:/export/usr/obj/usr/src/sys/MUSE i386


>Description:

graphics/libflash as of today won't compile on -CURRENT by following
reasons:

#1: files/Makefile has spaces (instead of TABS) at the beginning of
    some lines. 

#2: on -CURRENT, _includeinstall target seems not
    used. installincludes is used instead.

#3: shape.cc should include <math.h> to get the declaration of sqrt().

#4: sound.cc should include <sys/soundcard.h> instead of
    <machine/soundcard.h>.

>How-To-Repeat:

cd /usr/ports/graphics/libflash; make

>Fix:

Following patch will make this port compile on -CURRENT. No test on
-STABLE or older is done.

I'm not sure when (as a value of __FreeBSD_version)
machine/soundcard.h was moved to sys/soundcard.h.

Index: files/Makefile
===================================================================
RCS file: /export/cvsup/cvs/ports/graphics/libflash/files/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- files/Makefile	25 Oct 2000 19:21:38 -0000	1.2
+++ files/Makefile	12 Jul 2002 13:33:15 -0000
@@ -21,13 +21,13 @@
 .include <bsd.lib.mk>
 
 # For FreeBSD 3.x or older
-.if !target(_includeinstall)
+.if !target(_includeinstall) && !target(installincludes)
 _includeinstall:
 .if defined(INCS)
 .for header in ${INCS}
-        cd ${.CURDIR} && \
-        ${INSTALL} -C -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \
-                ${header} ${DESTDIR}${INCDIR}
+	cd ${.CURDIR} && \
+	${INSTALL} -C -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \
+		${header} ${DESTDIR}${INCDIR}
 
 .endfor
 .endif
Index: files/patch-ai
===================================================================
RCS file: /export/cvsup/cvs/ports/graphics/libflash/files/patch-ai,v
retrieving revision 1.1
diff -u -u -r1.1 patch-ai
--- files/patch-ai	14 Oct 2000 09:28:52 -0000	1.1
+++ files/patch-ai	12 Jul 2002 13:53:10 -0000
@@ -1,11 +1,16 @@
 --- sound.cc.orig	Thu Sep  2 00:10:03 1999
 +++ sound.cc	Thu Oct 12 14:49:31 2000
-@@ -26,7 +26,11 @@
+@@ -26,7 +26,16 @@
  #include <fcntl.h>
  #include <sys/ioctl.h>
  #ifndef NOSOUND
 +#ifdef __FreeBSD__
++#include <sys/param.h>
++#if __FreeBSD_version >= 400000
++#include <sys/soundcard.h>
++#else
 +#include <machine/soundcard.h>
++#endif
 +#else
  #include <linux/soundcard.h>
 +#endif
Index: files/patch-shape.cc
===================================================================
--- /dev/null	Fri Jul 12 22:53:15 2002
+++ files/patch-shape.cc	Fri Jul 12 07:57:49 2002
@@ -0,0 +1,10 @@
+--- shape.cc.orig	Fri Jul 12 07:55:33 2002
++++ shape.cc	Fri Jul 12 07:56:13 2002
+@@ -21,6 +21,7 @@
+ //
+ 
+ #include "swf.h"
++#include <math.h>
+ 
+ #ifdef RCSID
+ static char *rcsid = "$Id: shape.cc,v 1.5 1999/09/10 13:08:52 ode Exp $";
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->knu 
Responsible-Changed-By: ijliao 
Responsible-Changed-When: Mon Jul 15 20:06:59 PDT 2002 
Responsible-Changed-Why:  
over to maintainer 

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

From: Takanori Saneto <sanewo@ba2.so-net.ne.jp>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/40606: graphics/libflash won't compile on -CURRENT
Date: Sat, 20 Jul 2002 08:21:31 +0900

 This problem (#1, #2) and fix (to Makefile) will apply to
 following ports as well:
 
 textproc/expat
 graphics/ming
 -- 
 SANETO Takanori <sanewo@ba2.so-net.ne.jp>
State-Changed-From-To: open->closed 
State-Changed-By: knu 
State-Changed-When: Wed Jul 24 06:07:19 JST 2002 
State-Changed-Why:  
Committed, thanks! 

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