From nobody@FreeBSD.org  Fri Nov 19 18:19:25 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8762F106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 19 Nov 2010 18:19:25 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 765378FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 19 Nov 2010 18:19:25 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id oAJIJOWC009655
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 19 Nov 2010 18:19:24 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id oAJIJOKM009654;
	Fri, 19 Nov 2010 18:19:24 GMT
	(envelope-from nobody)
Message-Id: <201011191819.oAJIJOKM009654@www.freebsd.org>
Date: Fri, 19 Nov 2010 18:19:24 GMT
From: Rainer Hurling <rhurlin@gwdg.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: math/saga: update from 2.0.5 to 2.0.6
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         152410
>Category:       ports
>Synopsis:       math/saga: update from 2.0.5 to 2.0.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 19 18:20:03 UTC 2010
>Closed-Date:    Wed Nov 24 05:56:27 UTC 2010
>Last-Modified:  Wed Nov 24 06:00:23 UTC 2010
>Originator:     Rainer Hurling
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
FreeBSD x.x.x 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Sun Nov 14 19:26:56 CET 2010 x@x.x.x:/usr/obj/usr/src/sys/CUSTOM amd64
>Description:
This is an update of the linux sources of SAGA GIS (2.0.5 to 2.0.6) with new modules and features. Many bugfixes are also included.

The updated port now supports opencv and liblas. It handles <malloc.h> in a more correct way I hope.


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Naur saga/Makefile saga/Makefile
--- saga/Makefile	2010-09-09 07:30:32.000000000 +0200
+++ saga/Makefile	2010-11-19 10:42:28.000000000 +0100
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	saga
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.6
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
-DISTNAME=	${PORTNAME}_${PORTVERSION}_src
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	System for Automated Geoscientific Analyses
@@ -18,7 +18,9 @@
 		gdal.15:${PORTSDIR}/graphics/gdal \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		iodbc.3:${PORTSDIR}/databases/libiodbc
+		iodbc.3:${PORTSDIR}/databases/libiodbc \
+		las.1:${PORTSDIR}/devel/liblas \
+		cv.2:${PORTSDIR}/graphics/opencv
 
 USE_WX=		2.8
 USE_LDCONFIG=	yes
@@ -59,13 +61,11 @@
 		${WRKSRC}/configure; do \
 		${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' "$$f"; \
 	done
-	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
-		${WRKSRC}/configure \
+	@${REINPLACE_CMD} -e 's|#if !defined(__APPLE__) && !defined(__BSD__)|#ifdef HAVE_MALLOC_H|' \
 		${WRKSRC}/src/saga_core/saga_api/api_core.h \
-		${WRKSRC}/src/saga_core/saga_api/api_memory.cpp \
-		${WRKSRC}/src/modules_io/esri_e00/io_esri_e00/e00compr/cpl_port.h \
-		${WRKSRC}/src/modules_io/grid/io_grid_grib2/g2clib-1.0.4/enc_png.c \
 		${WRKSRC}/src/modules_projection/pj_georeference/pj_georeference/lmdif0.c
+	@${REINPLACE_CMD} -e 's,<cv.h>,<opencv/cv.h>,' \
+		${WRKSRC}/src/modules_images/modules_opencv/opencv/opencv.h
 .if ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|typedef unsigned long	DWORD;|typedef unsigned int	DWORD;|' \
 		${WRKSRC}/src/saga_core/saga_api/api_core.h
diff -Naur saga/distinfo saga/distinfo
--- saga/distinfo	2010-09-04 14:53:44.000000000 +0200
+++ saga/distinfo	2010-11-18 20:46:44.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (saga_2.0.5_src.tar.gz) = 4a9d15db2cabc4ccb60946fda40eaf92
-SHA256 (saga_2.0.5_src.tar.gz) = 064fbf69f43038e2a6a4bfb349c20352eb4ed04b3f46fed5832519bf3145927f
-SIZE (saga_2.0.5_src.tar.gz) = 2960764
+SHA256 (saga_2.0.6.tar.gz) = 9e3e8a69eb65483a9be65b31be96179918ab5a16e39c5ff5812acd7935aebe7f
+SIZE (saga_2.0.6.tar.gz) = 3327054
diff -Naur saga/files/patch-Makefile.in saga/files/patch-Makefile.in
--- saga/files/patch-Makefile.in	2010-09-04 14:53:44.000000000 +0200
+++ saga/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
---- src/saga_core/saga_cmd/Makefile.in	2010-08-18 14:28:14.000000000 +0200
-+++ src/saga_core/saga_cmd/Makefile.in	2010-08-29 14:11:13.000000000 +0200
-@@ -239,9 +239,9 @@
- #
- @DEBUG_TRUE@DBGFLAGS = -g -DDEBUG
- MLIBPATH = "MODULE_LIBRARY_PATH=\"$(prefix)/lib/saga\""
--BASEFLAGS = -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD $(DBGFLAGS) -I.. -D$(MLIBPATH)
-+BASEFLAGS = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD $(DBGFLAGS) -I.. -D$(MLIBPATH)
- @SAGA_UNICODE_FALSE@AM_CXXFLAGS = -fPIC `wx-config --unicode=no --cxxflags` $(BASEFLAGS)
--@SAGA_UNICODE_TRUE@AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags` $(BASEFLAGS)
-+@SAGA_UNICODE_TRUE@AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags` $(BASEFLAGS) -D_SAGA_UNICODE
- @SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC `wx-config --unicode=no --libs` -lm
- @SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs` -lm
- saga_cmd_LDADD = ../saga_api/libsaga_api.la
diff -Naur saga/files/patch-dlg_about saga/files/patch-dlg_about
--- saga/files/patch-dlg_about	2010-09-04 14:53:44.000000000 +0200
+++ saga/files/patch-dlg_about	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- src/saga_core/saga_gui/dlg_about.cpp	2009-10-01 18:18:30.000000000 +0200
-+++ src/saga_core/saga_gui/dlg_about.cpp	2010-08-30 16:25:31.000000000 +0200
-@@ -256,7 +256,7 @@
- 		);
- 
- 		s.Append(
--			CSG_Doc_PDF::Get_Version()
-+			wxT("Haru Free PDF Library, Version 2.1.0")
- 		);
- 
- 		s.Append(
diff -Naur saga/pkg-plist saga/pkg-plist
--- saga/pkg-plist	2010-09-04 14:53:44.000000000 +0200
+++ saga/pkg-plist	2010-11-18 21:31:09.000000000 +0100
@@ -1,17 +1,21 @@
 bin/saga_cmd
 bin/saga_gui
-lib/libsaga_api-2.0.5.so
+lib/libsaga_api-2.0.6.so
 lib/libsaga_api.la
 lib/libsaga_api.so
-lib/libsaga_gdi-2.0.5.so
+lib/libsaga_gdi-2.0.6.so
 lib/libsaga_gdi.la
 lib/libsaga_gdi.so
-lib/libsaga_odbc-2.0.5.so
+lib/libsaga_odbc-2.0.6.so
 lib/libsaga_odbc.a
 lib/libsaga_odbc.la
 lib/libsaga_odbc.so
 lib/saga/libcontrib_a_perego.la
 lib/saga/libcontrib_a_perego.so
+lib/saga/libdocs_html.la
+lib/saga/libdocs_html.so
+lib/saga/libdocs_pdf.la
+lib/saga/libdocs_pdf.so
 lib/saga/libgeostatistics_grid.la
 lib/saga/libgeostatistics_grid.so
 lib/saga/libgeostatistics_kriging.la
@@ -40,6 +44,8 @@
 lib/saga/libgrid_visualisation.so
 lib/saga/libihacres.la
 lib/saga/libihacres.so
+lib/saga/libimagery_segmentation.la
+lib/saga/libimagery_segmentation.so
 lib/saga/libio_esri_e00.la
 lib/saga/libio_esri_e00.so
 lib/saga/libio_gdal.la
@@ -59,10 +65,14 @@
 lib/saga/libio_shapes.so
 lib/saga/libio_shapes_dxf.la
 lib/saga/libio_shapes_dxf.so
+lib/saga/libio_shapes_las.la
+lib/saga/libio_shapes_las.so
 lib/saga/libio_table.la
 lib/saga/libio_table.so
 lib/saga/liblectures_introduction.la
 lib/saga/liblectures_introduction.so
+lib/saga/libopencv.la
+lib/saga/libopencv.so
 lib/saga/libpj_georeference.la
 lib/saga/libpj_georeference.so
 lib/saga/libpj_proj4.la
@@ -95,8 +105,6 @@
 lib/saga/libsim_hydrology.so
 lib/saga/libta_channels.la
 lib/saga/libta_channels.so
-lib/saga/libta_compound.la
-lib/saga/libta_compound.so
 lib/saga/libta_hydrology.la
 lib/saga/libta_hydrology.so
 lib/saga/libta_lighting.la


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Sat Nov 20 01:10:05 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152410 
State-Changed-From-To: open->feedback 
State-Changed-By: beech 
State-Changed-When: Sat Nov 20 04:57:33 UTC 2010 
State-Changed-Why:  
Won't package due to plist errors. Waiting for maintainer feedback. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152410 

From: Rainer Hurling <rhurlin@gwdg.de>
To: bug-followup@FreeBSD.org, rhurlin@gwdg.de
Cc:  
Subject: Re: ports/152410: math/saga: update from 2.0.5 to 2.0.6
Date: Tue, 23 Nov 2010 22:01:42 +0100

 All plist errors were identified.
 
 Entries for libharu in pkg-plist may only be respected, when option 
 WITH_HARU is set (PLIST_SUB+).
 
 Libraries of opencv and liblas are only be found by configure, if 
 LDFLAGS+ explixitly sets the right path for configure args (as done 
 before for libharu). So I had to put the existing lines outside of 
 WITH_HARU definition.
State-Changed-From-To: feedback->closed 
State-Changed-By: beech 
State-Changed-When: Wed Nov 24 05:56:09 UTC 2010 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152410 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152410: commit references a PR
Date: Wed, 24 Nov 2010 05:55:29 +0000 (UTC)

 beech       2010-11-24 05:55:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/saga            Makefile distinfo pkg-plist 
   Removed files:
     math/saga/files      patch-Makefile.in patch-dlg_about 
   Log:
   Update to 2.0.6
   Remove MD5
   
   PR:             152410
   Submitted by:   Rainer Hurling <rhurlin@gwdg.de> (maintainer)
   Approved by:    itetcu
   
   Revision  Changes    Path
   1.8       +14 -11    ports/math/saga/Makefile
   1.3       +2 -3      ports/math/saga/distinfo
   1.2       +0 -14     ports/math/saga/files/patch-Makefile.in (dead)
   1.2       +0 -11     ports/math/saga/files/patch-dlg_about (dead)
   1.3       +13 -5     ports/math/saga/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
