Date: Sat, 7 Jan 2017 19:23:01 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430826 - in head: . math math/libproj4 math/proj.4 math/proj.4/files Message-ID: <201701071923.v07JN1ZR050649@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sat Jan 7 19:23:00 2017 New Revision: 430826 URL: https://svnweb.freebsd.org/changeset/ports/430826 Log: Upgrade libproj4 to proj.4 4.9.3. Added: head/math/proj.4/ - copied from r430825, head/math/libproj4/ head/math/proj.4/files/patch-src_pj__mutex.c (contents, props changed) Deleted: head/math/libproj4/ head/math/proj.4/files/patch-Makefile head/math/proj.4/files/patch-proj_ftmerc.c Modified: head/MOVED head/math/Makefile head/math/proj.4/Makefile head/math/proj.4/distinfo head/math/proj.4/pkg-descr head/math/proj.4/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Jan 7 19:22:01 2017 (r430825) +++ head/MOVED Sat Jan 7 19:23:00 2017 (r430826) @@ -8969,3 +8969,4 @@ databases/rubygem-rubyrep||2017-01-07|Ha databases/rubygem-activerecord-mysql-adapter||2017-01-07|Has expired: Depends on deprecated databases/rubygem-activerecord databases/rubygem-dm-active_model||2017-01-07|Has expired: Depends on deprecated databases/rubygem-activemodel databases/rubygem-activemodel||2017-01-07|Has expired: Upstream support ended +math/libproj4:math/proj.4|2017-01-07|Project was renamed Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Sat Jan 7 19:22:01 2017 (r430825) +++ head/math/Makefile Sat Jan 7 19:23:00 2017 (r430826) @@ -254,7 +254,6 @@ SUBDIR += libmissing SUBDIR += libocas SUBDIR += liborigin - SUBDIR += libproj4 SUBDIR += libqalculate SUBDIR += libranlip SUBDIR += librsb @@ -574,6 +573,7 @@ SUBDIR += plplot-ada SUBDIR += primegen SUBDIR += prng + SUBDIR += proj.4 SUBDIR += proofgeneral SUBDIR += pspp SUBDIR += pure-mpfr Modified: head/math/proj.4/Makefile ============================================================================== --- head/math/libproj4/Makefile Sat Jan 7 19:22:01 2017 (r430825) +++ head/math/proj.4/Makefile Sat Jan 7 19:23:00 2017 (r430826) @@ -1,43 +1,32 @@ # Created by: thierry@pompo.net # $FreeBSD$ -PORTNAME= libproj4 -DISTVERSION= 3_20081120 +PORTNAME= proj +PORTVERSION= 4.9.3 CATEGORIES= math geography -MASTER_SITES= http://home.comcast.net/~gevenden56/proj/ -DISTFILES= ${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX} -DIST_SUBDIR= ${PORTNAME} +MASTER_SITES= http://download.osgeo.org/proj/ MAINTAINER= thierry@FreeBSD.org COMMENT= C language procedures related to cartographic processes +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libgsl.so:math/gsl -USES= gmake tar:bzip2 -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -ALL_TARGET= libproj4 lproj -MAKE_JOBS_UNSAFE=yes +USES= cmake compiler USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${PORTNAME} - -.include <bsd.port.pre.mk> +FMAN1= cs2cs.1 geod.1 proj.1 +FMAN3= geodesic.3 pj_init.3 -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= manual.pdf -EXTRACT_ONLY= ${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX} -.endif - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034 -LIB_DEPENDS+= libmissing.so:math/libmissing -LDFLAGS+= -lmissing -.endif +pre-configure: + ${REINPLACE_CMD} -e 's|gcc|${COMPILER_TYPE}|' \ + ${WRKSRC}/cmake/Proj4SystemInfo.cmake post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${_DISTDIR}/manual.pdf ${STAGEDIR}${DOCSDIR} -.endif +.for m in 1 3 + (cd ${STAGEDIR}${MANPREFIX}/share/man/man${m} && ${GZIP_CMD} ${FMAN${m}}) +.endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/proj.4/distinfo ============================================================================== --- head/math/libproj4/distinfo Sat Jan 7 19:22:01 2017 (r430825) +++ head/math/proj.4/distinfo Sat Jan 7 19:23:00 2017 (r430826) @@ -1,4 +1,3 @@ -SHA256 (libproj4/libproj4.3_20081120.tar.bz2) = 5948cbc825ddc481f4dbcb6a33389fa7838a9a499148c9e4cc560644d3e9d2b1 -SIZE (libproj4/libproj4.3_20081120.tar.bz2) = 73360 -SHA256 (libproj4/manual.pdf) = 35ba85a86ed87effd3303c41066ff565dc3c0a53f941e6aa1d7d9c8cfe6cfbd6 -SIZE (libproj4/manual.pdf) = 2292932 +TIMESTAMP = 1483805279 +SHA256 (proj-4.9.3.tar.gz) = 6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7 +SIZE (proj-4.9.3.tar.gz) = 921448 Added: head/math/proj.4/files/patch-src_pj__mutex.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/proj.4/files/patch-src_pj__mutex.c Sat Jan 7 19:23:00 2017 (r430826) @@ -0,0 +1,11 @@ +--- src/pj_mutex.c.orig 2016-08-29 18:47:58 UTC ++++ src/pj_mutex.c +@@ -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); Modified: head/math/proj.4/pkg-descr ============================================================================== --- head/math/libproj4/pkg-descr Sat Jan 7 19:22:01 2017 (r430825) +++ head/math/proj.4/pkg-descr Sat Jan 7 19:23:00 2017 (r430826) @@ -3,4 +3,5 @@ to cartographic processes. Procedures fo categorized and although they may share common subfunctions they will not intersect in scope. -WWW: http://home.comcast.net/~gevenden56/proj/ +WWW: http://proj4.org/ +WWW: https://github.com/OSGeo/proj.4 Modified: head/math/proj.4/pkg-plist ============================================================================== --- head/math/libproj4/pkg-plist Sat Jan 7 19:22:01 2017 (r430825) +++ head/math/proj.4/pkg-plist Sat Jan 7 19:23:00 2017 (r430826) @@ -1,6 +1,31 @@ -bin/lproj -include/lib_proj.h -lib/libproj4.a -lib/libproj4.so -lib/libproj4.so.0 -%%PORTDOCS%%%%DOCSDIR%%/manual.pdf +bin/cs2cs +bin/geod +bin/nad2bin +bin/proj +include/geodesic.h +include/proj_api.h +include/projects.h +lib/libproj.so +lib/libproj.so.12 +lib/libproj.so.12.0.0 +share/cmake/PROJ4/proj4-config-version.cmake +share/cmake/PROJ4/proj4-config.cmake +share/cmake/PROJ4/proj4-targets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/PROJ4/proj4-targets.cmake +share/man/man1/cs2cs.1.gz +share/man/man1/geod.1.gz +share/man/man1/proj.1.gz +share/man/man3/geodesic.3.gz +share/man/man3/pj_init.3.gz +%%DATADIR%%/CH +%%DATADIR%%/GL27 +%%DATADIR%%/IGNF +%%DATADIR%%/epsg +%%DATADIR%%/esri +%%DATADIR%%/esri.extra +%%DATADIR%%/nad.lst +%%DATADIR%%/nad27 +%%DATADIR%%/nad83 +%%DATADIR%%/other.extra +%%DATADIR%%/proj_def.dat +%%DATADIR%%/world
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701071923.v07JN1ZR050649>