5 files changed, 40 insertions, 41 deletions

diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile
index aac57a860da5..d5ea7f818b2a 100644
--- a/devel/google-gdata/Makefile
+++ b/devel/google-gdata/Makefile
@@ -4,25 +4,29 @@
 PORTNAME=	google-gdata
 PORTVERSION=	1.4.0.2
 CATEGORIES=	devel
-MASTER_SITES=	http://google-gdata.googlecode.com/files/:1 \
-    		http://www.zlib.net/:2
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}:1 \
+		http://www.zlib.net/:2
 DISTNAME=	libgoogle-data-mono-${PORTVERSION}
-DISTFILES=	libgoogle-data-mono-${PORTVERSION}${EXTRACT_SUFX}:1 zlib-${ZLIB_VERSION}${EXTRACT_SUFX}:2
+DISTFILES=	libgoogle-data-mono-${PORTVERSION}${EXTRACT_SUFX}:1 zlib-${ZLIBVER}${EXTRACT_SUFX}:2
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	.NET library for the Google Data API
 
 BUILD_DEPENDS=	gmcs:${PORTSDIR}/lang/mono
 
+USES=		dos2unix gmake
+DOS2UNIX_FILES=	Makefile misc/gdata-sharp-core.pc.in
+
 # google-gdata depends on _THIS_ version of zlib so make them happy.
-ZLIB_VERSION=	1.2.3
+ZLIBVER=	1.2.3
 
-USES=		gmake
+# Google GData Client library directory
+GGCDIR=		lib/mono/gac/Google.GData.Client/1.4.0.2__04a59ca9b0273830
+PLIST_SUB=	GGCDIR=${GGCDIR}
 
-NO_STAGE=	yes
 pre-configure:
-	@${ECHO_CMD} "--->  Configuring for zlib-${ZLIB_VERSION}"
-	@(cd ${WRKDIR}/zlib-${ZLIB_VERSION} && \
+	@${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}" \
@@ -38,13 +42,14 @@ pre-configure:
 	    fi)
 
 pre-build:
-	@${ECHO_CMD} "--->  Building for zlib-${ZLIB_VERSION}"
-	@cd ${WRKDIR}/zlib-${ZLIB_VERSION} && ${MAKE}
+	@${ECHO_CMD} "--->  Building for zlib-${ZLIBVER}"
+	(cd ${WRKDIR}/zlib-${ZLIBVER} && ${MAKE_CMD})
 	@${ECHO_CMD} "--->  Returning to build for ${PKGNAME}"
 
 post-install:
-	@${CP} ${WRKDIR}/zlib-${ZLIB_VERSION}/libz.so.${ZLIB_VERSION} \
-	    ${WRKSRC}/misc/Google.GData.Client.dll.config \
-	    ${PREFIX}/lib/mono/gac/Google.GData.Client/${PORTVERSION}__04a59ca9b0273830/
+	${INSTALL_LIB} ${WRKDIR}/zlib-${ZLIBVER}/libz.so.${ZLIBVER} \
+		${STAGEDIR}${PREFIX}/${GGCDIR}
+	${INSTALL_DATA} ${WRKSRC}/misc/Google.GData.Client.dll.config \
+		${STAGEDIR}${PREFIX}/${GGCDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/google-gdata/files/patch-Makefile b/devel/google-gdata/files/patch-Makefile
index 5d4433a4e600..e7a4fbe71866 100644
--- a/devel/google-gdata/files/patch-Makefile
+++ b/devel/google-gdata/files/patch-Makefile
@@ -1,16 +1,13 @@
-
-$FreeBSD$
-
 --- Makefile.orig
 +++ Makefile
 @@ -120,8 +120,8 @@
- 

- 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"

- 

- uninstall:

- 	for i in $(ALLLIBS); do gacutil -u $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done

+ 
+ 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"
+ 
+ uninstall:
+ 	for i in $(ALLLIBS); do gacutil -u $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done
diff --git a/devel/google-gdata/files/patch-misc_gdata-sharp-core.pc.in b/devel/google-gdata/files/patch-misc_gdata-sharp-core.pc.in
index 2b437b3d54bb..248c3c39c58f 100644
--- a/devel/google-gdata/files/patch-misc_gdata-sharp-core.pc.in
+++ b/devel/google-gdata/files/patch-misc_gdata-sharp-core.pc.in
@@ -1,11 +1,8 @@
-
-$FreeBSD$
-
 --- 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

+ 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 --git a/devel/google-gdata/pkg-descr b/devel/google-gdata/pkg-descr
index 6eb72b8368d1..deaff4a87f34 100644
--- a/devel/google-gdata/pkg-descr
+++ b/devel/google-gdata/pkg-descr
@@ -1,4 +1,4 @@
-The GData .NET Client Library provides a library and source code that make it
-easy to access data through Google Data APIs (e.g. Contacts, Calendar).
+The GData .NET Client Library includes source code to make it easy to
+access data through Google Data APIs (e.g. Contacts, Calendar).
 
-WWW:	http://code.google.com/p/google-gdata/
+WWW: http://code.google.com/p/google-gdata/
diff --git a/devel/google-gdata/pkg-plist b/devel/google-gdata/pkg-plist
index 4c06b1cdefcf..8bbd1a1cfa57 100644
--- a/devel/google-gdata/pkg-plist
+++ b/devel/google-gdata/pkg-plist
@@ -16,9 +16,9 @@ lib/mono/gac/Google.GData.AccessControl/1.4.0.2__b4b8eb9a7afc8328/Google.GData.A
 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
-lib/mono/gac/Google.GData.Client/1.4.0.2__04a59ca9b0273830/Google.GData.Client.dll
-lib/mono/gac/Google.GData.Client/1.4.0.2__04a59ca9b0273830/Google.GData.Client.dll.config
-lib/mono/gac/Google.GData.Client/1.4.0.2__04a59ca9b0273830/libz.so.1.2.3
+%%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