Attachment 151834 Details for Bug 196871 – wip (2 ports converted)

[patch] wip (2 ports converted)

gac_install.diff (text/plain), 2.00 KB, created by Jan Beich on 2015-01-19 09:15:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-01-19 09:15:05 UTC

Size: 2.00 KB

patch

obsolete

>Index: Mk/Uses/mono.mk
>===================================================================
>--- Mk/Uses/mono.mk	(revision 376949)
>+++ Mk/Uses/mono.mk	(working copy)
>@@ -26,8 +26,9 @@ RUN_DEPENDS+=		mono:${PORTSDIR}/lang/mono
> XSP_DOCROOT=		${PREFIX}/www/xsp
> 
> # gac utilities
>-GACUTIL=${LOCALBASE}/bin/gacutil /root ${PREFIX}/lib/ /gacdir ${PREFIX}/lib
>-GACUTIL_INSTALL=${GACUTIL} /i
>-GACUTIL_INSTALL_PACKAGE=${GACUTIL} /i /package 1.0 /package 2.0
>+GACUTIL?=${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil \
>+	/root ${STAGEDIR}${PREFIX}/lib/ \
>+	/gacdir ${STAGEDIR}${PREFIX}/lib
>+GACUTIL_INSTALL?=${GACUTIL} /i /package
> 
> .endif
>Index: devel/newtonsoft-json/Makefile
>===================================================================
>--- devel/newtonsoft-json/Makefile	(revision 376949)
>+++ devel/newtonsoft-json/Makefile	(working copy)
>@@ -37,9 +37,8 @@ do-build:
> 
> do-install:
> 	(cd ${WRKSRC}/Src/Newtonsoft.Json/bin/Release/Net45 && \
>-		${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil \
>-	       	/root ${STAGEDIR}${PREFIX}/lib/ \
>-	       	/package Newtonsoft.Json /i Newtonsoft.Json.dll)
>+		${GACUTIL_INSTALL} \
>+	       	Newtonsoft.Json Newtonsoft.Json.dll)
> 	(cd ${WRKDIR} && ${INSTALL_DATA} Newtonsoft.Json.pc \
> 		${STAGEDIR}${PREFIX}/libdata/pkgconfig)
> 
>Index: devel/nini/Makefile
>===================================================================
>--- devel/nini/Makefile	(revision 376949)
>+++ devel/nini/Makefile	(working copy)
>@@ -23,7 +23,8 @@ PLIST_SUB+=	NINI_VERSION=${NINI_VERSION}
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
> do-install:
>-	@(cd ${INSTALL_WRKSRC}/Bin/Mono/1.1/Release && ${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil -root ${STAGEDIR}${PREFIX}/lib/ -gacdir ${STAGEDIR}${PREFIX}/lib -package ${PORTNAME}-${NINI_VERSION} -i Nini.dll)
>+	(cd ${INSTALL_WRKSRC}/Bin/Mono/1.1/Release && ${GACUTIL_INSTALL} \
>+		${PORTNAME}-${NINI_VERSION} Nini.dll)
> 	@${INSTALL_DATA} ${WRKDIR}/nini.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/nini-${NINI_VERSION}.pc
> 
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Actions: View | Diff

Attachments on bug 196871: 151834 | 243938