CVS commit: pkgsrc/geography/proj

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Feb 20 17:42:00 UTC 2019

Modified Files:
        pkgsrc/geography/proj: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/proj/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/proj/Makefile
diff -u pkgsrc/geography/proj/Makefile:1.13 pkgsrc/geography/proj/Makefile:1.14
--- pkgsrc/geography/proj/Makefile:1.13 Wed Feb 20 17:33:59 2019
+++ pkgsrc/geography/proj/Makefile      Wed Feb 20 17:42:00 2019
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2019/02/20 17:33:59 gdt Exp $
+# $NetBSD: Makefile,v 1.14 2019/02/20 17:42:00 gdt Exp $
 
 VERSION_BASE=  5.2.0
 VERSION_RC=    
 VERSION=       ${VERSION_BASE}${VERSION_RC}
 PKGREVISION=   1
 # proj RCs have names like 5.1.0RC1 but unpack to 5.1.0
-WRKSRC=                ${WRKDIR}/proj-${VERSION_BASE}
+WRKFINAL=      proj-${VERSION_BASE}
+WRKSRC=                ${WRKDIR}/${WRKFINAL}
 DISTNAME=      proj-${VERSION}
 CATEGORIES=    geography
 MASTER_SITES=  https://download.osgeo.org/proj/
@@ -29,18 +30,9 @@ GNU_CONFIGURE=               yes
 TEST_TARGET=           check
 
 # \todo Ideally, the files would be unpacked directly in nad.
-# The file lists are grouped in the same way as the datumgrid files
-# appear in DISTFILES.
-DATUMGRID_FILES=                                                       \
-       BETA2007.gsb FL MD README.DATUMGRID TN WI WO alaska conus \
-       egm96_15.gtx hawaii ntf_r93.gsb ntv1_can.dat null \
-       nzgd2kgrid0005.gsb prvi stgeorge stlrnc stpaul \
-       \
-       vertconc.gtx vertconw.gtx gvr2016.gtx vertcone.gtx gvr2000.gtx \
-       GL README.NORTHAMERICA
-
+# Assume that all of the stray files in ${WRKDIR} came from datumgrids.
 post-extract:
-       cd ${WRKDIR} && ${LN} ${DATUMGRID_FILES} ${WRKSRC}/nad
+       cd ${WRKDIR} && for f in *; do if [ $$f != ${WRKFINAL} ]; then mv $$f ${WRKFINAL}/nad; fi; done
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"