Date: Mon, 6 Mar 2017 01:12:17 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435509 - in head/graphics/proj: . files Message-ID: <201703060112.v261CHKA066168@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Mon Mar 6 01:12:16 2017 New Revision: 435509 URL: https://svnweb.freebsd.org/changeset/ports/435509 Log: - Update to 4.9.3 PR: 215880 Submitted by: rhurlin@gwdg.de Approved by: maintainer(timeout, > 50 days) Modified: head/graphics/proj/Makefile head/graphics/proj/distinfo head/graphics/proj/files/patch-src-pj_mutex.c head/graphics/proj/pkg-plist Modified: head/graphics/proj/Makefile ============================================================================== --- head/graphics/proj/Makefile Sun Mar 5 21:46:42 2017 (r435508) +++ head/graphics/proj/Makefile Mon Mar 6 01:12:16 2017 (r435509) @@ -2,10 +2,9 @@ # $FreeBSD$ 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 @@ LICENSE_FILE= ${WRKSRC}/COPYING 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> Modified: head/graphics/proj/distinfo ============================================================================== --- head/graphics/proj/distinfo Sun Mar 5 21:46:42 2017 (r435508) +++ head/graphics/proj/distinfo Mon Mar 6 01:12:16 2017 (r435509) @@ -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 Modified: head/graphics/proj/files/patch-src-pj_mutex.c ============================================================================== --- head/graphics/proj/files/patch-src-pj_mutex.c Sun Mar 5 21:46:42 2017 (r435508) +++ head/graphics/proj/files/patch-src-pj_mutex.c Mon Mar 6 01:12:16 2017 (r435509) @@ -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); Modified: head/graphics/proj/pkg-plist ============================================================================== --- head/graphics/proj/pkg-plist Sun Mar 5 21:46:42 2017 (r435508) +++ head/graphics/proj/pkg-plist Mon Mar 6 01:12:16 2017 (r435509) @@ -11,8 +11,8 @@ include/proj_api.h 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703060112.v261CHKA066168>