- Update to 0.3.0. Only X11 is supported at the moment.

- Minor packaging issues

PR:		ports/70438
Submitted by:	Roman Bogorodskiy (maintainer)

5 files changed, 18 insertions, 28 deletions

diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index bb4d5708e89d..03dafcba9d0a 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pearpc
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,20 +22,25 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN1=		ppc.1
 
+PLIST_FILES=	bin/ppc etc/ppccfg.example %%DATADIR%%/video.x
+PLIST_DIRS=	%%DATADIR%%
+
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
 .else
 CONFIGURE_ARGS+=	--disable-fpo
 .endif
 
-.if defined(WITH_QT)
-CONFIGURE_ARGS+=	--enable-gui=qt
-USE_QT_VER=	3
-QTDIR?=		${X11BASE}
-CONFIGURE_ENV+=	QTDIR="${QTDIR}"
-.else
-CONFIGURE_ARGS+=	--enable-gui=nogui
-.endif
+# GTK and QT ui are broken in this version
+#
+#.if defined(WITH_QT)
+#CONFIGURE_ARGS+=	--enable-ui=qt
+#USE_QT_VER=	3
+#QTDIR?=		${X11BASE}
+#CONFIGURE_ENV+=	QTDIR="${QTDIR}"
+#.else
+#CONFIGURE_ARGS+=	--enable-ui=nogui
+#.endif
 
 .include <bsd.port.pre.mk>
 
@@ -64,7 +69,7 @@ pre-everything::
 
 post-patch:
 .if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/src/system/posix/types.h
+	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/src/system/osapi/posix/types.h
 .endif
 
 post-configure:
diff --git a/emulators/pearpc/distinfo b/emulators/pearpc/distinfo
index 184791139af2..2781613a9e30 100644
--- a/emulators/pearpc/distinfo
+++ b/emulators/pearpc/distinfo
@@ -1,2 +1,2 @@
-MD5 (pearpc-0.2.0.tar.gz) = 1cf100ba0f9bbd05acbdc9ecdf87f5f5
-SIZE (pearpc-0.2.0.tar.gz) = 702392
+MD5 (pearpc-0.3.0.tar.gz) = 6d68187c78cae674a5efa6662c4cdb22
+SIZE (pearpc-0.3.0.tar.gz) = 814686
diff --git a/emulators/pearpc/files/patch-src-cpu_generic-ppc_cpu.cc b/emulators/pearpc/files/patch-src-cpu_generic-ppc_cpu.cc
deleted file mode 100644
index 26e6007ffb7e..000000000000
--- a/emulators/pearpc/files/patch-src-cpu_generic-ppc_cpu.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cpu_generic/ppc_cpu.cc.orig	Sun Aug  1 19:42:05 2004
-+++ src/cpu_generic/ppc_cpu.cc	Thu May  6 02:48:30 2004
-@@ -108,7 +108,7 @@
- 			ppc_debug_hook();
- 		} else {
- 			int ret;
-+			if ((ret = ppc_direct_effective_memory_handle_code(gCPU.pc & ~0xfff, (byte *&)gCPU.physical_code_page))) {
--			if ((ret = ppc_direct_effective_memory_handle_code(gCPU.pc & ~0xfff, gCPU.physical_code_page))) {
- 				if (ret == PPC_MMU_EXC) {
- 					gCPU.pc = gCPU.npc;
- 					continue;
diff --git a/emulators/pearpc/files/pkg-message.in b/emulators/pearpc/files/pkg-message.in
index ea59d137d75f..7c776fe43071 100644
--- a/emulators/pearpc/files/pkg-message.in
+++ b/emulators/pearpc/files/pkg-message.in
@@ -1,3 +1,3 @@
 
-Sample config file can be found at /usr/local/etc/ppccfg.example
+Sample config file can be found at PREFIX/etc/ppccfg.example
 
diff --git a/emulators/pearpc/pkg-plist b/emulators/pearpc/pkg-plist
deleted file mode 100644
index 8f8bbe97daf8..000000000000
--- a/emulators/pearpc/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/ppc
-etc/ppccfg.example
-%%DATADIR%%/video.x
-@dirrm %%DATADIR%%