From tkato432@yahoo.com  Fri Jul 12 18:01:44 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id C47ADE2F
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 12 Jul 2013 18:01:25 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from omta02.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145])
	by mx1.freebsd.org (Postfix) with ESMTP id 8867A136A
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 12 Jul 2013 18:01:25 +0000 (UTC)
Received: from localhost.localdomain (ZT028158.ppp.dion.ne.jp [59.128.28.158])
	by omta02.auone-net.jp (au one net mail) with ESMTP id 07E20156000F
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 13 Jul 2013 03:01:21 +0900 (JST)
Message-Id: <20130713025856.0311071f3e6584b4abf46761@yahoo.com>
Date: Sat, 13 Jul 2013 02:58:56 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: emulators/generator-cbiere: Fix build with clang

>Number:         180511
>Category:       ports
>Synopsis:       emulators/generator-cbiere: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 12 18:10:04 UTC 2013
>Closed-Date:    Mon Jul 15 15:03:12 UTC 2013
>Last-Modified:  Mon Jul 15 15:10:05 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add MAKE_JOBS_UNSAFE

New file:
files/patch-configure
files/patch-main__event.c
files/patch-main__vdp.c
files/patch-ym2612__support.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/emulators/generator-cbiere/Makefile emulators/generator-cbiere/Makefile
--- /usr/ports/emulators/generator-cbiere/Makefile	2013-06-21 03:54:08.000000000 +0900
+++ emulators/generator-cbiere/Makefile	2013-07-13 00:00:00.000000000 +0900
@@ -13,23 +13,24 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SEGA Genesis emulator
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
-
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
-USE_SDL=	sdl
-USE_GMAKE=	yes
-USE_GNOME=	gtk12
-MAKE_JOBS_UNSAFE=	yes
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS RAZE SDL
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS SDL
+OPTIONS_DEFINE_i386=	RAZE
 RAZE_DESC=	Use RAZE z80 emulation (only for i386)
 SDL_DESC=	Use SDL for audio
 
+USE_BZIP2=	yes
+USE_GNOME=	gtk12
+USE_SDL=	sdl
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
 CONFIGURE_ARGS+=--with-gtk
+MAKE_JOBS_UNSAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -37,13 +38,13 @@
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 CONFIGURE_ARGS+=	--without-gcc
 .endif
 
-.if ${PORT_OPTIONS:MRAZE} && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MRAZE}
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 CONFIGURE_ARGS+=--with-raze
 .else
@@ -63,4 +64,4 @@
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/emulators/generator-cbiere/files/patch-configure emulators/generator-cbiere/files/patch-configure
--- /usr/ports/emulators/generator-cbiere/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
+++ emulators/generator-cbiere/files/patch-configure	2013-07-13 00:00:00.000000000 +0900
@@ -0,0 +1,44 @@
+--- configure.orig
++++ configure
+@@ -3968,10 +3968,6 @@
+ #endif
+ #endif
+ 
+-int
+-main ()
+-{
+-
+ int main(int argc, char *argv[])
+ {
+   int fd = 0;
+@@ -3979,9 +3975,6 @@
+   ioctl(fd, SNDCTL_DSP_SETFRAGMENT, (char *)0);
+   return 0;
+ }
+-  ;
+-  return 0;
+-}
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -4026,10 +4019,6 @@
+ #endif
+ #endif
+ 
+-int
+-main ()
+-{
+-
+ int main(int argc, char *argv[])
+ {
+   int fd = 0;
+@@ -4037,9 +4026,6 @@
+   ioctl(fd, SNDCTL_DSP_SETFRAGMENT, (char *)0);
+   return 0;
+ }
+-  ;
+-  return 0;
+-}
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
diff -urN /usr/ports/emulators/generator-cbiere/files/patch-main__event.c emulators/generator-cbiere/files/patch-main__event.c
--- /usr/ports/emulators/generator-cbiere/files/patch-main__event.c	1970-01-01 09:00:00.000000000 +0900
+++ emulators/generator-cbiere/files/patch-main__event.c	2013-07-13 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- main/event.c.orig
++++ main/event.c
+@@ -15,7 +15,7 @@
+ 
+ /* time for next event - update vdp_event - return when to call again */
+ 
+-inline void event_nextevent(void)
++static inline void event_nextevent(void)
+ {
+   /* call this when it *is* time for the next event as dictated by vdp_event,
+      so we switch on it and update vdp_event at the same time */
diff -urN /usr/ports/emulators/generator-cbiere/files/patch-main__vdp.c emulators/generator-cbiere/files/patch-main__vdp.c
--- /usr/ports/emulators/generator-cbiere/files/patch-main__vdp.c	1970-01-01 09:00:00.000000000 +0900
+++ emulators/generator-cbiere/files/patch-main__vdp.c	2013-07-13 00:00:00.000000000 +0900
@@ -0,0 +1,20 @@
+--- main/vdp.c.orig
++++ main/vdp.c
+@@ -87,7 +87,7 @@ void vdp_describe(void);
+ void vdp_eventinit(void);
+ void vdp_layer_simple(unsigned int layer, unsigned int priority,
+                       uint8 *fielddata, unsigned int lineoffset);
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset);
+ void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
+ int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
+@@ -1733,7 +1733,7 @@ void vdp_endfield(void)
+      vdp_event_endline); */
+ }
+ 
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset)
+ {
+   int y, x;
diff -urN /usr/ports/emulators/generator-cbiere/files/patch-ym2612__support.h emulators/generator-cbiere/files/patch-ym2612__support.h
--- /usr/ports/emulators/generator-cbiere/files/patch-ym2612__support.h	1970-01-01 09:00:00.000000000 +0900
+++ emulators/generator-cbiere/files/patch-ym2612__support.h	2013-07-13 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- ym2612/support.h.orig
++++ ym2612/support.h
+@@ -3,7 +3,7 @@
+ #include "config.h"
+ 
+ #define errorlog 0
+-#define INLINE inline
++#define INLINE static inline
+ #define HAS_YM2612 1
+ #define YM2612UpdateRequest(x) 
+ #define AY8910_set_clock(chip,clock)
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jul 12 18:11:12 UTC 2013 
Responsible-Changed-Why:  
miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180511 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jul 15 15:03:12 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180511: commit references a PR
Date: Mon, 15 Jul 2013 15:03:17 +0000 (UTC)

 Author: miwi
 Date: Mon Jul 15 15:03:09 2013
 New Revision: 323057
 URL: http://svnweb.freebsd.org/changeset/ports/323057
 
 Log:
   - Unbreak build with clang
   
   PR:		180511
   Submitted by:	ports fury
 
 Added:
   head/emulators/generator-cbiere/files/
   head/emulators/generator-cbiere/files/patch-configure   (contents, props changed)
   head/emulators/generator-cbiere/files/patch-main__event.c   (contents, props changed)
   head/emulators/generator-cbiere/files/patch-main__vdp.c   (contents, props changed)
   head/emulators/generator-cbiere/files/patch-ym2612__support.h   (contents, props changed)
 Modified:
   head/emulators/generator-cbiere/Makefile   (contents, props changed)
 
 Modified: head/emulators/generator-cbiere/Makefile
 ==============================================================================
 --- head/emulators/generator-cbiere/Makefile	Mon Jul 15 14:59:14 2013	(r323056)
 +++ head/emulators/generator-cbiere/Makefile	Mon Jul 15 15:03:09 2013	(r323057)
 @@ -13,23 +13,24 @@ DISTNAME=	${PORTNAME}-0.35${PKGNAMESUFFI
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	SEGA Genesis emulator
  
 -LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 -
  LICENSE=	GPLv2
  
 -USE_BZIP2=	yes
 -USE_SDL=	sdl
 -USE_GMAKE=	yes
 -USE_GNOME=	gtk12
 -MAKE_JOBS_UNSAFE=	yes
 +LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
  
 -OPTIONS_DEFINE=	OPTIMIZED_CFLAGS RAZE SDL
 +OPTIONS_DEFINE=	OPTIMIZED_CFLAGS SDL
 +OPTIONS_DEFINE_i386=	RAZE
  RAZE_DESC=	Use RAZE z80 emulation (only for i386)
  SDL_DESC=	Use SDL for audio
  
 +USE_BZIP2=	yes
 +USE_GNOME=	gtk12
 +USE_SDL=	sdl
 +USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
  CONFIGURE_ARGS+=--with-gtk
 +MAKE_JOBS_UNSAFE=	yes
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 @@ -37,13 +38,13 @@ PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUF
  
  LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
  .if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
  CONFIGURE_ARGS+=	--without-gcc
  .endif
  
 -.if ${PORT_OPTIONS:MRAZE} && ${ARCH} == "i386"
 +.if ${PORT_OPTIONS:MRAZE}
  BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
  CONFIGURE_ARGS+=--with-raze
  .else
 @@ -63,4 +64,4 @@ post-install:
  	@${CAT} ${PKGMESSAGE}
  	@${ECHO_CMD}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Added: head/emulators/generator-cbiere/files/patch-configure
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/generator-cbiere/files/patch-configure	Mon Jul 15 15:03:09 2013	(r323057)
 @@ -0,0 +1,44 @@
 +--- configure.orig
 ++++ configure
 +@@ -3968,10 +3968,6 @@
 + #endif
 + #endif
 + 
 +-int
 +-main ()
 +-{
 +-
 + int main(int argc, char *argv[])
 + {
 +   int fd = 0;
 +@@ -3979,9 +3975,6 @@
 +   ioctl(fd, SNDCTL_DSP_SETFRAGMENT, (char *)0);
 +   return 0;
 + }
 +-  ;
 +-  return 0;
 +-}
 + _ACEOF
 + rm -f conftest.$ac_objext conftest$ac_exeext
 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +@@ -4026,10 +4019,6 @@
 + #endif
 + #endif
 + 
 +-int
 +-main ()
 +-{
 +-
 + int main(int argc, char *argv[])
 + {
 +   int fd = 0;
 +@@ -4037,9 +4026,6 @@
 +   ioctl(fd, SNDCTL_DSP_SETFRAGMENT, (char *)0);
 +   return 0;
 + }
 +-  ;
 +-  return 0;
 +-}
 + _ACEOF
 + rm -f conftest.$ac_objext conftest$ac_exeext
 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 
 Added: head/emulators/generator-cbiere/files/patch-main__event.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/generator-cbiere/files/patch-main__event.c	Mon Jul 15 15:03:09 2013	(r323057)
 @@ -0,0 +1,11 @@
 +--- main/event.c.orig
 ++++ main/event.c
 +@@ -15,7 +15,7 @@
 + 
 + /* time for next event - update vdp_event - return when to call again */
 + 
 +-inline void event_nextevent(void)
 ++static inline void event_nextevent(void)
 + {
 +   /* call this when it *is* time for the next event as dictated by vdp_event,
 +      so we switch on it and update vdp_event at the same time */
 
 Added: head/emulators/generator-cbiere/files/patch-main__vdp.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/generator-cbiere/files/patch-main__vdp.c	Mon Jul 15 15:03:09 2013	(r323057)
 @@ -0,0 +1,20 @@
 +--- main/vdp.c.orig
 ++++ main/vdp.c
 +@@ -87,7 +87,7 @@ void vdp_describe(void);
 + void vdp_eventinit(void);
 + void vdp_layer_simple(unsigned int layer, unsigned int priority,
 +                       uint8 *fielddata, unsigned int lineoffset);
 +-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
 ++static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
 +                          uint8 *cellloc, unsigned int lineoffset);
 + void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
 + int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
 +@@ -1733,7 +1733,7 @@ void vdp_endfield(void)
 +      vdp_event_endline); */
 + }
 + 
 +-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
 ++static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
 +                          uint8 *cellloc, unsigned int lineoffset)
 + {
 +   int y, x;
 
 Added: head/emulators/generator-cbiere/files/patch-ym2612__support.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/generator-cbiere/files/patch-ym2612__support.h	Mon Jul 15 15:03:09 2013	(r323057)
 @@ -0,0 +1,11 @@
 +--- ym2612/support.h.orig
 ++++ ym2612/support.h
 +@@ -3,7 +3,7 @@
 + #include "config.h"
 + 
 + #define errorlog 0
 +-#define INLINE inline
 ++#define INLINE static inline
 + #define HAS_YM2612 1
 + #define YM2612UpdateRequest(x) 
 + #define AY8910_set_clock(chip,clock)
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
