Attachment 147986 Details for Bug 194150 – patch for google-gdata-2.2.0.0

[patch] patch for google-gdata-2.2.0.0

google-gdata-2.2.0.0.patch (text/plain), 11.33 KB, created by Muhammad Moinur Rahman on 2014-10-04 22:46:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2014-10-04 22:46:07 UTC

Size: 11.33 KB

patch

obsolete

>diff -ruN /usr/ports//devel/google-gdata/Makefile ./Makefile
>--- /usr/ports//devel/google-gdata/Makefile	2014-09-09 02:01:21.000000000 +0600
>+++ ./Makefile	2014-10-05 04:42:29.432944884 +0600
>@@ -2,54 +2,26 @@
> # $FreeBSD: head/devel/google-gdata/Makefile 367689 2014-09-08 20:01:21Z marino $
> 
> PORTNAME=	google-gdata
>-PORTVERSION=	1.4.0.2
>+PORTVERSION=	2.2.0.0
> CATEGORIES=	devel
>-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}:1 \
>-		http://www.zlib.net/:2
>+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> DISTNAME=	libgoogle-data-mono-${PORTVERSION}
>-DISTFILES=	libgoogle-data-mono-${PORTVERSION}${EXTRACT_SUFX}:1 zlib-${ZLIBVER}${EXTRACT_SUFX}:2
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	.NET library for the Google Data API
>+MAINTAINER=	5u623l20@gmail.com
>+COMMENT=	DOT NET library for the Google Data API
> 
>-BUILD_DEPENDS=	gmcs:${PORTSDIR}/lang/mono
>+LICENSE=	APACHE20
> 
>-USES=		dos2unix gmake
>+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:${PORTSDIR}/devel/newtonsoft-json
>+
>+USES=		dos2unix gmake mono
> DOS2UNIX_FILES=	Makefile misc/gdata-sharp-core.pc.in
> 
>-# google-gdata depends on _THIS_ version of zlib so make them happy.
>-ZLIBVER=	1.2.3
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile
> 
>-# Google GData Client library directory
>-GGCDIR=		lib/mono/gac/Google.GData.Client/1.4.0.2__04a59ca9b0273830
>-PLIST_SUB=	GGCDIR=${GGCDIR}
>-
>-pre-configure:
>-	@${ECHO_CMD} "--->  Configuring for zlib-${ZLIBVER}"
>-	(cd ${WRKDIR}/zlib-${ZLIBVER} && \
>-	    ${SET_LATE_CONFIGURE_ARGS} \
>-	    if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
>-	    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
>-	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
>-	    INSTALL_DATA="${INSTALL_DATA}" \
>-	    INSTALL_LIB="${INSTALL_LIB}" \
>-	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
>-	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
>-	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} --shared; then \
>-		 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
>-		 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
>-		 ${FALSE}; \
>-	    fi)
>-
>-pre-build:
>-	@${ECHO_CMD} "--->  Building for zlib-${ZLIBVER}"
>-	(cd ${WRKDIR}/zlib-${ZLIBVER} && ${MAKE_CMD})
>-	@${ECHO_CMD} "--->  Returning to build for ${PKGNAME}"
>-
>-post-install:
>-	${INSTALL_LIB} ${WRKDIR}/zlib-${ZLIBVER}/libz.so.${ZLIBVER} \
>-		${STAGEDIR}${PREFIX}/${GGCDIR}
>-	${INSTALL_DATA} ${WRKSRC}/misc/Google.GData.Client.dll.config \
>-		${STAGEDIR}${PREFIX}/${GGCDIR}
>+post-stage:
>+	cd ${STAGEDIR}${PREFIX}; ${FIND} lib/mono libdata/pkgconfig \
>+		$ -type f -or -type l $ | ${SORT} >> ${TMPPLIST}
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports//devel/google-gdata/distinfo ./distinfo
>--- /usr/ports//devel/google-gdata/distinfo	2014-01-22 21:30:13.000000000 +0600
>+++ ./distinfo	2014-10-04 17:57:57.766609364 +0600
>@@ -1,4 +1,2 @@
>-SHA256 (libgoogle-data-mono-1.4.0.2.tar.gz) = 761124feb67ad972e61a10a09bbde68536a2fa8cc67f9f17fcda907bbdb2fbe4
>-SIZE (libgoogle-data-mono-1.4.0.2.tar.gz) = 2090937
>-SHA256 (zlib-1.2.3.tar.gz) = 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e
>-SIZE (zlib-1.2.3.tar.gz) = 496597
>+SHA256 (libgoogle-data-mono-2.2.0.0.tar.gz) = 08fa1b9ea5288d03370e3cf257f0549e9b34a1ed87f3ef7ca045c9992618435c
>+SIZE (libgoogle-data-mono-2.2.0.0.tar.gz) = 55582011
>diff -ruN /usr/ports//devel/google-gdata/files/patch-.._zlib-1.2.3_configure ./files/patch-.._zlib-1.2.3_configure
>--- /usr/ports//devel/google-gdata/files/patch-.._zlib-1.2.3_configure	2014-01-22 23:40:44.000000000 +0600
>+++ ./files/patch-.._zlib-1.2.3_configure	1970-01-01 06:00:00.000000000 +0600
>@@ -1,37 +0,0 @@
>-
>-$FreeBSD: head/devel/google-gdata/files/patch-.._zlib-1.2.3_configure 340725 2014-01-22 17:40:44Z mat $
>-
>---- ../zlib-1.2.3/configure.orig
>-+++ ../zlib-1.2.3/configure
>-@@ -32,7 +32,7 @@
>- mandir=${mandir-'${prefix}/share/man'}
>- shared_ext='.so'
>- shared=0
>--gcc=0
>-+has_cc=0
>- old_cc="$CC"
>- old_cflags="$CFLAGS"
>- 
>-@@ -63,17 +63,17 @@
>- int hello() {return getchar();}
>- EOF
>- 
>--test -z "$CC" && echo Checking for gcc...
>--cc=${CC-gcc}
>-+test -z "$CC" && echo Checking for cc...
>-+cc=${CC-cc}
>- cflags=${CFLAGS-"-O3"}
>- # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
>- case "$cc" in
>--  *gcc*) gcc=1;;
>-+  cc|gcc|clang) has_cc=1;;
>- esac
>- 
>--if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
>-+if test "$has_cc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
>-   CC="$cc"
>--  SFLAGS=${CFLAGS-"-fPIC -O3"}
>-+  SFLAGS="$CFLAGS -fPIC -O3"
>-   CFLAGS="$cflags"
>-   case `(uname -s || echo unknown) 2>/dev/null` in
>-   Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
>diff -ruN /usr/ports//devel/google-gdata/files/patch-Makefile ./files/patch-Makefile
>--- /usr/ports//devel/google-gdata/files/patch-Makefile	2014-09-09 02:01:21.000000000 +0600
>+++ ./files/patch-Makefile	2014-10-05 04:45:20.118932214 +0600
>@@ -1,13 +1,29 @@
>---- Makefile.orig
>-+++ Makefile
>-@@ -120,8 +120,8 @@
>+--- Makefile.orig	2014-10-03 03:48:04.991079598 +0600
>++++ Makefile	2014-10-03 03:48:20.722118155 +0600
>+@@ -5,7 +5,7 @@
>  
>+ VERSION=$(shell egrep AssemblyVersion version/AssemblyVersion.cs | egrep -o $[[:digit:]]\.$+[[:digit:]]+)
>+ PREFIX=/usr/local
>+-PKGCONFIGDIR = $(PREFIX)/lib/pkgconfig
>++PKGCONFIGDIR = $(PREFIX)/libdata/pkgconfig
>+ 
>+ CORELIBS= \
>+   Google.GData.Client.dll \
>+@@ -33,7 +33,7 @@
>+ 
>+ UNINSTALLLIBS = $(basename $(ALLLIBS))
>+ 
>+-FRAMEWORK_REFS = -r:System.dll -r:System.Xml.dll -r:System.Configuration.dll
>++FRAMEWORK_REFS = -r:System.dll -r:System.Xml.dll -r:System.Configuration.dll -r:%%LOCALBASE%%/lib/mono/Newtonsoft.Json/Newtonsoft.Json.dll
>+ 
>+ PKGCONFIG_FILES = $(patsubst %.pc.in,%.pc,$(wildcard misc/*.pc.in))
>+ 
>+@@ -112,7 +112,7 @@
>  install: all
>  	for i in $(ALLLIBS); do gacutil -i $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done
>--	install -d "$(DESTDIR)$(PREFIX)/lib/pkgconfig"
>--	install -m 644 -t "$(DESTDIR)$(PREFIX)/lib/pkgconfig" $(PKGCONFIG_FILES) 
>-+	install -d "$(DESTDIR)$(PREFIX)/libdata/pkgconfig"
>-+	install -m 644 $(PKGCONFIG_FILES) "$(DESTDIR)$(PREFIX)/libdata/pkgconfig"
>+ 	install -d "$(DESTDIR)$(PKGCONFIGDIR)"
>+-	install -m 644 -t "$(DESTDIR)$(PKGCONFIGDIR)" $(PKGCONFIG_FILES)
>++	install -m 644 $(PKGCONFIG_FILES) $(DESTDIR)$(PKGCONFIGDIR)
>  
>  uninstall:
>- 	for i in $(ALLLIBS); do gacutil -u $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done
>+ 	for i in $(UNINSTALLLIBS); do gacutil -u $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done
>diff -ruN /usr/ports//devel/google-gdata/files/patch-misc_gdata-sharp-core.pc.in ./files/patch-misc_gdata-sharp-core.pc.in
>--- /usr/ports//devel/google-gdata/files/patch-misc_gdata-sharp-core.pc.in	2014-09-09 02:01:21.000000000 +0600
>+++ ./files/patch-misc_gdata-sharp-core.pc.in	1970-01-01 06:00:00.000000000 +0600
>@@ -1,8 +0,0 @@
>---- misc/gdata-sharp-core.pc.in.orig
>-+++ misc/gdata-sharp-core.pc.in
>-@@ -5,4 +5,4 @@
>- Description: CLI bindings to Google's online services (Core libraries)
>- Version: @VERSION@
>- 
>--Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll
>-+Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r:${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll
>diff -ruN /usr/ports//devel/google-gdata/pkg-plist ./pkg-plist
>--- /usr/ports//devel/google-gdata/pkg-plist	2014-09-09 02:01:21.000000000 +0600
>+++ ./pkg-plist	1970-01-01 06:00:00.000000000 +0600
>@@ -1,72 +0,0 @@
>-lib/mono/GData-Sharp/Google.GData.AccessControl.dll
>-lib/mono/GData-Sharp/Google.GData.Apps.dll
>-lib/mono/GData-Sharp/Google.GData.Blogger.dll
>-lib/mono/GData-Sharp/Google.GData.Calendar.dll
>-lib/mono/GData-Sharp/Google.GData.Client.dll
>-lib/mono/GData-Sharp/Google.GData.CodeSearch.dll
>-lib/mono/GData-Sharp/Google.GData.Contacts.dll
>-lib/mono/GData-Sharp/Google.GData.Documents.dll
>-lib/mono/GData-Sharp/Google.GData.Extensions.dll
>-lib/mono/GData-Sharp/Google.GData.GoogleBase.dll
>-lib/mono/GData-Sharp/Google.GData.Health.dll
>-lib/mono/GData-Sharp/Google.GData.Photos.dll
>-lib/mono/GData-Sharp/Google.GData.Spreadsheets.dll
>-lib/mono/GData-Sharp/Google.GData.YouTube.dll
>-lib/mono/gac/Google.GData.AccessControl/1.4.0.2__b4b8eb9a7afc8328/Google.GData.AccessControl.dll
>-lib/mono/gac/Google.GData.Apps/1.4.0.2__e6feebfe441b89cb/Google.GData.Apps.dll
>-lib/mono/gac/Google.GData.Blogger/1.4.0.2__6f8943d33947d761/Google.GData.Blogger.dll
>-lib/mono/gac/Google.GData.Calendar/1.4.0.2__aa6748391206b888/Google.GData.Calendar.dll
>-%%GGCDIR%%/Google.GData.Client.dll
>-%%GGCDIR%%/Google.GData.Client.dll.config
>-%%GGCDIR%%/libz.so.1.2.3
>-lib/mono/gac/Google.GData.CodeSearch/1.4.0.2__cac30bb7c678972d/Google.GData.CodeSearch.dll
>-lib/mono/gac/Google.GData.Contacts/1.4.0.2__7e065189dd4b982f/Google.GData.Contacts.dll
>-lib/mono/gac/Google.GData.Documents/1.4.0.2__099e9a853da5b089/Google.GData.Documents.dll
>-lib/mono/gac/Google.GData.Extensions/1.4.0.2__0b4c5df2ebf20876/Google.GData.Extensions.dll
>-lib/mono/gac/Google.GData.GoogleBase/1.4.0.2__b361faa2ad5bd3db/Google.GData.GoogleBase.dll
>-lib/mono/gac/Google.GData.Health/1.4.0.2__7dc2246c3cef9211/Google.GData.Health.dll
>-lib/mono/gac/Google.GData.Photos/1.4.0.2__a25b50f2e8e3887a/Google.GData.Photos.dll
>-lib/mono/gac/Google.GData.Spreadsheets/1.4.0.2__3f77feb76ff0d9a1/Google.GData.Spreadsheets.dll
>-lib/mono/gac/Google.GData.YouTube/1.4.0.2__af04a32718ae8833/Google.GData.YouTube.dll
>-libdata/pkgconfig/gdata-sharp-acl.pc
>-libdata/pkgconfig/gdata-sharp-apps.pc
>-libdata/pkgconfig/gdata-sharp-base.pc
>-libdata/pkgconfig/gdata-sharp-blogger.pc
>-libdata/pkgconfig/gdata-sharp-calendar.pc
>-libdata/pkgconfig/gdata-sharp-codesearch.pc
>-libdata/pkgconfig/gdata-sharp-contacts.pc
>-libdata/pkgconfig/gdata-sharp-core.pc
>-libdata/pkgconfig/gdata-sharp-documents.pc
>-libdata/pkgconfig/gdata-sharp-health.pc
>-libdata/pkgconfig/gdata-sharp-photos.pc
>-libdata/pkgconfig/gdata-sharp-spreadsheets.pc
>-libdata/pkgconfig/gdata-sharp-youtube.pc
>-@dirrm lib/mono/gac/Google.GData.YouTube/1.4.0.2__af04a32718ae8833
>-@dirrm lib/mono/gac/Google.GData.YouTube
>-@dirrm lib/mono/gac/Google.GData.Spreadsheets/1.4.0.2__3f77feb76ff0d9a1
>-@dirrm lib/mono/gac/Google.GData.Spreadsheets
>-@dirrm lib/mono/gac/Google.GData.Photos/1.4.0.2__a25b50f2e8e3887a
>-@dirrm lib/mono/gac/Google.GData.Photos
>-@dirrm lib/mono/gac/Google.GData.Health/1.4.0.2__7dc2246c3cef9211
>-@dirrm lib/mono/gac/Google.GData.Health
>-@dirrm lib/mono/gac/Google.GData.GoogleBase/1.4.0.2__b361faa2ad5bd3db
>-@dirrm lib/mono/gac/Google.GData.GoogleBase
>-@dirrm lib/mono/gac/Google.GData.Extensions/1.4.0.2__0b4c5df2ebf20876
>-@dirrm lib/mono/gac/Google.GData.Extensions
>-@dirrm lib/mono/gac/Google.GData.Documents/1.4.0.2__099e9a853da5b089
>-@dirrm lib/mono/gac/Google.GData.Documents
>-@dirrm lib/mono/gac/Google.GData.Contacts/1.4.0.2__7e065189dd4b982f
>-@dirrm lib/mono/gac/Google.GData.Contacts
>-@dirrm lib/mono/gac/Google.GData.CodeSearch/1.4.0.2__cac30bb7c678972d
>-@dirrm lib/mono/gac/Google.GData.CodeSearch
>-@dirrm lib/mono/gac/Google.GData.Client/1.4.0.2__04a59ca9b0273830
>-@dirrm lib/mono/gac/Google.GData.Client
>-@dirrm lib/mono/gac/Google.GData.Calendar/1.4.0.2__aa6748391206b888
>-@dirrm lib/mono/gac/Google.GData.Calendar
>-@dirrm lib/mono/gac/Google.GData.Blogger/1.4.0.2__6f8943d33947d761
>-@dirrm lib/mono/gac/Google.GData.Blogger
>-@dirrm lib/mono/gac/Google.GData.Apps/1.4.0.2__e6feebfe441b89cb
>-@dirrm lib/mono/gac/Google.GData.Apps
>-@dirrm lib/mono/gac/Google.GData.AccessControl/1.4.0.2__b4b8eb9a7afc8328
>-@dirrm lib/mono/gac/Google.GData.AccessControl
>-@dirrm lib/mono/GData-Sharp

Actions: View | Diff

Attachments on bug 194150: 147986