Attachment 159176 Details for Bug 201838 – databases_grass.diff

[patch] databases_grass.diff

databases_grass.diff (text/plain), 3.49 KB, created by tkato432 on 2015-07-24 18:31:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-07-24 18:31:05 UTC

Size: 3.49 KB

patch

obsolete

>diff -urN /usr/ports/databases/grass/Makefile databases/grass/Makefile
>--- /usr/ports/databases/grass/Makefile	2015-07-10 18:29:31.774826000 +0900
>+++ databases/grass/Makefile	2015-07-25 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/databases/grass/Makefile 391657 2015-07-09 16:05:06Z sunpoet $
> 
> PORTNAME=	grass
>-PORTVERSION=	6.4.4
>-PORTREVISION=	6
>+PORTVERSION=	6.4.5
> PORTEPOCH=	2
> CATEGORIES=	databases geography
> MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
>@@ -22,7 +21,8 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Open source Geographical Information System (GIS)
> 
>-LICENSE=	GPLv2
>+LICENSE=	GPLv2 # (or later)
>+#LICENSE_FILE=	${WRKSRC}/GPL.TXT
> 
> BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
> LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
>@@ -33,8 +33,8 @@
> 		libfreetype.so:${PORTSDIR}/print/freetype2
> RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
> 
>-USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2 readline \
>-		shebangfix tk
>+USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2 \
>+		readline shebangfix tk
> SHEBANG_FILES=	scripts/i.spectral/i.spectral \
> 		scripts/r.tileset/r.tileset
> PATCH_TCL_SCRIPTS=lib/init/init.sh
>@@ -74,13 +74,16 @@
> 
> BROKEN_sparc64=		Does not configure on sparc64
> 
>-OPTIONS_DEFINE=		ATLAS FFMPEG MOTIF MYSQL ODBC PGSQL SQLITE
>+OPTIONS_DEFINE=		ATLAS FFMPEG MOTIF
>+OPTIONS_MULTI=		DB
>+OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
> OPTIONS_DEFAULT=	PGSQL
> OPTIONS_SUB=		yes
> 
> ATLAS_DESC=		Use ATLAS for BLAS and LAPACK
> ATLAS_USES=		blaslapack:atlas
> ATLAS_USES_OFF=		blaslapack
>+DB_DESC=		Database support
> FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
> FFMPEG_CONFIGURE_ON=	--with-ffmpeg \
> 			--with-ffmpeg-includes="${LOCALBASE}/include/libavcodec \
>@@ -108,12 +111,12 @@
> GRASS_INST_DIR=	${PORTNAME}-${PORTVERSION}
> .endif
> 
>-pre-configure:
>-	${REINPLACE_CMD} -e \
>-		's|-lblas|${BLASLIB}| ; \
>-		 s|-llapack|${LAPACKLIB}| ; \
>-		 s|g2c|f2c|' ${WRKSRC}/configure
>-	${REINPLACE_CMD} -e \
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		's|-lblas|${BLASLIB}|g ; \
>+		 s|-llapack|${LAPACKLIB}|g ; \
>+		 s|g2c|f2c|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
> 		's|make -C|$$(MAKE) -C| ; \
> 		 /^BINDIR/s|=.*|=	$${DESTDIR}$${UNIX_BIN}| ; \
> 		 /test /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \
>@@ -121,10 +124,10 @@
> 		 /chmod /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \
> 		 /tar /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \
> 		 s|> $${INST_DIR}|> $${DESTDIR}$${INST_DIR}|' ${WRKSRC}/Makefile
>-	${REINPLACE_CMD} -e \
>+	@${REINPLACE_CMD} -e \
> 		's|^CC=.*|CC?=cc| ; \
> 		 s|^CFLAGS=.*|CFLAGS+=-fno-common|' ${WRKSRC}/gem/Makefile
>-	${REINPLACE_CMD} -e \
>+	@${REINPLACE_CMD} -e \
> 		's|= python|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
> 
> post-install:
>@@ -145,4 +148,7 @@
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/libgrass_*.so
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo
> 
>+post-install-MOTIF-on:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/xganim
>+
> .include <bsd.port.mk>
>diff -urN /usr/ports/databases/grass/distinfo databases/grass/distinfo
>--- /usr/ports/databases/grass/distinfo	2014-08-10 01:56:26.000000000 +0900
>+++ databases/grass/distinfo	2015-07-25 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (grass-6.4.4.tar.gz) = 5ddba27b4e5495f602ee5249a07e287f342dd8e1422ea5d490c04311c731d274
>-SIZE (grass-6.4.4.tar.gz) = 25643959
>+SHA256 (grass-6.4.5.tar.gz) = f501da62807eb08efcb85820859fe5ade9bc392e20641b606273c956bb678f3e
>+SIZE (grass-6.4.5.tar.gz) = 25662709

Actions: View | Diff

Attachments on bug 201838: 159176