svn commit: r349346 - head/math/saga

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu Mar 27 16:43:43 2014
New Revision: 349346
URL: http://svnweb.freebsd.org/changeset/ports/349346
QAT: https://qat.redports.org/buildarchive/r349346/

Log:
  - Use USE_GCC=yes [1]
  - Use PORTVERSION instead of hard-coded "2.1.1" [2]
  
  Submitted by:	bapt [1], sunpoet (myself) [2]
  Approved by:	Rainer Hurling <rhurlin at gwdg.de> (maintainer)

Modified:
  head/math/saga/Makefile
  head/math/saga/pkg-plist

Modified: head/math/saga/Makefile
==============================================================================
--- head/math/saga/Makefile	Thu Mar 27 16:41:02 2014	(r349345)
+++ head/math/saga/Makefile	Thu Mar 27 16:43:43 2014	(r349346)
@@ -39,6 +39,7 @@ WX_UNICODE=	yes
 DESKTOP_ENTRIES=	"SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \
 			"saga_gui" "Science;Geoscience;Math;" true
 DOS2UNIX_GLOB=	*.cpp *.h
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	PGSQL OPENMP HARU VIGRA
 OPTIONS_DEFAULT=PGSQL OPENMP HARU VIGRA
@@ -63,7 +64,7 @@ VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libv
 .include <bsd.port.pre.mk>
 
 # CLANG is not able to handle neither Fortran nor OpenMP
-USE_GCC=	4.8+
+USE_GCC=	yes
 .if ${COMPILER_FEATURES:Mlibc++}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
 CFLAGS+=	-isystem ${LOCALBASE}/include/c++/v1
@@ -103,9 +104,9 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga_tip.txt ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_api-2.1.1.so
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-2.1.1.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-2.1.1.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_api-${PORTVERSION}.so
+	@${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
 
 .include <bsd.port.post.mk>

Modified: head/math/saga/pkg-plist
==============================================================================
--- head/math/saga/pkg-plist	Thu Mar 27 16:41:02 2014	(r349345)
+++ head/math/saga/pkg-plist	Thu Mar 27 16:43:43 2014	(r349346)
@@ -1,12 +1,12 @@
 bin/saga_cmd
 bin/saga_gui
-lib/libsaga_api-2.1.1.so
+lib/libsaga_api-%%PORTVERSION%%.so
 lib/libsaga_api.la
 lib/libsaga_api.so
-lib/libsaga_gdi-2.1.1.so
+lib/libsaga_gdi-%%PORTVERSION%%.so
 lib/libsaga_gdi.la
 lib/libsaga_gdi.so
-%%PYTHON_SITELIBDIR%%/_saga_api-2.1.1.so
+%%PYTHON_SITELIBDIR%%/_saga_api-%%PORTVERSION%%.so
 %%PYTHON_SITELIBDIR%%/_saga_api.a
 %%PYTHON_SITELIBDIR%%/_saga_api.la
 %%PYTHON_SITELIBDIR%%/_saga_api.so