Update to libgeotiff 1.3.0, now uses libtool, hence remove two

unneeded patches
This commit is contained in:
landry 2010-11-21 09:31:55 +00:00
parent f99d972ead
commit bad72fbc0a
5 changed files with 20 additions and 55 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2010/11/15 19:45:58 espie Exp $
# $OpenBSD: Makefile,v 1.11 2010/11/21 09:31:55 landry Exp $
COMMENT= GIS TIFF interchange library
DISTNAME= libgeotiff-1.2.5
REVISION = 0
DISTNAME= libgeotiff-1.3.0
CATEGORIES= devel geo
SHARED_LIBS= geotiff 1.2
@ -21,15 +20,17 @@ MASTER_SITES= ftp://ftp.remotesensing.org/geotiff/libgeotiff/ \
http://download.osgeo.org/geotiff/libgeotiff/
NO_REGRESS= Yes
USE_LIBTOOL = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include -fPIC" \
LDFLAGS=-L${LOCALBASE}/lib \
LIBgeotiff_VERSION=${LIBgeotiff_VERSION}
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-jpeg=${LOCALBASE} \
--with-proj=${LOCALBASE} \
--with-libtiff=${LOCALBASE}
--with-libtiff=${LOCALBASE} \
--with-libz
WANTLIB= c jpeg m z proj tiff
WANTLIB= c jpeg m z proj tiff pthread
LIB_DEPENDS= devel/proj \
graphics/tiff

View File

@ -1,5 +1,5 @@
MD5 (libgeotiff-1.2.5.tar.gz) = AA8keohRDxs41LMU0eRwSA==
RMD160 (libgeotiff-1.2.5.tar.gz) = 2C2McFl5/rUcNnJZ4WWf8zJTIPI=
SHA1 (libgeotiff-1.2.5.tar.gz) = OLEAcDdGNv7f3eMo/xyfPG6OWB8=
SHA256 (libgeotiff-1.2.5.tar.gz) = 8nsXWNaJmAUQfkxb6hfrGejS2ueULMBgQPqDes/pXnw=
SIZE (libgeotiff-1.2.5.tar.gz) = 1057705
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

View File

@ -1,29 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.2 2009/03/07 10:55:15 landry Exp $
--- Makefile.in.orig Fri May 9 20:37:46 2008
+++ Makefile.in Sat Mar 7 11:53:01 2009
@@ -102,8 +102,8 @@ libgeotiff.a: ${OBJS}
$(GEOTIFF_SO): ${OBJS}
${LD_SHARED} ${OBJS} ${LIBS} -o $(GEOTIFF_SO)
- rm -f libgeotiff.$(SO_EXT)
- ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT)
+# rm -f libgeotiff.$(SO_EXT)
+# ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT)
Progs: $(GEOTIFF_SO)
${CD} ${BIN};\
@@ -201,14 +201,6 @@ install:
$(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${bindir}; \
else \
$(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${libdir}; \
- (cd $(DESTDIR)${libdir} ; \
- rm -f libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR); \
- ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR); \
- rm -f libgeotiff.$(SO_EXT).$(VERSION_MAJOR); \
- ${LN} libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR) \
- libgeotiff.$(SO_EXT).$(VERSION_MAJOR); \
- rm -f libgeotiff.$(SO_EXT); \
- ${LN} libgeotiff.$(SO_EXT).$(VERSION_MAJOR) libgeotiff.$(SO_EXT); );\
fi;\
fi

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.4 2009/03/07 10:55:15 landry Exp $
--- configure.orig Wed Jul 23 21:38:12 2008
+++ configure Sat Mar 7 11:53:01 2009
@@ -3197,7 +3197,7 @@ if test "$LD_SHARED" != "/bin/true" ; then
GEOTIFF_DLL=cyggeotiff-1.dll
GEOTIFF_IMP=libgeotiff.dll.a
LD_SHARED="gcc -shared -Wl,--export-all -Wl,--out-implib=\$(GEOTIFF_IMP)" ;;
- *) GEOTIFF_SO=libgeotiff.${SO_EXT}.$VERSION_MAJOR.$VERSION_MINOR.$VERSION_POINT ;;
+ *) GEOTIFF_SO=libgeotiff.${SO_EXT}.${LIBgeotiff_VERSION} ;;
esac
fi
GEOTIFF_SO=$GEOTIFF_SO

View File

@ -1,7 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2009/03/07 10:55:15 landry Exp $
@comment $OpenBSD: PLIST,v 1.6 2010/11/21 09:31:55 landry Exp $
%%SHARED%%
@bin bin/applygeo
@bin bin/csv2html
@bin bin/geotifcp
@bin bin/listgeo
@bin bin/makegeo
include/cpl_serv.h
include/epsg_datum.inc
include/epsg_ellipse.inc
@ -13,6 +16,7 @@ include/epsg_units.inc
include/epsg_vertcs.inc
include/geo_config.h
include/geo_ctrans.inc
include/geo_incode_defs.h
include/geo_keyp.h
include/geo_normalize.h
include/geo_simpletags.h
@ -25,6 +29,7 @@ include/geotiffio.h
include/geovalues.h
include/xtiffio.h
lib/libgeotiff.a
lib/libgeotiff.la
share/epsg_csv/
share/epsg_csv/alias.csv
share/epsg_csv/area.csv
@ -40,8 +45,8 @@ 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/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/naming_system.csv