Attachment #117313 for bug #159387

View | Details | Raw Unified | Return to bug 159387
Collapse All | Expand All




USE_SDL=	sdl
USE_CMAKE=	yes
CMAKE_ARGS+=	-DVERSION:STRING="${PORTVERSION}" -DSYSCONFDIR:STRING="${PREFIX}/etc"
SVN_REV=	1001

.include <bsd.port.pre.mk>

.if defined(WITH_ASM) && ${ARCH} == "i386"
BUILD_DEPENDS+=	as:${PORTSDIR}/devel/binutils
CMAKE_ARGS+=	-DENABLE_ASM_CORE:BOOL=yes -DENABLE_ASM_SCALERS:BOOL=yes
.endif

.if defined(WITH_GVBAM)

		gdkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm
.else
PLIST_SUB+=	GVBAM="@comment "
CMAKE_ARGS+=	-DENABLE_GTK:BOOL=no
.endif

.if !defined(WITHOUT_NLS)
USE_GETTEXT=	yes
CMAKE_ARGS+=	-DENABLE_NLS:BOOL=yes
PLIST_SUB+=	NLS=""
.else
CMAKE_ARGS+=	-DENABLE_NLS:BOOL=no
PLIST_SUB+=	NLS="@comment "
.endif

post-patch:

Lines 1-2 Link Here

(-)visualboyadvance-m/distinfo (-2 / +2 lines)
1	SHA256 (visualboyadvance-m-1.8.0r966.tar.bz2) = 921bcc750fdaff4a41c72f1a52efa90886022cdefbefa909881da7b096b64021	1	SHA256 (visualboyadvance-m-1.8.0r1001.tar.bz2) = 8668c8b556826681c8e848d999ff3ba1383daf78e3410a20bcfc0e8f2eeed4c2
2	SIZE (visualboyadvance-m-1.8.0r966.tar.bz2) = 746183	2	SIZE (visualboyadvance-m-1.8.0r1001.tar.bz2) = 766938




--- CMakeLists.txt.orig	2010-03-14 23:36:45.000000000 -0400
+++ CMakeLists.txt	2010-11-26 03:08:11.543538713 -0500
@@ -1,5 +1,5 @@
 # The project's name is VBA-M it uses C and C++ code
-PROJECT(VBA-M C CXX)
+PROJECT(VBA-M)
 
 cmake_minimum_required( VERSION 2.6.0 )
 if( COMMAND cmake_policy )
@@ -344,8 +344,7 @@
 
     INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
-            DESTINATION ${SYSCONFDIR}
-            RENAME vbam.cfg)
+            DESTINATION ${SYSCONFDIR})
 ENDIF( ENABLE_SDL )
 
 IF( ENABLE_GTK )




%%GVBAM%%share/icons/hicolor/24x24/apps/vbam.png
%%GVBAM%%share/icons/hicolor/32x32/apps/vbam.png
%%GVBAM%%share/icons/hicolor/scalable/apps/vbam.svg
%%GVBAM%%%%NLS%%share/locale/en/LC_MESSAGES/gvbam.mo
%%GVBAM%%%%NLS%%share/locale/fr/LC_MESSAGES/gvbam.mo
%%GVBAM%%share/vbam/ui/cheatedit.ui
%%GVBAM%%share/vbam/ui/cheatlist.ui
%%GVBAM%%share/vbam/ui/display.ui
%%GVBAM%%share/vbam/ui/gameboy.ui
%%GVBAM%%share/vbam/ui/gameboyadvance.ui
%%GVBAM%%share/vbam/ui/preferences.ui
%%GVBAM%%share/vbam/ui/sound.ui
%%GVBAM%%share/vbam/ui/vbam.ui
%%GVBAM%%share/vbam/vba-over.ini
%%GVBAM%%@dirrmtry share/icons/hicolor/scalable/apps/
%%GVBAM%%@dirrmtry share/icons/hicolor/16x16/
%%GVBAM%%@dirrmtry share/icons/hicolor/22x22/
%%GVBAM%%@dirrmtry share/icons/hicolor/24x24/
%%GVBAM%%@dirrmtry share/icons/hicolor/32x32/
%%GVBAM%%@dirrmtry share/icons/hicolor/scalable/
%%GVBAM%%@dirrmtry share/icons/hicolor/
%%GVBAM%%@dirrmtry share/icons/
%%GVBAM%%@dirrm share/vbam/ui
%%GVBAM%%@dirrm share/vbam
%%GVBAM%%@dirrm share/icons/hicolor/scalable/apps
%%GVBAM%%@dirrm share/icons/hicolor/scalable
%%GVBAM%%@dirrm share/icons/hicolor/32x32/apps
%%GVBAM%%@dirrm share/icons/hicolor/32x32
%%GVBAM%%@dirrm share/icons/hicolor/24x24/apps
%%GVBAM%%@dirrm share/icons/hicolor/24x24
%%GVBAM%%@dirrm share/icons/hicolor/22x22/apps
%%GVBAM%%@dirrm share/icons/hicolor/22x22
%%GVBAM%%@dirrm share/icons/hicolor/16x16/apps
%%GVBAM%%@dirrm share/icons/hicolor/16x16
%%GVBAM%%@dirrm share/icons/hicolor
%%GVBAM%%@dirrm share/icons
%%GVBAM%%@dirrm share/applications
%%GVBAM%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
%%GVBAM%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Return to bug 159387

Lines 30-42 Link Here

(-)visualboyadvance-m/Makefile (-3 / +12 lines)
30	USE_SDL= sdl	30	USE_SDL= sdl
31	USE_CMAKE= yes	31	USE_CMAKE= yes
32	CMAKE_ARGS+= -DVERSION:STRING="${PORTVERSION}" -DSYSCONFDIR:STRING="${PREFIX}/etc"	32	CMAKE_ARGS+= -DVERSION:STRING="${PORTVERSION}" -DSYSCONFDIR:STRING="${PREFIX}/etc"
33	SVN_REV= 966	33	SVN_REV= 1001
34		34
35	.include <bsd.port.pre.mk>	35	.include <bsd.port.pre.mk>
36		36
37	.if defined(WITH_ASM) && ${ARCH} == "i386"	37	.if defined(WITH_ASM) && ${ARCH} == "i386"
38	BUILD_DEPENDS+= as:${PORTSDIR}/devel/binutils	38	BUILD_DEPENDS+= as:${PORTSDIR}/devel/binutils
39	CMAKE_ARGS+= -DUSE_ASM_CORE=yes -DUSE_ASM_SCALERS=yes	39	CMAKE_ARGS+= -DENABLE_ASM_CORE:BOOL=yes -DENABLE_ASM_SCALERS:BOOL=yes
40	.endif	40	.endif
41		41
42	.if defined(WITH_GVBAM)	42	.if defined(WITH_GVBAM)
Lines 49-55 Link Here
49	gdkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm	49	gdkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm
50	.else	50	.else
51	PLIST_SUB+= GVBAM="@comment "	51	PLIST_SUB+= GVBAM="@comment "
52	CMAKE_ARGS+= -DNO_GTK:BOOL=yes	52	CMAKE_ARGS+= -DENABLE_GTK:BOOL=no
		53	.endif
		54
		55	.if !defined(WITHOUT_NLS)
		56	USE_GETTEXT= yes
		57	CMAKE_ARGS+= -DENABLE_NLS:BOOL=yes
		58	PLIST_SUB+= NLS=""
		59	.else
		60	CMAKE_ARGS+= -DENABLE_NLS:BOOL=no
		61	PLIST_SUB+= NLS="@comment "
53	.endif	62	.endif
54		63
55	post-patch:	64	post-patch:

Lines 1-18 Link Here

(-)visualboyadvance-m/files/patch-CMakeLists.txt (-5 / +6 lines)
1	--- CMakeLists.txt.orig 2010-03-14 23:36:45.000000000 -0400	1	--- CMakeLists.txt.orig 2010-03-14 23:36:45.000000000 -0400
2	+++ CMakeLists.txt 2010-11-26 03:08:11.543538713 -0500	2	+++ CMakeLists.txt 2010-11-26 03:08:11.543538713 -0500
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	# The project's name is VBA-M it uses assembly, C and C++ code	4	# The project's name is VBA-M it uses C and C++ code
5	-PROJECT(VBA-M ASM C CXX)	5	-PROJECT(VBA-M C CXX)
6	+PROJECT(VBA-M)	6	+PROJECT(VBA-M)
7		7
8	cmake_minimum_required( VERSION 2.4.6 )	8	cmake_minimum_required( VERSION 2.6.0 )
9	if( COMMAND cmake_policy )	9	if( COMMAND cmake_policy )
10	@@ -341,8 +341,7 @@	10	@@ -344,8 +344,7 @@
11		11
12	INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)	12	INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
13	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example	13	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
14	- DESTINATION ${SYSCONFDIR}	14	- DESTINATION ${SYSCONFDIR}
15	- RENAME vbam.cfg)	15	- RENAME vbam.cfg)
16	+ DESTINATION ${SYSCONFDIR})	16	+ DESTINATION ${SYSCONFDIR})
		17	ENDIF( ENABLE_SDL )
17		18
18	ENDIF( CAN_BUILD_VBAM )	19	IF( ENABLE_GTK )

Lines 9-33 Link Here

(-)visualboyadvance-m/pkg-plist (-16 / +22 lines)
9	%%GVBAM%%share/icons/hicolor/24x24/apps/vbam.png	9	%%GVBAM%%share/icons/hicolor/24x24/apps/vbam.png
10	%%GVBAM%%share/icons/hicolor/32x32/apps/vbam.png	10	%%GVBAM%%share/icons/hicolor/32x32/apps/vbam.png
11	%%GVBAM%%share/icons/hicolor/scalable/apps/vbam.svg	11	%%GVBAM%%share/icons/hicolor/scalable/apps/vbam.svg
12	%%GVBAM%%share/vbam/ui/sound.ui	12	%%GVBAM%%%%NLS%%share/locale/en/LC_MESSAGES/gvbam.mo
13	%%GVBAM%%share/vbam/ui/gameboyadvance.ui	13	%%GVBAM%%%%NLS%%share/locale/fr/LC_MESSAGES/gvbam.mo
		14	%%GVBAM%%share/vbam/ui/cheatedit.ui
		15	%%GVBAM%%share/vbam/ui/cheatlist.ui
14	%%GVBAM%%share/vbam/ui/display.ui	16	%%GVBAM%%share/vbam/ui/display.ui
15	%%GVBAM%%share/vbam/ui/gameboy.ui	17	%%GVBAM%%share/vbam/ui/gameboy.ui
16	%%GVBAM%%share/vbam/ui/vbam.glade	18	%%GVBAM%%share/vbam/ui/gameboyadvance.ui
17	%%GVBAM%%@dirrmtry share/icons/hicolor/16x16/apps/	19	%%GVBAM%%share/vbam/ui/preferences.ui
18	%%GVBAM%%@dirrmtry share/icons/hicolor/22x22/apps/	20	%%GVBAM%%share/vbam/ui/sound.ui
19	%%GVBAM%%@dirrmtry share/icons/hicolor/24x24/apps/	21	%%GVBAM%%share/vbam/ui/vbam.ui
20	%%GVBAM%%@dirrmtry share/icons/hicolor/32x32/apps/	22	%%GVBAM%%share/vbam/vba-over.ini
21	%%GVBAM%%@dirrmtry share/icons/hicolor/scalable/apps/
22	%%GVBAM%%@dirrmtry share/icons/hicolor/16x16/
23	%%GVBAM%%@dirrmtry share/icons/hicolor/22x22/
24	%%GVBAM%%@dirrmtry share/icons/hicolor/24x24/
25	%%GVBAM%%@dirrmtry share/icons/hicolor/32x32/
26	%%GVBAM%%@dirrmtry share/icons/hicolor/scalable/
27	%%GVBAM%%@dirrmtry share/icons/hicolor/
28	%%GVBAM%%@dirrmtry share/icons/
29	%%GVBAM%%@dirrm share/vbam/ui	23	%%GVBAM%%@dirrm share/vbam/ui
30	%%GVBAM%%@dirrm share/vbam	24	%%GVBAM%%@dirrm share/vbam
31	%%GVBAM%%@dirrmtry share/applications	25	%%GVBAM%%@dirrm share/icons/hicolor/scalable/apps
		26	%%GVBAM%%@dirrm share/icons/hicolor/scalable
		27	%%GVBAM%%@dirrm share/icons/hicolor/32x32/apps
		28	%%GVBAM%%@dirrm share/icons/hicolor/32x32
		29	%%GVBAM%%@dirrm share/icons/hicolor/24x24/apps
		30	%%GVBAM%%@dirrm share/icons/hicolor/24x24
		31	%%GVBAM%%@dirrm share/icons/hicolor/22x22/apps
		32	%%GVBAM%%@dirrm share/icons/hicolor/22x22
		33	%%GVBAM%%@dirrm share/icons/hicolor/16x16/apps
		34	%%GVBAM%%@dirrm share/icons/hicolor/16x16
		35	%%GVBAM%%@dirrm share/icons/hicolor
		36	%%GVBAM%%@dirrm share/icons
		37	%%GVBAM%%@dirrm share/applications
32	%%GVBAM%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true	38	%%GVBAM%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true
33	%%GVBAM%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true	39	%%GVBAM%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true