5 files changed, 74 insertions, 100 deletions

diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile
index d95d63b6404b..70fdf0af4948 100644
--- a/emulators/aqemu/Makefile
+++ b/emulators/aqemu/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	aqemu
-PORTVERSION=	0.7.3
-PORTREVISION=	2
+PORTVERSION=	0.8.0
 CATEGORIES=	emulators
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S,.0$,,}/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt4 based Qemu frontend
@@ -18,45 +17,12 @@ LIB_DEPENDS=	vncclient.0:${PORTSDIR}/net/libvncserver
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui qtestlib xml qmake_build uic_build moc_build rcc_build
-HAS_CONFIGURE=	yes
+QT_COMPONENTS=	gui qtestlib xml qmake_build uic_build moc_build rcc_build \
+		linguist_build
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S,.0$,,}
 
-QMAKE_ARGS=	-unix -recursive ${QMAKE_PRO}
-QMAKE_PRO=	AQEMU.pro
-
-QT_LRELEASE=	${LOCALBASE}/bin/lrelease-qt4
-
-.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+=	linguist_build
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e 's,/usr/.*/aqemu,${DATADIR},' ${WRKSRC}/main.cpp
-
-do-configure:
-.if !defined(WITHOUT_NLS)
-	cd ${WRKSRC} && ${QT_LRELEASE} ${QMAKE_PRO}
-.endif
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS}
-
-post-configure:
-	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|'
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/AQEMU ${PREFIX}/bin/aqemu
-	${MKDIR} ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/menu_data/aqemu.desktop ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/menu_data/aqemu_*.png ${PREFIX}/share/pixmaps
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} os_icons ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} os_templates ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/aqemu_links.html ${DATADIR}
-.if !defined(WITHOUT_NLS)
-	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}
-.endif
+MAN1=		aqemu.1
 
 .include <bsd.port.mk>
diff --git a/emulators/aqemu/distinfo b/emulators/aqemu/distinfo
index 9702300e84e4..7917316bace8 100644
--- a/emulators/aqemu/distinfo
+++ b/emulators/aqemu/distinfo
@@ -1,3 +1,3 @@
-MD5 (aqemu-0.7.3.tar.bz2) = 0ee32e54ee70ec4451c5e30137f572fd
-SHA256 (aqemu-0.7.3.tar.bz2) = 9654e44eb3a19cff473e86e4b00291c536081df9d52887e5148ae520f45e47e1
-SIZE (aqemu-0.7.3.tar.bz2) = 610479
+MD5 (aqemu-0.8.0.tar.bz2) = d6cbe7955eeef4d2285b198cd1b32064
+SHA256 (aqemu-0.8.0.tar.bz2) = 29e2e8663bb34d10888994766bb3aba3a916bbf18d2d10c189309c61e813c363
+SIZE (aqemu-0.8.0.tar.bz2) = 866896
diff --git a/emulators/aqemu/files/patch-AQEMU.pro b/emulators/aqemu/files/patch-AQEMU.pro
deleted file mode 100644
index 241e7d007205..000000000000
--- a/emulators/aqemu/files/patch-AQEMU.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./AQEMU.pro.orig	2009-09-26 17:15:47.000000000 +0400
-+++ ./AQEMU.pro	2009-10-10 12:18:27.000000000 +0400
-@@ -112,7 +112,7 @@
- 
- RESOURCES += aqemu_images.qrc
- TRANSLATIONS += Russian.ts
--CONFIG += qtestlib debug_and_release
-+CONFIG += qtestlib release
- CONFIG -= debug
- #CONFIG -= release
- QT += xml network
diff --git a/emulators/aqemu/files/patch-CMakeLists.txt b/emulators/aqemu/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..6c1917f5ccea
--- /dev/null
+++ b/emulators/aqemu/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./CMakeLists.txt.orig	2010-07-12 16:29:53.000000000 +0400
++++ ./CMakeLists.txt	2010-10-21 23:29:00.939352177 +0400
+@@ -248,7 +248,7 @@
+ INSTALL( FILES ${app_menu} DESTINATION share/applications )
+ 
+ FILE( GLOB app_menu "${CMAKE_CURRENT_SOURCE_DIR}/aqemu.1.gz" )
+-INSTALL( FILES ${app_menu} DESTINATION share/man/man1 )
++INSTALL( FILES ${app_menu} DESTINATION man/man1 )
+ 
+ # Create docs .bz2 files
+ MACRO( create_docs _sources )
diff --git a/emulators/aqemu/pkg-plist b/emulators/aqemu/pkg-plist
index c4c35beed637..79b36c815052 100644
--- a/emulators/aqemu/pkg-plist
+++ b/emulators/aqemu/pkg-plist
@@ -1,49 +1,57 @@
 bin/aqemu
 share/applications/aqemu.desktop
-%%NLS%%%%DATADIR%%/Russian.qm
-%%DATADIR%%/aqemu_links.html
-%%DATADIR%%/os_icons/alt.png
-%%DATADIR%%/os_icons/arch.png
-%%DATADIR%%/os_icons/asp.png
-%%DATADIR%%/os_icons/centos.png
-%%DATADIR%%/os_icons/damnsmalllinux.png
-%%DATADIR%%/os_icons/debian.png
-%%DATADIR%%/os_icons/fedora.png
-%%DATADIR%%/os_icons/freebsd.png
-%%DATADIR%%/os_icons/gentoo.png
-%%DATADIR%%/os_icons/knoppix.png
-%%DATADIR%%/os_icons/kubuntu.png
-%%DATADIR%%/os_icons/mac.png
-%%DATADIR%%/os_icons/mandriva.png
-%%DATADIR%%/os_icons/netbsd.png
-%%DATADIR%%/os_icons/novell.png
-%%DATADIR%%/os_icons/openbsd.png
-%%DATADIR%%/os_icons/opensolaris.png
-%%DATADIR%%/os_icons/redhat.png
-%%DATADIR%%/os_icons/slackware.png
-%%DATADIR%%/os_icons/solaris.png
-%%DATADIR%%/os_icons/suse-novell.png
-%%DATADIR%%/os_icons/suse.png
-%%DATADIR%%/os_icons/symphony.png
-%%DATADIR%%/os_icons/ubuntu.png
-%%DATADIR%%/os_templates/FreeBSD_4.aqvmt
-%%DATADIR%%/os_templates/FreeBSD_7.aqvmt
-%%DATADIR%%/os_templates/Linux_2_0.aqvmt
-%%DATADIR%%/os_templates/Linux_2_4.aqvmt
-%%DATADIR%%/os_templates/Linux_2_6.aqvmt
-%%DATADIR%%/os_templates/Linux_x86_64.aqvmt
-%%DATADIR%%/os_templates/Mac_OS_X_x86.aqvmt
-%%DATADIR%%/os_templates/Windows_2000.aqvmt
-%%DATADIR%%/os_templates/Windows_7.aqvmt
-%%DATADIR%%/os_templates/Windows_7_x64.aqvmt
-%%DATADIR%%/os_templates/Windows_9X.aqvmt
-%%DATADIR%%/os_templates/Windows_Vista.aqvmt
-%%DATADIR%%/os_templates/Windows_Vista_x64.aqvmt
-%%DATADIR%%/os_templates/Windows_XP.aqvmt
-%%DATADIR%%/os_templates/Windows_XP_x64.aqvmt
+share/aqemu/Russian.qm
+share/aqemu/aqemu_links.html
+share/aqemu/crystalsvg_icons.rcc
+share/aqemu/os_icons/alt.png
+share/aqemu/os_icons/arch.png
+share/aqemu/os_icons/asp.png
+share/aqemu/os_icons/centos.png
+share/aqemu/os_icons/damnsmalllinux.png
+share/aqemu/os_icons/debian.png
+share/aqemu/os_icons/fedora.png
+share/aqemu/os_icons/freebsd.png
+share/aqemu/os_icons/gentoo.png
+share/aqemu/os_icons/knoppix.png
+share/aqemu/os_icons/kubuntu.png
+share/aqemu/os_icons/mac.png
+share/aqemu/os_icons/mandriva.png
+share/aqemu/os_icons/netbsd.png
+share/aqemu/os_icons/novell.png
+share/aqemu/os_icons/openbsd.png
+share/aqemu/os_icons/opensolaris.png
+share/aqemu/os_icons/redhat.png
+share/aqemu/os_icons/slackware.png
+share/aqemu/os_icons/solaris.png
+share/aqemu/os_icons/suse-novell.png
+share/aqemu/os_icons/suse.png
+share/aqemu/os_icons/symphony.png
+share/aqemu/os_icons/ubuntu.png
+share/aqemu/os_templates/FreeBSD 4.aqvmt
+share/aqemu/os_templates/FreeBSD 7.aqvmt
+share/aqemu/os_templates/FreeBSD 8.aqvmt
+share/aqemu/os_templates/Linux 2.0.aqvmt
+share/aqemu/os_templates/Linux 2.4.aqvmt
+share/aqemu/os_templates/Linux 2.6 x86_64.aqvmt
+share/aqemu/os_templates/Linux 2.6.aqvmt
+share/aqemu/os_templates/MacOS X x86.aqvmt
+share/aqemu/os_templates/Windows 2000.aqvmt
+share/aqemu/os_templates/Windows 7 x64.aqvmt
+share/aqemu/os_templates/Windows 7.aqvmt
+share/aqemu/os_templates/Windows 9X.aqvmt
+share/aqemu/os_templates/Windows Vista x64.aqvmt
+share/aqemu/os_templates/Windows Vista.aqvmt
+share/aqemu/os_templates/Windows XP x64.aqvmt
+share/aqemu/os_templates/Windows XP.aqvmt
+share/aqemu/oxygen_icons.rcc
+share/doc/aqemu/AUTHORS.bz2
+share/doc/aqemu/CHANGELOG.bz2
+share/doc/aqemu/README.bz2
+share/doc/aqemu/TODO.bz2
 share/pixmaps/aqemu_48x48.png
 share/pixmaps/aqemu_64x64.png
-@dirrm %%DATADIR%%/os_templates
-@dirrm %%DATADIR%%/os_icons
-@dirrm %%DATADIR%%
+@dirrm share/doc/aqemu
+@dirrm share/aqemu/os_templates
+@dirrm share/aqemu/os_icons
+@dirrm share/aqemu
 @dirrmtry share/applications