View | Details | Raw Unified | Return to bug 196871 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/mono.mk (-3 / +4 lines)
Lines 26-33 RUN_DEPENDS+= mono:${PORTSDIR}/lang/mono Link Here
26
XSP_DOCROOT=		${PREFIX}/www/xsp
26
XSP_DOCROOT=		${PREFIX}/www/xsp
27
27
28
# gac utilities
28
# gac utilities
29
GACUTIL=${LOCALBASE}/bin/gacutil /root ${PREFIX}/lib/ /gacdir ${PREFIX}/lib
29
GACUTIL?=${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil \
30
GACUTIL_INSTALL=${GACUTIL} /i
30
	/root ${STAGEDIR}${PREFIX}/lib/ \
31
GACUTIL_INSTALL_PACKAGE=${GACUTIL} /i /package 1.0 /package 2.0
31
	/gacdir ${STAGEDIR}${PREFIX}/lib
32
GACUTIL_INSTALL?=${GACUTIL} /i /package
32
33
33
.endif
34
.endif
(-)devel/newtonsoft-json/Makefile (-3 / +2 lines)
Lines 37-45 do-build: Link Here
37
37
38
do-install:
38
do-install:
39
	(cd ${WRKSRC}/Src/Newtonsoft.Json/bin/Release/Net45 && \
39
	(cd ${WRKSRC}/Src/Newtonsoft.Json/bin/Release/Net45 && \
40
		${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil \
40
		${GACUTIL_INSTALL} \
41
	       	/root ${STAGEDIR}${PREFIX}/lib/ \
41
	       	Newtonsoft.Json Newtonsoft.Json.dll)
42
	       	/package Newtonsoft.Json /i Newtonsoft.Json.dll)
43
	(cd ${WRKDIR} && ${INSTALL_DATA} Newtonsoft.Json.pc \
42
	(cd ${WRKDIR} && ${INSTALL_DATA} Newtonsoft.Json.pc \
44
		${STAGEDIR}${PREFIX}/libdata/pkgconfig)
43
		${STAGEDIR}${PREFIX}/libdata/pkgconfig)
45
44
(-)devel/nini/Makefile (-1 / +2 lines)
Lines 23-29 PLIST_SUB+= NINI_VERSION=${NINI_VERSION} Link Here
23
OPTIONS_DEFINE=	DOCS EXAMPLES
23
OPTIONS_DEFINE=	DOCS EXAMPLES
24
24
25
do-install:
25
do-install:
26
	@(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)
26
	(cd ${INSTALL_WRKSRC}/Bin/Mono/1.1/Release && ${GACUTIL_INSTALL} \
27
		${PORTNAME}-${NINI_VERSION} Nini.dll)
27
	@${INSTALL_DATA} ${WRKDIR}/nini.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/nini-${NINI_VERSION}.pc
28
	@${INSTALL_DATA} ${WRKDIR}/nini.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/nini-${NINI_VERSION}.pc
28
29
29
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
30
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Return to bug 196871