Attachment 157108 Details for Bug 200434 – patch file

patch file

proj-4.9.1.diff.txt (text/plain), 3.97 KB, created by Wen Heping on 2015-05-25 02:14:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2015-05-25 02:14:24 UTC

Size: 3.97 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 387363)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	proj
>-PORTVERSION=	4.8.0
>-PORTREVISION=	4
>+PORTVERSION=	4.9.1
> CATEGORIES=	graphics geography
> MASTER_SITES=	ftp://ftp.remotesensing.org/proj/ \
> 		http://download.osgeo.org/proj/
>@@ -13,18 +12,15 @@
> MAINTAINER=	fmysh@iijmio-mail.jp
> COMMENT=	Cartographic Projections library
> 
>-CONFLICTS=	proj4-[0-9]*
>+EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
> 
>-DATUM_GRID_FILES=	proj-datumgrid-1.5.zip
>+DATUM_GRID_FILES=	proj-datumgrid-1.6RC1.zip
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake libtool pathfix zip:infozip
>+USES=		gmake libtool pathfix
> USE_LDCONFIG=	yes
> 
> post-extract:
> 	@${UNZIP_CMD} -q ${DISTDIR}/${DATUM_GRID_FILES} -d ${WRKSRC}/nad
> 
>-post-install:
>-	${INSTALL_DATA} ${WRKSRC}/src/projects.h ${STAGEDIR}${PREFIX}/include
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 387363)
>+++ distinfo	(working copy)
>@@ -1,4 +1,4 @@
>-SHA256 (proj-4.8.0.zip) = b502df56db315e358d4e73a268426d7b0a17a7a5644d5339e8c270fa3c6c72ec
>-SIZE (proj-4.8.0.zip) = 901078
>-SHA256 (proj-datumgrid-1.5.zip) = 723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db
>-SIZE (proj-datumgrid-1.5.zip) = 2250131
>+SHA256 (proj-4.9.1.tar.gz) = fca0388f3f8bc5a1a803d2f6ff30017532367992b30cf144f2d39be88f36c319
>+SIZE (proj-4.9.1.tar.gz) = 876386
>+SHA256 (proj-datumgrid-1.6RC1.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
>+SIZE (proj-datumgrid-1.6RC1.zip) = 2766762
>Index: files/patch-src-pj_mutex.c
>===================================================================
>--- files/patch-src-pj_mutex.c	(revision 0)
>+++ files/patch-src-pj_mutex.c	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/pj_mutex.c.orig	2015-05-25 16:01:14.724346000 +0800
>++++ src/pj_mutex.c	2015-05-25 16:03:52.777784000 +0800
>+@@ -118,11 +118,7 @@
>+         pthread_mutex_lock( &pj_precreated_lock);
>+ 
>+         pthread_mutexattr_init(&mutex_attr);
>+-#ifndef PTHREAD_MUTEX_RECURSIVE
>+-        pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
>+-#else
>+         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
>+-#endif
>+         pthread_mutex_init(&pj_core_lock, &mutex_attr);
>+         pj_core_lock_created = 1;
>+ 
>
>Property changes on: files/patch-src-pj_mutex.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 387363)
>+++ pkg-plist	(working copy)
>@@ -4,21 +4,33 @@
> bin/invproj
> bin/nad2bin
> bin/proj
>+include/geodesic.h
>+include/org_proj4_PJ.h
> include/org_proj4_Projections.h
> include/proj_api.h
> include/projects.h
> lib/libproj.a
> lib/libproj.so
>-lib/libproj.so.0
>-lib/libproj.so.0.7.0
>+lib/libproj.so.9
>+lib/libproj.so.9.0.0
> libdata/pkgconfig/proj.pc
> man/man1/cs2cs.1.gz
> man/man1/geod.1.gz
> man/man1/proj.1.gz
>+man/man3/geodesic.3.gz
> man/man3/pj_init.3.gz
>-%%DATADIR%%/FL
>+%%DATADIR%%/CH
> %%DATADIR%%/GL27
> %%DATADIR%%/IGNF
>+%%DATADIR%%/epsg
>+%%DATADIR%%/esri
>+%%DATADIR%%/esri.extra
>+%%DATADIR%%/nad.lst
>+%%DATADIR%%/nad27
>+%%DATADIR%%/nad83
>+%%DATADIR%%/other.extra
>+%%DATADIR%%/world
>+%%DATADIR%%/FL
> %%DATADIR%%/MD
> %%DATADIR%%/TN
> %%DATADIR%%/WI
>@@ -25,21 +37,12 @@
> %%DATADIR%%/WO
> %%DATADIR%%/alaska
> %%DATADIR%%/conus
>-%%DATADIR%%/epsg
>-%%DATADIR%%/esri
>-%%DATADIR%%/esri.extra
> %%DATADIR%%/hawaii
>-%%DATADIR%%/nad.lst
>-%%DATADIR%%/nad27
>-%%DATADIR%%/nad83
> %%DATADIR%%/ntf_r93.gsb
> %%DATADIR%%/ntv1_can.dat
> %%DATADIR%%/null
> %%DATADIR%%/nzgd2kgrid0005.gsb
>-%%DATADIR%%/other.extra
>-%%DATADIR%%/proj_def.dat
> %%DATADIR%%/prvi
> %%DATADIR%%/stgeorge
> %%DATADIR%%/stlrnc
> %%DATADIR%%/stpaul
>-%%DATADIR%%/world

Flags:

koobs: maintainer-approval? (fmysh)

Actions: View

Attachments on bug 200434: 157108