Attachment #230285 for bug #260124

Lines 111-116 Link Here

(-)b/emulators/Makefile (+1 lines)
111	SUBDIR += qemu5	111	SUBDIR += qemu5
112	SUBDIR += qmc2	112	SUBDIR += qmc2
113	SUBDIR += quasi88	113	SUBDIR += quasi88
		114	SUBDIR += ripes
114	SUBDIR += riscv-isa-sim	115	SUBDIR += riscv-isa-sim
115	SUBDIR += rpcs3	116	SUBDIR += rpcs3
116	SUBDIR += rtc	117	SUBDIR += rtc




PORTNAME=	ripes
DISTVERSIONPREFIX=	v
DISTVERSION=	2.2.3
CATEGORIES=	emulators

MAINTAINER=	mclay@astate.edu
COMMENT=	Graphical processor simulator and assembly editor for the RISC-V ISA

LICENSE=	MIT

USES=		cmake qmake qt:5

USE_QT=		buildtools_build charts concurrent core gui svg testlib widgets

USE_GITHUB=	yes
GH_ACCOUNT=	mortbopet
GH_PROJECT=	Ripes
GH_TUPLE=	mortbopet:VSRTL:65ac251:VSRTL/external/VSRTL \
		serge1:ELFIO:79fcd11:ELFIO/external/ELFIO \
		pbhogan:Signals:17881fb:Signals/external/VSRTL/external/Signals \
		USCiLab:cereal:51cbda5:cereal/external/VSRTL/external/cereal \
		mortbopet:better-enums:52a694b:better_enums/external/VSRTL/external/better-enums

.include <bsd.port.mk>




TIMESTAMP = 1638160024
SHA256 (mortbopet-Ripes-v2.2.3_GH0.tar.gz) = 321dbe3884a339d859e36c6d5fd1c402c616916c72fba5ead544eef64075e7ca
SIZE (mortbopet-Ripes-v2.2.3_GH0.tar.gz) = 14150373
SHA256 (mortbopet-VSRTL-65ac251_GH0.tar.gz) = 872b619e5c6f590d94a0ab6fec5e037cc3c948fefe3d3e59f7b5ba3bf9bfe8cc
SIZE (mortbopet-VSRTL-65ac251_GH0.tar.gz) = 14500229
SHA256 (serge1-ELFIO-79fcd11_GH0.tar.gz) = 2f2478e48dc20b30fd705e9ae7208ea8ab175b5aa9195d0705142ad6e9054e55
SIZE (serge1-ELFIO-79fcd11_GH0.tar.gz) = 4229577
SHA256 (pbhogan-Signals-17881fb_GH0.tar.gz) = 7d2c420dc34471519306dd4070c571c74cb129cac782cb0a38ba07f0ba8488f8
SIZE (pbhogan-Signals-17881fb_GH0.tar.gz) = 38528
SHA256 (USCiLab-cereal-51cbda5_GH0.tar.gz) = efa214cfc850a4a2360baf4419b88c93be2a08b09ff5f9bac604a18498b83cfb
SIZE (USCiLab-cereal-51cbda5_GH0.tar.gz) = 335754
SHA256 (mortbopet-better-enums-52a694b_GH0.tar.gz) = 6fe24b59328a174eae7b4d755d606615a5bc0397a2b9846079a931486bf94cd3
SIZE (mortbopet-better-enums-52a694b_GH0.tar.gz) = 136663




--- CMakeLists.txt.orig	2021-11-29 18:06:47 UTC
+++ CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.13)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -9,12 +9,20 @@ if(CCACHE_PROGRAM)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
 endif()
 
-project(Ripes CXX)
+project(Ripes
+        LANGUAGES CXX
+        DESCRIPTION "A graphical processor simulator and assembly editor for the RISC-V ISA"
+        HOMEPAGE_URL "https://github.com/mortbopet/Ripes"
+)
 
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    include(GNUInstallDirs) #Must exist after declaring a project
+endif()
+
 # Error flags on everything but MSVC
 if(NOT MSVC)
     set(CMAKE_CXX_FLAGS "-Wextra -Wall \
-        -Werror=switch -Werror=return-type -Werror=shadow \
+        -Werror=switch -Werror=return-type \
         -Werror=unreachable-code")
 endif()
 
@@ -89,6 +97,9 @@ elseif(${WIN32})
 endif()
 
 add_subdirectory(external)
+
+# Fix the name of the ripes library.
+set(RIPES_LIB ripes_lib)
 add_subdirectory(src)
 
 option(RIPES_BUILD_TESTS "Build Ripes tests" OFF)
@@ -102,4 +113,23 @@ add_executable(${APP_NAME} ${SYSTEM_FLAGS} ${ICONS_SRC
 # Link Qt libraries
 target_link_libraries(${APP_NAME} Qt5::Core Qt5::Widgets)
 # Link Ripes library
-target_link_libraries(${APP_NAME} ripes_lib)
+target_link_libraries(${APP_NAME} ${RIPES_LIB})
+
+if(UNIX AND NOT APPLE) #Define the LINUX variable before testing it
+    set(LINUX TRUE)
+endif()
+
+if(${LINUX})
+    install(TARGETS ${APP_NAME}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+elseif(${APPLE})
+    install(TARGETS ${APP_NAME}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        BUNDLE  DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+endif()
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/appdir/usr/
+    DESTINATION ${CMAKE_INSTALL_PREFIX}
+)

Added Link Here

(-)b/emulators/ripes/pkg-descr (+11 lines)
1	Ripes is a graphical processor simulator and assembly code editor built
2	for the RISC-V instruction set architecture, suitable for teaching how
3	assembly level code is executed on various microarchitectures.
4
5	Ripes may be used to explore concepts such as how machine code is executed
6	on a variety of microarchitectures (RV32IMC/RV64IMC based), how different
7	cache designs influence performance, how C and assembly code is compiled
8	and assembled to executable machine code, and how a processor interacts
9	with memory-mapped I/O.
10
11	WWW: https://github.com/mortbopet/ripes

Added Link Here

(-)b/emulators/ripes/pkg-plist (-1 / +11 lines)
0	-	1	/usr/local/bin/Ripes
		2	/usr/local/share/applications/Ripes.desktop
		3	/usr/local/share/icons/hicolor/48x48/apps/Ripes.png
		4	/usr/local/share/icons/hicolor/64x64/apps/Ripes.png
		5	/usr/local/share/icons/hicolor/512x512/apps/Ripes.png
		6	/usr/local/share/icons/hicolor/256x256/apps/Ripes.png
		7	/usr/local/share/icons/hicolor/24x24/apps/Ripes.png
		8	/usr/local/share/icons/hicolor/128x128/apps/Ripes.png
		9	/usr/local/share/icons/hicolor/22x22/apps/Ripes.png
		10	/usr/local/share/icons/hicolor/32x32/apps/Ripes.png
		11	/usr/local/share/icons/hicolor/16x16/apps/Ripes.png

Return to bug 260124

Added Link Here

(-)b/emulators/ripes/Makefile (+24 lines)
1	PORTNAME= ripes
2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.2.3
4	CATEGORIES= emulators
5
6	MAINTAINER= mclay@astate.edu
7	COMMENT= Graphical processor simulator and assembly editor for the RISC-V ISA
8
9	LICENSE= MIT
10
11	USES= cmake qmake qt:5
12
13	USE_QT= buildtools_build charts concurrent core gui svg testlib widgets
14
15	USE_GITHUB= yes
16	GH_ACCOUNT= mortbopet
17	GH_PROJECT= Ripes
18	GH_TUPLE= mortbopet:VSRTL:65ac251:VSRTL/external/VSRTL \
19	serge1:ELFIO:79fcd11:ELFIO/external/ELFIO \
20	pbhogan:Signals:17881fb:Signals/external/VSRTL/external/Signals \
21	USCiLab:cereal:51cbda5:cereal/external/VSRTL/external/cereal \
22	mortbopet:better-enums:52a694b:better_enums/external/VSRTL/external/better-enums
23
24	.include <bsd.port.mk>

Added Link Here

(-)b/emulators/ripes/distinfo (+13 lines)
1	TIMESTAMP = 1638160024
2	SHA256 (mortbopet-Ripes-v2.2.3_GH0.tar.gz) = 321dbe3884a339d859e36c6d5fd1c402c616916c72fba5ead544eef64075e7ca
3	SIZE (mortbopet-Ripes-v2.2.3_GH0.tar.gz) = 14150373
4	SHA256 (mortbopet-VSRTL-65ac251_GH0.tar.gz) = 872b619e5c6f590d94a0ab6fec5e037cc3c948fefe3d3e59f7b5ba3bf9bfe8cc
5	SIZE (mortbopet-VSRTL-65ac251_GH0.tar.gz) = 14500229
6	SHA256 (serge1-ELFIO-79fcd11_GH0.tar.gz) = 2f2478e48dc20b30fd705e9ae7208ea8ab175b5aa9195d0705142ad6e9054e55
7	SIZE (serge1-ELFIO-79fcd11_GH0.tar.gz) = 4229577
8	SHA256 (pbhogan-Signals-17881fb_GH0.tar.gz) = 7d2c420dc34471519306dd4070c571c74cb129cac782cb0a38ba07f0ba8488f8
9	SIZE (pbhogan-Signals-17881fb_GH0.tar.gz) = 38528
10	SHA256 (USCiLab-cereal-51cbda5_GH0.tar.gz) = efa214cfc850a4a2360baf4419b88c93be2a08b09ff5f9bac604a18498b83cfb
11	SIZE (USCiLab-cereal-51cbda5_GH0.tar.gz) = 335754
12	SHA256 (mortbopet-better-enums-52a694b_GH0.tar.gz) = 6fe24b59328a174eae7b4d755d606615a5bc0397a2b9846079a931486bf94cd3
13	SIZE (mortbopet-better-enums-52a694b_GH0.tar.gz) = 136663

Added Link Here

(-)b/emulators/ripes/files/patch-CMakeLists.txt (+66 lines)
1	--- CMakeLists.txt.orig 2021-11-29 18:06:47 UTC
2	+++ CMakeLists.txt
3	@@ -1,4 +1,4 @@
4	-cmake_minimum_required(VERSION 3.9)
5	+cmake_minimum_required(VERSION 3.13)
6	set(CMAKE_CXX_STANDARD 17)
7	set(CMAKE_CXX_STANDARD_REQUIRED ON)
8	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
9	@@ -9,12 +9,20 @@ if(CCACHE_PROGRAM)
10	set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
11	endif()
12
13	-project(Ripes CXX)
14	+project(Ripes
15	+ LANGUAGES CXX
16	+ DESCRIPTION "A graphical processor simulator and assembly editor for the RISC-V ISA"
17	+ HOMEPAGE_URL "https://github.com/mortbopet/Ripes"
18	+)
19
20	+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
21	+ include(GNUInstallDirs) #Must exist after declaring a project
22	+endif()
23	+
24	# Error flags on everything but MSVC
25	if(NOT MSVC)
26	set(CMAKE_CXX_FLAGS "-Wextra -Wall \
27	- -Werror=switch -Werror=return-type -Werror=shadow \
28	+ -Werror=switch -Werror=return-type \
29	-Werror=unreachable-code")
30	endif()
31
32	@@ -89,6 +97,9 @@ elseif(${WIN32})
33	endif()
34
35	add_subdirectory(external)
36	+
37	+# Fix the name of the ripes library.
38	+set(RIPES_LIB ripes_lib)
39	add_subdirectory(src)
40
41	option(RIPES_BUILD_TESTS "Build Ripes tests" OFF)
42	@@ -102,4 +113,23 @@ add_executable(${APP_NAME} ${SYSTEM_FLAGS} ${ICONS_SRC
43	# Link Qt libraries
44	target_link_libraries(${APP_NAME} Qt5::Core Qt5::Widgets)
45	# Link Ripes library
46	-target_link_libraries(${APP_NAME} ripes_lib)
47	+target_link_libraries(${APP_NAME} ${RIPES_LIB})
48	+
49	+if(UNIX AND NOT APPLE) #Define the LINUX variable before testing it
50	+ set(LINUX TRUE)
51	+endif()
52	+
53	+if(${LINUX})
54	+ install(TARGETS ${APP_NAME}
55	+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
56	+ )
57	+elseif(${APPLE})
58	+ install(TARGETS ${APP_NAME}
59	+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
60	+ BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
61	+ )
62	+endif()
63	+
64	+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/appdir/usr/
65	+ DESTINATION ${CMAKE_INSTALL_PREFIX}
66	+)