Attachment 149810 Details for Bug 195358 – Patch

[patch] Patch

el.patch (text/plain), 2.88 KB, created by Dmitry Marakasov on 2014-11-25 01:24:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-11-25 01:24:20 UTC

Size: 2.88 KB

patch

obsolete

>Index: el/Makefile
>===================================================================
>--- el/Makefile	(revision 373391)
>+++ el/Makefile	(working copy)
>@@ -15,6 +15,8 @@
> 		libcal3d.so:${PORTSDIR}/graphics/cal3d
> RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data
> 
>+BROKEN_sparc64=	Does not build on sparc64
>+
> USES=		compiler:c++11-lang gmake iconv openal:al,alut tar:xz
> USE_GNOME=	libxml2
> USE_SDL=	sdl net image
>@@ -23,26 +25,17 @@
> 
> ALL_TARGET=	el.bin
> MAKEFILE=	Makefile.bsd
>-PLIST=		${WRKDIR}/pkg-plist
>+PLIST_FILES=	bin/el \
>+		%%DATADIR%%/el.bin
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "sparc64"
>-BROKEN=		Does not build on ${ARCH}
>-.endif
>-
> pre-install:
> 	@${ECHO} "#!/bin/sh" > ${WRKDIR}/el
> 	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/el
> 	@${ECHO} "exec ${DATADIR}/el.bin" >> ${WRKDIR}/el
> 
>-	@${ECHO} "bin/el" > ${PLIST}
>-	@${ECHO} "%%DATADIR%%/el.bin" >> ${PLIST}
>-	@${ECHO} "@dirrmtry %%DATADIR%%" >> ${PLIST}
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
> 	${INSTALL_SCRIPT} ${WRKDIR}/el ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKSRC}/el.bin ${STAGEDIR}${DATADIR}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: el-data/Makefile
>===================================================================
>--- el-data/Makefile	(revision 373362)
>+++ el-data/Makefile	(working copy)
>@@ -22,10 +22,11 @@
> DOS2UNIX_GLOB=	*.ini *.txt
> 
> DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
>-PLIST=		${WRKDIR}/pkg-plist
> WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX:S/-/_/}linux
> EL_DATA=	${PKGNAMEPREFIX:S/-/_/}linux_${PORTVERSION}.zip
> 
>+PORTDATA=	*
>+
> OPTIONS_DEFINE=	ELSOUND ELMUSIC
> OPTIONS_DEFAULT=	ELSOUND ELMUSIC
> ELSOUND_DESC=	Install additional sound files
>@@ -35,12 +36,10 @@
> 
> .if ${PORT_OPTIONS:MELSOUND}
> DISTFILES+=	EL_sound_191${EXTRACT_SUFX}:sound
>-HAVE_ESOUND=	yes
> .endif
> 
> .if ${PORT_OPTIONS:MELMUSIC}
> DISTFILES+=	EL_music_full${EXTRACT_SUFX}:music
>-HAVE_EMUSIC=	yes
> .endif
> 
> do-extract:
>@@ -64,17 +63,7 @@
> 	@${FIND} ${WRKSRC} -type f -name "*.bin" -print0 | \
> 		${XARGS} -0 ${RM} -R
> 
>-pre-install:
>-	@${RM} -f ${PLIST}
>-	@cd ${WRKSRC} && \
>-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
>-			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
>-	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
>-
> do-install:
>-	${MKDIR} ${STAGEDIR}${DATADIR}
>-	@cd ${WRKSRC} && \
>-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
>-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/{}" \;
>+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
> 
> .include <bsd.port.mk>
>Index: el-data/pkg-descr
>===================================================================
>--- el-data/pkg-descr	(revision 373362)
>+++ el-data/pkg-descr	(working copy)
>@@ -1,3 +1,3 @@
> The Eternal Lands data and sounds files.
> 
>-WWW:	http://www.eternal-lands.com/
>+WWW: http://www.eternal-lands.com/

Actions: View | Diff

Attachments on bug 195358: 149810