4 files changed, 58 insertions, 72 deletions

diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 2c5b6e35933d..89ae4a427d58 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -6,29 +6,25 @@
 #
 
 PORTNAME=	gdata
-PORTVERSION=	1.0
+PORTVERSION=	1.0.3
 CATEGORIES=	devel python
 MASTER_SITES=	http://gdata-python-client.googlecode.com/files/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	gdata.py.${PORTVERSION}
+DISTNAME=	gdata.py-${PORTVERSION}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	GData Python Client Library
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_ZIP=	yes
-
-WRKSRC=	${WRKDIR}/gdata-python-client
 
 EXAMPLESDIR=	${TARGETDIR}/share/examples/py-${PORTNAME}
 
-do-patch:
-	${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${FILESDIR}/setup.py \
-		> ${WRKSRC}/setup.py
-
+NOPORTEXAMPLES=	yes
+.if !defined(NOPORTEXAMPLES)
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/samples/ ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-gdata/distinfo b/devel/py-gdata/distinfo
index a4f4330955b7..59c814763cb5 100644
--- a/devel/py-gdata/distinfo
+++ b/devel/py-gdata/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdata.py.1.0.zip) = b6475fa6fdf3fd14a740a23ae045cff4
-SHA256 (gdata.py.1.0.zip) = 6528ffa2ad9d8de0675fb0c30682f345059a175ff9bb2ec9f26107acce31958b
-SIZE (gdata.py.1.0.zip) = 86450
+MD5 (gdata.py-1.0.3.tar.gz) = 3d582da141b0fd1c5ecd0d75667de848
+SHA256 (gdata.py-1.0.3.tar.gz) = feb6abbd49953fd7c699ef8aa083d7b4ef67a023bf659e6346de15a8769577a1
+SIZE (gdata.py-1.0.3.tar.gz) = 77072
diff --git a/devel/py-gdata/files/setup.py b/devel/py-gdata/files/setup.py
deleted file mode 100644
index 33f0982fe43b..000000000000
--- a/devel/py-gdata/files/setup.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from distutils.core import setup
-
-setup(
-	name = 'gdata',
-	version = "%%PORTVERSION%%",
-	py_modules = [
-		'app_service',
-		'atom',
-		'gbase',
-		'gbase_service',
-		'gcalendar',
-		'gcalendar_service',
-		'gdata',
-		'gdata_client',
-		'gdata_service',
-		'gspreadsheet',
-		'gspreadsheet_service',
-	],
-)
diff --git a/devel/py-gdata/pkg-plist b/devel/py-gdata/pkg-plist
index d88da2453222..4087adbdebb7 100644
--- a/devel/py-gdata/pkg-plist
+++ b/devel/py-gdata/pkg-plist
@@ -1,41 +1,50 @@
-%%PYTHON_SITELIBDIR%%/app_service.py
-%%PYTHON_SITELIBDIR%%/app_service.pyc
-%%PYTHON_SITELIBDIR%%/app_service.pyo
-%%PYTHON_SITELIBDIR%%/atom.py
-%%PYTHON_SITELIBDIR%%/atom.pyc
-%%PYTHON_SITELIBDIR%%/atom.pyo
-%%PYTHON_SITELIBDIR%%/gbase.py
-%%PYTHON_SITELIBDIR%%/gbase.pyc
-%%PYTHON_SITELIBDIR%%/gbase.pyo
-%%PYTHON_SITELIBDIR%%/gbase_service.py
-%%PYTHON_SITELIBDIR%%/gbase_service.pyc
-%%PYTHON_SITELIBDIR%%/gbase_service.pyo
-%%PYTHON_SITELIBDIR%%/gcalendar.py
-%%PYTHON_SITELIBDIR%%/gcalendar.pyc
-%%PYTHON_SITELIBDIR%%/gcalendar.pyo
-%%PYTHON_SITELIBDIR%%/gcalendar_service.py
-%%PYTHON_SITELIBDIR%%/gcalendar_service.pyc
-%%PYTHON_SITELIBDIR%%/gcalendar_service.pyo
-%%PYTHON_SITELIBDIR%%/gdata.py
-%%PYTHON_SITELIBDIR%%/gdata.pyc
-%%PYTHON_SITELIBDIR%%/gdata.pyo
-%%PYTHON_SITELIBDIR%%/gdata_client.py
-%%PYTHON_SITELIBDIR%%/gdata_client.pyc
-%%PYTHON_SITELIBDIR%%/gdata_client.pyo
-%%PYTHON_SITELIBDIR%%/gdata_service.py
-%%PYTHON_SITELIBDIR%%/gdata_service.pyc
-%%PYTHON_SITELIBDIR%%/gdata_service.pyo
-%%PYTHON_SITELIBDIR%%/gspreadsheet.py
-%%PYTHON_SITELIBDIR%%/gspreadsheet.pyc
-%%PYTHON_SITELIBDIR%%/gspreadsheet.pyo
-%%PYTHON_SITELIBDIR%%/gspreadsheet_service.py
-%%PYTHON_SITELIBDIR%%/gspreadsheet_service.pyc
-%%PYTHON_SITELIBDIR%%/gspreadsheet_service.pyo
-%%EXAMPLESDIR%%/base/baseQueryExample.py
-%%EXAMPLESDIR%%/base/dryRunInsert.py
-%%EXAMPLESDIR%%/calendar/calendarExample.py
-%%EXAMPLESDIR%%/spreadsheets/spreadsheetExample.py
-@dirrm %%EXAMPLESDIR%%/spreadsheets
-@dirrm %%EXAMPLESDIR%%/calendar
-@dirrm %%EXAMPLESDIR%%/base
-@dirrm %%EXAMPLESDIR%%
+%%PYTHON_SITELIBDIR%%/atom/__init__.py
+%%PYTHON_SITELIBDIR%%/atom/__init__.pyc
+%%PYTHON_SITELIBDIR%%/atom/__init__.pyo
+%%PYTHON_SITELIBDIR%%/atom/service.py
+%%PYTHON_SITELIBDIR%%/atom/service.pyc
+%%PYTHON_SITELIBDIR%%/atom/service.pyo
+%%PYTHON_SITELIBDIR%%/gdata/__init__.py
+%%PYTHON_SITELIBDIR%%/gdata/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gdata/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gdata/base/__init__.py
+%%PYTHON_SITELIBDIR%%/gdata/base/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gdata/base/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gdata/base/service.py
+%%PYTHON_SITELIBDIR%%/gdata/base/service.pyc
+%%PYTHON_SITELIBDIR%%/gdata/base/service.pyo
+%%PYTHON_SITELIBDIR%%/gdata/calendar/__init__.py
+%%PYTHON_SITELIBDIR%%/gdata/calendar/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gdata/calendar/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gdata/calendar/service.py
+%%PYTHON_SITELIBDIR%%/gdata/calendar/service.pyc
+%%PYTHON_SITELIBDIR%%/gdata/calendar/service.pyo
+%%PYTHON_SITELIBDIR%%/gdata/service.py
+%%PYTHON_SITELIBDIR%%/gdata/service.pyc
+%%PYTHON_SITELIBDIR%%/gdata/service.pyo
+%%PYTHON_SITELIBDIR%%/gdata/spreadsheet/__init__.py
+%%PYTHON_SITELIBDIR%%/gdata/spreadsheet/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gdata/spreadsheet/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gdata/spreadsheet/service.py
+%%PYTHON_SITELIBDIR%%/gdata/spreadsheet/service.pyc
+%%PYTHON_SITELIBDIR%%/gdata/spreadsheet/service.pyo
+%%PYTHON_SITELIBDIR%%/gdata/test_data.py
+%%PYTHON_SITELIBDIR%%/gdata/test_data.pyc
+%%PYTHON_SITELIBDIR%%/gdata/test_data.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/gdata/spreadsheet
+@dirrm %%PYTHON_SITELIBDIR%%/gdata/calendar
+@dirrm %%PYTHON_SITELIBDIR%%/gdata/base
+@dirrm %%PYTHON_SITELIBDIR%%/gdata
+@dirrm %%PYTHON_SITELIBDIR%%/atom
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base/baseQueryExample.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base/dryRunInsert.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/blogger/BloggerExample.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar/calendarExample.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mashups/birthdaySample.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spreadsheets/spreadsheetExample.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/spreadsheets
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mashups
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/calendar
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blogger
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/base
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%