4 files changed, 25 insertions, 8 deletions

diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 0a8d816e531c..41b61b314dba 100644
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@@ -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 @@ post-patch:
 	@${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 --git a/graphics/geomorph/distinfo b/graphics/geomorph/distinfo
index 5e12595852a4..1452387119ca 100644
--- a/graphics/geomorph/distinfo
+++ b/graphics/geomorph/distinfo
@@ -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 --git a/graphics/geomorph/files/patch-src-hf-img_process.c b/graphics/geomorph/files/patch-src-hf-img_process.c
new file mode 100644
index 000000000000..00fc203b1e59
--- /dev/null
+++ b/graphics/geomorph/files/patch-src-hf-img_process.c
@@ -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 --git a/graphics/geomorph/pkg-plist b/graphics/geomorph/pkg-plist
index 8e88fd477811..cd7ee8e06443 100644
--- a/graphics/geomorph/pkg-plist
+++ b/graphics/geomorph/pkg-plist
@@ -5,7 +5,6 @@ bin/geomorph
 %%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 @@ bin/geomorph
 %%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 @@ bin/geomorph
 %%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