Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Oct 2014 16:02:18 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371011 - in head/devel/google-gdata: . files
Message-ID:  <201410161602.s9GG2IOw004955@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Thu Oct 16 16:02:17 2014
New Revision: 371011
URL: https://svnweb.freebsd.org/changeset/ports/371011
QAT: https://qat.redports.org/buildarchive/r371011/

Log:
  devel/google-gdata: Update to version 1.4.0.2 => 2.2.0.0
  
  Pass maintainership to submitter.
  Uncomfortably, this port was converted to generated plist out of
  necessity due to gacutil creating randomly named directories.
  
  PR:		194150
  Submitted by:	Muhammad Rahman

Deleted:
  head/devel/google-gdata/files/patch-.._zlib-1.2.3_configure
  head/devel/google-gdata/files/patch-misc_gdata-sharp-core.pc.in
  head/devel/google-gdata/pkg-plist
Modified:
  head/devel/google-gdata/Makefile
  head/devel/google-gdata/distinfo
  head/devel/google-gdata/files/patch-Makefile

Modified: head/devel/google-gdata/Makefile
==============================================================================
--- head/devel/google-gdata/Makefile	Thu Oct 16 15:26:11 2014	(r371010)
+++ head/devel/google-gdata/Makefile	Thu Oct 16 16:02:17 2014	(r371011)
@@ -2,54 +2,26 @@
 # $FreeBSD$
 
 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>

Modified: head/devel/google-gdata/distinfo
==============================================================================
--- head/devel/google-gdata/distinfo	Thu Oct 16 15:26:11 2014	(r371010)
+++ head/devel/google-gdata/distinfo	Thu Oct 16 16:02:17 2014	(r371011)
@@ -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

Modified: head/devel/google-gdata/files/patch-Makefile
==============================================================================
--- head/devel/google-gdata/files/patch-Makefile	Thu Oct 16 15:26:11 2014	(r371010)
+++ head/devel/google-gdata/files/patch-Makefile	Thu Oct 16 16:02:17 2014	(r371011)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410161602.s9GG2IOw004955>