Attachment 178630 Details for Bug 215880 – patch to update graphics/proj to 4.9.3

[patch] patch to update graphics/proj to 4.9.3

patch-graphics_proj_4.9.2-4.9.3.diff (text/plain), 3.33 KB, created by Rainer Hurling on 2017-01-08 18:22:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2017-01-08 18:22:53 UTC

Size: 3.33 KB

patch

obsolete

>diff -urN proj.orig/Makefile proj/Makefile
>--- proj.orig/Makefile	2016-04-30 21:55:53.318060000 +0200
>+++ proj/Makefile	2017-01-08 18:41:49.678877000 +0100
>@@ -2,10 +2,9 @@
> # $FreeBSD: head/graphics/proj/Makefile 414347 2016-04-30 15:39:03Z sunpoet $
> 
> PORTNAME=	proj
>-PORTVERSION=	4.9.2
>+PORTVERSION=	4.9.3
> CATEGORIES=	graphics geography
>-MASTER_SITES=	ftp://ftp.remotesensing.org/proj/ \
>-		http://download.osgeo.org/proj/
>+MASTER_SITES=	http://download.osgeo.org/proj/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
>@@ -17,13 +16,27 @@
> 
> EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
> 
>-DATUM_GRID_FILES=	proj-datumgrid-1.6RC1.zip
>+DATUM_GRID_FILES=	proj-datumgrid-1.6.zip
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake libtool pathfix
>+USES=		compiler gmake libtool pathfix
> USE_LDCONFIG=	yes
> 
>+FMAN1=	cs2cs.1 geod.1 proj.1
>+FMAN3=	geodesic.3 pj_init.3
>+
>+INSTALL_TARGET=	install-strip
>+
> post-extract:
> 	@${UNZIP_CMD} -q ${DISTDIR}/${DATUM_GRID_FILES} -d ${WRKSRC}/nad
> 
>+pre-configure:
>+	@${REINPLACE_CMD} -e 's|gcc|${COMPILER_TYPE}|' \
>+		${WRKSRC}/cmake/Proj4SystemInfo.cmake
>+
>+post-install:
>+.for m in 1 3
>+	(cd ${STAGEDIR}${MANPREFIX}/man/man${m} && ${GZIP_CMD} ${FMAN${m}})
>+.endfor
>+
> .include <bsd.port.mk>
>diff -urN proj.orig/distinfo proj/distinfo
>--- proj.orig/distinfo	2016-04-30 21:55:53.228653000 +0200
>+++ proj/distinfo	2017-01-08 18:10:14.631722000 +0100
>@@ -1,4 +1,5 @@
>-SHA256 (proj-4.9.2.tar.gz) = 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796
>-SIZE (proj-4.9.2.tar.gz) = 874816
>-SHA256 (proj-datumgrid-1.6RC1.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
>-SIZE (proj-datumgrid-1.6RC1.zip) = 2766762
>+TIMESTAMP = 1483895414
>+SHA256 (proj-4.9.3.tar.gz) = 6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7
>+SIZE (proj-4.9.3.tar.gz) = 921448
>+SHA256 (proj-datumgrid-1.6.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
>+SIZE (proj-datumgrid-1.6.zip) = 2766762
>diff -urN proj.orig/files/patch-src-pj_mutex.c proj/files/patch-src-pj_mutex.c
>--- proj.orig/files/patch-src-pj_mutex.c	2016-04-30 21:55:53.893513000 +0200
>+++ proj/files/patch-src-pj_mutex.c	2017-01-08 18:19:28.984926000 +0100
>@@ -1,14 +1,11 @@
>---- src/pj_mutex.c.orig	2015-09-10 13:41:24 UTC
>+--- src/pj_mutex.c.orig	2016-08-29 18:47:58 UTC
> +++ src/pj_mutex.c
>-@@ -122,11 +122,7 @@ void pj_acquire_lock()
>+@@ -124,7 +124,7 @@ void pj_acquire_lock()
>          pthread_mutex_lock( &pj_precreated_lock);
>  
>          pthread_mutexattr_init(&mutex_attr);
> -#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
>++#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__)
>          pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
>--#else
>--        pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
>--#endif
>-         pthread_mutex_init(&pj_core_lock, &mutex_attr);
>-         pj_core_lock_created = 1;
>- 
>+ #else
>+         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
>diff -urN proj.orig/pkg-plist proj/pkg-plist
>--- proj.orig/pkg-plist	2016-04-30 21:55:53.318467000 +0200
>+++ proj/pkg-plist	2017-01-08 18:22:59.242398000 +0100
>@@ -11,8 +11,8 @@
> include/projects.h
> lib/libproj.a
> lib/libproj.so
>-lib/libproj.so.9
>-lib/libproj.so.9.1.0
>+lib/libproj.so.12
>+lib/libproj.so.12.0.0
> libdata/pkgconfig/proj.pc
> man/man1/cs2cs.1.gz
> man/man1/geod.1.gz

Actions: View | Diff

Attachments on bug 215880: 178630