pull in some changes from Eric Faurot's port:

- use our semantics for shared libs instead of linux
- pass -with-{jpeg/proj/libtiff}=${LOCALBASE} in CONFIGURE_ARGS
also bump package to p0
This commit is contained in:
jason 2007-05-30 20:41:53 +00:00
parent 517b4e6bc4
commit 067739ebd3
5 changed files with 51 additions and 8 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2007/05/27 19:07:09 jason Exp $
# $OpenBSD: Makefile,v 1.3 2007/05/30 20:41:53 jason Exp $
COMMENT= "GIS TIFF interchange library"
DISTNAME= libgeotiff-1.2.3
PKGNAME= $(DISTNAME)p0
CATEGORIES= devel geo
SHARED_LIBS= geotiff 1.2
SHARED_LIBS= geotiff 1.2.3
HOMEPAGE= http://www.remotesensing.org/geotiff/geotiff.html
@ -21,8 +22,11 @@ MASTER_SITES= ftp://ftp.remotesensing.org/geotiff/libgeotiff/ \
CONFIGURE_STYLE= autoconf no-autoheader
AUTOCONF_VERSION= 2.59
CONFIGURE_ENV += CFLAGS=-I${LOCALBASE}/include \
CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include -fPIC" \
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-jpeg=${LOCALBASE} \
--with-proj=${LOCALBASE} \
--with-libtiff=${LOCALBASE}
WANTLIB= m z c jpeg

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/05/30 20:41:54 jason Exp $
--- Makefile.in.orig Thu Mar 16 10:18:49 2006
+++ Makefile.in Thu Mar 16 10:50:17 2006
@@ -101,8 +101,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:
${CD} ${BIN};\
@@ -206,14 +206,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

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2007/05/30 20:41:54 jason Exp $
--- configure.orig Thu Mar 16 10:48:39 2006
+++ configure Thu Mar 16 10:37:59 2006
@@ -2728,7 +2728,7 @@ if test "$LD_SHARED" != "/bin/true" ; th
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}.$VERSION_MAJOR.$VERSION_MINOR ;;
esac
fi
GEOTIFF_SO=$GEOTIFF_SO

View File

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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/26 20:23:47 jason Exp $
@comment $OpenBSD: PLIST,v 1.2 2007/05/30 20:41:54 jason Exp $
%%SHARED%%
bin/geotifcp
bin/listgeo
@ -24,8 +24,6 @@ include/geotiffio.h
include/geovalues.h
include/xtiffio.h
lib/libgeotiff.a
lib/libgeotiff.so.1
lib/libgeotiff.so.1.2.3
share/epsg_csv/
share/epsg_csv/alias.csv
share/epsg_csv/area.csv
@ -52,3 +50,4 @@ share/epsg_csv/projop_wparm.csv
share/epsg_csv/stateplane.csv
share/epsg_csv/unit_of_measure.csv
share/epsg_csv/version_history.csv
share/nls/pl_PL.ISO_8859-2/