Attachment #210393 for bug #242940




# $FreeBSD$

PORTNAME=	devilutionX
PORTVERSION=	1.0.0
PORTREVISION=	0
CATEGORIES=	games

MAINTAINER=	benny.goemans@gmail.com
COMMENT=	Diablo I engine for modern operating systems

LICENSE=	UNLICENSE

LIB_DEPENDS=	libsodium.so:security/libsodium

BUILD_DEPENDS=	${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf:x11-fonts/charis
RUN_DEPENDS:=	${BUILD_DEPENDS}

USES=		cmake compiler:c++11-lang dos2unix sdl
USE_SDL=	mixer2 sdl2 ttf2
DOS2UNIX_GLOB=  *.c *.h CMakeLists.txt
PLIST_FILES=	bin/devilutionx

USE_GITHUB=	yes
GH_ACCOUNT=	diasurgical

CMAKE_ARGS+=	-D CMAKE_CXX_FLAGS=-DTTF_FONT_PATH=\"${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf\" \
		-D CMAKE_INSTALL_BINDIR:PATH=${BINDIR} \
		-D CMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \
		-D GIT_TAG=${PORTVERSION}

RELEASE_DESC=	Build a release build
NIGHTLY_DESC=	Build a debug build

RELEASE_CMAKE_BOOL=	BINARY_RELEASE
NIGHTLY_CMAKE_BOOL=	NIGHTLY_BUILD

.if defined(WITH_DEBUG)
CMAKE_ARGS+=	-D NIGHTLY_BUILD:BOOL=ON
.else
CMAKE_ARGS+=	-D BINARY_RELEASE:BOOL=ON
.endif
			false

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/games/devilutionX/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1570734030	1	TIMESTAMP = 1577908977
2	SHA256 (diasurgical-devilutionX-0.5.0_GH0.tar.gz) = 45f779084aa7459880e5eab1bf3d63dcd223d937485a840dc055e7d1e8eace5c	2	SHA256 (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = fafb0bac935bbbee8e261d7fbd2d4ea769b88bbc78ba1affef74064a2cc77779
3	SIZE (diasurgical-devilutionX-0.5.0_GH0.tar.gz) = 1767600	3	SIZE (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = 1798349




--- CMakeLists.txt.orig	2019-12-27 15:25:22 UTC
+++ CMakeLists.txt
@@ -326,7 +326,7 @@ if(WIN32)
   endif()
   set(ASAN OFF)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
+  add_definitions(-D__BSD_VISIBLE=1)
+  add_definitions(-D__POSIX_VISIBLE=200809L)
+  add_definitions(-D__XSI_VISIBLE=1)
 endif()
 
-if(NOT WIN32 AND NOT APPLE)
+if(NOT WIN32 AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
   # Enable POSIX extensions such as `readlink` and `ftruncate`.
   add_definitions(-D_POSIX_C_SOURCE=200809L)
 endif()
@@ -337,8 +337,8 @@ endif()
 
 if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   # Change __FILE__ to only show the path relative to the project folder

 
   if(DEBUG)
     # Note: For Valgrind suppor.
@@ -399,3 +399,9 @@ if(APPLE)
 
   include(CPack)
 endif()
+
+install(TARGETS devilutionx 				DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES   Packaging/fedora/devilutionx.desktop 	DESTINATION ${CMAKE_INSTALL_SHAREDIR}/applications)
+install(FILES   Packaging/resources/16.png 		DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/16x16/apps RENAME devilutionx.png)
+install(FILES   Packaging/resources/Diablo_32.png 	DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/32x32/apps RENAME devilutionx.png)
+install(FILES   Packaging/resources/Diablo_48.png 	DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png)




--- Packaging/fedora/devilutionx.desktop.orig	2019-12-27 16:29:35 UTC
+++ Packaging/fedora/devilutionx.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=devilutionX
+Name=DevilutionX
 GenericName=DevilutionX
-Comment=Play Diablo I on Linux
+Comment=Play Diablo I
 Exec=devilutionx
-Icon=devilutionx.png
+Icon=devilutionx
 Terminal=false
 Type=Application
 X-DCOP-ServiceType=Multi
 X-KDE-StartupNotify=true
-Categories=Qt;Game;RolePlaying;
+Categories=Game;RolePlaying;

Added Link Here

(-)b/games/devilutionX/pkg-plist (+5 lines)
1	bin/devilutionx
2	share/applications/devilutionx.desktop
3	share/icons/hicolor/16x16/apps/devilutionx.png
4	share/icons/hicolor/32x32/apps/devilutionx.png
5	share/icons/hicolor/48x48/apps/devilutionx.png

Return to bug 242940

Lines 1-41 Link Here

(-)b/games/devilutionX/Makefile (-20 / +15 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= devilutionX	3	PORTNAME= devilutionX
4	PORTVERSION= 0.5.0	4	PORTVERSION= 1.0.0
5	PORTREVISION= 0	5	PORTREVISION= 0
6	CATEGORIES= games	6	CATEGORIES= games
7		7
8	MAINTAINER= benny.goemans@gmail.com	8	MAINTAINER= benny.goemans@gmail.com
9	COMMENT= Open-source implementation of Diablo Game engine	9	COMMENT= Diablo I engine for modern operating systems
10		10
11	LICENSE= UNLICENSE	11	LICENSE= UNLICENSE
12		12
13	LIB_DEPENDS= libsodium.so:security/libsodium	13	LIB_DEPENDS= libsodium.so:security/libsodium
14		14
		15	BUILD_DEPENDS= ${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf:x11-fonts/charis
		16	RUN_DEPENDS:= ${BUILD_DEPENDS}
		17
15	USES= cmake compiler:c++11-lang dos2unix sdl	18	USES= cmake compiler:c++11-lang dos2unix sdl
16	USE_SDL= mixer2 sdl2 ttf2	19	USE_SDL= mixer2 sdl2 ttf2
17		20	DOS2UNIX_GLOB= .c .h CMakeLists.txt
18	PLIST_FILES= bin/devilutionx
19		21
20	USE_GITHUB= yes	22	USE_GITHUB= yes
21	GH_ACCOUNT= diasurgical	23	GH_ACCOUNT= diasurgical
22		24
23	OPTIONS_DEFAULT= RELEASE	25	CMAKE_ARGS+= -D CMAKE_CXX_FLAGS=-DTTF_FONT_PATH=\"${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf\" \
24		26	-D CMAKE_INSTALL_BINDIR:PATH=${BINDIR} \
25	OPTIONS_SINGLE= TYPE	27	-D CMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \
26	OPTIONS_SINGLE_TYPE= NIGHTLY RELEASE	28	-D GIT_TAG=${PORTVERSION}
27
28	RELEASE_DESC= Build a release build
29	NIGHTLY_DESC= Build a debug build
30
31	RELEASE_CMAKE_BOOL= BINARY_RELEASE
32	NIGHTLY_CMAKE_BOOL= NIGHTLY_BUILD
33		29
34	DESKTOP_ENTRIES= "DevilutionX" \	30	.if defined(WITH_DEBUG)
35	"" \	31	CMAKE_ARGS+= -D NIGHTLY_BUILD:BOOL=ON
36	"" \	32	.else
37	"devilutionx" \	33	CMAKE_ARGS+= -D BINARY_RELEASE:BOOL=ON
38	"Game;AdventureGame;" \	34	.endif
39	false
40		35
41	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)b/games/devilutionX/files/patch-CMakeLists.txt (-17 / +17 lines)
1	--- CMakeLists.txt.orig 2019-10-11 23:27:07 UTC	1	--- CMakeLists.txt.orig 2019-12-27 15:25:22 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -68,6 +68,9 @@ list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DI	3	@@ -326,7 +326,7 @@ if(WIN32)
4	if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)	4	endif()
5	set(ASAN OFF)
6	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
7	+ add_definitions(-D__BSD_VISIBLE=1)
8	+ add_definitions(-D__POSIX_VISIBLE=200809L)
9	+ add_definitions(-D__XSI_VISIBLE=1)
10	endif()	5	endif()
11		6
12	if(WIN32)	7	-if(NOT WIN32 AND NOT APPLE)
13	@@ -337,8 +340,8 @@ endif()	8	+if(NOT WIN32 AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
		9	# Enable POSIX extensions such as `readlink` and `ftruncate`.
		10	add_definitions(-D_POSIX_C_SOURCE=200809L)
		11	endif()
		12	@@ -337,8 +337,8 @@ endif()
14		13
15	if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")	14	if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
16	# Change __FILE__ to only show the path relative to the project folder	15	# Change __FILE__ to only show the path relative to the project folder
Lines 21-32 Link Here
21		20
22	if(DEBUG)	21	if(DEBUG)
23	# Note: For Valgrind suppor.	22	# Note: For Valgrind suppor.
24	@@ -368,6 +371,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")	23	@@ -399,3 +399,9 @@ if(APPLE)
25	# Silence appfat.cpp warnings	24
26	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing")	25	include(CPack)
27	endif()	26	endif()
28	+	27	+
29	+install(TARGETS devilutionx DESTINATION ${BINDIR})	28	+install(TARGETS devilutionx DESTINATION ${CMAKE_INSTALL_BINDIR})
30		29	+install(FILES Packaging/fedora/devilutionx.desktop DESTINATION ${CMAKE_INSTALL_SHAREDIR}/applications)
31	if(APPLE)	30	+install(FILES Packaging/resources/16.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/16x16/apps RENAME devilutionx.png)
32	set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)	31	+install(FILES Packaging/resources/Diablo_32.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/32x32/apps RENAME devilutionx.png)
		32	+install(FILES Packaging/resources/Diablo_48.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png)

Added Link Here

(-)b/games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop (+18 lines)
1	--- Packaging/fedora/devilutionx.desktop.orig 2019-12-27 16:29:35 UTC
2	+++ Packaging/fedora/devilutionx.desktop
3	@@ -1,11 +1,11 @@
4	[Desktop Entry]
5	-Name=devilutionX
6	+Name=DevilutionX
7	GenericName=DevilutionX
8	-Comment=Play Diablo I on Linux
9	+Comment=Play Diablo I
10	Exec=devilutionx
11	-Icon=devilutionx.png
12	+Icon=devilutionx
13	Terminal=false
14	Type=Application
15	X-DCOP-ServiceType=Multi
16	X-KDE-StartupNotify=true
17	-Categories=Qt;Game;RolePlaying;
18	+Categories=Game;RolePlaying;