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

(-)proj/Makefile (-5 / +18 lines)
Lines 2-11 Link Here
2
# $FreeBSD: head/graphics/proj/Makefile 414347 2016-04-30 15:39:03Z sunpoet $
2
# $FreeBSD: head/graphics/proj/Makefile 414347 2016-04-30 15:39:03Z sunpoet $
3
3
4
PORTNAME=	proj
4
PORTNAME=	proj
5
PORTVERSION=	4.9.2
5
PORTVERSION=	4.9.3
6
CATEGORIES=	graphics geography
6
CATEGORIES=	graphics geography
7
MASTER_SITES=	ftp://ftp.remotesensing.org/proj/ \
7
MASTER_SITES=	http://download.osgeo.org/proj/
8
		http://download.osgeo.org/proj/
9
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
8
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
10
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
9
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
11
10
Lines 17-29 Link Here
17
16
18
EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
17
EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
19
18
20
DATUM_GRID_FILES=	proj-datumgrid-1.6RC1.zip
19
DATUM_GRID_FILES=	proj-datumgrid-1.6.zip
21
20
22
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
23
USES=		gmake libtool pathfix
22
USES=		compiler gmake libtool pathfix
24
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
25
24
25
FMAN1=	cs2cs.1 geod.1 proj.1
26
FMAN3=	geodesic.3 pj_init.3
27
28
INSTALL_TARGET=	install-strip
29
26
post-extract:
30
post-extract:
27
	@${UNZIP_CMD} -q ${DISTDIR}/${DATUM_GRID_FILES} -d ${WRKSRC}/nad
31
	@${UNZIP_CMD} -q ${DISTDIR}/${DATUM_GRID_FILES} -d ${WRKSRC}/nad
28
32
33
pre-configure:
34
	@${REINPLACE_CMD} -e 's|gcc|${COMPILER_TYPE}|' \
35
		${WRKSRC}/cmake/Proj4SystemInfo.cmake
36
37
post-install:
38
.for m in 1 3
39
	(cd ${STAGEDIR}${MANPREFIX}/man/man${m} && ${GZIP_CMD} ${FMAN${m}})
40
.endfor
41
29
.include <bsd.port.mk>
42
.include <bsd.port.mk>
(-)proj/distinfo (-4 / +5 lines)
Lines 1-4 Link Here
1
SHA256 (proj-4.9.2.tar.gz) = 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796
1
TIMESTAMP = 1483895414
2
SIZE (proj-4.9.2.tar.gz) = 874816
2
SHA256 (proj-4.9.3.tar.gz) = 6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7
3
SHA256 (proj-datumgrid-1.6RC1.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
3
SIZE (proj-4.9.3.tar.gz) = 921448
4
SIZE (proj-datumgrid-1.6RC1.zip) = 2766762
4
SHA256 (proj-datumgrid-1.6.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
5
SIZE (proj-datumgrid-1.6.zip) = 2766762
(-)proj/files/patch-src-pj_mutex.c (-8 / +5 lines)
Lines 1-14 Link Here
1
--- src/pj_mutex.c.orig	2015-09-10 13:41:24 UTC
1
--- src/pj_mutex.c.orig	2016-08-29 18:47:58 UTC
2
+++ src/pj_mutex.c
2
+++ src/pj_mutex.c
3
@@ -122,11 +122,7 @@ void pj_acquire_lock()
3
@@ -124,7 +124,7 @@ void pj_acquire_lock()
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
-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
7
-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
8
+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__)
8
         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
9
         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
9
-#else
10
 #else
10
-        pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
11
         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
11
-#endif
12
         pthread_mutex_init(&pj_core_lock, &mutex_attr);
13
         pj_core_lock_created = 1;
14
 
(-)proj/pkg-plist (-2 / +2 lines)
Lines 11-18 Link Here
11
include/projects.h
11
include/projects.h
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.12
15
lib/libproj.so.9.1.0
15
lib/libproj.so.12.0.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

Return to bug 215880