Attachment 101776 Details for Bug 141410 – file.diff

[patch] file.diff

file.diff (text/plain), 2.29 KB, created by Barbara on 2009-12-12 21:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Barbara

Created: 2009-12-12 21:40:02 UTC

Size: 2.29 KB

patch

obsolete

>--- Makefile.orig	2009-12-12 15:27:41.000000000 +0100
>+++ Makefile	2009-12-12 22:29:33.000000000 +0100
>@@ -21,7 +21,7 @@
> 
> OPTIONS=	ALLEGRO "Use Allegro for hardware API" off \
> 		FLAC "Enable FLAC support" off \
>-		LAUNCHER "Build GUI launcher" on \
>+		LAUNCHER "Build GUI launcher" off \
> 		LIBMAD "Enable MP3 support" off \
> 		MIKMOD "Enable MikMod support" off \
> 		OPENAL "Enable OpenAL support" off \
>@@ -29,12 +29,10 @@
> 		OPTIMIZED_CFLAGS "Enable compilation optimizations" off \
> 		VORBIS "Enable Ogg Vorbis support" off \
> 		SDL "Use SDL for hardware API" on \
>-		WXUNICODE "Enable Unicode support" on
>+		WXUNICODE "Enable Unicode support" off
> 
> SUB_FILES=	pkg-message
> 
>-BROKEN=		fails to build with new cmake.
>-
> .include <bsd.port.pre.mk>
> 
> # The `-fno-strict-aliasing' flag (default on FreeBSD 6.0+) produces
>@@ -64,15 +62,15 @@
> CMAKE_ARGS+=	-DWITH_FLAC=N
> .endif
> 
>-.if defined(WITH_LAUNCHER)
>-USE_WX=		2.4+
>-CMAKE_ARGS+=	-DENABLE_LAUNCHER=Y \
>-		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}"
>-PLIST_SUB+=	LAUNCHER=""
>-.else
>+#.if defined(WITH_LAUNCHER)
>+#USE_WX=		2.4+
>+#CMAKE_ARGS+=	-DENABLE_LAUNCHER=Y \
>+#		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}"
>+#PLIST_SUB+=	LAUNCHER=""
>+#.else
> CMAKE_ARGS+=	-DENABLE_LAUNCHER=N
> PLIST_SUB+=	LAUNCHER="@comment "
>-.endif
>+#.endif
> 
> .if defined(WITH_LIBMAD)
> LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
>@@ -128,6 +126,14 @@
> WX_UNICODE=yes
> .endif
> 
>+pre-everything::
>+.if defined(WITH_LAUNCHER)
>+	@${ECHO_MSG}    ""
>+	@${ECHO_MSG}    "===> Even if WITH_LAUNCHER has been set, vlauch will not"
>+	@${ECHO_MSG}    "===> be built because of a problem with cmake and wxgtk"
>+	@${ECHO_MSG}    ""
>+.endif
>+
> post-patch:
> 	@cd ${WRKSRC} && ${SH} fixunix.sh
> 	@${REINPLACE_CMD} -e 's|$$\* ||; s|$${IWADDIR}|-iwaddir ${DMDIR} $$*|' \
>--- files/pkg-message.in.orig	2008-04-24 18:41:23.000000000 +0200
>+++ files/pkg-message.in	2009-12-12 22:26:59.000000000 +0100
>@@ -12,6 +12,7 @@
> "games/vavoom-extras" port. Note that textures require OPENGL and soundtracks
> need VORBIS (build options).
> 
>-If you enabled LAUNCHER (build option), run "vlaunch" for a launcher GUI.
>+Even if you enabled LAUNCHER (build option), the launcher GUI "vlaunch"
>+has not been built because of a problem with cmake. It will be fixed ASAP.
> 
> ==============================================================================

Actions: View | Diff

Attachments on bug 141410: 101776