cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to geotiff 1.4.0.

Browse Source 
Remove the now unneeded backports for geos update.
Merge PFRAG.shared to PLIST.
Went into a bulk without issues.
This commit is contained in:
landry 2013-03-18 20:40:38 +00:00
parent 505f877d4b
commit fbfec1782d
6 changed files with 17 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/geotiff/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.12 2013/03/11 10:50:04 espie Exp $
# $OpenBSD: Makefile,v 1.13 2013/03/18 20:40:38 landry Exp $
COMMENT= GIS TIFF interchange library
DISTNAME= libgeotiff-1.3.0
DISTNAME= libgeotiff-1.4.0
CATEGORIES= devel geo
SHARED_LIBS= geotiff 1.2
SHARED_LIBS= geotiff 1.3
HOMEPAGE= http://trac.osgeo.org/geotiff/
MAINTAINER= Landry Breuil <gaston@gcu.info>
MAINTAINER= Landry Breuil <landry@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM= Yes
@ -16,7 +16,6 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ftp://ftp.remotesensing.org/geotiff/libgeotiff/ \
http://download.osgeo.org/geotiff/libgeotiff/
NO_TEST= Yes
USE_LIBTOOL = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include -fPIC" \

7
devel/geotiff/distinfo
View File

@ -1,5 +1,2 @@
MD5 (libgeotiff-1.3.0.tar.gz) = asPCLkRxHpo63ZBE5AuVJw==
RMD160 (libgeotiff-1.3.0.tar.gz) = hForupuLYgTYaJX3WA466fO47Wc=
SHA1 (libgeotiff-1.3.0.tar.gz) = uM3lAUz4L+RoP6NfyBpeqNZLlA8=
SHA256 (libgeotiff-1.3.0.tar.gz) = D6LpEwKBxYZ62lUe91f9gfVMdg2fMDnTPjSfmS9EDSc=
SIZE (libgeotiff-1.3.0.tar.gz) = 1287837
SHA256 (libgeotiff-1.4.0.tar.gz) = 0Ky400H9ao8sZzRW4J/bj1D5HjFmrJNHGf4Fsw0ygyk=
SIZE (libgeotiff-1.4.0.tar.gz) = 1517881

72
devel/geotiff/patches/patch-configure
View File

@ -1,72 +0,0 @@
$OpenBSD: patch-configure,v 1.6 2013/03/09 23:09:20 landry Exp $
http://trac.osgeo.org/geotiff/changeset/1907
unbreak with proj 4.8.0
--- configure.orig Thu Nov 12 14:53:29 2009
+++ configure Sun Mar 10 00:01:20 2013
@@ -21142,7 +21142,6 @@ fi
PROJ_CONFIG="no"
-PROJECTS_H_CONFIG="no"
# Check whether --with-proj was given.
@@ -21158,12 +21157,12 @@ if test "$PROJ_HOME" != "" -a "$PROJ_HOME" != "no" ; t
PROJ_HOME=$PROJ_HOME/src
fi
- if test -f "$PROJ_HOME/libproj.a" -a -f "$PROJ_HOME/projects.h" ; then
+ if test -f "$PROJ_HOME/libproj.a" -a -f "$PROJ_HOME/proj_api.h" ; then
PROJ_LIB=$PROJ_HOME/libproj.a
PROJ_INC=$PROJ_HOME
PROJ_CONFIG="yes"
- elif test -f "$PROJ_HOME/.libs/libproj.a" -a -f "$PROJ_HOME/projects.h" ; then
+ elif test -f "$PROJ_HOME/.libs/libproj.a" -a -f "$PROJ_HOME/proj_api.h" ; then
PROJ_LIB=$PROJ_HOME/.libs/libproj.a
PROJ_INC=$PROJ_HOME
@@ -21175,7 +21174,7 @@ if test "$PROJ_HOME" != "" -a "$PROJ_HOME" != "no" ; t
PROJ_CONFIG="yes"
else
- echo "PROJ_HOME=$PROJ_HOME, but either projects.h or libproj.a not found!"
+ echo "PROJ_HOME=$PROJ_HOME, but either proj_api.h or libproj.a not found!"
fi
fi
@@ -21185,7 +21184,7 @@ if test "$PROJ_HOME" = "no" ; then
elif test "$PROJ_LIB" != "" -a "$PROJ_INC" != "" ; then
echo "Found $PROJ_LIB"
- echo "Found $PROJ_INC/projects.h"
+ echo "Found $PROJ_INC/proj_api.h"
LIBS="$PROJ_LIB $LIBS"
PROJ_INC=-I$PROJ_INC
@@ -21193,16 +21192,11 @@ elif test "$PROJ_LIB" != "" -a "$PROJ_INC" != "" ; the
PROJ_INC=$PROJ_INC
cat >>confdefs.h <<\_ACEOF
-#define HAVE_PROJECTS_H 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBPROJ 1
_ACEOF
PROJ_CONFIG="yes"
- PROJECTS_H_CONFIG="yes"
else
@@ -21277,7 +21271,7 @@ _ACEOF
fi
-for ac_header in projects.h
+for ac_header in proj_api.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

71
devel/geotiff/patches/patch-geotiff_proj4_c
View File

@ -1,71 +0,0 @@
$OpenBSD: patch-geotiff_proj4_c,v 1.1 2013/03/09 23:09:20 landry Exp $
http://trac.osgeo.org/geotiff/changeset/1907
unbreak with proj 4.8.0
--- geotiff_proj4.c.orig Mon Oct 19 16:53:57 2009
+++ geotiff_proj4.c Sun Mar 10 00:05:52 2013
@@ -1299,7 +1299,7 @@ char * GTIFGetProj4Defn( GTIFDefn * psDefn )
return( strdup( szProjection ) );
}
-#if !defined(HAVE_LIBPROJ) || !defined(HAVE_PROJECTS_H)
+#if !defined(HAVE_LIBPROJ)
int GTIFProj4ToLatLong( GTIFDefn * psDefn, int nPoints,
double *padfX, double *padfY )
@@ -1330,12 +1330,8 @@ int GTIFProj4FromLatLong( GTIFDefn * psDefn, int nPoin
}
#else
-#include "projects.h"
+#include "proj_api.h"
-#ifdef USE_PROJUV
-# define UV projUV
-#endif
-
/************************************************************************/
/* GTIFProj4FromLatLong() */
/* */
@@ -1348,7 +1344,7 @@ int GTIFProj4FromLatLong( GTIFDefn * psDefn, int nPoin
{
char *pszProjection, **papszArgs;
- PJ *psPJ;
+ projPJ *psPJ;
int i;
/* -------------------------------------------------------------------- */
@@ -1380,7 +1376,7 @@ int GTIFProj4FromLatLong( GTIFDefn * psDefn, int nPoin
/* -------------------------------------------------------------------- */
for( i = 0; i < nPoints; i++ )
{
- UV sUV;
+ projUV sUV;
sUV.u = padfX[i] * DEG_TO_RAD;
sUV.v = padfY[i] * DEG_TO_RAD;
@@ -1408,7 +1404,7 @@ int GTIFProj4ToLatLong( GTIFDefn * psDefn, int nPoints
{
char *pszProjection, **papszArgs;
- PJ *psPJ;
+ projPJ *psPJ;
int i;
/* -------------------------------------------------------------------- */
@@ -1440,7 +1436,7 @@ int GTIFProj4ToLatLong( GTIFDefn * psDefn, int nPoints
/* -------------------------------------------------------------------- */
for( i = 0; i < nPoints; i++ )
{
- UV sUV;
+ projUV sUV;
sUV.u = padfX[i];
sUV.v = padfY[i];
@@ -1456,5 +1452,5 @@ int GTIFProj4ToLatLong( GTIFDefn * psDefn, int nPoints
return TRUE;
}
-#endif /* has projects.h and -lproj */
+#endif /* has proj_api.h and -lproj */

2
devel/geotiff/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2007/05/30 20:41:54 jason Exp $
@lib lib/libgeotiff.so.${LIBgeotiff_VERSION}

15
devel/geotiff/pkg/PLIST
View File

@ -1,7 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2010/11/21 09:31:55 landry Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.7 2013/03/18 20:40:38 landry Exp $
@bin bin/applygeo
@bin bin/csv2html
@bin bin/geotifcp
@bin bin/listgeo
@bin bin/makegeo
@ -30,11 +28,13 @@ include/geovalues.h
include/xtiffio.h
lib/libgeotiff.a
lib/libgeotiff.la
@lib lib/libgeotiff.so.${LIBgeotiff_VERSION}
@man man/man1/listgeo.1
share/epsg_csv/
share/epsg_csv/alias.csv
share/epsg_csv/area.csv
share/epsg_csv/change.csv
share/epsg_csv/codes.csv
share/epsg_csv/compdcs.csv
share/epsg_csv/coordinate_axis.csv
share/epsg_csv/coordinate_axis_name.csv
share/epsg_csv/coordinate_operation.csv
@ -45,15 +45,22 @@ share/epsg_csv/coordinate_operation_path.csv
share/epsg_csv/coordinate_reference_system.csv
share/epsg_csv/coordinate_system.csv
share/epsg_csv/datum.csv
share/epsg_csv/datum_shift.csv
share/epsg_csv/datum_shift_pref.csv
share/epsg_csv/deprecation.csv
share/epsg_csv/ellipsoid.csv
share/epsg_csv/esri_datum_override.csv
share/epsg_csv/gcs.csv
share/epsg_csv/gcs.override.csv
share/epsg_csv/geoccs.csv
share/epsg_csv/naming_system.csv
share/epsg_csv/pcs.csv
share/epsg_csv/pcs.override.csv
share/epsg_csv/prime_meridian.csv
share/epsg_csv/projop_wparm.csv
share/epsg_csv/stateplane.csv
share/epsg_csv/supersession.csv
share/epsg_csv/unit_of_measure.csv
share/epsg_csv/version_history.csv
share/epsg_csv/vertcs.csv
share/epsg_csv/vertcs.override.csv