diff options
| author | bapt <bapt@FreeBSD.org> | 2014-05-06 00:24:00 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-05-06 00:24:00 +0800 |
| commit | 602652f5f498977ca9afddad82ce1abd529c8fdb (patch) | |
| tree | 111c3e996440f35b3a05e66700954340c9919761 /math/saga | |
| parent | c7c57f6ff3ff10dcbd4c447d7f21425e9de38302 (diff) | |
| download | freebsd-ports-gnome-602652f5f498977ca9afddad82ce1abd529c8fdb.tar.gz freebsd-ports-gnome-602652f5f498977ca9afddad82ce1abd529c8fdb.tar.zst freebsd-ports-gnome-602652f5f498977ca9afddad82ce1abd529c8fdb.zip | |
Fix unixODBC vs libiodbc conflicts
Always rely on unixODBC each time a port is looking for libodbc.so
Remove odbc compat from libiodbc
This allows to install both kde and gnome at the same time
While here:
- Convert libiodbc to USES=libtool
- Convert a bunch of libiodbc dependencies to USES=libtool
- Chase libiodbc.so shlib change
- Stagify some ports
- Convert some ports to USES=pgsql
Discussed with: rakuco (kde)
With hat: portmgr
Diffstat (limited to 'math/saga')
| -rw-r--r-- | math/saga/Makefile | 5 | ||||
| -rw-r--r-- | math/saga/pkg-plist | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/math/saga/Makefile b/math/saga/Makefile index 88fad49537a2..8f8ffd6b5ac6 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -3,7 +3,7 @@ PORTNAME= saga PORTVERSION= 2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -33,7 +33,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -lopencv_core USE_PYTHON= 2 USE_LDCONFIG= yes USE_WX= 3.0 -USES= compiler:features iconv:wchar_t dos2unix +USES= compiler:features iconv:wchar_t dos2unix libtool WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WX_UNICODE= yes @@ -109,6 +109,5 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/saga/*.so - ${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include <bsd.port.post.mk> diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist index 06a613345b6d..f9b5654ce1f1 100644 --- a/math/saga/pkg-plist +++ b/math/saga/pkg-plist @@ -1,14 +1,11 @@ bin/saga_cmd bin/saga_gui lib/libsaga_api-%%PORTVERSION%%.so -lib/libsaga_api.la lib/libsaga_api.so lib/libsaga_gdi-%%PORTVERSION%%.so -lib/libsaga_gdi.la lib/libsaga_gdi.so %%PYTHON_SITELIBDIR%%/_saga_api-%%PORTVERSION%%.so %%PYTHON_SITELIBDIR%%/_saga_api.a -%%PYTHON_SITELIBDIR%%/_saga_api.la %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py %%PYTHON_SITELIBDIR%%/saga_api.pyc @@ -82,7 +79,6 @@ lib/saga/libtin_viewer.so %%VIGRA%%lib/saga/libvigra.so man/man1/saga_cmd.1.gz man/man1/saga_gui.1.gz -share/applications/saga_gui.desktop %%DATADIR%%/saga.png %%DATADIR%%/saga_tip.txt @dirrmtry %%DATADIR%% |