Update to 1.12.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18443 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 15 insertions, 13 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 52de4f561..7d4b416cb 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.12.1
+PORTVERSION=	1.12.2
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -23,14 +23,14 @@ USE_XZ=		yes
 USES=		gettext pathfix desktop-file-utils shared-mime-info
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehier libgsf pygobject3
-USE_PYTHON=	2.7-
+USE_PYTHON=	-2.7
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LIBS="-liconv ${PTHREAD_LIBS}" \
+CONFIGURE_ENV=	LIBS="-liconv -pthread" \
 		python_prog=${PYTHON_VERSION}
 MAKE_JOBS_SAFE=	yes
 
@@ -65,6 +65,10 @@ CONFIGURE_ARGS+=	--without-gda
 PLIST_SUB+=		GNOMEDB="@comment "
 #.endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^GETTEXT_PACKAGE=gnumeric-$${VERSION}|GETTEXT_PACKAGE=gnumeric|g' \
+		${WRKSRC}/configure
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${PREFIX}/share/mime-info
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 82e79fd43..5c21ab214 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnumeric-1.12.1.tar.xz) = 0f5a7af3acae7db643eb00e8b4fca6a9e90162259c6a73e4214cfa8c96cc3901
-SIZE (gnome3/gnumeric-1.12.1.tar.xz) = 15692328
+SHA256 (gnome3/gnumeric-1.12.2.tar.xz) = d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874
+SIZE (gnome3/gnumeric-1.12.2.tar.xz) = 15517296
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 0f3fc8614..8b0a50e51 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -45,6 +45,7 @@ include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-so-polygon.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnm-style-impl.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric-conf.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric-features.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric-fwd.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric-simple-canvas.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gnumeric.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/go-data-cache-field.h
@@ -56,7 +57,6 @@ include/libspreadsheet-%%SHORT_VER%%/spreadsheet/go-val.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/graph.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gui-clipboard.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gui-file.h
-include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gui-gnumeric.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gui-util.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/gutils.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/history.h
@@ -823,17 +823,11 @@ share/pixmaps/gnome-application-x-applix-spreadsheet.png
 share/pixmaps/gnome-application-x-generic-spreadsheet.png
 share/pixmaps/gnome-application-x-gnumeric.png
 share/pixmaps/gnome-application-x-xls.png
-share/pixmaps/gnumeric/down-right.png
 share/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png
 share/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png
 share/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png
 share/pixmaps/gnumeric/gnome-application-x-gnumeric.png
 share/pixmaps/gnumeric/gnome-application-x-xls.png
-share/pixmaps/gnumeric/gnumeric-about.png
-share/pixmaps/gnumeric/orient-horizontal.png
-share/pixmaps/gnumeric/orient-vertical.png
-share/pixmaps/gnumeric/right-down.png
-share/pixmaps/gnumeric/stf-druid.png
 share/pixmaps/gnumeric/win32-gnumeric.ico
 share/pixmaps/win32-gnumeric.ico
 share/locale/am/LC_MESSAGES/gnumeric-functions.mo
@@ -952,6 +946,8 @@ share/locale/vi/LC_MESSAGES/gnumeric-functions.mo
 share/locale/vi/LC_MESSAGES/gnumeric.mo
 share/locale/zh_CN/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_CN/LC_MESSAGES/gnumeric.mo
+share/locale/zh_HK/LC_MESSAGES/gnumeric-functions.mo
+share/locale/zh_HK/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm share/pixmaps/gnumeric
@@ -1024,6 +1020,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm include/libspreadsheet-%%SHORT_VER%%/spreadsheet
 @dirrm include/libspreadsheet-%%SHORT_VER%%
 @dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/rw/LC_MESSAGES