Date: Mon, 3 Jun 2013 02:50:43 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/179210: emulators/e-uae: Fix build with clang Message-ID: <20130603025043.e42834ecc338401c815a683d@yahoo.com> Resent-Message-ID: <201306021810.r52IA1WH099408@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179210
>Category: ports
>Synopsis: emulators/e-uae: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 02 18:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add LICENSE
New file:
files/patch-src__dms__cdata.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/emulators/e-uae/Makefile emulators/e-uae/Makefile
--- /usr/ports/emulators/e-uae/Makefile 2012-11-08 10:18:03.000000000 +0900
+++ emulators/e-uae/Makefile 2013-06-03 00:00:00.000000000 +0900
@@ -11,25 +11,36 @@
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 @@
${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>
diff -urN /usr/ports/emulators/e-uae/files/patch-src__dms__cdata.h emulators/e-uae/files/patch-src__dms__cdata.h
--- /usr/ports/emulators/e-uae/files/patch-src__dms__cdata.h 1970-01-01 09:00:00.000000000 +0900
+++ emulators/e-uae/files/patch-src__dms__cdata.h 2013-06-03 00:00:00.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130603025043.e42834ecc338401c815a683d>