Attachment 144584 Details for Bug 191813 – databases_grass.diff

[patch] databases_grass.diff

databases_grass.diff (text/plain), 5.81 KB, created by tkato432 on 2014-07-11 18:41:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-07-11 18:41:34 UTC

Size: 5.81 KB

patch

obsolete

>diff -urN /usr/ports/databases/grass/Makefile databases/grass/Makefile
>--- /usr/ports/databases/grass/Makefile	2014-07-11 23:31:37.000000000 +0900
>+++ databases/grass/Makefile	2014-07-12 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/databases/grass/Makefile 361523 2014-07-11 11:16:06Z sunpoet $
> 
> PORTNAME=	grass
>-PORTVERSION=	6.4.3
>-PORTREVISION=	5
>+PORTVERSION=	6.4.4
> PORTEPOCH=	2
> CATEGORIES=	databases geography
> MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
>@@ -74,6 +73,8 @@
> 		VERSION="${PORTVERSION}" \
> 		VER="${PORTVERSION:R:C/\.//}"
> 
>+BROKEN_sparc64=		Does not configure on sparc64
>+
> OPTIONS_DEFINE=		ATLAS FFMPEG MOTIF MYSQL ODBC PGSQL SQLITE
> OPTIONS_DEFAULT=	PGSQL
> OPTIONS_SUB=		yes
>@@ -113,10 +114,6 @@
> LAPACKLIB=	lapack
> .endif
> 
>-.if ${ARCH} == "sparc64"
>-BROKEN=		Does not configure on sparc64
>-.endif
>-
> .if !defined (GRASS_INST_DIR)
> GRASS_INST_DIR=	${PORTNAME}-${PORTVERSION}
> .endif
>@@ -133,11 +130,30 @@
> 		 /test /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \
> 		 /tar /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \
> 		 /chmod /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \
>-		 /GISBASE/s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g' ${WRKSRC}/Makefile
>+		 /tar /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \
>+		 s|> $${INST_DIR}|> $${DESTDIR}$${INST_DIR}|' ${WRKSRC}/Makefile
> 	@${REINPLACE_CMD} -e \
> 		's|^CC=.*|CC?=cc| ; \
> 		 s|^CFLAGS=.*|CFLAGS+=-fno-common|' ${WRKSRC}/gem/Makefile
> 	@${REINPLACE_CMD} -e \
> 		's|= python|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
> 
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gem64
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*.*
>+.for i in HTMLMAP PNG PS XDRIVER cairo
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/${i}
>+.endfor
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/*
>+.for i in bmif_to_cell clean_temp current_time_s_ms echo frame.* grocat \
>+	i.ask i.find i.photo.* lock mod* mon.* poly_to_bmif r.watershed.* \
>+	run set_data
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i}
>+.endfor
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/form/form
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/lister/*
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/nviz2.2/nviz
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/libgrass_*.so
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo
>+
> .include <bsd.port.mk>
>diff -urN /usr/ports/databases/grass/distinfo databases/grass/distinfo
>--- /usr/ports/databases/grass/distinfo	2014-06-21 17:46:11.000000000 +0900
>+++ databases/grass/distinfo	2014-07-12 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (grass-6.4.3.tar.gz) = 5d29d322a262330894aa046845e6790258cd6e3f95b28c350ed7839810672ed6
>-SIZE (grass-6.4.3.tar.gz) = 25287682
>+SHA256 (grass-6.4.4.tar.gz) = 5ddba27b4e5495f602ee5249a07e287f342dd8e1422ea5d490c04311c731d274
>+SIZE (grass-6.4.4.tar.gz) = 25643959
>diff -urN /usr/ports/databases/grass/pkg-plist databases/grass/pkg-plist
>--- /usr/ports/databases/grass/pkg-plist	2014-06-21 17:46:11.000000000 +0900
>+++ databases/grass/pkg-plist	2014-07-12 00:00:00.000000000 +0900
>@@ -268,7 +268,6 @@
> %%GRASS_INST_DIR%%/bin/r3.timestamp
> %%GRASS_INST_DIR%%/bin/r3.to.rast
> %%GRASS_INST_DIR%%/bin/r3.univar
>-%%GRASS_INST_DIR%%/bin/v.buffer
> %%GRASS_INST_DIR%%/bin/v.build
> %%GRASS_INST_DIR%%/bin/v.build.polylines
> %%GRASS_INST_DIR%%/bin/v.category
>@@ -505,6 +504,7 @@
> %%GRASS_INST_DIR%%/docs/html/d.what.vect.html
> %%GRASS_INST_DIR%%/docs/html/d.where.html
> %%GRASS_INST_DIR%%/docs/html/d.zoom.html
>+%%GRASS_INST_DIR%%/docs/html/d_correlate.png
> %%GRASS_INST_DIR%%/docs/html/d_geodesic.png
> %%GRASS_INST_DIR%%/docs/html/d_polar_aspect.png
> %%GRASS_INST_DIR%%/docs/html/d_rhumbline.png
>@@ -553,6 +553,7 @@
> %%GRASS_INST_DIR%%/docs/html/g.tempfile.html
> %%GRASS_INST_DIR%%/docs/html/g.transform.html
> %%GRASS_INST_DIR%%/docs/html/g.version.html
>+%%GRASS_INST_DIR%%/docs/html/g_parser_test.png
> %%GRASS_INST_DIR%%/docs/html/gis.m.html
> %%GRASS_INST_DIR%%/docs/html/gm_animate.html
> %%GRASS_INST_DIR%%/docs/html/gm_animate1.png
>@@ -1195,7 +1196,6 @@
> %%GRASS_INST_DIR%%/docs/html/tasscap3.jpg
> %%GRASS_INST_DIR%%/docs/html/tasscap4.jpg
> %%GRASS_INST_DIR%%/docs/html/tcurv.png
>-%%GRASS_INST_DIR%%/docs/html/v.buffer.html
> %%GRASS_INST_DIR%%/docs/html/v.build.all.html
> %%GRASS_INST_DIR%%/docs/html/v.build.html
> %%GRASS_INST_DIR%%/docs/html/v.build.polylines.html
>@@ -2085,6 +2085,7 @@
> %%GRASS_INST_DIR%%/etc/nviz2.2/msgs/lv.msg
> %%GRASS_INST_DIR%%/etc/nviz2.2/msgs/nl.msg
> %%GRASS_INST_DIR%%/etc/nviz2.2/msgs/pl.msg
>+%%GRASS_INST_DIR%%/etc/nviz2.2/msgs/ro.msg
> %%GRASS_INST_DIR%%/etc/nviz2.2/nviz
> %%GRASS_INST_DIR%%/etc/nviz2.2/scripts/ACS_utils.tcl
> %%GRASS_INST_DIR%%/etc/nviz2.2/scripts/assoc.tcl
>@@ -2253,7 +2254,7 @@
> %%GRASS_INST_DIR%%/etc/r.in.wms/wms.request
> %%GRASS_INST_DIR%%/etc/r.li.setup/area_query
> %%GRASS_INST_DIR%%/etc/r.li.setup/circle.txt
>-%%GRASS_INST_DIR%%/etc/r.li.setup/masked_area_selection
>+%%GRASS_INST_DIR%%/etc/r.li.setup/masked_area_selection.sh
> %%GRASS_INST_DIR%%/etc/r.li.setup/polygon.txt
> %%GRASS_INST_DIR%%/etc/r.li.setup/r.li.setup.main
> %%GRASS_INST_DIR%%/etc/r.li.setup/r.li.setup.procedures.tcl
>@@ -2837,6 +2838,7 @@
> %%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grasslibs.mo
> %%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grassmods.mo
> %%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grasslibs.mo
>+%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grasswxpy.mo
> %%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grassmods.mo
> %%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grasslibs.mo
> %%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grasswxpy.mo
>@@ -3234,7 +3236,6 @@
> %%GRASS_INST_DIR%%/man/man1/raster3dintro.1
> %%GRASS_INST_DIR%%/man/man1/rasterintro.1
> %%GRASS_INST_DIR%%/man/man1/sql.1
>-%%GRASS_INST_DIR%%/man/man1/v.buffer.1
> %%GRASS_INST_DIR%%/man/man1/v.build.1
> %%GRASS_INST_DIR%%/man/man1/v.build.all.1
> %%GRASS_INST_DIR%%/man/man1/v.build.polylines.1

Actions: View | Diff

Attachments on bug 191813: 144584