svn commit: r363524 - in head/emulators/pearpc: . files

[John Marino]

Author: marino
Date: Wed Jul 30 23:02:15 2014
New Revision: 363524
URL: http://svnweb.freebsd.org/changeset/ports/363524
QAT: https://qat.redports.org/buildarchive/r363524/

Log:
  emulators/pearpc: Upgrade version 0.4 => 0.5 and stage
  
  PR:		191819
  Submitted by:	Ports Fury

Added:
  head/emulators/pearpc/files/patch-src__cpu__mem.h   (contents, props changed)
Deleted:
  head/emulators/pearpc/files/mbrtowc.c
  head/emulators/pearpc/files/patch-src__io__prom__fs__hfsplus__unicode.c
  head/emulators/pearpc/files/pkg-message.in
  head/emulators/pearpc/files/wcrtomb.c
Modified:
  head/emulators/pearpc/Makefile
  head/emulators/pearpc/distinfo

Modified: head/emulators/pearpc/Makefile
==============================================================================
--- head/emulators/pearpc/Makefile	Wed Jul 30 22:45:03 2014	(r363523)
+++ head/emulators/pearpc/Makefile	Wed Jul 30 23:02:15 2014	(r363524)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pearpc
-PORTVERSION=	0.4
-PORTREVISION=	5
+PORTVERSION=	0.5
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
 
@@ -12,61 +11,50 @@ COMMENT=	PowerPC architecture emulator
 
 LICENSE=	GPLv2
 
-GNU_CONFIGURE=	yes
+USES=		tar:bzip2
 USE_XORG=	x11
-MAN1=		ppc.1
-SUB_FILES=	pkg-message
-
-PLIST_FILES=	bin/ppc etc/ppccfg.example %%DATADIR%%/video.x
-PLIST_DIRS=	%%DATADIR%%
-
-OPTIONS_DEFINE=	SDL OPTIMIZED_CFLAGS DEBUG
-SDL_DESC=	Use SDL for user interface
+GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+BROKEN_ia64=	Internal compiler error on ia64
 
-.if ${ARCH} == "ia64"
-BROKEN=		Internal compiler error on ia64
-.endif
+PORTEXAMPLES=	ppccfg.example
+PLIST_FILES=	bin/ppc man/man1/ppc.1.gz %%DATADIR%%/video.x
+PLIST_DIRS=	%%DATADIR%%
 
-.if ${PORT_OPTIONS:MSDL}
-CONFIGURE_ARGS+=	--enable-ui=sdl
-USE_SDL=	sdl
-.else
-CONFIGURE_ARGS+=	--enable-ui=x11
-.endif
+OPTIONS_DEFINE=		DEBUG EXAMPLES OPTIMIZED_CFLAGS SDL
 
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+=	-O3 -ffast-math
-.else
-CONFIGURE_ARGS+=	--disable-fpo
-.endif
+DEBUG_CONFIGURE_ENABLE=	debug
+OPTIMIZED_CFLAGS_CFLAGS=	-O3 -ffast-math
+OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	fpo
+SDL_USE=		sdl=sdl
+SDL_CONFIGURE_ON=	--enable-ui=sdl
+SDL_CONFIGURE_OFF=	--enable-ui=x11
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-profiling	# implies --enable-debug
-.endif
+.include <bsd.port.options.mk>
 
-.if ${ARCH} == "i386"
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-CONFIGURE_ARGS+=	--enable-cpu=jitc_x86
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+USE_GCC=	yes
 .else
 CONFIGURE_ARGS+=	--enable-cpu=generic
 .endif
 
-post-extract:
-	@${REINPLACE_CMD} -e 's|-g -O2||;s|-O2||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|PROCESS_CPUTIME|THREAD_CPUTIME|' \
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-O3|| ; \
+		 s|^\(x86_64\)|amd64\* \| \1| ; \
+		 s|-g -O2||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		 's|video\.x"|${DATADIR}/&|' ${WRKSRC}/ppccfg.example
+	@${REINPLACE_CMD} -e \
+		's|PROCESS_CPUTIME|THREAD_CPUTIME|' \
 		${WRKSRC}/src/system/osapi/posix/systimer.cc
-	@${REINPLACE_CMD} -e 's|video\.x"|${DATADIR}/&|' \
-		${WRKSRC}/ppccfg.example
 
 post-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/video.x ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${PREFIX}/etc
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} video.x \
+		${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ppccfg.example \
+		${STAGEDIR}${EXAMPLESDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/emulators/pearpc/distinfo
==============================================================================
--- head/emulators/pearpc/distinfo	Wed Jul 30 22:45:03 2014	(r363523)
+++ head/emulators/pearpc/distinfo	Wed Jul 30 23:02:15 2014	(r363524)
@@ -1,2 +1,2 @@
-SHA256 (pearpc-0.4.tar.gz) = cf9501dc95b418dc9632e57c75d59e78ec5204db0ed6b41abced2cea30021cce
-SIZE (pearpc-0.4.tar.gz) = 910621
+SHA256 (pearpc-0.5.tar.bz2) = 4b5ac6b111ba55640c2b2d1de9c4f68cb211aadc472474a564ad9ce6a645fbd3
+SIZE (pearpc-0.5.tar.bz2) = 800380

Added: head/emulators/pearpc/files/patch-src__cpu__mem.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/pearpc/files/patch-src__cpu__mem.h	Wed Jul 30 23:02:15 2014	(r363524)
@@ -0,0 +1,11 @@
+--- src/cpu/mem.h.orig
++++ src/cpu/mem.h
+@@ -23,7 +23,7 @@
+ 
+ #include "system/types.h"
+ 
+-bool	ppc_init_physical_memory(uint size);
++bool	FASTCALL ppc_init_physical_memory(uint size);
+ 
+ uint32  ppc_get_memory_size();
+