Bug 179210 - emulators/e-uae: Fix build with clang
Summary: emulators/e-uae: Fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-02 19:10 UTC by tkato432
Modified: 2013-06-04 09:30 UTC (History)
0 users

See Also:


Attachments
file.diff (1.99 KB, patch)
2013-06-02 19:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-06-02 19:10:00 UTC
- Fix build with clang
- Add LICENSE

New file:
files/patch-src__dms__cdata.h
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-02 19:10:13 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-06-04 09:21:28 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-06-04 09:22:39 UTC
Author: miwi
Date: Tue Jun  4 08:22:22 2013
New Revision: 319830
URL: http://svnweb.freebsd.org/changeset/ports/319830

Log:
  - Fix build with clang
  - Add LICENSE
  
  PR:		179210
  Submitted by:	Ports Fury

Added:
  head/emulators/e-uae/files/
  head/emulators/e-uae/files/patch-src__dms__cdata.h   (contents, props changed)
Modified:
  head/emulators/e-uae/Makefile

Modified: head/emulators/e-uae/Makefile
==============================================================================
--- head/emulators/e-uae/Makefile	Tue Jun  4 08:20:26 2013	(r319829)
+++ head/emulators/e-uae/Makefile	Tue Jun  4 08:22:22 2013	(r319830)
@@ -11,25 +11,36 @@ DISTNAME=	e-uae-0.8.29-WIP4
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced version of UAE, the Amiga emulator
 
+LICENSE=	GPLv2
+
+OPTIONS_DEFINE=	DOCS
+
 CONFLICTS=	uae-[0-9]*
-USE_GMAKE=	yes
+
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 USE_SDL=	sdl
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sdl --with-sdl-gfx
 MAKE_JOBS_UNSAFE=	yes
 
-PLIST_FILES=	bin/uae bin/readdisk
 PORTDOCS=	ChangeLog README bsdsocket.txt cmd-line.txt \
 		compiling.txt configuration.txt floppies.txt \
 		joystick.txt keyboard.txt scsi.txt
+PLIST_FILES=	bin/readdisk bin/uae
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/X11\/xkb\/rules/s|/usr/X11R6/lib|${LOCALBASE}/share|' \
+		${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/uae ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/readdisk ${PREFIX}/bin
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
@@ -43,8 +54,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/scsi.txt ${DOCSDIR}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6/lib/X11/xkb/rules|${LOCALBASE}/share/X11/xkb/rules|' \
-	${WRKSRC}/configure
-
 .include <bsd.port.mk>

Added: head/emulators/e-uae/files/patch-src__dms__cdata.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/e-uae/files/patch-src__dms__cdata.h	Tue Jun  4 08:22:22 2013	(r319830)
@@ -0,0 +1,11 @@
+--- src/dms/cdata.h.orig
++++ src/dms/cdata.h
+@@ -31,7 +31,7 @@
+ 		#define INLINE inline
+ 	#else
+ 		#ifdef __GNUC__
+-			#define INLINE inline
++			#define INLINE static inline
+ 		#else
+ 			#ifdef __SASC
+ 				#define INLINE __inline
_______________________________________________
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"