Wed Feb 20 17:42:00 2019 UTC ()
geography/proj: Change method for handling of datumgrids

Stop having an explicit list of files, and just rearrange them en
masse.  Simplifies maintenance -- no change to binary package.


(gdt)
diff -r1.13 -r1.14 pkgsrc/geography/proj/Makefile
cvs diff -r1.13 -r1.14 pkgsrc/geography/proj/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/proj/Makefile 2019/02/20 17:33:59 1.13
+++ pkgsrc/geography/proj/Makefile 2019/02/20 17:42:00 1.14
@@ -1,46 +1,38 @@ @@ -1,46 +1,38 @@
1# $NetBSD: Makefile,v 1.13 2019/02/20 17:33:59 gdt Exp $ 1# $NetBSD: Makefile,v 1.14 2019/02/20 17:42:00 gdt Exp $
2 2
3VERSION_BASE= 5.2.0 3VERSION_BASE= 5.2.0
4VERSION_RC=  4VERSION_RC=
5VERSION= ${VERSION_BASE}${VERSION_RC} 5VERSION= ${VERSION_BASE}${VERSION_RC}
6PKGREVISION= 1 6PKGREVISION= 1
7# proj RCs have names like 5.1.0RC1 but unpack to 5.1.0 7# proj RCs have names like 5.1.0RC1 but unpack to 5.1.0
8WRKSRC= ${WRKDIR}/proj-${VERSION_BASE} 8WRKFINAL= proj-${VERSION_BASE}
 9WRKSRC= ${WRKDIR}/${WRKFINAL}
9DISTNAME= proj-${VERSION} 10DISTNAME= proj-${VERSION}
10CATEGORIES= geography 11CATEGORIES= geography
11MASTER_SITES= https://download.osgeo.org/proj/ 12MASTER_SITES= https://download.osgeo.org/proj/
12DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ 13DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
13 proj-datumgrid-1.8${EXTRACT_SUFX} \ 14 proj-datumgrid-1.8${EXTRACT_SUFX} \
14 proj-datumgrid-north-america-1.1${EXTRACT_SUFX} 15 proj-datumgrid-north-america-1.1${EXTRACT_SUFX}
15 16
16MAINTAINER= gdt@NetBSD.org 17MAINTAINER= gdt@NetBSD.org
17HOMEPAGE= http://proj4.org/ 18HOMEPAGE= http://proj4.org/
18COMMENT= Cartographic projection software 19COMMENT= Cartographic projection software
19 20
20LICENSE= mit 21LICENSE= mit
21 22
22PREV_PKGPATH= misc/proj 23PREV_PKGPATH= misc/proj
23 24
24USE_LANGUAGES= c99 c++ 25USE_LANGUAGES= c99 c++
25USE_LIBTOOL= yes 26USE_LIBTOOL= yes
26USE_TOOLS+= gmake 27USE_TOOLS+= gmake
27GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
28 29
29TEST_TARGET= check 30TEST_TARGET= check
30 31
31# \todo Ideally, the files would be unpacked directly in nad. 32# \todo Ideally, the files would be unpacked directly in nad.
32# The file lists are grouped in the same way as the datumgrid files 33# Assume that all of the stray files in ${WRKDIR} came from datumgrids.
33# appear in DISTFILES. 
34DATUMGRID_FILES= \ 
35 BETA2007.gsb FL MD README.DATUMGRID TN WI WO alaska conus \ 
36 egm96_15.gtx hawaii ntf_r93.gsb ntv1_can.dat null \ 
37 nzgd2kgrid0005.gsb prvi stgeorge stlrnc stpaul \ 
38 \ 
39 vertconc.gtx vertconw.gtx gvr2016.gtx vertcone.gtx gvr2000.gtx \ 
40 GL README.NORTHAMERICA 
41 
42post-extract: 34post-extract:
43 cd ${WRKDIR} && ${LN} ${DATUMGRID_FILES} ${WRKSRC}/nad 35 cd ${WRKDIR} && for f in *; do if [ $$f != ${WRKFINAL} ]; then mv $$f ${WRKFINAL}/nad; fi; done
44 36
45.include "../../mk/pthread.buildlink3.mk" 37.include "../../mk/pthread.buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"