Attachment #169418 for bug #208512

View | Details | Raw Unified | Return to bug 208512
Collapse All | Expand All

Lines 2-8 Link Here

(-)proj/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/graphics/proj/Makefile 412663 2016-04-07 13:29:29Z sunpoet $	2	# $FreeBSD: head/graphics/proj/Makefile 412663 2016-04-07 13:29:29Z sunpoet $
3		3
4	PORTNAME= proj	4	PORTNAME= proj
5	PORTVERSION= 4.9.1	5	PORTVERSION= 4.9.2
6	CATEGORIES= graphics geography	6	CATEGORIES= graphics geography
7	MASTER_SITES= ftp://ftp.remotesensing.org/proj/ \	7	MASTER_SITES= ftp://ftp.remotesensing.org/proj/ \
8	http://download.osgeo.org/proj/	8	http://download.osgeo.org/proj/

Lines 1-4 Link Here

(-)proj/distinfo (-2 / +2 lines)
1	SHA256 (proj-4.9.1.tar.gz) = fca0388f3f8bc5a1a803d2f6ff30017532367992b30cf144f2d39be88f36c319	1	SHA256 (proj-4.9.2.tar.gz) = 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796
2	SIZE (proj-4.9.1.tar.gz) = 876386	2	SIZE (proj-4.9.2.tar.gz) = 874816
3	SHA256 (proj-datumgrid-1.6RC1.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866	3	SHA256 (proj-datumgrid-1.6RC1.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
4	SIZE (proj-datumgrid-1.6RC1.zip) = 2766762	4	SIZE (proj-datumgrid-1.6RC1.zip) = 2766762




--- src/pj_mutex.c.orig	2016-04-02 07:44:36.012729000 -0700
+++ src/pj_mutex.c	2016-04-02 07:46:34.022406000 -0700
@@ -122,11 +122,7 @@
         pthread_mutex_lock( &pj_precreated_lock);
 
         pthread_mutexattr_init(&mutex_attr);
-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
-        pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
-#else
         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;




lib/libproj.a
lib/libproj.so
lib/libproj.so.9
lib/libproj.so.9.1.0
libdata/pkgconfig/proj.pc
man/man1/cs2cs.1.gz
man/man1/geod.1.gz

man/man3/geodesic.3.gz
man/man3/pj_init.3.gz
%%DATADIR%%/CH
%%DATADIR%%/FL
%%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
%%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

Return to bug 208512

Lines 1-13 Link Here

(-)proj/files/patch-src-pj_mutex.c (-6 / +6 lines)
1	--- src/pj_mutex.c.orig 2015-05-25 16:01:14.724346000 +0800	1	--- src/pj_mutex.c.orig 2016-04-02 07:44:36.012729000 -0700
2	+++ src/pj_mutex.c 2015-05-25 16:03:52.777784000 +0800	2	+++ src/pj_mutex.c 2016-04-02 07:46:34.022406000 -0700
3	@@ -118,11 +118,7 @@	3	@@ -122,11 +122,7 @@
4	pthread_mutex_lock( &pj_precreated_lock);	4	pthread_mutex_lock( &pj_precreated_lock);
5		5
6	pthread_mutexattr_init(&mutex_attr);	6	pthread_mutexattr_init(&mutex_attr);
7	-#ifndef PTHREAD_MUTEX_RECURSIVE	7	-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
8	- pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
9	-#else
10	pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);	8	pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
		9	-#else
		10	- pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
11	-#endif	11	-#endif
12	pthread_mutex_init(&pj_core_lock, &mutex_attr);	12	pthread_mutex_init(&pj_core_lock, &mutex_attr);
13	pj_core_lock_created = 1;	13	pj_core_lock_created = 1;

Lines 12-18 Link Here

(-)proj/pkg-plist (-10 / +11 lines)
12	lib/libproj.a	12	lib/libproj.a
13	lib/libproj.so	13	lib/libproj.so
14	lib/libproj.so.9	14	lib/libproj.so.9
15	lib/libproj.so.9.0.0	15	lib/libproj.so.9.1.0
16	libdata/pkgconfig/proj.pc	16	libdata/pkgconfig/proj.pc
17	man/man1/cs2cs.1.gz	17	man/man1/cs2cs.1.gz
18	man/man1/geod.1.gz	18	man/man1/geod.1.gz
Lines 20-48 Link Here
20	man/man3/geodesic.3.gz	20	man/man3/geodesic.3.gz
21	man/man3/pj_init.3.gz	21	man/man3/pj_init.3.gz
22	%%DATADIR%%/CH	22	%%DATADIR%%/CH
		23	%%DATADIR%%/FL
23	%%DATADIR%%/GL27	24	%%DATADIR%%/GL27
24	%%DATADIR%%/IGNF	25	%%DATADIR%%/IGNF
25	%%DATADIR%%/epsg
26	%%DATADIR%%/esri
27	%%DATADIR%%/esri.extra
28	%%DATADIR%%/nad.lst
29	%%DATADIR%%/nad27
30	%%DATADIR%%/nad83
31	%%DATADIR%%/other.extra
32	%%DATADIR%%/world
33	%%DATADIR%%/FL
34	%%DATADIR%%/MD	26	%%DATADIR%%/MD
35	%%DATADIR%%/TN	27	%%DATADIR%%/TN
36	%%DATADIR%%/WI	28	%%DATADIR%%/WI
37	%%DATADIR%%/WO	29	%%DATADIR%%/WO
38	%%DATADIR%%/alaska	30	%%DATADIR%%/alaska
39	%%DATADIR%%/conus	31	%%DATADIR%%/conus
		32	%%DATADIR%%/epsg
		33	%%DATADIR%%/esri
		34	%%DATADIR%%/esri.extra
40	%%DATADIR%%/hawaii	35	%%DATADIR%%/hawaii
		36	%%DATADIR%%/nad.lst
		37	%%DATADIR%%/nad27
		38	%%DATADIR%%/nad83
41	%%DATADIR%%/ntf_r93.gsb	39	%%DATADIR%%/ntf_r93.gsb
42	%%DATADIR%%/ntv1_can.dat	40	%%DATADIR%%/ntv1_can.dat
43	%%DATADIR%%/null	41	%%DATADIR%%/null
44	%%DATADIR%%/nzgd2kgrid0005.gsb	42	%%DATADIR%%/nzgd2kgrid0005.gsb
		43	%%DATADIR%%/other.extra
		44	%%DATADIR%%/proj_def.dat
45	%%DATADIR%%/prvi	45	%%DATADIR%%/prvi
46	%%DATADIR%%/stgeorge	46	%%DATADIR%%/stgeorge
47	%%DATADIR%%/stlrnc	47	%%DATADIR%%/stlrnc
48	%%DATADIR%%/stpaul	48	%%DATADIR%%/stpaul
		49	%%DATADIR%%/world