ports/109502: [MAINTEINER] graphics/geomorph: update to 0.40

[Dmitry Marakasov]

>Number:         109502
>Category:       ports
>Synopsis:       [MAINTEINER] graphics/geomorph: update to 0.40
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 24 22:40:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 6.1-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p12 FreeBSD 6.1-RELEASE-p12 #0: Tue Jan 16 23:12:21 MSK 2007 amdmi3 at hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
Update to 0.40
>How-To-Repeat:
>Fix:

--- geomorph-0.40.diff begins here ---
diff -ruN geomorph.orig/Makefile geomorph/Makefile
--- geomorph.orig/Makefile	Sun Feb 25 00:50:26 2007
+++ geomorph/Makefile	Sun Feb 25 01:03:35 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geomorph
-PORTVERSION=	0.31
+PORTVERSION=	0.40
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,7 +34,6 @@
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/local/share/geomorph|${DATADIR}|' ${WRKSRC}/install-step* ${WRKSRC}/install-user ${WRKSRC}/src/app/app.c
 	@${REINPLACE_CMD} -e 's|\$$HOME/geomorph|\$$HOME/.geomorph|' ${WRKSRC}/install-step* ${WRKSRC}/install-user
-	@${REINPLACE_CMD} -e 's|>&|>|' ${WRKSRC}/install-step2-rcfile
 	@${REINPLACE_CMD} -e '/DEFAULT_DIR/ s|geomorph|.geomorph|' ${WRKSRC}/src/app/globals.h ${WRKSRC}/src/hf/globals.h
 	@${RM} ${WRKSRC}/install-step*.bak ${WRKSRC}/install-user*.bak
 
diff -ruN geomorph.orig/distinfo geomorph/distinfo
--- geomorph.orig/distinfo	Sun Feb 25 00:50:26 2007
+++ geomorph/distinfo	Sun Feb 25 00:52:37 2007
@@ -1,3 +1,3 @@
-MD5 (geomorph-0.31.tgz) = 778b2ec4efba77b7efb402bc17dc90ac
-SHA256 (geomorph-0.31.tgz) = 8c505f6ee9a0d4c53565e608e68a62b54b966bbae41ced562fabcb191f0097a1
-SIZE (geomorph-0.31.tgz) = 1041449
+MD5 (geomorph-0.40.tgz) = a094b0fea21affbef449c7df38b19e62
+SHA256 (geomorph-0.40.tgz) = e7bb107bb46d9098762383af3d8ee0d1c02629dc624166de5cb0a4fc44712768
+SIZE (geomorph-0.40.tgz) = 676510
diff -ruN geomorph.orig/files/patch-src-hf-img_process.c geomorph/files/patch-src-hf-img_process.c
--- geomorph.orig/files/patch-src-hf-img_process.c	Thu Jan  1 03:00:00 1970
+++ geomorph/files/patch-src-hf-img_process.c	Sun Feb 25 01:08:00 2007
@@ -0,0 +1,11 @@
+--- src/hf/img_process.c.orig	Tue Dec 26 07:44:14 2006
++++ src/hf/img_process.c	Sun Feb 25 01:07:13 2007
+@@ -1828,6 +1828,8 @@
+ 	free(buffer_out);
+ }
+ 
++#define log2(x) log(x)/log(2)
++
+ void hf_cut_graph (hf_struct_type *hf, gint index, gint axis) {
+ 
+ 	// Draw a graph of line / column "index" on axis "axis"
diff -ruN geomorph.orig/pkg-plist geomorph/pkg-plist
--- geomorph.orig/pkg-plist	Sun Feb 25 00:50:26 2007
+++ geomorph/pkg-plist	Sun Feb 25 01:13:16 2007
@@ -5,7 +5,6 @@
 %%DATADIR%%/%%PORTVERSION%%/LISEZMOI
 %%DATADIR%%/%%PORTVERSION%%/README
 %%DATADIR%%/%%PORTVERSION%%/TODO
-%%DATADIR%%/%%PORTVERSION%%/geomorphrc
 %%DATADIR%%/%%PORTVERSION%%/geomorphrc_de
 %%DATADIR%%/%%PORTVERSION%%/geomorphrc_en
 %%DATADIR%%/%%PORTVERSION%%/geomorphrc_fr
@@ -16,16 +15,23 @@
 %%DATADIR%%/%%PORTVERSION%%/scenes/canyon.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/colmap
 %%DATADIR%%/%%PORTVERSION%%/scenes/colmap.c
+%%DATADIR%%/%%PORTVERSION%%/scenes/cracknet.pov
+%%DATADIR%%/%%PORTVERSION%%/scenes/cracknet_bumptest.pov
+%%DATADIR%%/%%PORTVERSION%%/scenes/cracknet_nobump.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/desert.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/desert_new.pov
-%%DATADIR%%/%%PORTVERSION%%/scenes/desert_with_tree.pov
+%%DATADIR%%/%%PORTVERSION%%/scenes/geomorph.inc
 %%DATADIR%%/%%PORTVERSION%%/scenes/geomorph_txtr.inc
+%%DATADIR%%/%%PORTVERSION%%/scenes/giant_causeway.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/global_settings.inc
 %%DATADIR%%/%%PORTVERSION%%/scenes/iced_satellite.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/maprock1.inc
+%%DATADIR%%/%%PORTVERSION%%/scenes/maprock_brownmud.inc
+%%DATADIR%%/%%PORTVERSION%%/scenes/maprock_redmud.inc
 %%DATADIR%%/%%PORTVERSION%%/scenes/moon.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/mountains.pov
-%%DATADIR%%/%%PORTVERSION%%/scenes/olivier4.inc
+%%DATADIR%%/%%PORTVERSION%%/scenes/mountains_test.pov
+%%DATADIR%%/%%PORTVERSION%%/scenes/mountains_with_water.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/painted_desert.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/painted_desert_map1.inc
 %%DATADIR%%/%%PORTVERSION%%/scenes/painted_desert_map2.inc
@@ -38,6 +44,7 @@
 %%DATADIR%%/%%PORTVERSION%%/scenes/stars.inc
 %%DATADIR%%/%%PORTVERSION%%/scenes/sunseta.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/sunsetb.pov
+%%DATADIR%%/%%PORTVERSION%%/scenes/terraces.pov
 %%DATADIR%%/%%PORTVERSION%%/scenes/uranus.inc
 %%DATADIR%%/%%PORTVERSION%%/splash.jpg
 %%DATADIR%%/%%PORTVERSION%%/update-rc
--- geomorph-0.40.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: