Attachment 105618 Details for Bug 146120 – scummvm-tools.diff

[patch] scummvm-tools.diff

scummvm-tools.diff (text/x-patch; charset=US-ASCII), 5.84 KB, created by Andre on 2010-05-08 17:13:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andre

Created: 2010-05-08 17:13:10 UTC

Size: 5.84 KB

patch

obsolete

>diff -urN orig-scummvm-tools/Makefile scummvm-tools/Makefile
>--- orig-scummvm-tools/Makefile	2010-05-08 10:33:43.000000000 +0200
>+++ scummvm-tools/Makefile	2010-05-08 17:48:08.000000000 +0200
>@@ -6,69 +6,125 @@
> #
> 
> PORTNAME=	scummvm-tools
>-DISTVERSION=	1.0.0rc1
>-PORTREVISION=	2
>+DISTVERSION=	1.1.1
> CATEGORIES=	games emulators
>-MASTER_SITES=	SF/scummvm/${PORTNAME}/${DISTVERSION}
>+MASTER_SITES=	SF
>+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${DISTVERSION}
> 
> MAINTAINER=	lme@FreeBSD.org
>-COMMENT=	Tools for use with the SCUMMVM game emulator
>+COMMENT=	Tools for use with the ScummVM interpreter
> 
> RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
>-BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
>-		flac:${PORTSDIR}/audio/flac \
>-		oggenc:${PORTSDIR}/audio/vorbis-tools \
>-		oggdec:${PORTSDIR}/audio/vorbis-tools \
>-
>-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
>-		vorbis.4:${PORTSDIR}/audio/libvorbis
> 
> USE_BZIP2=	yes
> USE_GMAKE=	yes
>+HAS_CONFIGURE=	yes
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
>+CONFIGURE_ARGS=	--prefix=${PREFIX} \
>+		--with-zlib-prefix=/usr \
>+		--disable-debug \
>+		--disable-tremor
>+
>+CONFIGURE_ENV=	CXX="${CXX}" \
>+		LDFLAGS="${PTHREAD_LIBS}"
>+
>+OPTIONS=	WX "Build wxWidgets GUI" on \
>+		VORBIS "Enable Ogg Vorbis support" on \
>+		MP3 "Enable MP3 support" on \
>+		FLAC "Enable FLAC support" on \
>+		PNG "Enable PNG support" on
>+
>+PORTDOCS=	COPYING NEWS README
>+
>+TOOLSBIN=	scummvm-tools-cli \
>+		construct_mohawk \
>+		dekyra \
>+		degob \
>+		descumm \
>+		extract_mohawk \
>+		desword2 \
>+		decine \
>+		deriven \
>+		create_sjisfnt
> 
>-MAKE_JOBS_SAFE=	yes
>+.include <bsd.port.pre.mk>
> 
>-MAKE_ENV=	"LDFLAGS= -L${LOCALBASE}/lib"
>-CXXFLAGS=	-I${LOCALBASE}/include
>+.if defined(WITH_WX)
>+TOOLSBIN+=	scummvm-tools
> 
>-OPTIONS=	WX "Build wxWidgets GUI" On
>+DESKTOP_ENTRIES="ScummVM Tools" \
>+		"Extraction & Compression Wizard" \
>+		"${DATADIR}/scummvmtools_128.png" \
>+		"scummvm-tools" \
>+		"Game;AdventureGame;" \
>+		false
>+.endif
> 
>-.include <bsd.port.pre.mk>
>+TOOLSMEDIA=	scummvmtools_128.png \
>+		detaillogo.jpg \
>+		logo.jpg \
>+		tile.gif
>+
>+PLIST_FILES=	$(TOOLSBIN:S/^/bin\/$$/) \
>+		$(TOOLSMEDIA:S/^/%%DATADIR%%\/$$/)
>+
>+PLIST_DIRS=	%%DATADIR%%
> 
> .if defined(WITH_WX)
> USE_WX=		2.4+
> WX_CONFIG=	${LOCALBASE}/bin/wxgtk2-2.8-config
> WX_COMP=	wx:lib:build
>-GUI_BIN=	tools_gui
>-PLIST_SUB=	WX=""
>+CONFIGURE_ARGS+=--with-wx-prefix=${LOCALBASE}
> .else
>-PLIST_SUB=	WX="@comment "
>+CONFIGURE_ARGS+=--disable-wxwidgets
> .endif
> 
>-post-patch:
>-.if defined(WITH_WX)
>-	@${REINPLACE_CMD} -e 's,wx-config,${WX_CONFIG},' ${WRKSRC}/Makefile
>+.if defined(WITH_VORBIS)
>+LIB_DEPENDS+=	ogg.6:${PORTSDIR}/audio/libogg \
>+		vorbis.4:${PORTSDIR}/audio/libvorbis
>+RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
>+CONFIGURE_ARGS+=--with-ogg-prefix=${LOCALBASE} \
>+		--with-vorbis-prefix=${LOCALBASE}
>+.else
>+CONFIGURE_ARGS+=--disable-vorbis
>+.endif
>+
>+.if defined(WITH_MP3)
>+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
>+RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
>+CONFIGURE_ARGS+=--with-mad-prefix=${LOCALBASE}
>+.else
>+CONFIGURE_ARGS+=--disable-mad
>+.endif
>+
>+.if defined(WITH_FLAC)
>+LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
>+RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
>+CONFIGURE_ARGS+=--with-flac-prefix=${LOCALBASE}
> .else
>-	@${REINPLACE_CMD} -e '/tools_gui$$(EXEEXT)$$/d' ${WRKSRC}/Makefile
>+CONFIGURE_ARGS+=--disable-flac
>+.endif
>+
>+.if defined(WITH_PNG)
>+LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
>+CONFIGURE_ARGS+=--with-png-prefix=${LOCALBASE}
>+.else
>+CONFIGURE_ARGS+=--disable-png
> .endif
> 
> do-install:
>-.for i in compress_agos compress_kyra compress_queen compress_saga \
>-		compress_scumm_bun compress_scumm_san compress_scumm_sou \
>-		compress_sword1 compress_sword2 compress_touche compress_tucker \
>-		decine dekyra descumm desword2 degob encode_dxa extract_agos \
>-		extract_cine extract_kyra extract_loom_tg16 extract_mm_apple \
>-		extract_mm_c64 extract_mm_nes extract_parallaction \
>-		extract_scumm_mac extract_t7g_mac extract_zak_c64 \
>-		extract_gob_stk ${GUI_BIN}
>-	@${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin
>+.for i in ${TOOLSBIN}
>+	@${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
>+.endfor
>+	@${MKDIR} ${DATADIR}
>+.for i in ${TOOLSMEDIA}
>+	@${INSTALL_DATA} ${WRKSRC}/gui/media/${i} ${DATADIR}
> .endfor
>-
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>+.for i in ${PORTDOCS}
>+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
>+.endfor
> .endif
> 
> .include <bsd.port.post.mk>
>diff -urN orig-scummvm-tools/distinfo scummvm-tools/distinfo
>--- orig-scummvm-tools/distinfo	2010-05-08 10:33:43.000000000 +0200
>+++ scummvm-tools/distinfo	2010-05-08 13:24:10.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (scummvm-tools-1.0.0rc1.tar.bz2) = 3434770afa91a8eaf4fa31c9229d7686
>-SHA256 (scummvm-tools-1.0.0rc1.tar.bz2) = 437d32f06bb00ae9a5bf6b38b73b8447ebf2ab9e28ecaf5580fcdef6be1c7545
>-SIZE (scummvm-tools-1.0.0rc1.tar.bz2) = 241672
>+MD5 (scummvm-tools-1.1.1.tar.bz2) = 3d747434cbb5fb768b16a5b80ed39220
>+SHA256 (scummvm-tools-1.1.1.tar.bz2) = b651e6e732d890d7cb1786b793c0de50092334dd3211ec6d43f0e8f189d966ac
>+SIZE (scummvm-tools-1.1.1.tar.bz2) = 456844
>diff -urN orig-scummvm-tools/pkg-plist scummvm-tools/pkg-plist
>--- orig-scummvm-tools/pkg-plist	2010-05-08 10:33:43.000000000 +0200
>+++ scummvm-tools/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>@@ -1,32 +0,0 @@
>-bin/compress_agos
>-bin/compress_kyra
>-bin/compress_queen
>-bin/compress_saga
>-bin/compress_scumm_bun
>-bin/compress_scumm_san
>-bin/compress_scumm_sou
>-bin/compress_sword1
>-bin/compress_sword2
>-bin/compress_touche
>-bin/compress_tucker
>-bin/decine
>-bin/degob
>-bin/dekyra
>-bin/descumm
>-bin/desword2
>-bin/encode_dxa
>-bin/extract_agos
>-bin/extract_cine
>-bin/extract_gob_stk
>-bin/extract_kyra
>-bin/extract_loom_tg16
>-bin/extract_mm_apple
>-bin/extract_mm_c64
>-bin/extract_mm_nes
>-bin/extract_parallaction
>-bin/extract_scumm_mac
>-bin/extract_t7g_mac
>-bin/extract_zak_c64
>-%%WX%%bin/tools_gui
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 146120: 105616 | 105617 | 105618